From c7146cb7e3684eb63645380dfa767acda270e4ee Mon Sep 17 00:00:00 2001 From: nongyehong <2439646234@qq.com> Date: Thu, 28 Mar 2024 23:58:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?:zap:=20perf(style):=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .npmrc | 2 + README.md | 3 +- README.zh-CN.md | 3 +- package.json | 10 +- pnpm-lock.yaml | 141 ++++++------ src-tauri/tray/msg.png | Bin 601 -> 595 bytes src/components/common/InfoPopover.vue | 4 +- src/components/common/NaiveProvider.vue | 33 ++- src/components/rightBox/Details.vue | 4 +- src/components/rightBox/MsgInput/index.vue | 7 +- .../rightBox/chatBox/ChatFooter.vue | 4 +- .../rightBox/chatBox/ChatHeader.vue | 4 +- src/components/rightBox/chatBox/ChatMain.vue | 202 +++++++++--------- .../rightBox/chatBox/ChatSidebar.vue | 70 +++--- src/components/windows/ActionBar.vue | 3 +- src/layout/center/index.vue | 10 +- src/layout/index.vue | 2 +- src/layout/left/index.vue | 10 +- src/layout/left/style.scss | 4 +- src/layout/right/index.vue | 2 +- src/styles/scss/chat-header.scss | 2 +- src/styles/scss/chat-main.scss | 8 +- src/styles/scss/global/variable.scss | 8 +- src/styles/scss/message.scss | 1 + src/typings/components.d.ts | 1 + src/views/Tray.vue | 2 +- src/views/home-window/Dynamic.vue | 8 +- src/views/home-window/FriendsList.vue | 140 ++++++------ src/views/home-window/Mail.vue | 2 +- src/views/home-window/message/index.vue | 89 ++++---- src/views/home-window/more/About.vue | 4 +- .../home-window/more/settings/General.vue | 6 +- src/views/home-window/more/settings/index.vue | 2 +- src/views/home-window/more/settings/model.tsx | 8 +- src/views/home-window/onlineStatus/index.vue | 4 +- src/views/login-window/Login.vue | 14 +- src/views/login-window/QRCode.vue | 6 +- uno.config.ts | 5 +- 38 files changed, 443 insertions(+), 385 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..aa7b2e2 --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +registry=https://repo.huaweicloud.com/repository/npm/ +engine-strict=true \ No newline at end of file diff --git a/README.md b/README.md index e0a399c..aab5602 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@

- +

-

HuLa

An Instant Messaging System Built with Tauri, Vite 5, Vue 3, and TypeScript

diff --git a/README.zh-CN.md b/README.zh-CN.md index 4a65fb1..4625095 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,8 +1,7 @@

- +

-

HuLa

一个基于Tauri、Vite 5、Vue 3 和 TypeScript 构建的即时通讯系统

