From a22727c2a2aa2da5b7bc0da6e40635b234f9fffa Mon Sep 17 00:00:00 2001 From: caiyx Date: Thu, 28 Nov 2024 16:55:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 234 +++++++++++++++ src/components/base/AvatarCropper.vue | 2 +- src/components/x-message/message/index.vue | 2 +- src/connect.js | 2 +- src/hooks/useSessionMenu.js | 12 +- src/hooks/useTalkRecord.js | 2 +- src/main.js | 2 +- src/pages/dialog/components/emojiPanel.vue | 3 +- src/pages/dialog/formats/emoji.ts | 40 +++ src/pages/dialog/index.vue | 239 +++++++++++---- src/static/image/emoji/001_微笑.png | Bin 5013 -> 0 bytes src/static/image/emoji/002_撇嘴.png | Bin 4723 -> 0 bytes src/static/image/emoji/003_色.png | Bin 5107 -> 0 bytes src/static/image/emoji/004_发呆.png | Bin 5266 -> 0 bytes src/static/image/emoji/005_得意.png | Bin 5015 -> 0 bytes src/static/image/emoji/006_流泪.png | Bin 4635 -> 0 bytes src/static/image/emoji/007_害羞.png | Bin 5154 -> 0 bytes src/static/image/emoji/008_闭嘴.png | Bin 5246 -> 0 bytes src/static/image/emoji/009_睡.png | Bin 4833 -> 0 bytes src/static/image/emoji/010_大哭.png | Bin 5165 -> 0 bytes src/static/image/emoji/011_尴尬.png | Bin 4790 -> 0 bytes src/static/image/emoji/012_发怒.png | Bin 4748 -> 0 bytes src/static/image/emoji/013_调皮.png | Bin 4728 -> 0 bytes src/static/image/emoji/014_呲牙.png | Bin 5592 -> 0 bytes src/static/image/emoji/015_惊讶.png | Bin 5004 -> 0 bytes src/static/image/emoji/016_难过.png | Bin 4604 -> 0 bytes src/static/image/emoji/017_囧.png | Bin 4861 -> 0 bytes src/static/image/emoji/018_抓狂.png | Bin 5743 -> 0 bytes src/static/image/emoji/019_吐.png | Bin 5437 -> 0 bytes src/static/image/emoji/020_偷笑.png | Bin 5409 -> 0 bytes src/static/image/emoji/021_愉快.png | Bin 4841 -> 0 bytes src/static/image/emoji/022_白眼.png | Bin 5066 -> 0 bytes src/static/image/emoji/023_傲慢.png | Bin 5105 -> 0 bytes src/static/image/emoji/024_困.png | Bin 4416 -> 0 bytes src/static/image/emoji/025_惊恐.png | Bin 4989 -> 0 bytes src/static/image/emoji/026_憨笑.png | Bin 5451 -> 0 bytes src/static/image/emoji/027_悠闲.png | Bin 4404 -> 0 bytes src/static/image/emoji/028_咒骂.png | Bin 5910 -> 0 bytes src/static/image/emoji/029_疑问.png | Bin 5913 -> 0 bytes src/static/image/emoji/030_嘘.png | Bin 5197 -> 0 bytes src/static/image/emoji/031_晕.png | Bin 5599 -> 0 bytes src/static/image/emoji/032_衰.png | Bin 4869 -> 0 bytes src/static/image/emoji/033_骷髅.png | Bin 5267 -> 0 bytes src/static/image/emoji/034_敲打.png | Bin 6155 -> 0 bytes src/static/image/emoji/035_再见.png | Bin 4960 -> 0 bytes src/static/image/emoji/036_擦汗.png | Bin 5190 -> 0 bytes src/static/image/emoji/037_抠鼻.png | Bin 4974 -> 0 bytes src/static/image/emoji/038_鼓掌.png | Bin 5691 -> 0 bytes src/static/image/emoji/039_坏笑.png | Bin 5107 -> 0 bytes src/static/image/emoji/040_右哼哼.png | Bin 4663 -> 0 bytes src/static/image/emoji/041_鄙视.png | Bin 5766 -> 0 bytes src/static/image/emoji/042_委屈.png | Bin 5484 -> 0 bytes src/static/image/emoji/043_快哭了.png | Bin 5218 -> 0 bytes src/static/image/emoji/044_阴险.png | Bin 5185 -> 0 bytes src/static/image/emoji/045_亲亲.png | Bin 4995 -> 0 bytes src/static/image/emoji/046_可怜.png | Bin 5601 -> 0 bytes src/static/image/emoji/047_笑脸.png | Bin 5290 -> 0 bytes src/static/image/emoji/048_生病.png | Bin 5237 -> 0 bytes src/static/image/emoji/049_脸红.png | Bin 5354 -> 0 bytes src/static/image/emoji/050_破涕为笑.png | Bin 5588 -> 0 bytes src/static/image/emoji/051_恐惧.png | Bin 5169 -> 0 bytes src/static/image/emoji/052_失望.png | Bin 4902 -> 0 bytes src/static/image/emoji/053_无语.png | Bin 4958 -> 0 bytes src/static/image/emoji/054_嘿哈.png | Bin 5754 -> 0 bytes src/static/image/emoji/055_捂脸.png | Bin 5823 -> 0 bytes src/static/image/emoji/056_奸笑.png | Bin 5402 -> 0 bytes src/static/image/emoji/057_机智.png | Bin 5534 -> 0 bytes src/static/image/emoji/058_皱眉.png | Bin 5094 -> 0 bytes src/static/image/emoji/059_耶.png | Bin 5986 -> 0 bytes src/static/image/emoji/060_吃瓜.png | Bin 5509 -> 0 bytes src/static/image/emoji/061_加油.png | Bin 5769 -> 0 bytes src/static/image/emoji/062_汗.png | Bin 4876 -> 0 bytes src/static/image/emoji/063_天啊.png | Bin 5288 -> 0 bytes src/static/image/emoji/064_Emm.png | Bin 4653 -> 0 bytes src/static/image/emoji/065_社会社会.png | Bin 5888 -> 0 bytes src/static/image/emoji/066_旺柴.png | Bin 5083 -> 0 bytes src/static/image/emoji/067_好的.png | Bin 5804 -> 0 bytes src/static/image/emoji/068_打脸.png | Bin 5230 -> 0 bytes src/static/image/emoji/069_哇.png | Bin 5486 -> 0 bytes src/static/image/emoji/070_翻白眼.png | Bin 4480 -> 0 bytes src/static/image/emoji/071_666.png | Bin 6095 -> 0 bytes src/static/image/emoji/072_让我看看.png | Bin 5785 -> 0 bytes src/static/image/emoji/073_叹气.png | Bin 5141 -> 0 bytes src/static/image/emoji/074_苦涩.png | Bin 4863 -> 0 bytes src/static/image/emoji/075_裂开.png | Bin 5632 -> 0 bytes src/static/image/emoji/076_嘴唇.png | Bin 4131 -> 0 bytes src/static/image/emoji/077_爱心.png | Bin 3898 -> 0 bytes src/static/image/emoji/078_心碎.png | Bin 4215 -> 0 bytes src/static/image/emoji/079_拥抱.png | Bin 4551 -> 0 bytes src/static/image/emoji/080_强.png | Bin 3681 -> 0 bytes src/static/image/emoji/081_弱.png | Bin 3559 -> 0 bytes src/static/image/emoji/082_握手.png | Bin 5025 -> 0 bytes src/static/image/emoji/083_胜利.png | Bin 4920 -> 0 bytes src/static/image/emoji/084_抱拳.png | Bin 4764 -> 0 bytes src/static/image/emoji/085_勾引.png | Bin 4565 -> 0 bytes src/static/image/emoji/086_拳头.png | Bin 5256 -> 0 bytes src/static/image/emoji/087_OK.png | Bin 5502 -> 0 bytes src/static/image/emoji/088_合十.png | Bin 4164 -> 0 bytes src/static/image/emoji/089_啤酒.png | Bin 5542 -> 0 bytes src/static/image/emoji/090_咖啡.png | Bin 5208 -> 0 bytes src/static/image/emoji/091_蛋糕.png | Bin 5290 -> 0 bytes src/static/image/emoji/092_玫瑰.png | Bin 3480 -> 0 bytes src/static/image/emoji/093_凋谢.png | Bin 4530 -> 0 bytes src/static/image/emoji/094_菜刀.png | Bin 2840 -> 0 bytes src/static/image/emoji/095_炸弹.png | Bin 4558 -> 0 bytes src/static/image/emoji/096_便便.png | Bin 4891 -> 0 bytes src/static/image/emoji/097_月亮.png | Bin 4884 -> 0 bytes src/static/image/emoji/098_太阳.png | Bin 5605 -> 0 bytes src/static/image/emoji/099_庆祝.png | Bin 4705 -> 0 bytes src/static/image/emoji/100_礼物.png | Bin 5358 -> 0 bytes src/static/image/emoji/101_红包.png | Bin 2577 -> 0 bytes src/static/image/emoji/102_發.png | Bin 4620 -> 0 bytes src/static/image/emoji/103_福.png | Bin 3767 -> 0 bytes src/static/image/emoji/104_烟花.png | Bin 6219 -> 0 bytes src/static/image/emoji/105_爆竹.png | Bin 4297 -> 0 bytes src/static/image/emoji/106_猪头.png | Bin 4511 -> 0 bytes src/static/image/emoji/107_跳跳.png | Bin 3977 -> 0 bytes src/static/image/emoji/108_发抖.png | Bin 4230 -> 0 bytes src/static/image/emoji/109_转圈.png | Bin 3766 -> 0 bytes src/store/auth/index.js | 2 +- src/store/index.js | 2 +- src/store/modules/dialogue.js | 6 +- src/store/modules/editor.js | 2 - src/store/modules/settings.ts | 37 +++ src/store/modules/talk.js | 2 +- src/utils/emojis.js | 330 +++++++-------------- 127 files changed, 625 insertions(+), 295 deletions(-) create mode 100644 src/pages/dialog/formats/emoji.ts delete mode 100644 src/static/image/emoji/001_微笑.png delete mode 100644 src/static/image/emoji/002_撇嘴.png delete mode 100644 src/static/image/emoji/003_色.png delete mode 100644 src/static/image/emoji/004_发呆.png delete mode 100644 src/static/image/emoji/005_得意.png delete mode 100644 src/static/image/emoji/006_流泪.png delete mode 100644 src/static/image/emoji/007_害羞.png delete mode 100644 src/static/image/emoji/008_闭嘴.png delete mode 100644 src/static/image/emoji/009_睡.png delete mode 100644 src/static/image/emoji/010_大哭.png delete mode 100644 src/static/image/emoji/011_尴尬.png delete mode 100644 src/static/image/emoji/012_发怒.png delete mode 100644 src/static/image/emoji/013_调皮.png delete mode 100644 src/static/image/emoji/014_呲牙.png delete mode 100644 src/static/image/emoji/015_惊讶.png delete mode 100644 src/static/image/emoji/016_难过.png delete mode 100644 src/static/image/emoji/017_囧.png delete mode 100644 src/static/image/emoji/018_抓狂.png delete mode 100644 src/static/image/emoji/019_吐.png delete mode 100644 src/static/image/emoji/020_偷笑.png delete mode 100644 src/static/image/emoji/021_愉快.png delete mode 100644 src/static/image/emoji/022_白眼.png delete mode 100644 src/static/image/emoji/023_傲慢.png delete mode 100644 src/static/image/emoji/024_困.png delete mode 100644 src/static/image/emoji/025_惊恐.png delete mode 100644 src/static/image/emoji/026_憨笑.png delete mode 100644 src/static/image/emoji/027_悠闲.png delete mode 100644 src/static/image/emoji/028_咒骂.png delete mode 100644 src/static/image/emoji/029_疑问.png delete mode 100644 src/static/image/emoji/030_嘘.png delete mode 100644 src/static/image/emoji/031_晕.png delete mode 100644 src/static/image/emoji/032_衰.png delete mode 100644 src/static/image/emoji/033_骷髅.png delete mode 100644 src/static/image/emoji/034_敲打.png delete mode 100644 src/static/image/emoji/035_再见.png delete mode 100644 src/static/image/emoji/036_擦汗.png delete mode 100644 src/static/image/emoji/037_抠鼻.png delete mode 100644 src/static/image/emoji/038_鼓掌.png delete mode 100644 src/static/image/emoji/039_坏笑.png delete mode 100644 src/static/image/emoji/040_右哼哼.png delete mode 100644 src/static/image/emoji/041_鄙视.png delete mode 100644 src/static/image/emoji/042_委屈.png delete mode 100644 src/static/image/emoji/043_快哭了.png delete mode 100644 src/static/image/emoji/044_阴险.png delete mode 100644 src/static/image/emoji/045_亲亲.png delete mode 100644 src/static/image/emoji/046_可怜.png delete mode 100644 src/static/image/emoji/047_笑脸.png delete mode 100644 src/static/image/emoji/048_生病.png delete mode 100644 src/static/image/emoji/049_脸红.png delete mode 100644 src/static/image/emoji/050_破涕为笑.png delete mode 100644 src/static/image/emoji/051_恐惧.png delete mode 100644 src/static/image/emoji/052_失望.png delete mode 100644 src/static/image/emoji/053_无语.png delete mode 100644 src/static/image/emoji/054_嘿哈.png delete mode 100644 src/static/image/emoji/055_捂脸.png delete mode 100644 src/static/image/emoji/056_奸笑.png delete mode 100644 src/static/image/emoji/057_机智.png delete mode 100644 src/static/image/emoji/058_皱眉.png delete mode 100644 src/static/image/emoji/059_耶.png delete mode 100644 src/static/image/emoji/060_吃瓜.png delete mode 100644 src/static/image/emoji/061_加油.png delete mode 100644 src/static/image/emoji/062_汗.png delete mode 100644 src/static/image/emoji/063_天啊.png delete mode 100644 src/static/image/emoji/064_Emm.png delete mode 100644 src/static/image/emoji/065_社会社会.png delete mode 100644 src/static/image/emoji/066_旺柴.png delete mode 100644 src/static/image/emoji/067_好的.png delete mode 100644 src/static/image/emoji/068_打脸.png delete mode 100644 src/static/image/emoji/069_哇.png delete mode 100644 src/static/image/emoji/070_翻白眼.png delete mode 100644 src/static/image/emoji/071_666.png delete mode 100644 src/static/image/emoji/072_让我看看.png delete mode 100644 src/static/image/emoji/073_叹气.png delete mode 100644 src/static/image/emoji/074_苦涩.png delete mode 100644 src/static/image/emoji/075_裂开.png delete mode 100644 src/static/image/emoji/076_嘴唇.png delete mode 100644 src/static/image/emoji/077_爱心.png delete mode 100644 src/static/image/emoji/078_心碎.png delete mode 100644 src/static/image/emoji/079_拥抱.png delete mode 100644 src/static/image/emoji/080_强.png delete mode 100644 src/static/image/emoji/081_弱.png delete mode 100644 src/static/image/emoji/082_握手.png delete mode 100644 src/static/image/emoji/083_胜利.png delete mode 100644 src/static/image/emoji/084_抱拳.png delete mode 100644 src/static/image/emoji/085_勾引.png delete mode 100644 src/static/image/emoji/086_拳头.png delete mode 100644 src/static/image/emoji/087_OK.png delete mode 100644 src/static/image/emoji/088_合十.png delete mode 100644 src/static/image/emoji/089_啤酒.png delete mode 100644 src/static/image/emoji/090_咖啡.png delete mode 100644 src/static/image/emoji/091_蛋糕.png delete mode 100644 src/static/image/emoji/092_玫瑰.png delete mode 100644 src/static/image/emoji/093_凋谢.png delete mode 100644 src/static/image/emoji/094_菜刀.png delete mode 100644 src/static/image/emoji/095_炸弹.png delete mode 100644 src/static/image/emoji/096_便便.png delete mode 100644 src/static/image/emoji/097_月亮.png delete mode 100644 src/static/image/emoji/098_太阳.png delete mode 100644 src/static/image/emoji/099_庆祝.png delete mode 100644 src/static/image/emoji/100_礼物.png delete mode 100644 src/static/image/emoji/101_红包.png delete mode 100644 src/static/image/emoji/102_發.png delete mode 100644 src/static/image/emoji/103_福.png delete mode 100644 src/static/image/emoji/104_烟花.png delete mode 100644 src/static/image/emoji/105_爆竹.png delete mode 100644 src/static/image/emoji/106_猪头.png delete mode 100644 src/static/image/emoji/107_跳跳.png delete mode 100644 src/static/image/emoji/108_发抖.png delete mode 100644 src/static/image/emoji/109_转圈.png create mode 100644 src/store/modules/settings.ts diff --git a/package.json b/package.json index e2e2215..ea57ce6 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "axios": "^1.7.2", "dayjs": "^1.11.12", "less": "^4.2.0", + "lodash": "^4.17.21", "nzh": "^1.0.13", "pinia-plugin-persistedstate": "^4.1.3", "quill-mention": "^6.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 276fadc..26ae4d6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -59,6 +59,9 @@ importers: '@uni-helper/uni-use': specifier: ^0.19.12 version: 0.19.12(@vueuse/core@9.13.0(vue@3.4.35(typescript@5.5.4)))(postcss@8.4.40)(typescript@5.5.4)(vue@3.4.35(typescript@5.5.4)) + '@vueup/vue-quill': + specifier: ^1.2.0 + version: 1.2.0(vue@3.4.35(typescript@5.5.4)) '@vueuse/core': specifier: ^9.13.0 version: 9.13.0(vue@3.4.35(typescript@5.5.4)) @@ -71,12 +74,18 @@ importers: less: specifier: ^4.2.0 version: 4.2.0 + lodash: + specifier: ^4.17.21 + version: 4.17.21 nzh: specifier: ^1.0.13 version: 1.0.13 pinia-plugin-persistedstate: specifier: ^4.1.3 version: 4.1.3(pinia@2.0.36(typescript@5.5.4)(vue@3.4.35(typescript@5.5.4)))(rollup@4.19.2) + quill-mention: + specifier: ^6.0.2 + version: 6.0.2 vconsole: specifier: ^3.15.1 version: 3.15.1 @@ -2190,6 +2199,11 @@ packages: '@vue/tsconfig@0.5.1': resolution: {integrity: sha512-VcZK7MvpjuTPx2w6blwnwZAu5/LgBUtejFOi3pPGQFXQN5Ela03FUtd2Qtg4yWGGissVL0dr6Ro1LfOFh+PCuQ==} + '@vueup/vue-quill@1.2.0': + resolution: {integrity: sha512-kd5QPSHMDpycklojPXno2Kw2JSiKMYduKYQckTm1RJoVDA557MnyUXgcuuDpry4HY/Rny9nGNcK+m3AHk94wag==} + peerDependencies: + vue: ^3.2.41 + '@vueuse/core@9.13.0': resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==} @@ -2499,6 +2513,10 @@ packages: cliui@7.0.4: resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} + clone@2.1.2: + resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==} + engines: {node: '>=0.8'} + co@4.6.0: resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==} engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'} @@ -2679,6 +2697,10 @@ packages: dedent@0.7.0: resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==} + deep-equal@1.1.2: + resolution: {integrity: sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==} + engines: {node: '>= 0.4'} + deep-pick-omit@1.2.1: resolution: {integrity: sha512-2J6Kc/m3irCeqVG42T+SaUMesaK7oGWaedGnQQK/+O0gYc+2SP5bKh/KKTE7d7SJ+GCA9UUE1GRzh6oDe0EnGw==} @@ -2698,6 +2720,10 @@ packages: resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==} engines: {node: '>=8'} + define-properties@1.2.1: + resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==} + engines: {node: '>= 0.4'} + defu@6.1.4: resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==} @@ -2867,6 +2893,9 @@ packages: resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==} engines: {node: '>= 0.6'} + eventemitter3@2.0.3: + resolution: {integrity: sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==} + eventemitter3@5.0.1: resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==} @@ -2893,9 +2922,21 @@ packages: resolution: {integrity: sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==} engines: {node: '>= 0.10.0'} + extend@3.0.2: + resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} + fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} + fast-diff@1.1.2: + resolution: {integrity: sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==} + + fast-diff@1.2.0: + resolution: {integrity: sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==} + + fast-diff@1.3.0: + resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==} + fast-glob@3.3.2: resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} engines: {node: '>=8.6.0'} @@ -2983,6 +3024,9 @@ packages: function-bind@1.1.2: resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} + functions-have-names@1.2.3: + resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} + generic-names@4.0.0: resolution: {integrity: sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==} @@ -3069,6 +3113,10 @@ packages: resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} engines: {node: '>= 0.4'} + has-tostringtag@1.0.2: + resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==} + engines: {node: '>= 0.4'} + hash-sum@2.0.0: resolution: {integrity: sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==} @@ -3177,6 +3225,10 @@ packages: resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} engines: {node: '>= 0.10'} + is-arguments@1.1.1: + resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==} + engines: {node: '>= 0.4'} + is-arrayish@0.2.1: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} @@ -3188,6 +3240,10 @@ packages: resolution: {integrity: sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==} engines: {node: '>= 0.4'} + is-date-object@1.0.5: + resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} + engines: {node: '>= 0.4'} + is-docker@2.2.1: resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==} engines: {node: '>=8'} @@ -3227,6 +3283,10 @@ packages: is-potential-custom-element-name@1.0.1: resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==} + is-regex@1.1.4: + resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} + engines: {node: '>= 0.4'} + is-stream@2.0.1: resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} engines: {node: '>=8'} @@ -3555,12 +3615,21 @@ packages: resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} engines: {node: '>=8'} + lodash-es@4.17.21: + resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} + lodash.camelcase@4.3.0: resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==} + lodash.clonedeep@4.5.0: + resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==} + lodash.debounce@4.0.8: resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==} + lodash.isequal@4.5.0: + resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==} + lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} @@ -3773,6 +3842,14 @@ packages: resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==} engines: {node: '>= 0.4'} + object-is@1.1.6: + resolution: {integrity: sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==} + engines: {node: '>= 0.4'} + + object-keys@1.1.1: + resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} + engines: {node: '>= 0.4'} + ofetch@1.3.4: resolution: {integrity: sha512-KLIET85ik3vhEfS+3fDlc/BAZiAp+43QEC/yCo5zkNoY2YaKvNkOaFr/6wCFgFH1kuYQM5pMNi0Tg8koiIemtw==} @@ -3827,6 +3904,12 @@ packages: pako@1.0.11: resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==} + parchment@1.1.4: + resolution: {integrity: sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==} + + parchment@3.0.0: + resolution: {integrity: sha512-HUrJFQ/StvgmXRcQ1ftY6VEZUq3jA2t9ncFN4F84J/vN0/FPpQF+8FKXb3l6fLces6q0uOHj6NJn+2xvZnxO6A==} + parse-bmfont-ascii@1.0.6: resolution: {integrity: sha512-U4RrVsUFCleIOBsIGYOMKjn9PavsGOXxbvYGtMOEfnId0SVNsgehXh1DxUdVPLoxd5mvcEtvmKs2Mmf0Mpa1ZA==} @@ -4081,6 +4164,27 @@ packages: queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} + quill-delta@3.6.3: + resolution: {integrity: sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==} + engines: {node: '>=0.10'} + + quill-delta@4.2.2: + resolution: {integrity: sha512-qjbn82b/yJzOjstBgkhtBjN2TNK+ZHP/BgUQO+j6bRhWQQdmj2lH6hXG7+nwwLF41Xgn//7/83lxs9n2BkTtTg==} + + quill-delta@5.1.0: + resolution: {integrity: sha512-X74oCeRI4/p0ucjb5Ma8adTXd9Scumz367kkMK5V/IatcX6A0vlgLgKbzXWy5nZmCGeNJm2oQX0d2Eqj+ZIlCA==} + engines: {node: '>= 12.0.0'} + + quill-mention@6.0.2: + resolution: {integrity: sha512-ZyiEzLxtoNJ/hAjMyfVsugpXAcOdD2fbHmJT3yKuwpUxiDHdmutVJqOzpItqiVbcjUecnjAF+/Yo1IN3/W6iAg==} + + quill@1.3.7: + resolution: {integrity: sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==} + + quill@2.0.2: + resolution: {integrity: sha512-QfazNrhMakEdRG57IoYFwffUIr04LWJxbS/ZkidRFXYCQt63c1gK6Z7IHUXMx/Vh25WgPBU42oBaNzQ0K1R/xw==} + engines: {npm: '>=8.2.3'} + range-parser@1.2.1: resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==} engines: {node: '>= 0.6'} @@ -4122,6 +4226,10 @@ packages: regenerator-transform@0.15.2: resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==} + regexp.prototype.flags@1.5.3: + resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==} + engines: {node: '>= 0.4'} + regexpu-core@5.3.2: resolution: {integrity: sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==} engines: {node: '>=4'} @@ -4236,6 +4344,10 @@ packages: resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} engines: {node: '>= 0.4'} + set-function-name@2.0.2: + resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==} + engines: {node: '>= 0.4'} + setprototypeof@1.2.0: resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} @@ -7822,6 +7934,12 @@ snapshots: '@vue/tsconfig@0.5.1': {} + '@vueup/vue-quill@1.2.0(vue@3.4.35(typescript@5.5.4))': + dependencies: + quill: 1.3.7 + quill-delta: 4.2.2 + vue: 3.4.35(typescript@5.5.4) + '@vueuse/core@9.13.0(vue@3.4.35(typescript@5.5.4))': dependencies: '@types/web-bluetooth': 0.0.16 @@ -8188,6 +8306,8 @@ snapshots: strip-ansi: 6.0.1 wrap-ansi: 7.0.0 + clone@2.1.2: {} + co@4.6.0: {} collect-v8-coverage@1.0.2: {} @@ -8322,6 +8442,15 @@ snapshots: dedent@0.7.0: {} + deep-equal@1.1.2: + dependencies: + is-arguments: 1.1.1 + is-date-object: 1.0.5 + is-regex: 1.1.4 + object-is: 1.1.6 + object-keys: 1.1.1 + regexp.prototype.flags: 1.5.3 + deep-pick-omit@1.2.1: {} deepmerge@4.3.1: {} @@ -8338,6 +8467,12 @@ snapshots: define-lazy-prop@2.0.0: {} + define-properties@1.2.1: + dependencies: + define-data-property: 1.1.4 + has-property-descriptors: 1.0.2 + object-keys: 1.1.1 + defu@6.1.4: {} delayed-stream@1.0.0: {} @@ -8536,6 +8671,8 @@ snapshots: etag@1.8.1: {} + eventemitter3@2.0.3: {} + eventemitter3@5.0.1: {} execa@5.1.1: @@ -8609,8 +8746,16 @@ snapshots: transitivePeerDependencies: - supports-color + extend@3.0.2: {} + fast-deep-equal@3.1.3: {} + fast-diff@1.1.2: {} + + fast-diff@1.2.0: {} + + fast-diff@1.3.0: {} + fast-glob@3.3.2: dependencies: '@nodelib/fs.stat': 2.0.5 @@ -8696,6 +8841,8 @@ snapshots: function-bind@1.1.2: {} + functions-have-names@1.2.3: {} + generic-names@4.0.0: dependencies: loader-utils: 3.3.1 @@ -8787,6 +8934,10 @@ snapshots: has-symbols@1.0.3: {} + has-tostringtag@1.0.2: + dependencies: + has-symbols: 1.0.3 + hash-sum@2.0.0: {} hasown@2.0.2: @@ -8890,6 +9041,11 @@ snapshots: ipaddr.js@1.9.1: {} + is-arguments@1.1.1: + dependencies: + call-bind: 1.0.7 + has-tostringtag: 1.0.2 + is-arrayish@0.2.1: {} is-binary-path@2.1.0: @@ -8900,6 +9056,10 @@ snapshots: dependencies: hasown: 2.0.2 + is-date-object@1.0.5: + dependencies: + has-tostringtag: 1.0.2 + is-docker@2.2.1: {} is-extglob@2.1.1: {} @@ -8924,6 +9084,11 @@ snapshots: is-potential-custom-element-name@1.0.1: {} + is-regex@1.1.4: + dependencies: + call-bind: 1.0.7 + has-tostringtag: 1.0.2 + is-stream@2.0.1: {} is-stream@3.0.0: {} @@ -9502,10 +9667,16 @@ snapshots: dependencies: p-locate: 4.1.0 + lodash-es@4.17.21: {} + lodash.camelcase@4.3.0: {} + lodash.clonedeep@4.5.0: {} + lodash.debounce@4.0.8: {} + lodash.isequal@4.5.0: {} + lodash@4.17.21: {} log-update@6.1.0: @@ -9685,6 +9856,13 @@ snapshots: object-inspect@1.13.2: {} + object-is@1.1.6: + dependencies: + call-bind: 1.0.7 + define-properties: 1.2.1 + + object-keys@1.1.1: {} + ofetch@1.3.4: dependencies: destr: 2.0.3 @@ -9739,6 +9917,10 @@ snapshots: pako@1.0.11: {} + parchment@1.1.4: {} + + parchment@3.0.0: {} + parse-bmfont-ascii@1.0.6: {} parse-bmfont-binary@1.0.6: {} @@ -9963,6 +10145,44 @@ snapshots: queue-microtask@1.2.3: {} + quill-delta@3.6.3: + dependencies: + deep-equal: 1.1.2 + extend: 3.0.2 + fast-diff: 1.1.2 + + quill-delta@4.2.2: + dependencies: + fast-diff: 1.2.0 + lodash.clonedeep: 4.5.0 + lodash.isequal: 4.5.0 + + quill-delta@5.1.0: + dependencies: + fast-diff: 1.3.0 + lodash.clonedeep: 4.5.0 + lodash.isequal: 4.5.0 + + quill-mention@6.0.2: + dependencies: + quill: 2.0.2 + + quill@1.3.7: + dependencies: + clone: 2.1.2 + deep-equal: 1.1.2 + eventemitter3: 2.0.3 + extend: 3.0.2 + parchment: 1.1.4 + quill-delta: 3.6.3 + + quill@2.0.2: + dependencies: + eventemitter3: 5.0.1 + lodash-es: 4.17.21 + parchment: 3.0.0 + quill-delta: 5.1.0 + range-parser@1.2.1: {} raw-body@2.5.2: @@ -10003,6 +10223,13 @@ snapshots: dependencies: '@babel/runtime': 7.25.0 + regexp.prototype.flags@1.5.3: + dependencies: + call-bind: 1.0.7 + define-properties: 1.2.1 + es-errors: 1.3.0 + set-function-name: 2.0.2 + regexpu-core@5.3.2: dependencies: '@babel/regjsgen': 0.8.0 @@ -10143,6 +10370,13 @@ snapshots: gopd: 1.0.1 has-property-descriptors: 1.0.2 + set-function-name@2.0.2: + dependencies: + define-data-property: 1.1.4 + es-errors: 1.3.0 + functions-have-names: 1.2.3 + has-property-descriptors: 1.0.2 + setprototypeof@1.2.0: {} shebang-command@2.0.0: diff --git a/src/components/base/AvatarCropper.vue b/src/components/base/AvatarCropper.vue index 3fb39c8..982b080 100644 --- a/src/components/base/AvatarCropper.vue +++ b/src/components/base/AvatarCropper.vue @@ -91,7 +91,7 @@ const onSubmit = () => { if (res.code == 200) { emit('success', res.data.avatar) } else { - window['$message'].info(res.message) + message.warning(res.message) } }) }) diff --git a/src/components/x-message/message/index.vue b/src/components/x-message/message/index.vue index b40fa58..866dd35 100644 --- a/src/components/x-message/message/index.vue +++ b/src/components/x-message/message/index.vue @@ -26,7 +26,7 @@ const typeList=ref({ imgSrc:new URL(`@/static/image/login/warn@3x.png`, import.meta.url).href, borderColor:'#FAE0B5', bgColor:'#FEF7ED' - } + }, }) diff --git a/src/connect.js b/src/connect.js index 260eb5f..43ecbc2 100644 --- a/src/connect.js +++ b/src/connect.js @@ -179,7 +179,7 @@ class Connect { onEventError() { this.conn.on('event_error', (data) => { - // window['$message'] && window['$message'].error(JSON.stringify(data)) + message && message.error(JSON.stringify(data)) }) } } diff --git a/src/hooks/useSessionMenu.js b/src/hooks/useSessionMenu.js index 9a6eebb..3dd5dab 100644 --- a/src/hooks/useSessionMenu.js +++ b/src/hooks/useSessionMenu.js @@ -132,13 +132,13 @@ export function useSessionMenu() { is_disturb: item.is_disturb == 0 ? 1 : 0 }).then(({ code, message }) => { if (code == 200) { - window['$message'].success('设置成功!') + message.success('设置成功!') talkStore.updateItem({ index_name: item.index_name, is_disturb: item.is_disturb == 0 ? 1 : 0 }) } else { - window['$message'].error(message) + message.error(message) } }) } @@ -146,7 +146,7 @@ export function useSessionMenu() { // 置顶会话 const onToTopTalk = (item) => { if (item.is_top == 0 && talkStore.topItems.length >= 18) { - return window['$message'].info('置顶最多不能超过18个会话') + return message.warning('置顶最多不能超过18个会话') } ServeTopTalkList({ @@ -159,7 +159,7 @@ export function useSessionMenu() { is_top: item.is_top == 0 ? 1 : 0 }) } else { - window['$message'].error(message) + message.error(message) } }) } @@ -202,10 +202,10 @@ export function useSessionMenu() { group_id: item.receiver_id }).then(({ code, message }) => { if (code == 200) { - window['$message'].success('已退出群聊') + message.success('已退出群聊') onDeleteTalk(item.index_name) } else { - window['$message'].error(message) + message.error(message) } }) } diff --git a/src/hooks/useTalkRecord.js b/src/hooks/useTalkRecord.js index 9774d09..07c9df4 100644 --- a/src/hooks/useTalkRecord.js +++ b/src/hooks/useTalkRecord.js @@ -33,7 +33,7 @@ export const useTalkRecord = (uid) => { if (location.num === 0) { location.msgid = '' location.num = 0 - window['$message'].info('仅支持查看最近300条的记录') + message.warning('仅支持查看最近300条的记录') return } } diff --git a/src/main.js b/src/main.js index 38ed547..b6b9f18 100644 --- a/src/main.js +++ b/src/main.js @@ -19,9 +19,9 @@ if (import.meta.env.VITE_SHOW_CONSOLE){ } export function createApp() { const app = createSSRApp(App) - app.use(tmui,{...config}) plugins.setPinia(app) plugins.setComponents(app) + app.use(tmui,{...config}) app.directive("loading", vLoading) app.mixin(pageAnimation) app.component('x-loaderror',xLoaderror) diff --git a/src/pages/dialog/components/emojiPanel.vue b/src/pages/dialog/components/emojiPanel.vue index ea2dac4..7781977 100644 --- a/src/pages/dialog/components/emojiPanel.vue +++ b/src/pages/dialog/components/emojiPanel.vue @@ -5,7 +5,7 @@