更新

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",

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:

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)
       }
     })
   })

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'
-  }
+  },
 })
 </script>
 

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))
     })
   }
 }

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)
           }
         })
       }

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
         }
       }

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)

src/pages/dialog/components/emojiPanel.vue

@@ -5,7 +5,7 @@
   </div>
 </template>
 <script setup>
-import { ref, reactive, defineProps } from "vue"
+import { ref, reactive, defineProps,defineEmits } from "vue"
 import dayjs from "dayjs";
 import { beautifyTime } from '@/utils/datetime'
 import { useTalkStore } from '@/store'
@@ -21,6 +21,7 @@ const props = defineProps({
   },
 });
 
+const emit = defineEmits(['on-select'])
 const onSendEmoticon = (type, value, img = '') => {
   if (img) {
     const imgSrcReg = /<img.*?src='(.*?)'/g

src/pages/dialog/formats/emoji.ts

@@ -0,0 +1,40 @@
+import Quill from 'quill'
+
+const ImageBlot = Quill.import('formats/image')
+
+class EmojiBlot extends ImageBlot {
+  static blotName = 'emoji'
+  static tagName = 'img'
+  static className = 'ed-emoji'
+
+  static create(value: HTMLImageElement) {
+    const node = super.create()
+
+    node.setAttribute('alt', value.alt)
+    node.setAttribute('src', value.src)
+    node.setAttribute('width', value.width)
+    node.setAttribute('height', value.height)
+    return node
+  }
+
+  static formats(node: HTMLImageElement) {
+    return {
+      alt: node.getAttribute('alt'),
+      src: node.getAttribute('src'),
+      width: node.getAttribute('width'),
+      height: node.getAttribute('height')
+    }
+  }
+
+  static value(node: HTMLImageElement) {
+    // 主要在有初始值时起作用
+    return {
+      alt: node.getAttribute('alt'),
+      src: node.getAttribute('src'),
+      width: node.getAttribute('width'),
+      height: node.getAttribute('height')
+    }
+  }
+}
+
+export default EmojiBlot

src/pages/dialog/index.vue

@@ -76,7 +76,7 @@
 
                 <div v-if="item.extra.reply" class="talk-reply pointer"
                   @click="onJumpMessage(item.extra?.reply?.msg_id)">
-                  <n-icon :component="ToTop" size="14" class="icon-top" />
+                  <!-- <n-icon :component="ToTop" size="14" class="icon-top" /> -->
                   <span class="ellipsis">
                     回复 {{ item.extra?.reply?.nickname }}:
                     {{ item.extra?.reply?.content }}
@@ -96,18 +96,19 @@
     </div>
     <div class="footBox">
       <div class="mt-[16rpx] ml-[32rpx] mr-[32rpx] flex items-center justify-between">
-        <div class="w-[534rpx] quillBox" >
+        <div class="flex-1 quillBox" >
           <QuillEditor ref="editor" id="editor" :options="editorOption" @editorChange="onEditorChange"
             style="height: 100%; border: none" />
           <!-- <tm-input type=textarea autoHeight focusColor="#F9F9F9" color="#F9F9F9" :inputPadding="[12]"
             placeholder=""></tm-input> -->
         </div>
-        <tm-image @click="state.isOpenEmojiPanel = !state.isOpenEmojiPanel" :width="52" :height="52" :round="12"
+        <tm-image :margin="[10,0]" @click="state.isOpenEmojiPanel = !state.isOpenEmojiPanel" :width="52" :height="52" :round="12"
           :src="state.isOpenEmojiPanel ? keyboard : smile"></tm-image>
-        <tm-image :width="52" :height="52" :round="12" :src="addCircleGray"></tm-image>
+        <tm-image :margin="[10,0]" :width="52" :height="52" :round="12" :src="addCircleGray"></tm-image>
+        <tm-button @click="onSendMessageClick" :margin="[0,0]" :padding="[0,30]" color="#46299D" :fontSize="28" size="mini" :shadow="0" label="发送"></tm-button>
       </div>
       <div v-if="state.isOpenEmojiPanel" class="mt-[50rpx]">
-        <emoji-panel />
+        <emoji-panel @on-select="onEmoticonEvent" />
       </div>
       <!--底部安全区-->
       <div class="content-placeholder"></div>
@@ -117,9 +118,10 @@
 <script setup>
 import { ref, reactive, watch, computed, onMounted } from 'vue';
 import { QuillEditor, Quill } from '@vueup/vue-quill'
+import EmojiBlot from './formats/emoji'
 import { useChatList } from "@/store/chatList/index.js";
 import { useAuth } from "@/store/auth";
-import { useUserStore, useDialogueStore, useUploadsStore, useEditorDraftStore } from '@/store'
+import { useUserStore, useDialogueStore, useUploadsStore, useEditorDraftStore,useTalkStore,useSettingsStore } from '@/store'
 import addCircleGray from "@/static/image/chatList/addCircleGray.png";
 import { MessageComponents, ForwardableMessageType } from '@/constant/message'
 import { formatTime, parseTime } from '@/utils/datetime'
@@ -127,10 +129,17 @@ import { deltaToMessage, deltaToString, isEmptyDelta } from './util'
 import smile from "@/static/image/chatList/smile@2x.png";
 import keyboard from "@/static/image/chatList/keyboard@2x.png";
 import { useInject, useTalkRecord } from '@/hooks'
+import { emitCall } from '@/utils/common'
 import ZPaging from "@/uni_modules/z-paging/components/z-paging/z-paging.vue";
 import useZPaging from "@/uni_modules/z-paging/components/z-paging/js/hooks/useZPaging.js";
 import emojiPanel from './components/emojiPanel.vue'
+import lodash from "lodash";
+import { ServePublishMessage } from '@/api/chat'
 
+Quill.register('formats/emoji', EmojiBlot)
+
+const talkStore = useTalkStore()
+const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 const dialogueStore = useDialogueStore()
 const editorDraftStore = useEditorDraftStore()
@@ -153,6 +162,99 @@ const state = ref({
   isOpenEmojiPanel: false
 })
 
+const onSendMessage = (data = {}, callBack) => {
+  let message = {
+    ...data,
+    receiver: {
+      receiver_id: talkParams.receiver_id,
+      talk_type: talkParams.type
+    }
+  }
+
+  ServePublishMessage(message)
+    .then(({ code, message }) => {
+      if (code == 200) {
+        callBack(true)
+      } else {
+        message.warning(message)
+      }
+    })
+    .catch(() => {
+      message.warning('网络繁忙,请稍后重试!')
+    })
+}
+
+const onSendMessageClick = () => {
+  let delta = getQuill().getContents()
+  let data = deltaToMessage(delta)
+
+  if (data.items.length === 0) {
+    return
+  }
+
+  switch (data.msgType) {
+    case 1: // 文字消息
+      if (data.items[0].content.length > 1024) {
+        return message.info('发送内容超长，请分条发送')
+      }
+      onSendTextEvent({data,callBack:(ok) => {
+        if(!ok) return
+        getQuill().setContents([], Quill.sources.USER)
+      }})
+      break
+  }
+}
+
+// 发送文本消息
+const onSendTextEvent = lodash.throttle((value) => {
+  let { data, callBack } = value
+
+  let message = {
+    type: 'text',
+    content: data.items[0].content,
+    quote_id: data.quoteId,
+    mentions: data.mentionUids
+  }
+
+  onSendMessage(message, (ok) => {
+    if (!ok) return
+
+    let el = document.getElementById('talk-session-list')
+    el?.scrollTo({ top: 0, behavior: 'smooth' })
+
+    callBack(true)
+  })
+}, 1000)
+
+// 编辑器输入事件
+const onInputEvent = ({ data }) => {
+  talkStore.updateItem({
+    index_name: indexName.value,
+    draft_text: data
+  })
+
+  // 判断对方是否在线和是否需要推送
+  // 3秒时间内推送一次
+  if (settingsStore.isKeyboard && props.online) {
+    onKeyboardPush()
+  }
+}
+
+// 发送表情消息
+const onSendEmoticonEvent = ({ data, callBack }) => {
+  onSendMessage({ type: 'emoticon', emoticon_id: data }, callBack)
+}
+
+// 注册事件
+const evnets = {
+  text_event: onSendTextEvent,
+  input_event: onInputEvent,
+  emoticon_event: onSendEmoticonEvent,
+  history_event: () => {
+    isShowHistory.value = true
+  },
+}
+
 const { loadConfig, records, onLoad, onRefreshLoad, onJumpMessage } = useTalkRecord(talkParams.uid)
 
 // 添加计算属性来反转records数组
@@ -164,8 +266,42 @@ const getQuill = () => {
   return editor.value?.getQuill()
 }
 
+// 编辑器事件
+const onEditorEvent = (msg) => {
+  evnets[msg.event] && evnets[msg.event](msg)
+}
+
+const getQuillSelectionIndex = () => {
+  let quill = getQuill()
+  return (quill.getSelection() || {}).index
+}
+
+const onEmoticonEvent = (data) => {
+  if (data.type == 1) {
+    const quill = getQuill()
+    let index = getQuillSelectionIndex()
+
+    if (index == 1 && quill.getLength() == 1 && quill.getText(0, 1) == '\n') {
+      quill.deleteText(0, 1)
+      index = 0
+    }
+    if (data.img) {
+      quill.insertEmbed(index, 'emoji', {
+        alt: data.value,
+        src: data.img,
+      })
+    } else {
+      quill.insertText(index, data.value)
+    }
+
+    quill.setSelection(index + 1, 0, 'user')
+  } else {
+    let fn = emitCall('emoticon_event', data.value, () => {})
+    emit('editor-event', fn)
+  }
+}
+
 const onEditorChange = () => {
-  debugger
   let delta = getQuill().getContents()
 
   let text = deltaToString(delta)
@@ -179,62 +315,38 @@ const onEditorChange = () => {
     // 删除 editorDraftStore.items 下的元素
     delete editorDraftStore.items[indexName.value || '']
   }
-
+  onEditorEvent(emitCall('input_event', text))
   // emit('editor-event', emitCall('input_event', text))
 }
 
-const onSendMessage = () => {
-  let delta = getQuill().getContents()
-  let data = deltaToMessage(delta)
+const onClipboardMatcher = (node, Delta) => {
+  // debugger
+  const ops = []
 
-  if (data.items.length === 0) {
-    return
-  }
-
-  switch (data.msgType) {
-    case 1: // 文字消息
-      if (data.items[0].content.length > 1024) {
-        return window['$message'].info('发送内容超长，请分条发送')
-      }
-
-      emit(
-        'editor-event',
-        emitCall('text_event', data, (ok) => {
-          ok && getQuill().setContents([], Quill.sources.USER)
+  Delta.ops.forEach((op) => {
+    // 如果粘贴了图片，这里会是一个对象，所以可以这样处理
+    if (op.insert && typeof op.insert === 'string') {
+      ops.push({
+        insert: op.insert, // 文字内容
+        attributes: {} //文字样式（包括背景色和文字颜色等）
       })
-      )
-      break
-    case 3: // 图片消息
-      emit(
-        'editor-event',
-        emitCall(
-          'image_event',
-          { ...getImageInfo(data.items[0].content), url: data.items[0].content, size: 10000 },
-          (ok) => {
-            ok && getQuill().setContents([])
+    } else {
+      ops.push(op)
     }
-        )
-      )
-      break
-    case 12: // 图文消息
-      emit(
-        'editor-event',
-        emitCall('mixed_event', data, (ok) => {
-          ok && getQuill().setContents([])
   })
-      )
-      break
-  }
+
+  Delta.ops = ops
+  return Delta
 }
 
 const editorOption = {
   debug: false,
   modules: {
     toolbar: false,
-    // clipboard: {
-    //   // 粘贴版，处理粘贴时候的自带样式
-    //   matchers: [[Node.ELEMENT_NODE, onClipboardMatcher]]
-    // },
+    clipboard: {
+      // 粘贴版，处理粘贴时候的自带样式
+      matchers: [[Node.ELEMENT_NODE, onClipboardMatcher]]
+    },
 
     keyboard: {
       bindings: {
@@ -562,8 +674,10 @@ page {
 
 .quillBox {
   :deep(.ql-clipboard) {
-    width: 0;
-    height: 0;
+    position: relative;
+    opacity: 0;
+    height: 1rpx;
+    overflow: auto;
   }
 
   :deep(.ql-editor) {
@@ -571,6 +685,23 @@ page {
     background-color: #F9F9F9;
     border-radius: 8rpx;
     outline: none !important;
+    max-height: 294rpx;
+    overflow: auto;
+    line-height: 44rpx;
+    font-size: 32rpx;
+    p{
+      display: inline-flex;
+      align-items: center;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+      white-space: normal;
+      word-break: break-all;
+      .ed-emoji{
+        width: 44rpx;
+        height: 44rpx;
+        display: inline-block;
+      }
+    }
   }
 }
 </style>