diff --git a/package.json b/package.json index 85f5552..2129ac1 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "pinia-plugin-persistedstate": "^3.2.1", "pinia-shared-state": "^0.5.1", "vue": "^3.4.21", - "vue-draggable-plus": "^0.3.5", + "vue-draggable-plus": "^0.4.0", "vue-router": "^4.3.0" }, "devDependencies": { @@ -55,10 +55,10 @@ "@types/node": "^20.10.4", "@typescript-eslint/eslint-plugin": "7.1.0", "@typescript-eslint/parser": "^7.1.0", - "@unocss/preset-uno": "^0.58.5", - "@unocss/reset": "^0.58.5", - "@unocss/transformer-directives": "^0.58.5", - "@unocss/vite": "^0.58.5", + "@unocss/preset-uno": "^0.58.7", + "@unocss/reset": "^0.58.7", + "@unocss/transformer-directives": "^0.58.7", + "@unocss/vite": "^0.58.7", "@vitejs/plugin-vue": "^5.0.4", "@vitejs/plugin-vue-jsx": "^3.1.0", "@vueuse/core": "^10.8.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7ac0cb2..df4dc27 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,8 +39,8 @@ dependencies: specifier: ^3.4.21 version: 3.4.21(typescript@5.4.2) vue-draggable-plus: - specifier: ^0.3.5 - version: 0.3.5(@types/sortablejs@1.15.8) + specifier: ^0.4.0 + version: 0.4.0(@types/sortablejs@1.15.8) vue-router: specifier: ^4.3.0 version: 4.3.0(vue@3.4.21) @@ -68,17 +68,17 @@ devDependencies: specifier: ^7.1.0 version: 7.1.0(eslint@8.56.0)(typescript@5.4.2) '@unocss/preset-uno': - specifier: ^0.58.5 - version: 0.58.5 + specifier: ^0.58.7 + version: 0.58.7 '@unocss/reset': - specifier: ^0.58.5 - version: 0.58.5 + specifier: ^0.58.7 + version: 0.58.7 '@unocss/transformer-directives': - specifier: ^0.58.5 - version: 0.58.5 + specifier: ^0.58.7 + version: 0.58.7 '@unocss/vite': - specifier: ^0.58.5 - version: 0.58.5(vite@5.2.6) + specifier: ^0.58.7 + version: 0.58.7(vite@5.2.6) '@vitejs/plugin-vue': specifier: ^5.0.4 version: 5.0.4(vite@5.2.6)(vue@3.4.21) @@ -1602,95 +1602,95 @@ packages: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} dev: true - /@unocss/config@0.58.5: - resolution: {integrity: sha512-O1pLSeNXfG11QHaLSVwS9rJKvE4b9304IQ3UvOdbYN+7SAT4YTZ7JDU4ngO1KWyOFBO6RD0WspCR95pgqOqJiQ==} + /@unocss/config@0.58.7: + resolution: {integrity: sha512-ZMSFWJI8DfE/4HiIU+hkTSKUtEkennRn+raej5HCGTfy5xpdYCm9Zdrw/cYqkN2LPHM8o076Z2sD6H4MV5HrvA==} engines: {node: '>=14'} dependencies: - '@unocss/core': 0.58.5 + '@unocss/core': 0.58.7 unconfig: 0.3.11 dev: true - /@unocss/core@0.58.5: - resolution: {integrity: sha512-qbPqL+46hf1/UelQOwUwpAuvm6buoss43DPYHOPdfNJ+NTWkSpATQMF0JKT04QE0QRQbHNSHdMe9ariG+IIlCw==} + /@unocss/core@0.58.7: + resolution: {integrity: sha512-Df5ytibV0MB7kWLggzLHsJUj08Of2oqXmPg7QjRUghMvCT3dl2LUIZXiztYPMH0F4x0cPebNoa/pavNt8xz9eQ==} dev: true - /@unocss/extractor-arbitrary-variants@0.58.5: - resolution: {integrity: sha512-KJQX0OJKzy4YjJo09h2la2Q+cn5IJ1JdyPVJJkzovHnv7jSBWzsfct+bj/6a+SJ4p4JBIqEJz3M/qxHv4EPJyA==} + /@unocss/extractor-arbitrary-variants@0.58.7: + resolution: {integrity: sha512-wEuilON0u/e1milNp1UBWGps3Hdtm9qBfmc2YmsHN8KhpTSSCluzbrLSYfF++tU5iWmVWR2514Lc2waVDhuiwg==} dependencies: - '@unocss/core': 0.58.5 + '@unocss/core': 0.58.7 dev: true - /@unocss/inspector@0.58.5: - resolution: {integrity: sha512-cbJlIHEZ14puTtttf7sl+VZFDscV1DJiSseh9sSe0xJ/1NVBT9Bvkm09/1tnpLYAgF5gfa1CaCcjKmURgYzKrA==} + /@unocss/inspector@0.58.7: + resolution: {integrity: sha512-5vYsAuOj4ODgCm2Hmfhgcih+MdjsOxAHpUUDcZKAuVkr5j4dmrQnjWmS0fafR5vcjQch6T1JTsPE9x/Ws51UIw==} dependencies: - '@unocss/core': 0.58.5 - '@unocss/rule-utils': 0.58.5 + '@unocss/core': 0.58.7 + '@unocss/rule-utils': 0.58.7 gzip-size: 6.0.0 sirv: 2.0.4 dev: true - /@unocss/preset-mini@0.58.5: - resolution: {integrity: sha512-WqD31fKUAN28OCUOyi1uremmLk0eTMqtCizjbbXsY/DP6RKYUT7trFAtppTcHWFhSQcknb4FURfAZppACsTVQQ==} + /@unocss/preset-mini@0.58.7: + resolution: {integrity: sha512-ktfrMlOtnks9j1r1ZJFzPcmCbWRjOfXh7UwoGYhH7c3Fi9Zbn1HI9+wblroEBstvbGUZGyaH5Ht+0rCmRrg5HQ==} dependencies: - '@unocss/core': 0.58.5 - '@unocss/extractor-arbitrary-variants': 0.58.5 - '@unocss/rule-utils': 0.58.5 + '@unocss/core': 0.58.7 + '@unocss/extractor-arbitrary-variants': 0.58.7 + '@unocss/rule-utils': 0.58.7 dev: true - /@unocss/preset-uno@0.58.5: - resolution: {integrity: sha512-vgq/R4f7RDmdROy+pX+PeE38I3SgYKd4LL7Wb1HJUaVwz7PkF0XHCynOTbwrPXnK1kp1cnZYYEww7/RiYp+IQQ==} + /@unocss/preset-uno@0.58.7: + resolution: {integrity: sha512-oirPRtIailoewLvim/VjcxHZrBotRzBNaFZFMD1GLwScAYrzS8DWJ3pozNn7+s2E80ZUBfgekRTgvUKAFMPSCw==} dependencies: - '@unocss/core': 0.58.5 - '@unocss/preset-mini': 0.58.5 - '@unocss/preset-wind': 0.58.5 - '@unocss/rule-utils': 0.58.5 + '@unocss/core': 0.58.7 + '@unocss/preset-mini': 0.58.7 + '@unocss/preset-wind': 0.58.7 + '@unocss/rule-utils': 0.58.7 dev: true - /@unocss/preset-wind@0.58.5: - resolution: {integrity: sha512-54RkjLmlqMUlC8o8nDCVzB25D1zzK4eth+/3uQzt739qU0U92NxuZKY21ADj9Rp/mVhKBV5FKuXPjmYc6yTQRQ==} + /@unocss/preset-wind@0.58.7: + resolution: {integrity: sha512-rELMKcd/cwMnw6fPf/dmg63u41fRXJoXDO5rlO/+Fa8DF4/r8KJTUbjJbZfcOnh3n8jHz3NUz+QigdRBuDTEuw==} dependencies: - '@unocss/core': 0.58.5 - '@unocss/preset-mini': 0.58.5 - '@unocss/rule-utils': 0.58.5 + '@unocss/core': 0.58.7 + '@unocss/preset-mini': 0.58.7 + '@unocss/rule-utils': 0.58.7 dev: true - /@unocss/reset@0.58.5: - resolution: {integrity: sha512-2wMrkCj3SSb5hrx9TKs5jZa34QIRkHv9FotbJutAPo7o8hx+XXn56ogzdoUrcFPJZJUx2R2nyOVbSlGMIjtFtw==} + /@unocss/reset@0.58.7: + resolution: {integrity: sha512-KiN5u5D4zJcU0Tg+wjgTWYIm8VEfHpi7t2a3YfNCLo9s/75Ty4tlYB9StEShYmVMCXBOu0mK1CwqQTNaFpfM1w==} dev: true - /@unocss/rule-utils@0.58.5: - resolution: {integrity: sha512-w0sGJoeUGwMWLVFLEE9PDiv/fQcQqZnTIIQLYNCjTdqXDRlwTp9ACW0h47x/hAAIXdOtEOOBuTfjGD79GznUmA==} + /@unocss/rule-utils@0.58.7: + resolution: {integrity: sha512-SbMwAUSgx5v4TXy+MXiWbqzoMjVHSeMaJpJOruU9PmtrOuZmqeajffMtI6pLtGlgrEL76frLRyMmSErxhyNelw==} engines: {node: '>=14'} dependencies: - '@unocss/core': 0.58.5 + '@unocss/core': 0.58.7 magic-string: 0.30.8 dev: true - /@unocss/scope@0.58.5: - resolution: {integrity: sha512-vSentagAwYTnThGRCjzZ6eNSSRuzdWBl21L1BbvVNM91Ss/FugQnZ1hd0m3TrVvvStYXnFVHMQ/MjCAEJ4cMYg==} + /@unocss/scope@0.58.7: + resolution: {integrity: sha512-DaAHFT3azxq5eFiTRrDAqk8TSDlo6x5ImBowzdNO4B2QMt+o1X9uhbe8Qt+WlG3MOwhti87JT8ooNA1pzi3Iig==} dev: true - /@unocss/transformer-directives@0.58.5: - resolution: {integrity: sha512-allspF5TlT1B2bJSZ1houHScXOTaTPlatLiEmgQKzr/m93rCvktokaO5J6qeN2VXQdpTIsxdA5B8//7UkfTuIA==} + /@unocss/transformer-directives@0.58.7: + resolution: {integrity: sha512-vMn86ARgrhCd+bZf1qvwBWhvQnOkAwOXbFGHM2cuuC0VVGJQcRE+dwTnUEJ5iqKGUNFWPJ/7NaV47kh58YITcg==} dependencies: - '@unocss/core': 0.58.5 - '@unocss/rule-utils': 0.58.5 + '@unocss/core': 0.58.7 + '@unocss/rule-utils': 0.58.7 css-tree: 2.3.1 dev: true - /@unocss/vite@0.58.5(vite@5.2.6): - resolution: {integrity: sha512-p4o1XNX1rvjmoUqSSdua8XyWNg/d+YUChDd2L/xEty+6j2qv0wUaohs3UQ87vWlv632/UmgdX+2MbrgtqthCtw==} + /@unocss/vite@0.58.7(vite@5.2.6): + resolution: {integrity: sha512-S8TJojR1/7O9Sfykj2k4yOq6gZOnjMNZq5ug/6edA11Q/gz2WrT/sx6aPcfIm3xVBnmLxaHfy3r06W+SiIbZcg==} peerDependencies: vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 dependencies: - '@ampproject/remapping': 2.2.1 + '@ampproject/remapping': 2.3.0 '@rollup/pluginutils': 5.1.0 - '@unocss/config': 0.58.5 - '@unocss/core': 0.58.5 - '@unocss/inspector': 0.58.5 - '@unocss/scope': 0.58.5 - '@unocss/transformer-directives': 0.58.5 - chokidar: 3.5.3 + '@unocss/config': 0.58.7 + '@unocss/core': 0.58.7 + '@unocss/inspector': 0.58.7 + '@unocss/scope': 0.58.7 + '@unocss/transformer-directives': 0.58.7 + chokidar: 3.6.0 fast-glob: 3.3.2 magic-string: 0.30.8 vite: 5.2.6(@types/node@20.11.7)(sass@1.71.1) @@ -2284,6 +2284,21 @@ packages: fsevents: 2.3.3 dev: true + /chokidar@3.6.0: + resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} + engines: {node: '>= 8.10.0'} + dependencies: + anymatch: 3.1.3 + braces: 3.0.2 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.6.0 + optionalDependencies: + fsevents: 2.3.3 + dev: true + /cli-cursor@2.1.0: resolution: {integrity: sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==} engines: {node: '>=4'} @@ -4461,7 +4476,7 @@ packages: acorn: 8.11.3 pathe: 1.1.2 pkg-types: 1.0.3 - ufo: 1.4.0 + ufo: 1.5.3 dev: true /mrmime@2.0.0: @@ -5782,8 +5797,8 @@ packages: resolution: {integrity: sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==} dev: true - /ufo@1.4.0: - resolution: {integrity: sha512-Hhy+BhRBleFjpJ2vchUNN40qgkh0366FWJGqVLYBHev0vpHTrXSA0ryT+74UiW6KWsldNurQMKGqCm1M2zBciQ==} + /ufo@1.5.3: + resolution: {integrity: sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==} dev: true /uglify-js@3.17.4: @@ -6045,8 +6060,8 @@ packages: dependencies: vue: 3.4.21(typescript@5.4.2) - /vue-draggable-plus@0.3.5(@types/sortablejs@1.15.8): - resolution: {integrity: sha512-HqIxV4Wr4U5LRPLRi2oV+EJ4g6ibyRKhuaiH4ZQo+LxK4zrk2XcBk9UyXC88OXp4SAq0XYH4Wco/T3LX5kJ79A==} + /vue-draggable-plus@0.4.0(@types/sortablejs@1.15.8): + resolution: {integrity: sha512-CcvSopMmSZY9McCdQ56QsAydT5cZilx9LzLU0UIz6KDYe9ll6QnmNHN80t6wnxN402ZECSXc5X1dm/myiMFi+A==} peerDependencies: '@types/sortablejs': ^1.15.0 '@vue/composition-api': '*' diff --git a/src-tauri/tray/msg.png b/src-tauri/tray/msg.png index f5761dadbae6dae84f10b4713f464c91858a592f..8829e05027e1aaa6c2c01684a975d03908f719ea 100644 GIT binary patch delta 557 zcmV+|0@D521k(hNF@Ft7L_t(YOYN3FPuoxs!0%oRWy1>Tz?N@NhN@C0`UR>CNHC%< z!I3JJxr6hPiWxECL_!EQ5DR<)_ylBSK!SyVI_QlhiQiQR*s_C({{RsK-t718e)r#p zFy;rx%!4O^AKP+{KunV+GmTN+2Rczdq$)YmBA~BGFa>~T1Ani-rGBnm`Z^u~%}rSr zLNBL*_;&;v$8Oa=DLM5$0$3c9z4iu!FFrH^%mZWPdQxmm^r5UZoyHl8gn!(cwD~Lo zEVk@=7SH^WY%sqYk9autcz z!#WUP-?i?;`C>p;6jW;K_bia{SqqpffH?nKm7O62?q8qdVW5yeX%dI3CNKD#xh+kj zFFtWEcdh#2i+UJI1%U#DU|=8>I?OCrp9jSKezzd7f!&V*^A_{|YM%7erEsALTHOK)A5N<(@`1 v7m&T=g(itt$haIOfis0PNm-inu>=1DL5U75n0uJ900000NkvXXu0mjf)1>&w delta 563 zcmV-30?hr>1la_TF@F2fasI`IHbir8+h2pthkcmnbSq@_R#4Fy%Yb7E%)tuMB`NgRJ9L=?EOWbe#xW_IVl zgK*{t&&-2dpfRy||O@E=emI(k)fyf|$?|&*Ocfs4?&&03=awQ&^IuN3+sa_ogU>CDOO) zP5HJsLQnI++5M9mKT!s)vFs31t4!oYYZ8s!D{a}2Vm}d}RTms94X2ry0=9!XJVZIY zRGthYXs(fUvXT{-DACWrSj5h6`Va4%r`pse#MlU~rD}+~FcIsb8gGvnCDwz~KAGcQ z#&-A6lq|7wdQCAfi4k(&9u>K$R?;GGCH|is_y;Tj0xaskSa$#b002ovPDHLkV1gX2 B3l0DP diff --git a/src/components/common/InfoPopover.vue b/src/components/common/InfoPopover.vue index 0467da1..fd0975c 100644 --- a/src/components/common/InfoPopover.vue +++ b/src/components/common/InfoPopover.vue @@ -1,7 +1,7 @@