diff --git a/README.zh-CN.md b/README.zh-CN.md
index 94ffa24..7dfadc9 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -5,6 +5,7 @@
一个基于Tauri、Vite 5、Vue 3 和 TypeScript 构建的即时通讯系统
+ 
diff --git a/package.json b/package.json
index 0cfa9cb..ebb505d 100644
--- a/package.json
+++ b/package.json
@@ -69,11 +69,11 @@
"@types/node": "^20.14.14",
"@typescript-eslint/eslint-plugin": "7.1.0",
"@typescript-eslint/parser": "^7.15.0",
- "@unocss/preset-uno": "^0.62.3",
- "@unocss/reset": "^0.62.3",
- "@unocss/transformer-directives": "^0.62.3",
- "@unocss/transformer-variant-group": "^0.62.3",
- "@unocss/vite": "^0.62.3",
+ "@unocss/preset-uno": "^0.64.0",
+ "@unocss/reset": "^0.64.0",
+ "@unocss/transformer-directives": "^0.64.0",
+ "@unocss/transformer-variant-group": "^0.64.0",
+ "@unocss/vite": "^0.64.0",
"@vitejs/plugin-vue": "^5.1.2",
"@vitejs/plugin-vue-jsx": "^4.0.0",
"@vueuse/core": "^10.11.0",
From 41c2fb551075d4c3a2ac9735cc91c5badfd8b402 Mon Sep 17 00:00:00 2001
From: nongyehong <2439646234@qq.com>
Date: Tue, 12 Nov 2024 12:02:27 +0800
Subject: [PATCH 03/12] =?UTF-8?q?build(sass):=20:package:=20=E5=8D=87?=
=?UTF-8?q?=E7=BA=A7sass=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=B8=BA@use?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
pnpm-lock.yaml | 440 ++++++++++++------
src/components/common/ContextMenu.vue | 1 +
src/layout/center/index.vue | 2 +-
src/layout/center/style.scss | 2 +
src/layout/left/components/ActionList.vue | 2 +-
src/layout/left/components/LeftAvatar.vue | 2 +-
.../left/components/definePlugins/Card.vue | 1 +
.../left/components/definePlugins/List.vue | 1 +
src/layout/left/index.vue | 2 +-
src/layout/left/style.scss | 2 +
src/views/homeWindow/more/settings/index.vue | 1 +
vite.config.ts | 7 +-
13 files changed, 325 insertions(+), 140 deletions(-)
diff --git a/package.json b/package.json
index ebb505d..b236683 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
"oxlint": "^0.2.18",
"prettier": "^3.3.2",
"release-it": "^17.10.0",
- "sass": "1.77.6",
+ "sass": "1.80.6",
"typescript": "^5.6.2",
"unplugin-auto-import": "^0.18.2",
"unplugin-vue-components": "^0.27.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 41ca4b7..a0e8fa6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -102,26 +102,26 @@ importers:
specifier: ^7.15.0
version: 7.18.0(eslint@8.57.0)(typescript@5.6.2)
'@unocss/preset-uno':
- specifier: ^0.62.3
- version: 0.62.3
+ specifier: ^0.64.0
+ version: 0.64.0
'@unocss/reset':
- specifier: ^0.62.3
- version: 0.62.3
+ specifier: ^0.64.0
+ version: 0.64.0
'@unocss/transformer-directives':
- specifier: ^0.62.3
- version: 0.62.3
+ specifier: ^0.64.0
+ version: 0.64.0
'@unocss/transformer-variant-group':
- specifier: ^0.62.3
- version: 0.62.3
+ specifier: ^0.64.0
+ version: 0.64.0
'@unocss/vite':
- specifier: ^0.62.3
- version: 0.62.3(rollup@4.24.3)(vite@5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))
+ specifier: ^0.64.0
+ version: 0.64.0(rollup@4.24.3)(vite@5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))
'@vitejs/plugin-vue':
specifier: ^5.1.2
- version: 5.1.2(vite@5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))
+ version: 5.1.2(vite@5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))
'@vitejs/plugin-vue-jsx':
specifier: ^4.0.0
- version: 4.0.0(vite@5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))
+ version: 4.0.0(vite@5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))
'@vueuse/core':
specifier: ^10.11.0
version: 10.11.1(vue@3.5.11(typescript@5.6.2))
@@ -162,8 +162,8 @@ importers:
specifier: ^17.10.0
version: 17.10.0(typescript@5.6.2)
sass:
- specifier: 1.77.6
- version: 1.77.6
+ specifier: 1.80.6
+ version: 1.80.6
typescript:
specifier: ^5.6.2
version: 5.6.2
@@ -175,7 +175,7 @@ importers:
version: 0.27.4(@babel/parser@7.26.2)(@nuxt/kit@3.14.0(rollup@4.24.3)(webpack-sources@3.2.3))(rollup@4.24.3)(vue@3.5.11(typescript@5.6.2))(webpack-sources@3.2.3)
vite:
specifier: 5.4.10
- version: 5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5)
+ version: 5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5)
vue-tsc:
specifier: ^2.1.4
version: 2.1.4(typescript@5.6.2)
@@ -1181,6 +1181,108 @@ packages:
cpu: [x64]
os: [win32]
+ '@parcel/watcher-android-arm64@2.5.0':
+ resolution:
+ { integrity: sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [arm64]
+ os: [android]
+
+ '@parcel/watcher-darwin-arm64@2.5.0':
+ resolution:
+ { integrity: sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [arm64]
+ os: [darwin]
+
+ '@parcel/watcher-darwin-x64@2.5.0':
+ resolution:
+ { integrity: sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [x64]
+ os: [darwin]
+
+ '@parcel/watcher-freebsd-x64@2.5.0':
+ resolution:
+ { integrity: sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [x64]
+ os: [freebsd]
+
+ '@parcel/watcher-linux-arm-glibc@2.5.0':
+ resolution:
+ { integrity: sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [arm]
+ os: [linux]
+ libc: [glibc]
+
+ '@parcel/watcher-linux-arm-musl@2.5.0':
+ resolution:
+ { integrity: sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [arm]
+ os: [linux]
+ libc: [musl]
+
+ '@parcel/watcher-linux-arm64-glibc@2.5.0':
+ resolution:
+ { integrity: sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [arm64]
+ os: [linux]
+ libc: [glibc]
+
+ '@parcel/watcher-linux-arm64-musl@2.5.0':
+ resolution:
+ { integrity: sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [arm64]
+ os: [linux]
+ libc: [musl]
+
+ '@parcel/watcher-linux-x64-glibc@2.5.0':
+ resolution:
+ { integrity: sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [x64]
+ os: [linux]
+ libc: [glibc]
+
+ '@parcel/watcher-linux-x64-musl@2.5.0':
+ resolution:
+ { integrity: sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [x64]
+ os: [linux]
+ libc: [musl]
+
+ '@parcel/watcher-win32-arm64@2.5.0':
+ resolution:
+ { integrity: sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [arm64]
+ os: [win32]
+
+ '@parcel/watcher-win32-ia32@2.5.0':
+ resolution:
+ { integrity: sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [ia32]
+ os: [win32]
+
+ '@parcel/watcher-win32-x64@2.5.0':
+ resolution:
+ { integrity: sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [x64]
+ os: [win32]
+
+ '@parcel/watcher@2.5.0':
+ resolution:
+ { integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ== }
+ engines: { node: '>= 10.0.0' }
+
'@pkgr/core@0.1.1':
resolution:
{ integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA== }
@@ -1201,9 +1303,9 @@ packages:
{ integrity: sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw== }
engines: { node: '>=12' }
- '@polka/url@1.0.0-next.25':
+ '@polka/url@1.0.0-next.28':
resolution:
- { integrity: sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ== }
+ { integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw== }
'@release-it/bumper@6.0.1':
resolution:
@@ -1630,59 +1732,55 @@ packages:
resolution:
{ integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== }
- '@unocss/config@0.62.3':
+ '@unocss/config@0.64.0':
resolution:
- { integrity: sha512-zYOvFE0HfGIbnP/AvsbAlJpPRx9CQyXzL11m/8zgsHW5SGlJIYxuTll83l/xu026G5mPiksy7quoEOEgCLslqw== }
+ { integrity: sha512-L97x4vEk7jNG5ptZY5Xp0xgEk//tbMpQVm2BzfyL7w+Hg8X3AV4YjFL6hysHvpYiTdUCVaZg+S0s3b7wuj8Mqw== }
engines: { node: '>=14' }
- '@unocss/core@0.62.3':
+ '@unocss/core@0.64.0':
resolution:
- { integrity: sha512-Pfyrj8S7jq9K1QXD6Z5BCeiQavaHpbMN5q958/kmdbNGp57hOg1e346fMJAvgPjLBR+lE/hgZEsDrijtRiZXnw== }
+ { integrity: sha512-Qb8wWPYNlTagCdJGzULew+e3NMM8Bd7fr38lDLgrMj+njop+wzkSe1ZZOyMMH9yHSq/Rznn5eCjnyzyHwxGslQ== }
- '@unocss/extractor-arbitrary-variants@0.62.3':
+ '@unocss/extractor-arbitrary-variants@0.64.0':
resolution:
- { integrity: sha512-9ZscWyXEwDZif+b56xZyJFHwJOjdMXmj+6x96jOsnRNBzwT9eW7YcGCErP1ih/q1S6KmuRrHM/JOXMBQ6H4qlw== }
+ { integrity: sha512-oVB8l8zM+x0MQJTkraRcsrfJnWEwyPVgMgtzmNUm//HqV+xTrjZCNtOqHFNIZdj/+w0gkErGQLxzRwyPjlHq4g== }
- '@unocss/inspector@0.62.3':
+ '@unocss/inspector@0.64.0':
resolution:
- { integrity: sha512-nTSXOf7YimFPxEYJo5VfP5wlMgYOCjlv3c5Ub/0fynCJXZNb89SFeU05ABXkEgg/FfiobVBTscikLc6guW8eHQ== }
+ { integrity: sha512-aFEfxEuPOpbPNH3j1CLLnN7ZyZkc64XoxZbz7RbG20Wy5oJxonOnlu+Wikz9SfGvIyF16MVAMCkHu12WFRRC+g== }
- '@unocss/preset-mini@0.62.3':
+ '@unocss/preset-mini@0.64.0':
resolution:
- { integrity: sha512-dn/8ubeW2ry/ZF3iKxdQHnS0l3EBibt0rIOE/XVwx24ub6pRzclU4r7xHnXeqvAFOO9PoiKDGgFR92m6R2MxyQ== }
+ { integrity: sha512-bc7zanalVQUrETJ06eyS7y/lhceRlY8kBG/lRCV/dYmKl4Ho/s57LrpZH0G63OcO6IfWIjwoZHVC8/RHAqnYvQ== }
- '@unocss/preset-uno@0.62.3':
+ '@unocss/preset-uno@0.64.0':
resolution:
- { integrity: sha512-RlsrMlpEzoZqB0lr5VvlkHGpEgr0Vp6z4Q/7DjW5t7mi20Z2i8olaLGWM0TO1wKoRi8bxc6HP0RHUS7pHtZxBA== }
+ { integrity: sha512-gUmuL8anty551r/Q2XU5wc0aNZ+te4yydnamXHSUv3EkX6PCphOaiWsQ5f95fj26G8EYH9fLBvxqXurFBPM7og== }
- '@unocss/preset-wind@0.62.3':
+ '@unocss/preset-wind@0.64.0':
resolution:
- { integrity: sha512-6+VNce1he1U5EXKlXRwTIPn8KeK6bZ2jAEgcCxk8mFy8SzOlLeYzXCI9lcdiWRTjIeIiK5iSaUqmsQFtKdTyQg== }
+ { integrity: sha512-cJbZI4etFrIIQoC1VhRqyEZU5fUaYqOH3uIt5lM3osxBdAvHds7SPjLRbdR612US7JbuPeFhMMRnA1EYoo39sQ== }
- '@unocss/reset@0.62.3':
+ '@unocss/reset@0.64.0':
resolution:
- { integrity: sha512-XVKPkbm8y9SGzRaG3x+HygGZURm50MvKLVHXsbxi67RbIir9Ouyt9hQTV6Xs3RicRZFWOpJx3wMRb8iKUOe5Zw== }
+ { integrity: sha512-75SiDtRX/mtg/7GWeoLfDfdWF4z59zF1XesL46FNd2hDZL36a+SZHIKB/J+PPzLyX9irqm3mAETS2PNfynuJpA== }
- '@unocss/rule-utils@0.62.3':
+ '@unocss/rule-utils@0.64.0':
resolution:
- { integrity: sha512-qI37jHH//XzyR5Y2aN3Kpo4lQrQO+CaiXpqPSwMLYh2bIypc2RQVpqGVtU736x0eA6IIx41XEkKzUW+VtvJvmg== }
+ { integrity: sha512-R5b/uspq6XsmpEqhxSzOOePHsS+pdxya+0pkQw7m6thsUxNDL7kVDpBiz2iNX5lnwagvhyhUWYu85a8XmZ8ymw== }
engines: { node: '>=14' }
- '@unocss/scope@0.62.3':
+ '@unocss/transformer-directives@0.64.0':
resolution:
- { integrity: sha512-TJGmFfsMrTo8DBJ7CJupIqObpgij+w4jCHMBf1uu0/9jbm63dH6WGcrl3zf5mm6UBTeLmB0RwJ8K4hs7LtrBDQ== }
+ { integrity: sha512-+e2bDEQMEsfq4KZ2R+GQNrEv0bL3E1KbXGPQXUiMGitmZzzagDfIBk9VTP3gNhU+hgTaWtjXlReeap1eSmwKGQ== }
- '@unocss/transformer-directives@0.62.3':
+ '@unocss/transformer-variant-group@0.64.0':
resolution:
- { integrity: sha512-HqHwFOA7DfxD/A1ROZIp8Dr8iZcE0z4w3VQtViWPQ89Fqmb7p2wCPGekk+8yW5PAltpynvHE4ahJEto5xjdg6w== }
+ { integrity: sha512-c4CN+W8ShBhGIma3KHHcBe7CRljRwZ0f5UamRrUIMs28a2jfa1TlPlr/4Ke5b6icr0mwTGajJEUaPanOK0Fp1A== }
- '@unocss/transformer-variant-group@0.62.3':
+ '@unocss/vite@0.64.0':
resolution:
- { integrity: sha512-oNX1SdfWemz0GWGSXACu8NevM0t2l44j2ancnooNkNz3l1+z1nbn4vFwfsJCOqOaoVm4ZqxaiQ8HIx81ZSiU1A== }
-
- '@unocss/vite@0.62.3':
- resolution:
- { integrity: sha512-RrqF6Go8s0BGpwRfkOiLuO+n3CUE/CXxGqb0ipbUARhmNWJlekE3YPfayqImSEnCcImpaPgtVGv6Y0u3kLGG/w== }
+ { integrity: sha512-QrfXlI8YcIaqQc4WRVrLbCho8eEi5pjs1/C8AwnUHGximEDN6MZNUk0htjo4QZ+50IA2b4RrYdz1N3875bJoFg== }
peerDependencies:
vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
@@ -2419,9 +2517,9 @@ packages:
resolution:
{ integrity: sha512-9nF4PdUle+5ta4W5SyZdLCCmFd37uVimSjg1evcTqKJCyvCEEj12WKzOSBNak6r4im4J4iYXKH1OWpUV5LBYFg== }
- css-tree@2.3.1:
+ css-tree@3.0.1:
resolution:
- { integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw== }
+ { integrity: sha512-8Fxxv+tGhORlshCdCwnNJytvlvq46sOLSYEx2ZIGurahWvMucSRnyjPA3AmrMq4VPRYbHVpWj5VkiVasrM2H4Q== }
engines: { node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0 }
cssesc@3.0.0:
@@ -2616,6 +2714,12 @@ packages:
{ integrity: sha512-Mc7QhQ8s+cLrnUfU/Ji94vG/r8M26m8f++vyres4ZoojaRDpZ1eSIh/EpzLNwlWuvzSZ3UbDFspjFvTDXe6e/g== }
engines: { node: '>=12.20' }
+ detect-libc@1.0.3:
+ resolution:
+ { integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg== }
+ engines: { node: '>=0.10' }
+ hasBin: true
+
dir-glob@3.0.1:
resolution:
{ integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== }
@@ -2983,9 +3087,9 @@ packages:
resolution:
{ integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== }
- fdir@6.3.0:
+ fdir@6.4.2:
resolution:
- { integrity: sha512-QOnuT+BOtivR77wYvCWHfGt9s4Pz1VIMbD463vegT5MLqNXy8rYFT/lPVEqf/bhYeT6qmqrNHhsX+rWwe3rOCQ== }
+ { integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ== }
peerDependencies:
picomatch: ^3 || ^4
peerDependenciesMeta:
@@ -3134,9 +3238,9 @@ packages:
{ integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== }
engines: { node: '>= 0.4' }
- get-tsconfig@4.8.0:
+ get-tsconfig@4.8.1:
resolution:
- { integrity: sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw== }
+ { integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg== }
get-uri@6.0.3:
resolution:
@@ -4001,9 +4105,9 @@ packages:
resolution:
{ integrity: sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw== }
- mdn-data@2.0.30:
+ mdn-data@2.12.1:
resolution:
- { integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA== }
+ { integrity: sha512-rsfnCbOHjqrhWxwt5/wtSLzpoKTzW7OXdT5lLOIH1OTYhWu9rRJveGq0sKvDZODABH7RX+uoR+DYcpFnq4Tf6Q== }
meow@12.1.1:
resolution:
@@ -4182,6 +4286,10 @@ packages:
{ integrity: sha512-NHDDGYudnvRutt/VhKFlX26IotXe1w0cmkDm6JGquh5bz/bDTw0LufSmH/GxTjEdpHEO+bVKFTwdrcGa/9XlKQ== }
engines: { node: ^12.20.0 || ^14.13.1 || >=16.0.0 }
+ node-addon-api@7.1.1:
+ resolution:
+ { integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ== }
+
node-bitmap@0.0.1:
resolution:
{ integrity: sha512-Jx5lPaaLdIaOsj2mVLWMWulXF6GQVdyLvNSxmiYCvZ8Ma2hfKX0POoR2kgKOqz+oFsRreq0yYZjQ2wjE9VNzCA== }
@@ -4789,9 +4897,9 @@ packages:
resolution:
{ integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== }
- sass@1.77.6:
+ sass@1.80.6:
resolution:
- { integrity: sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q== }
+ { integrity: sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg== }
engines: { node: '>=14.0.0' }
hasBin: true
@@ -4902,11 +5010,6 @@ packages:
{ integrity: sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw== }
engines: { node: '>= 10.0.0', npm: '>= 3.0.0' }
- source-map-js@1.2.0:
- resolution:
- { integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== }
- engines: { node: '>=0.10.0' }
-
source-map-js@1.2.1:
resolution:
{ integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== }
@@ -5090,9 +5193,9 @@ packages:
resolution:
{ integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== }
- tinyglobby@0.2.6:
+ tinyglobby@0.2.10:
resolution:
- { integrity: sha512-NbBoFBpqfcgd1tCiO8Lkfdk+xrA7mlLR9zgvZcZWQQwU63XAfUePyd6wZBaU93Hqw347lHnwFzttAkemHzzz4g== }
+ { integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew== }
engines: { node: '>=12.0.0' }
tmp@0.0.33:
@@ -5139,9 +5242,9 @@ packages:
resolution:
{ integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== }
- tsx@4.19.0:
+ tsx@4.19.2:
resolution:
- { integrity: sha512-bV30kM7bsLZKZIOCHeMNVMJ32/LuJzLVajkQI/qf92J2Qr08ueLQvW00PUZGiuLPP760UINwupgUj8qrSCPUKg== }
+ { integrity: sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g== }
engines: { node: '>=18.0.0' }
hasBin: true
@@ -5459,6 +5562,12 @@ packages:
peerDependencies:
eslint: '>=6.0.0'
+ vue-flow-layout@0.1.1:
+ resolution:
+ { integrity: sha512-JdgRRUVrN0Y2GosA0M68DEbKlXMqJ7FQgsK8CjQD2vxvNSqAU6PZEpi4cfcTVtfM2GVOMjHo7GKKLbXxOBqDqA== }
+ peerDependencies:
+ vue: ^3.4.37
+
vue-router@4.4.3:
resolution:
{ integrity: sha512-sv6wmNKx2j3aqJQDMxLFzs/u/mjA9Z5LCgy6BE0f7yFWMjrPLnS/sPNn8ARY/FXw6byV18EFutn5lTO6+UsV5A== }
@@ -6468,6 +6577,67 @@ snapshots:
'@oxlint/win32-x64@0.2.18':
optional: true
+ '@parcel/watcher-android-arm64@2.5.0':
+ optional: true
+
+ '@parcel/watcher-darwin-arm64@2.5.0':
+ optional: true
+
+ '@parcel/watcher-darwin-x64@2.5.0':
+ optional: true
+
+ '@parcel/watcher-freebsd-x64@2.5.0':
+ optional: true
+
+ '@parcel/watcher-linux-arm-glibc@2.5.0':
+ optional: true
+
+ '@parcel/watcher-linux-arm-musl@2.5.0':
+ optional: true
+
+ '@parcel/watcher-linux-arm64-glibc@2.5.0':
+ optional: true
+
+ '@parcel/watcher-linux-arm64-musl@2.5.0':
+ optional: true
+
+ '@parcel/watcher-linux-x64-glibc@2.5.0':
+ optional: true
+
+ '@parcel/watcher-linux-x64-musl@2.5.0':
+ optional: true
+
+ '@parcel/watcher-win32-arm64@2.5.0':
+ optional: true
+
+ '@parcel/watcher-win32-ia32@2.5.0':
+ optional: true
+
+ '@parcel/watcher-win32-x64@2.5.0':
+ optional: true
+
+ '@parcel/watcher@2.5.0':
+ dependencies:
+ detect-libc: 1.0.3
+ is-glob: 4.0.3
+ micromatch: 4.0.8
+ node-addon-api: 7.1.1
+ optionalDependencies:
+ '@parcel/watcher-android-arm64': 2.5.0
+ '@parcel/watcher-darwin-arm64': 2.5.0
+ '@parcel/watcher-darwin-x64': 2.5.0
+ '@parcel/watcher-freebsd-x64': 2.5.0
+ '@parcel/watcher-linux-arm-glibc': 2.5.0
+ '@parcel/watcher-linux-arm-musl': 2.5.0
+ '@parcel/watcher-linux-arm64-glibc': 2.5.0
+ '@parcel/watcher-linux-arm64-musl': 2.5.0
+ '@parcel/watcher-linux-x64-glibc': 2.5.0
+ '@parcel/watcher-linux-x64-musl': 2.5.0
+ '@parcel/watcher-win32-arm64': 2.5.0
+ '@parcel/watcher-win32-ia32': 2.5.0
+ '@parcel/watcher-win32-x64': 2.5.0
+ optional: true
+
'@pkgr/core@0.1.1': {}
'@pnpm/config.env-replace@1.1.0': {}
@@ -6482,7 +6652,7 @@ snapshots:
'@pnpm/network.ca-file': 1.0.2
config-chain: 1.1.13
- '@polka/url@1.0.0-next.25': {}
+ '@polka/url@1.0.0-next.28': {}
'@release-it/bumper@6.0.1(release-it@17.10.0(typescript@5.6.2))':
dependencies:
@@ -6805,94 +6975,94 @@ snapshots:
'@ungap/structured-clone@1.2.0': {}
- '@unocss/config@0.62.3':
+ '@unocss/config@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
+ '@unocss/core': 0.64.0
unconfig: 0.5.5
transitivePeerDependencies:
- supports-color
- '@unocss/core@0.62.3': {}
+ '@unocss/core@0.64.0': {}
- '@unocss/extractor-arbitrary-variants@0.62.3':
+ '@unocss/extractor-arbitrary-variants@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
+ '@unocss/core': 0.64.0
- '@unocss/inspector@0.62.3':
+ '@unocss/inspector@0.64.0(vue@3.5.11(typescript@5.6.2))':
dependencies:
- '@unocss/core': 0.62.3
- '@unocss/rule-utils': 0.62.3
+ '@unocss/core': 0.64.0
+ '@unocss/rule-utils': 0.64.0
gzip-size: 6.0.0
sirv: 2.0.4
+ vue-flow-layout: 0.1.1(vue@3.5.11(typescript@5.6.2))
+ transitivePeerDependencies:
+ - vue
- '@unocss/preset-mini@0.62.3':
+ '@unocss/preset-mini@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
- '@unocss/extractor-arbitrary-variants': 0.62.3
- '@unocss/rule-utils': 0.62.3
+ '@unocss/core': 0.64.0
+ '@unocss/extractor-arbitrary-variants': 0.64.0
+ '@unocss/rule-utils': 0.64.0
- '@unocss/preset-uno@0.62.3':
+ '@unocss/preset-uno@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
- '@unocss/preset-mini': 0.62.3
- '@unocss/preset-wind': 0.62.3
- '@unocss/rule-utils': 0.62.3
+ '@unocss/core': 0.64.0
+ '@unocss/preset-mini': 0.64.0
+ '@unocss/preset-wind': 0.64.0
+ '@unocss/rule-utils': 0.64.0
- '@unocss/preset-wind@0.62.3':
+ '@unocss/preset-wind@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
- '@unocss/preset-mini': 0.62.3
- '@unocss/rule-utils': 0.62.3
+ '@unocss/core': 0.64.0
+ '@unocss/preset-mini': 0.64.0
+ '@unocss/rule-utils': 0.64.0
- '@unocss/reset@0.62.3': {}
+ '@unocss/reset@0.64.0': {}
- '@unocss/rule-utils@0.62.3':
+ '@unocss/rule-utils@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
- magic-string: 0.30.11
+ '@unocss/core': 0.64.0
+ magic-string: 0.30.12
- '@unocss/scope@0.62.3': {}
-
- '@unocss/transformer-directives@0.62.3':
+ '@unocss/transformer-directives@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
- '@unocss/rule-utils': 0.62.3
- css-tree: 2.3.1
+ '@unocss/core': 0.64.0
+ '@unocss/rule-utils': 0.64.0
+ css-tree: 3.0.1
- '@unocss/transformer-variant-group@0.62.3':
+ '@unocss/transformer-variant-group@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
+ '@unocss/core': 0.64.0
- '@unocss/vite@0.62.3(rollup@4.24.3)(vite@5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))':
+ '@unocss/vite@0.64.0(rollup@4.24.3)(vite@5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))':
dependencies:
'@ampproject/remapping': 2.3.0
- '@rollup/pluginutils': 5.1.0(rollup@4.24.3)
- '@unocss/config': 0.62.3
- '@unocss/core': 0.62.3
- '@unocss/inspector': 0.62.3
- '@unocss/scope': 0.62.3
- '@unocss/transformer-directives': 0.62.3
+ '@rollup/pluginutils': 5.1.3(rollup@4.24.3)
+ '@unocss/config': 0.64.0
+ '@unocss/core': 0.64.0
+ '@unocss/inspector': 0.64.0(vue@3.5.11(typescript@5.6.2))
chokidar: 3.6.0
- magic-string: 0.30.11
- tinyglobby: 0.2.6
- vite: 5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5)
+ magic-string: 0.30.12
+ tinyglobby: 0.2.10
+ vite: 5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5)
transitivePeerDependencies:
- rollup
- supports-color
+ - vue
- '@vitejs/plugin-vue-jsx@4.0.0(vite@5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))':
+ '@vitejs/plugin-vue-jsx@4.0.0(vite@5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))':
dependencies:
'@babel/core': 7.25.2
'@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2)
'@vue/babel-plugin-jsx': 1.2.2(@babel/core@7.25.2)
- vite: 5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5)
+ vite: 5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5)
vue: 3.5.11(typescript@5.6.2)
transitivePeerDependencies:
- supports-color
- '@vitejs/plugin-vue@5.1.2(vite@5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))':
+ '@vitejs/plugin-vue@5.1.2(vite@5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))':
dependencies:
- vite: 5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5)
+ vite: 5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5)
vue: 3.5.11(typescript@5.6.2)
'@volar/language-core@2.4.1':
@@ -7574,9 +7744,9 @@ snapshots:
'@emotion/hash': 0.8.0
csstype: 3.0.11
- css-tree@2.3.1:
+ css-tree@3.0.1:
dependencies:
- mdn-data: 2.0.30
+ mdn-data: 2.12.1
source-map-js: 1.2.1
cssesc@3.0.0: {}
@@ -7708,6 +7878,9 @@ snapshots:
detect-indent@7.0.1: {}
+ detect-libc@1.0.3:
+ optional: true
+
dir-glob@3.0.1:
dependencies:
path-type: 4.0.0
@@ -8138,7 +8311,7 @@ snapshots:
dependencies:
reusify: 1.0.4
- fdir@6.3.0(picomatch@4.0.2):
+ fdir@6.4.2(picomatch@4.0.2):
optionalDependencies:
picomatch: 4.0.2
@@ -8275,7 +8448,7 @@ snapshots:
es-errors: 1.3.0
get-intrinsic: 1.2.4
- get-tsconfig@4.8.0:
+ get-tsconfig@4.8.1:
dependencies:
resolve-pkg-maps: 1.0.0
@@ -8522,7 +8695,7 @@ snapshots:
jiti: 2.0.0-beta.3
jiti-v1: jiti@1.21.6
pathe: 1.1.2
- tsx: 4.19.0
+ tsx: 4.19.2
transitivePeerDependencies:
- supports-color
@@ -8932,7 +9105,7 @@ snapshots:
dependencies:
'@jridgewell/sourcemap-codec': 1.5.0
- mdn-data@2.0.30: {}
+ mdn-data@2.12.1: {}
meow@12.1.1: {}
@@ -9065,6 +9238,9 @@ snapshots:
dependencies:
type-fest: 2.19.0
+ node-addon-api@7.1.1:
+ optional: true
+
node-bitmap@0.0.1: {}
node-fetch-native@1.6.4: {}
@@ -9639,11 +9815,13 @@ snapshots:
safer-buffer@2.1.2: {}
- sass@1.77.6:
+ sass@1.80.6:
dependencies:
- chokidar: 3.6.0
+ chokidar: 4.0.1
immutable: 4.3.7
- source-map-js: 1.2.0
+ source-map-js: 1.2.1
+ optionalDependencies:
+ '@parcel/watcher': 2.5.0
scule@1.3.0: {}
@@ -9698,7 +9876,7 @@ snapshots:
sirv@2.0.4:
dependencies:
- '@polka/url': 1.0.0-next.25
+ '@polka/url': 1.0.0-next.28
mrmime: 2.0.0
totalist: 3.0.1
@@ -9733,8 +9911,6 @@ snapshots:
ip-address: 9.0.5
smart-buffer: 4.2.0
- source-map-js@1.2.0: {}
-
source-map-js@1.2.1: {}
source-map-support@0.5.21:
@@ -9880,9 +10056,9 @@ snapshots:
through@2.3.8: {}
- tinyglobby@0.2.6:
+ tinyglobby@0.2.10:
dependencies:
- fdir: 6.3.0(picomatch@4.0.2)
+ fdir: 6.4.2(picomatch@4.0.2)
picomatch: 4.0.2
tmp@0.0.33:
@@ -9917,10 +10093,10 @@ snapshots:
tslib@2.6.3: {}
- tsx@4.19.0:
+ tsx@4.19.2:
dependencies:
esbuild: 0.23.1
- get-tsconfig: 4.8.0
+ get-tsconfig: 4.8.1
optionalDependencies:
fsevents: 2.3.3
@@ -10182,7 +10358,7 @@ snapshots:
core-util-is: 1.0.2
extsprintf: 1.3.0
- vite@5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5):
+ vite@5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5):
dependencies:
esbuild: 0.21.5
postcss: 8.4.47
@@ -10190,7 +10366,7 @@ snapshots:
optionalDependencies:
'@types/node': 20.14.15
fsevents: 2.3.3
- sass: 1.77.6
+ sass: 1.80.6
terser: 5.31.5
vooks@0.2.12(vue@3.5.11(typescript@5.6.2)):
@@ -10221,6 +10397,10 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ vue-flow-layout@0.1.1(vue@3.5.11(typescript@5.6.2)):
+ dependencies:
+ vue: 3.5.11(typescript@5.6.2)
+
vue-router@4.4.3(vue@3.5.11(typescript@5.6.2)):
dependencies:
'@vue/devtools-api': 6.6.3
diff --git a/src/components/common/ContextMenu.vue b/src/components/common/ContextMenu.vue
index 53b4d93..40766e2 100644
--- a/src/components/common/ContextMenu.vue
+++ b/src/components/common/ContextMenu.vue
@@ -167,6 +167,7 @@ const handleAfterEnter = (el: any) => {
diff --git a/src/layout/center/style.scss b/src/layout/center/style.scss
index ffd37a3..121aed4 100644
--- a/src/layout/center/style.scss
+++ b/src/layout/center/style.scss
@@ -1,3 +1,5 @@
+@use '@/styles/scss/global/variable.scss' as *;
+
.resizable {
height: 100%;
position: relative;
diff --git a/src/layout/left/components/ActionList.vue b/src/layout/left/components/ActionList.vue
index 60f4518..21f4c78 100644
--- a/src/layout/left/components/ActionList.vue
+++ b/src/layout/left/components/ActionList.vue
@@ -355,7 +355,7 @@ onMounted(() => {
})
diff --git a/src/layout/left/components/definePlugins/Card.vue b/src/layout/left/components/definePlugins/Card.vue
index 9674adf..6ca7328 100644
--- a/src/layout/left/components/definePlugins/Card.vue
+++ b/src/layout/left/components/definePlugins/Card.vue
@@ -230,6 +230,7 @@ onUnmounted(() => {
diff --git a/src/layout/left/style.scss b/src/layout/left/style.scss
index 30107d0..cc7968a 100644
--- a/src/layout/left/style.scss
+++ b/src/layout/left/style.scss
@@ -1,3 +1,5 @@
+@use '@/styles/scss/global/variable.scss' as *;
+
@mixin action() {
&:not(.active):hover {
background: var(--left-bg-hover);
diff --git a/src/views/homeWindow/more/settings/index.vue b/src/views/homeWindow/more/settings/index.vue
index 98baae3..1a0cac7 100644
--- a/src/views/homeWindow/more/settings/index.vue
+++ b/src/views/homeWindow/more/settings/index.vue
@@ -93,6 +93,7 @@ onMounted(async () => {
From f626a96c1abfb00e07d53fceec12ea3cdd1faca0 Mon Sep 17 00:00:00 2001
From: Dawn <2439646234@qq.com>
Date: Fri, 15 Nov 2024 14:55:16 +0800
Subject: [PATCH 05/12] =?UTF-8?q?fix(view):=20:bug:=20=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=8A=9F=E8=83=BD=E6=BC=8F=E6=B4=9E=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=20(#38)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix(view): :bug: 修复打开独立窗口后主窗口消息窗口无法打开问题
* fix(service): :bug: 修复请求参数错误问题
* feat(view): :sparkles: 优化登录
增加账号密码登录功能
请求增加中断
优化自动登录
简化请求接口
---------
Co-authored-by: ZOL4789 <44133469+ZOL4789@users.noreply.github.com>
---
.env.development | 4 +-
.vscode/tasks.json | 13 +++
src/enums/index.ts | 10 +-
src/layout/left/config.tsx | 14 ++-
src/model/User.ts | 16 +++
src/router/index.ts | 5 +
src/services/apis.ts | 37 +++++--
src/services/http.ts | 7 +-
src/services/request.ts | 23 ++---
src/services/types.ts | 4 +
src/services/urls.ts | 13 ++-
src/stores/chat.ts | 6 +-
src/stores/contacts.ts | 4 +-
src/stores/group.ts | 8 +-
src/stores/loginHistory.ts | 10 +-
src/typings/components.d.ts | 2 -
src/views/loginWindow/Login.vue | 117 ++++++++++++++++------
src/views/loginWindow/QRCode.vue | 2 +-
src/views/registerWindow/Register.vue | 137 ++++++++++++++++++++++++++
vite.config.ts | 2 +-
20 files changed, 354 insertions(+), 80 deletions(-)
create mode 100644 .vscode/tasks.json
create mode 100644 src/model/User.ts
create mode 100644 src/views/registerWindow/Register.vue
diff --git a/.env.development b/.env.development
index 2444f4f..31d22f8 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
# 后端服务地址
-VITE_SERVICE_URL="https://hulaspark.com"
+VITE_SERVICE_URL="http://localhost:9190"
# websocket服务地址
-VITE_WEBSOCKET_URL="wss://hulaspark.com/websocket"
+VITE_WEBSOCKET_URL="ws://localhost:8090/websocket"
# 项目标题
VITE_APP_TITLE="HuLa—IM"
# 项目名称
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..77e49c5
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,13 @@
+{
+ "version": "2.0.0",
+ "tasks": [
+ {
+ "type": "npm",
+ "script": "tauri:build:debug",
+ "group": "build",
+ "problemMatcher": [],
+ "label": "npm: tauri:build:debug",
+ "detail": "tauri build --debug"
+ }
+ ]
+}
diff --git a/src/enums/index.ts b/src/enums/index.ts
index e9ad41c..bf568c4 100644
--- a/src/enums/index.ts
+++ b/src/enums/index.ts
@@ -21,13 +21,15 @@ export enum RCodeEnum {
/**URL*/
export enum URLEnum {
/**用户*/
- USER = '/api/user',
+ USER = '/user',
+ /**Token*/
+ TOKEN = '/token',
/**聊天*/
- CHAT = '/api/chat',
+ CHAT = '/chat',
/**房间*/
- ROOM = '/api/room',
+ ROOM = '/room',
/**oss*/
- OSS = '/api/oss'
+ OSS = '/oss'
}
/** tauri原生跨窗口通信时传输的类型 */
diff --git a/src/layout/left/config.tsx b/src/layout/left/config.tsx
index c0ccb59..de06c43 100644
--- a/src/layout/left/config.tsx
+++ b/src/layout/left/config.tsx
@@ -2,9 +2,13 @@ import { useWindow } from '@/hooks/useWindow.ts'
import { MittEnum, ModalEnum, PluginEnum } from '@/enums'
import Mitt from '@/utils/Bus.ts'
import { useLogin } from '@/hooks/useLogin.ts'
+import { useSettingStore } from '@/stores/setting.ts'
+import apis from '@/services/apis.ts'
const { createWebviewWindow } = useWindow()
const { logout } = useLogin()
+const settingStore = useSettingStore()
+const { login } = storeToRefs(settingStore)
/**
* 这里的顶部的操作栏使用pinia写入了localstorage中
*/
@@ -89,7 +93,15 @@ const moreList = ref([
label: '退出账号',
icon: 'power',
click: async () => {
- await logout()
+ await apis
+ .logout()
+ .then(async () => {
+ await logout()
+ login.value.accountInfo.token = ''
+ })
+ .catch(() => {
+ window.$message.error('退出账号失败')
+ })
}
}
])
diff --git a/src/model/User.ts b/src/model/User.ts
new file mode 100644
index 0000000..4dfacab
--- /dev/null
+++ b/src/model/User.ts
@@ -0,0 +1,16 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+interface User {
+ id: number
+ name: string
+ account: string
+ password: string
+ avatar: string
+ sex: number
+ openId: string
+ activeStatus: number
+ lastOptTime: string
+ itemId: number
+ status: number
+ createTime: string
+ updateTime: string
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index fb73364..d7b9154 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -8,6 +8,11 @@ const routes: Array = [
name: 'login',
component: () => import('@/views/loginWindow/Login.vue')
},
+ {
+ path: '/register',
+ name: 'register',
+ component: () => import('@/views/registerWindow/Register.vue')
+ },
{
path: '/qrCode',
name: 'qrCode',
diff --git a/src/services/apis.ts b/src/services/apis.ts
index def854a..f4b1ded 100644
--- a/src/services/apis.ts
+++ b/src/services/apis.ts
@@ -22,10 +22,10 @@ import type {
import request from '@/services/request'
-const GET = (url: string, params?: any) => request.get(url, params)
-const POST = (url: string, params?: any) => request.post(url, params)
-const PUT = (url: string, params?: any) => request.put(url, params)
-const DELETE = (url: string, params?: any) => request.delete(url, params)
+const GET = (url: string, params?: any, abort?: AbortController) => request.get(url, params, abort)
+const POST = (url: string, params?: any, abort?: AbortController) => request.post(url, params, abort)
+const PUT = (url: string, params?: any, abort?: AbortController) => request.put(url, params, abort)
+const DELETE = (url: string, params?: any, abort?: AbortController) => request.delete(url, params, abort)
export default {
/** 获取用户信息 */
@@ -67,9 +67,9 @@ export default {
/** 删除id */
deleteEmoji: (params: { id: number }) => DELETE(urls.deleteEmoji, params),
/** 获取联系人列表 */
- getContactList: (params?: any) => GET>(urls.getContactList, { params }),
+ getContactList: (params?: any) => GET>(urls.getContactList, params),
/** 获取好友申请列表 */
- requestFriendList: (params?: any) => GET>(urls.requestFriendList, { params }),
+ requestFriendList: (params?: any) => GET>(urls.requestFriendList, params),
/** 发送添加好友请求 */
sendAddFriendRequest: (params: { targetUid: number; msg: string }) =>
POST(urls.sendAddFriendRequest, params),
@@ -96,7 +96,7 @@ export default {
/** 群组详情 */
groupDetail: (params: { id: number }) => GET(urls.groupDetail, params),
/** 会话详情 */
- sessionDetail: (params: { id: number }) => GET(urls.sessionDetail, { params }),
+ sessionDetail: (params: { id: number }) => GET(urls.sessionDetail, params),
/** 会话详情(联系人列表发消息用) */
sessionDetailWithFriends: (params: { uid: number }) => GET(urls.sessionDetailWithFriends, params),
/** 添加群管理 */
@@ -115,5 +115,26 @@ export default {
exitGroup: ({ roomId }: { roomId: number }) =>
DELETE(urls.exitGroup, {
roomId
- })
+ }),
+ /** 账号密码登录 */
+ login: (user: User, abort?: AbortController) =>
+ POST(
+ urls.login,
+ {
+ account: user.account,
+ password: user.password
+ },
+ abort
+ ),
+ /** 退出登录 */
+ logout: (abort?: AbortController) => POST(urls.logout, abort),
+ /** 注册 */
+ register: (user: User) =>
+ POST(urls.register, {
+ name: user.name,
+ account: user.account,
+ password: user.password
+ }),
+ /** 检查token是否有效 */
+ checkToken: () => POST(urls.checkToken)
}
diff --git a/src/services/http.ts b/src/services/http.ts
index 3d9c333..a8af1ae 100644
--- a/src/services/http.ts
+++ b/src/services/http.ts
@@ -24,12 +24,14 @@ export type HttpParams = {
* @param {string} url 请求地址
* @param {HttpParams} options 请求参数
* @param {boolean} [fullResponse=false] 是否返回完整响应
+ * @param {AbortController} abort 中断器
* @returns {Promise; resp: Response }>} 请求结果
*/
async function Http(
url: string,
options: HttpParams,
- fullResponse?: true
+ fullResponse?: true,
+ abort?: AbortController
): Promise<{ data: Promise; resp: Response }> {
// 构建请求头
const httpHeaders = new Headers(options.headers || {})
@@ -37,7 +39,8 @@ async function Http(
// 构建 fetch 请求选项
const fetchOptions: RequestInit = {
method: options.method,
- headers: httpHeaders
+ headers: httpHeaders,
+ signal: abort?.signal
}
// 判断是否需要添加请求体
diff --git a/src/services/request.ts b/src/services/request.ts
index 5a9c173..a83f739 100644
--- a/src/services/request.ts
+++ b/src/services/request.ts
@@ -26,7 +26,8 @@ const responseInterceptor = async (
url: string,
method: 'GET' | 'POST' | 'PUT' | 'DELETE',
query: any,
- body: any
+ body: any,
+ abort?: AbortController
): Promise => {
const token = useSettingStore().login.accountInfo.token
@@ -54,11 +55,11 @@ const responseInterceptor = async (
}
try {
- const data = await Http(url, httpParams, true)
+ const data = await Http(url, httpParams, true, abort)
const resp = data.resp
const serviceData = (await data.data) as ServiceResponse
- console.log(data)
+ console.log(url, data)
//检查发送请求是否成功
if (resp.status > 400) {
let message = ''
@@ -116,20 +117,20 @@ const responseInterceptor = async (
}
}
-const get = async (url: string, query: T): Promise => {
- return responseInterceptor(url, 'GET', query, {})
+const get = async (url: string, query: T, abort?: AbortController): Promise => {
+ return responseInterceptor(url, 'GET', query, {}, abort)
}
-const post = async (url: string, params: any): Promise => {
- return responseInterceptor(url, 'POST', {}, params)
+const post = async (url: string, params: any, abort?: AbortController): Promise => {
+ return responseInterceptor(url, 'POST', {}, params, abort)
}
-const put = async (url: string, params: any): Promise => {
- return responseInterceptor(url, 'PUT', {}, params)
+const put = async (url: string, params: any, abort?: AbortController): Promise => {
+ return responseInterceptor(url, 'PUT', {}, params, abort)
}
-const del = async (url: string, params: any): Promise => {
- return responseInterceptor(url, 'DELETE', {}, params)
+const del = async (url: string, params: any, abort?: AbortController): Promise => {
+ return responseInterceptor(url, 'DELETE', {}, params, abort)
}
export default {
diff --git a/src/services/types.ts b/src/services/types.ts
index 42b6a2d..31644d1 100644
--- a/src/services/types.ts
+++ b/src/services/types.ts
@@ -135,6 +135,10 @@ export type UserInfoType = {
/** 用户唯一标识 */
uid: number
/** 用户头像 */
+ account: string
+ /** 用户头像 */
+ password: string
+ /** 用户头像 */
avatar: string
/** 用户名 */
name: string
diff --git a/src/services/urls.ts b/src/services/urls.ts
index 87f1d26..94245d2 100644
--- a/src/services/urls.ts
+++ b/src/services/urls.ts
@@ -5,6 +5,7 @@ const { VITE_SERVICE_URL } = import.meta.env
const prefix = VITE_SERVICE_URL
export default {
+ // 用户相关
getUserInfo: `${prefix + URLEnum.USER}/userInfo`, // 获取用户信息
getBadgeList: `${prefix + URLEnum.USER}/badges`, // 获取徽章列表
getMemberStatistic: `${prefix + URLEnum.CHAT}/public/member/statistic`,
@@ -43,5 +44,15 @@ export default {
revokeAdmin: `${prefix + URLEnum.ROOM}/group/admin`, // 添加管理员
groupDetail: `${prefix + URLEnum.ROOM}/public/group`, // 群组详情
sessionDetail: `${prefix + URLEnum.CHAT}/public/contact/detail`, // 会话详情
- sessionDetailWithFriends: `${prefix + URLEnum.CHAT}/public/contact/detail/friend` // 会话详情(联系人列表发消息用)
+ sessionDetailWithFriends: `${prefix + URLEnum.CHAT}/public/contact/detail/friend`, // 会话详情(联系人列表发消息用)
+
+ // token相关
+ // 注册
+ register: `${prefix + URLEnum.TOKEN}/register`,
+ // 登录
+ login: `${prefix + URLEnum.TOKEN}/login`,
+ // 退出登录
+ logout: `${prefix + URLEnum.TOKEN}/logout`,
+ // 检查token是否有效
+ checkToken: `${prefix + URLEnum.TOKEN}/check`
}
diff --git a/src/stores/chat.ts b/src/stores/chat.ts
index 9d861f0..5e3c35e 100644
--- a/src/stores/chat.ts
+++ b/src/stores/chat.ts
@@ -188,10 +188,8 @@ export const useChatStore = defineStore('chat', () => {
sessionOptions.isLoading = true
const response = await apis
.getSessionList({
- params: {
- pageSize: sessionList.length > pageSize ? sessionList.length : pageSize,
- cursor: isFresh || !sessionOptions.cursor ? undefined : sessionOptions.cursor
- }
+ pageSize: sessionList.length > pageSize ? sessionList.length : pageSize,
+ cursor: isFresh || !sessionOptions.cursor ? '' : sessionOptions.cursor
})
.catch(() => {
sessionOptions.isLoading = false
diff --git a/src/stores/contacts.ts b/src/stores/contacts.ts
index c8a5bd2..8432e10 100644
--- a/src/stores/contacts.ts
+++ b/src/stores/contacts.ts
@@ -25,7 +25,7 @@ export const useContactStore = defineStore('contact', () => {
.getContactList({
// TODO 先写 100，稍后优化
pageSize: 100,
- cursor: isFresh || !contactsOptions.cursor ? undefined : contactsOptions.cursor
+ cursor: isFresh || !contactsOptions.cursor ? '' : contactsOptions.cursor
})
.catch(() => {
contactsOptions.isLoading = false
@@ -62,7 +62,7 @@ export const useContactStore = defineStore('contact', () => {
const res = await apis
.requestFriendList({
pageSize,
- cursor: isFresh || !requestFriendsOptions.cursor ? undefined : requestFriendsOptions.cursor
+ cursor: isFresh || !requestFriendsOptions.cursor ? '' : requestFriendsOptions.cursor
})
.catch(() => {
requestFriendsOptions.isLoading = false
diff --git a/src/stores/group.ts b/src/stores/group.ts
index ce57b85..72aaa7c 100644
--- a/src/stores/group.ts
+++ b/src/stores/group.ts
@@ -88,11 +88,9 @@ export const useGroupStore = defineStore('group', () => {
// 获取群成员
const getGroupUserList = async (refresh = false) => {
const res = await apis.getGroupList({
- params: {
- pageSize,
- cursor: refresh ? undefined : userListOptions.cursor,
- roomId: currentRoomId.value
- }
+ pageSize: pageSize,
+ cursor: refresh ? '' : userListOptions.cursor,
+ roomId: currentRoomId.value
})
if (!res) return
const data = res
diff --git a/src/stores/loginHistory.ts b/src/stores/loginHistory.ts
index 7dedd01..26895b2 100644
--- a/src/stores/loginHistory.ts
+++ b/src/stores/loginHistory.ts
@@ -7,8 +7,8 @@ export const useLoginHistoriesStore = defineStore(
() => {
const loginHistories = ref([
{
- account: 'hula',
- password: '123456',
+ account: 'admin',
+ password: 'admin',
name: '超级GG帮',
avatar: 'https://picsum.photos/140?1',
uid: 123456,
@@ -16,7 +16,7 @@ export const useLoginHistoriesStore = defineStore(
},
{
account: 'hula1',
- password: '123456',
+ password: 'hula1',
name: '二狗子',
avatar: 'https://picsum.photos/140?2',
uid: 123456,
@@ -24,7 +24,7 @@ export const useLoginHistoriesStore = defineStore(
},
{
account: 'hula2',
- password: '123456',
+ password: 'hula2',
name: '李山离',
avatar: 'https://picsum.photos/140?3',
uid: 123456,
@@ -32,7 +32,7 @@ export const useLoginHistoriesStore = defineStore(
},
{
account: 'hula3',
- password: '123456',
+ password: 'hula3',
name: '牛什么呢',
avatar: 'https://picsum.photos/140?4',
uid: 123456,
diff --git a/src/typings/components.d.ts b/src/typings/components.d.ts
index 48257a0..19f79ac 100644
--- a/src/typings/components.d.ts
+++ b/src/typings/components.d.ts
@@ -36,7 +36,6 @@ declare module 'vue' {
NDropdown: typeof import('naive-ui')['NDropdown']
NEllipsis: typeof import('naive-ui')['NEllipsis']
NFlex: typeof import('naive-ui')['NFlex']
- NGradientText: typeof import('naive-ui')['NGradientText']
NIcon: typeof import('naive-ui')['NIcon']
NIconWrapper: typeof import('naive-ui')['NIconWrapper']
NImage: typeof import('naive-ui')['NImage']
@@ -60,7 +59,6 @@ declare module 'vue' {
NTab: typeof import('naive-ui')['NTab']
NTabPane: typeof import('naive-ui')['NTabPane']
NTabs: typeof import('naive-ui')['NTabs']
- NText: typeof import('naive-ui')['NText']
NTooltip: typeof import('naive-ui')['NTooltip']
NVirtualList: typeof import('naive-ui')['NVirtualList']
RenderMessage: typeof import('./../components/rightBox/renderMessage/index.vue')['default']
diff --git a/src/views/loginWindow/Login.vue b/src/views/loginWindow/Login.vue
index 72b50f8..173f83b 100644
--- a/src/views/loginWindow/Login.vue
+++ b/src/views/loginWindow/Login.vue
@@ -6,7 +6,7 @@
+
![]()
- {{ loginText }}
+ {{ loginText }}
@@ -99,7 +99,6 @@
-
@@ -132,13 +131,17 @@
-
@@ -154,6 +157,7 @@ import { useSettingStore } from '@/stores/setting.ts'
import { useLogin } from '@/hooks/useLogin.ts'
import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow'
import { useLoginHistoriesStore } from '@/stores/loginHistory.ts'
+import apis from '@/services/apis.ts'
const settingStore = useSettingStore()
const loginHistoriesStore = useLoginHistoriesStore()
@@ -167,6 +171,7 @@ const info = ref({
name: '',
uid: 0
})
+
/** 是否中断登录 */
const interruptLogin = ref(false)
/** 协议 */
@@ -174,7 +179,6 @@ const protocol = ref(true)
const loginDisabled = ref(false)
const loading = ref(false)
const arrowStatus = ref(false)
-const isAutoLogin = ref(false)
const { setLoginState } = useLogin()
const accountPH = ref('输入HuLa账号')
const passwordPH = ref('输入HuLa密码')
@@ -190,6 +194,8 @@ watchEffect(() => {
}
if (interruptLogin.value) {
loginDisabled.value = false
+ loading.value = false
+ interruptLogin.value = false
}
})
@@ -222,35 +228,61 @@ const giveAccount = (item: STO.Setting['login']['accountInfo']) => {
}
/**登录后创建主页窗口*/
-const loginWin = () => {
- if (interruptLogin.value) return
+const normalLogin = async () => {
loading.value = true
- delay(async () => {
- await createWebviewWindow('HuLa', 'home', 960, 720, 'login', true)
- loading.value = false
- if (!login.value.autoLogin || login.value.accountInfo.password === '') {
- const account = {
- ...info.value,
- token: 'test'
- }
- settingStore.setAccountInfo(account)
- loginHistoriesStore.addLoginHistory(account)
- await setLoginState()
- }
- }, 1000)
+ apis
+ .login({ ...info.value } as unknown as User)
+ .then((token) => {
+ window.$message.success('登录成功，正在跳转首页')
+ delay(async () => {
+ if (interruptLogin.value) return
+ login.value.accountInfo.token = token
+ // 获取用户信息
+ const userDetail = await apis.getUserDetail()
+ const account = {
+ ...userDetail,
+ token
+ }
+ loading.value = false
+ settingStore.setAccountInfo(account)
+ loginHistoriesStore.addLoginHistory(account)
+ // 打开主界面
+ await openHomeWindow()
+ }, 1000)
+ })
+ .catch(() => {
+ window.$message.error('登录失败')
+ loading.value = false
+ })
+}
+
+const openHomeWindow = async () => {
+ await createWebviewWindow('HuLa', 'home', 960, 720, 'login', true)
}
/** 自动登录 */
const autoLogin = () => {
interruptLogin.value = false
- isAutoLogin.value = true
+ loading.value = true
// TODO 检查用户网络是否连接 (nyh -> 2024-03-16 12:06:59)
loginText.value = '网络连接中'
- delay(async () => {
- loginWin()
- loginText.value = '登录'
- await setLoginState()
- }, 1000)
+ apis
+ .checkToken()
+ .then(() => {
+ window.$message.success('登录成功，正在跳转首页')
+ delay(async () => {
+ loading.value = false
+ await openHomeWindow()
+ await setLoginState()
+ }, 1000)
+ })
+ .catch(() => {
+ window.$message.error('登录失败')
+ login.value.accountInfo.token = ''
+ router.push('/login')
+ loading.value = false
+ loginText.value = '登录'
+ })
}
const closeMenu = (event: MouseEvent) => {
@@ -258,11 +290,30 @@ const closeMenu = (event: MouseEvent) => {
if (!target.matches('.account-box, .account-box *, .down')) {
arrowStatus.value = false
}
- if (target.matches('#bottomBar *') && isAutoLogin.value) {
+ if (target.matches('#bottomBar *') && login.value.autoLogin) {
interruptLogin.value = true
}
}
+// 移除已登录账号
+const removeToken = () => {
+ login.value.accountInfo = {
+ account: '',
+ password: '',
+ avatar: '/logo.png',
+ name: '',
+ uid: 0,
+ token: ''
+ }
+ login.value.autoLogin = false
+}
+
+const enterKey = (e: KeyboardEvent) => {
+ if (e.key === 'Enter') {
+ normalLogin()
+ }
+}
+
onMounted(async () => {
// 判断是否需要马上跳转到二维码登录页面
if (localStorage.getItem('isToQrcode')) {
@@ -272,15 +323,19 @@ onMounted(async () => {
})
}
await getCurrentWebviewWindow().show()
- if (login.value.autoLogin && login.value.accountInfo.password !== '') {
+ // 自动登录
+ if (login.value.autoLogin && login.value.accountInfo.token) {
autoLogin()
+ } else {
+ loginHistories.length > 0 && giveAccount(loginHistories[0])
}
- loginHistories.length > 0 && giveAccount(loginHistories[0])
window.addEventListener('click', closeMenu, true)
+ window.addEventListener('keyup', enterKey)
})
onUnmounted(() => {
window.removeEventListener('click', closeMenu, true)
+ window.removeEventListener('keyup', enterKey)
})
diff --git a/src/views/loginWindow/QRCode.vue b/src/views/loginWindow/QRCode.vue
index cb9a60b..31d8d22 100644
--- a/src/views/loginWindow/QRCode.vue
+++ b/src/views/loginWindow/QRCode.vue
@@ -36,7 +36,7 @@
diff --git a/src/views/registerWindow/Register.vue b/src/views/registerWindow/Register.vue
new file mode 100644
index 0000000..c7f9503
--- /dev/null
+++ b/src/views/registerWindow/Register.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+ {{ btnText }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vite.config.ts b/vite.config.ts
index 0911ad0..d4ad4df 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -96,7 +96,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
// “/api” 以及前置字符串会被替换为真正域名
target: config.VITE_SERVICE_URL, // 请求域名
changeOrigin: true, // 是否跨域
- rewrite: (path) => path.replace(/^\/api/, '/api')
+ rewrite: (path) => path.replace(/^\/api/, '')
}
},
hmr: true, // 热更新
From 54ee3ff1688ec1dd248b5e7120e3613ce8758ac9 Mon Sep 17 00:00:00 2001
From: nongyehong <2439646234@qq.com>
Date: Fri, 15 Nov 2024 22:34:17 +0800
Subject: [PATCH 06/12] =?UTF-8?q?fix(view):=20:bug:=20=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E7=99=BB=E5=BD=95=E5=92=8C=E8=AF=B7=E6=B1=82=E7=9A=84=E4=B8=80?=
=?UTF-8?q?=E4=BA=9B=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 +--
.env.production | 2 +-
src/components/common/InfoPopover.vue | 13 ++++++-
src/components/rightBox/chatBox/ChatMain.vue | 33 ++++++++++++++----
src/layout/left/components/LeftAvatar.vue | 34 +++++++++++++++++--
src/router/index.ts | 2 +-
src/services/apis.ts | 17 ++--------
src/stores/chat.ts | 3 +-
src/views/loginWindow/Login.vue | 6 ++--
.../Register.vue | 1 -
10 files changed, 80 insertions(+), 35 deletions(-)
rename src/views/{registerWindow => loginWindow}/Register.vue (97%)
diff --git a/.env.development b/.env.development
index 31d22f8..a7e4419 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
# 后端服务地址
-VITE_SERVICE_URL="http://localhost:9190"
+VITE_SERVICE_URL="https://hulaspark.com/api"
# websocket服务地址
-VITE_WEBSOCKET_URL="ws://localhost:8090/websocket"
+VITE_WEBSOCKET_URL="wss://hulaspark.com/websocket"
# 项目标题
VITE_APP_TITLE="HuLa—IM"
# 项目名称
diff --git a/.env.production b/.env.production
index 2444f4f..a6a9b64 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
# 后端服务地址
-VITE_SERVICE_URL="https://hulaspark.com"
+VITE_SERVICE_URL="https://hulaspark.com/api/"
# websocket服务地址
VITE_WEBSOCKET_URL="wss://hulaspark.com/websocket"
# 项目标题
diff --git a/src/components/common/InfoPopover.vue b/src/components/common/InfoPopover.vue
index 5f2387d..f8d81c3 100644
--- a/src/components/common/InfoPopover.vue
+++ b/src/components/common/InfoPopover.vue
@@ -4,13 +4,24 @@
+ {{ isCurrentUser.name }}
+
+
在线状态
diff --git a/src/components/rightBox/chatBox/ChatMain.vue b/src/components/rightBox/chatBox/ChatMain.vue
index 430876b..d8551f0 100644
--- a/src/components/rightBox/chatBox/ChatMain.vue
+++ b/src/components/rightBox/chatBox/ChatMain.vue
@@ -94,18 +94,27 @@
:content="item"
:menu="chatStore.isGroup ? optionsList : void 0"
:special-menu="report">
+
+
@@ -430,6 +439,16 @@ watch(chatMessageList, (value, oldValue) => {
}
})
+/** 获取用户头像 */
+const getAvatarSrc = (uid: number) => {
+ return uid === userUid.value ? login.value.accountInfo.avatar : useUserInfo(uid).value.avatar
+}
+
+/** 头像是否存在 */
+const avatarExists = (uid: number) => {
+ return getAvatarSrc(uid) ? void 0 : useUserInfo(uid).value.name?.slice(0, 1)
+}
+
// 当鼠标进入时触发的处理函数
const handleMouseEnter = (key: any) => {
// 设置定时器，在1600毫秒后更新悬浮气泡的key值
diff --git a/src/layout/left/components/LeftAvatar.vue b/src/layout/left/components/LeftAvatar.vue
index ec3188d..51a4ed9 100644
--- a/src/layout/left/components/LeftAvatar.vue
+++ b/src/layout/left/components/LeftAvatar.vue
@@ -8,7 +8,17 @@
- 群聊成员 {{ userList.length }}
+ 在线群聊成员 {{ groupStore.countInfo.onlineNum }}
@@ -47,6 +47,7 @@
id="image-chat-sidebar"
style="max-height: calc(100vh - 130px)"
item-resizable
+ @scroll="handleScroll($event)"
:item-size="42"
:items="filteredUserList">
@@ -93,7 +94,7 @@
:intersection-observer-options="{
root: '#image-chat-sidebar'
}">
- {{ item.name.slice(0, 1) }}
+ {{ item.name?.slice(0, 1) }}
{{ item.name }}
diff --git a/package.json b/package.json
index 0cfa9cb..ebb505d 100644
--- a/package.json
+++ b/package.json
@@ -69,11 +69,11 @@
"@types/node": "^20.14.14",
"@typescript-eslint/eslint-plugin": "7.1.0",
"@typescript-eslint/parser": "^7.15.0",
- "@unocss/preset-uno": "^0.62.3",
- "@unocss/reset": "^0.62.3",
- "@unocss/transformer-directives": "^0.62.3",
- "@unocss/transformer-variant-group": "^0.62.3",
- "@unocss/vite": "^0.62.3",
+ "@unocss/preset-uno": "^0.64.0",
+ "@unocss/reset": "^0.64.0",
+ "@unocss/transformer-directives": "^0.64.0",
+ "@unocss/transformer-variant-group": "^0.64.0",
+ "@unocss/vite": "^0.64.0",
"@vitejs/plugin-vue": "^5.1.2",
"@vitejs/plugin-vue-jsx": "^4.0.0",
"@vueuse/core": "^10.11.0",
From 41c2fb551075d4c3a2ac9735cc91c5badfd8b402 Mon Sep 17 00:00:00 2001
From: nongyehong <2439646234@qq.com>
Date: Tue, 12 Nov 2024 12:02:27 +0800
Subject: [PATCH 03/12] =?UTF-8?q?build(sass):=20:package:=20=E5=8D=87?=
=?UTF-8?q?=E7=BA=A7sass=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=B8=BA@use?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
pnpm-lock.yaml | 440 ++++++++++++------
src/components/common/ContextMenu.vue | 1 +
src/layout/center/index.vue | 2 +-
src/layout/center/style.scss | 2 +
src/layout/left/components/ActionList.vue | 2 +-
src/layout/left/components/LeftAvatar.vue | 2 +-
.../left/components/definePlugins/Card.vue | 1 +
.../left/components/definePlugins/List.vue | 1 +
src/layout/left/index.vue | 2 +-
src/layout/left/style.scss | 2 +
src/views/homeWindow/more/settings/index.vue | 1 +
vite.config.ts | 7 +-
13 files changed, 325 insertions(+), 140 deletions(-)
diff --git a/package.json b/package.json
index ebb505d..b236683 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
"oxlint": "^0.2.18",
"prettier": "^3.3.2",
"release-it": "^17.10.0",
- "sass": "1.77.6",
+ "sass": "1.80.6",
"typescript": "^5.6.2",
"unplugin-auto-import": "^0.18.2",
"unplugin-vue-components": "^0.27.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 41ca4b7..a0e8fa6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -102,26 +102,26 @@ importers:
specifier: ^7.15.0
version: 7.18.0(eslint@8.57.0)(typescript@5.6.2)
'@unocss/preset-uno':
- specifier: ^0.62.3
- version: 0.62.3
+ specifier: ^0.64.0
+ version: 0.64.0
'@unocss/reset':
- specifier: ^0.62.3
- version: 0.62.3
+ specifier: ^0.64.0
+ version: 0.64.0
'@unocss/transformer-directives':
- specifier: ^0.62.3
- version: 0.62.3
+ specifier: ^0.64.0
+ version: 0.64.0
'@unocss/transformer-variant-group':
- specifier: ^0.62.3
- version: 0.62.3
+ specifier: ^0.64.0
+ version: 0.64.0
'@unocss/vite':
- specifier: ^0.62.3
- version: 0.62.3(rollup@4.24.3)(vite@5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))
+ specifier: ^0.64.0
+ version: 0.64.0(rollup@4.24.3)(vite@5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))
'@vitejs/plugin-vue':
specifier: ^5.1.2
- version: 5.1.2(vite@5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))
+ version: 5.1.2(vite@5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))
'@vitejs/plugin-vue-jsx':
specifier: ^4.0.0
- version: 4.0.0(vite@5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))
+ version: 4.0.0(vite@5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))
'@vueuse/core':
specifier: ^10.11.0
version: 10.11.1(vue@3.5.11(typescript@5.6.2))
@@ -162,8 +162,8 @@ importers:
specifier: ^17.10.0
version: 17.10.0(typescript@5.6.2)
sass:
- specifier: 1.77.6
- version: 1.77.6
+ specifier: 1.80.6
+ version: 1.80.6
typescript:
specifier: ^5.6.2
version: 5.6.2
@@ -175,7 +175,7 @@ importers:
version: 0.27.4(@babel/parser@7.26.2)(@nuxt/kit@3.14.0(rollup@4.24.3)(webpack-sources@3.2.3))(rollup@4.24.3)(vue@3.5.11(typescript@5.6.2))(webpack-sources@3.2.3)
vite:
specifier: 5.4.10
- version: 5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5)
+ version: 5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5)
vue-tsc:
specifier: ^2.1.4
version: 2.1.4(typescript@5.6.2)
@@ -1181,6 +1181,108 @@ packages:
cpu: [x64]
os: [win32]
+ '@parcel/watcher-android-arm64@2.5.0':
+ resolution:
+ { integrity: sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [arm64]
+ os: [android]
+
+ '@parcel/watcher-darwin-arm64@2.5.0':
+ resolution:
+ { integrity: sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [arm64]
+ os: [darwin]
+
+ '@parcel/watcher-darwin-x64@2.5.0':
+ resolution:
+ { integrity: sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [x64]
+ os: [darwin]
+
+ '@parcel/watcher-freebsd-x64@2.5.0':
+ resolution:
+ { integrity: sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [x64]
+ os: [freebsd]
+
+ '@parcel/watcher-linux-arm-glibc@2.5.0':
+ resolution:
+ { integrity: sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [arm]
+ os: [linux]
+ libc: [glibc]
+
+ '@parcel/watcher-linux-arm-musl@2.5.0':
+ resolution:
+ { integrity: sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [arm]
+ os: [linux]
+ libc: [musl]
+
+ '@parcel/watcher-linux-arm64-glibc@2.5.0':
+ resolution:
+ { integrity: sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [arm64]
+ os: [linux]
+ libc: [glibc]
+
+ '@parcel/watcher-linux-arm64-musl@2.5.0':
+ resolution:
+ { integrity: sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [arm64]
+ os: [linux]
+ libc: [musl]
+
+ '@parcel/watcher-linux-x64-glibc@2.5.0':
+ resolution:
+ { integrity: sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [x64]
+ os: [linux]
+ libc: [glibc]
+
+ '@parcel/watcher-linux-x64-musl@2.5.0':
+ resolution:
+ { integrity: sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [x64]
+ os: [linux]
+ libc: [musl]
+
+ '@parcel/watcher-win32-arm64@2.5.0':
+ resolution:
+ { integrity: sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [arm64]
+ os: [win32]
+
+ '@parcel/watcher-win32-ia32@2.5.0':
+ resolution:
+ { integrity: sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [ia32]
+ os: [win32]
+
+ '@parcel/watcher-win32-x64@2.5.0':
+ resolution:
+ { integrity: sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw== }
+ engines: { node: '>= 10.0.0' }
+ cpu: [x64]
+ os: [win32]
+
+ '@parcel/watcher@2.5.0':
+ resolution:
+ { integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ== }
+ engines: { node: '>= 10.0.0' }
+
'@pkgr/core@0.1.1':
resolution:
{ integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA== }
@@ -1201,9 +1303,9 @@ packages:
{ integrity: sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw== }
engines: { node: '>=12' }
- '@polka/url@1.0.0-next.25':
+ '@polka/url@1.0.0-next.28':
resolution:
- { integrity: sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ== }
+ { integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw== }
'@release-it/bumper@6.0.1':
resolution:
@@ -1630,59 +1732,55 @@ packages:
resolution:
{ integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== }
- '@unocss/config@0.62.3':
+ '@unocss/config@0.64.0':
resolution:
- { integrity: sha512-zYOvFE0HfGIbnP/AvsbAlJpPRx9CQyXzL11m/8zgsHW5SGlJIYxuTll83l/xu026G5mPiksy7quoEOEgCLslqw== }
+ { integrity: sha512-L97x4vEk7jNG5ptZY5Xp0xgEk//tbMpQVm2BzfyL7w+Hg8X3AV4YjFL6hysHvpYiTdUCVaZg+S0s3b7wuj8Mqw== }
engines: { node: '>=14' }
- '@unocss/core@0.62.3':
+ '@unocss/core@0.64.0':
resolution:
- { integrity: sha512-Pfyrj8S7jq9K1QXD6Z5BCeiQavaHpbMN5q958/kmdbNGp57hOg1e346fMJAvgPjLBR+lE/hgZEsDrijtRiZXnw== }
+ { integrity: sha512-Qb8wWPYNlTagCdJGzULew+e3NMM8Bd7fr38lDLgrMj+njop+wzkSe1ZZOyMMH9yHSq/Rznn5eCjnyzyHwxGslQ== }
- '@unocss/extractor-arbitrary-variants@0.62.3':
+ '@unocss/extractor-arbitrary-variants@0.64.0':
resolution:
- { integrity: sha512-9ZscWyXEwDZif+b56xZyJFHwJOjdMXmj+6x96jOsnRNBzwT9eW7YcGCErP1ih/q1S6KmuRrHM/JOXMBQ6H4qlw== }
+ { integrity: sha512-oVB8l8zM+x0MQJTkraRcsrfJnWEwyPVgMgtzmNUm//HqV+xTrjZCNtOqHFNIZdj/+w0gkErGQLxzRwyPjlHq4g== }
- '@unocss/inspector@0.62.3':
+ '@unocss/inspector@0.64.0':
resolution:
- { integrity: sha512-nTSXOf7YimFPxEYJo5VfP5wlMgYOCjlv3c5Ub/0fynCJXZNb89SFeU05ABXkEgg/FfiobVBTscikLc6guW8eHQ== }
+ { integrity: sha512-aFEfxEuPOpbPNH3j1CLLnN7ZyZkc64XoxZbz7RbG20Wy5oJxonOnlu+Wikz9SfGvIyF16MVAMCkHu12WFRRC+g== }
- '@unocss/preset-mini@0.62.3':
+ '@unocss/preset-mini@0.64.0':
resolution:
- { integrity: sha512-dn/8ubeW2ry/ZF3iKxdQHnS0l3EBibt0rIOE/XVwx24ub6pRzclU4r7xHnXeqvAFOO9PoiKDGgFR92m6R2MxyQ== }
+ { integrity: sha512-bc7zanalVQUrETJ06eyS7y/lhceRlY8kBG/lRCV/dYmKl4Ho/s57LrpZH0G63OcO6IfWIjwoZHVC8/RHAqnYvQ== }
- '@unocss/preset-uno@0.62.3':
+ '@unocss/preset-uno@0.64.0':
resolution:
- { integrity: sha512-RlsrMlpEzoZqB0lr5VvlkHGpEgr0Vp6z4Q/7DjW5t7mi20Z2i8olaLGWM0TO1wKoRi8bxc6HP0RHUS7pHtZxBA== }
+ { integrity: sha512-gUmuL8anty551r/Q2XU5wc0aNZ+te4yydnamXHSUv3EkX6PCphOaiWsQ5f95fj26G8EYH9fLBvxqXurFBPM7og== }
- '@unocss/preset-wind@0.62.3':
+ '@unocss/preset-wind@0.64.0':
resolution:
- { integrity: sha512-6+VNce1he1U5EXKlXRwTIPn8KeK6bZ2jAEgcCxk8mFy8SzOlLeYzXCI9lcdiWRTjIeIiK5iSaUqmsQFtKdTyQg== }
+ { integrity: sha512-cJbZI4etFrIIQoC1VhRqyEZU5fUaYqOH3uIt5lM3osxBdAvHds7SPjLRbdR612US7JbuPeFhMMRnA1EYoo39sQ== }
- '@unocss/reset@0.62.3':
+ '@unocss/reset@0.64.0':
resolution:
- { integrity: sha512-XVKPkbm8y9SGzRaG3x+HygGZURm50MvKLVHXsbxi67RbIir9Ouyt9hQTV6Xs3RicRZFWOpJx3wMRb8iKUOe5Zw== }
+ { integrity: sha512-75SiDtRX/mtg/7GWeoLfDfdWF4z59zF1XesL46FNd2hDZL36a+SZHIKB/J+PPzLyX9irqm3mAETS2PNfynuJpA== }
- '@unocss/rule-utils@0.62.3':
+ '@unocss/rule-utils@0.64.0':
resolution:
- { integrity: sha512-qI37jHH//XzyR5Y2aN3Kpo4lQrQO+CaiXpqPSwMLYh2bIypc2RQVpqGVtU736x0eA6IIx41XEkKzUW+VtvJvmg== }
+ { integrity: sha512-R5b/uspq6XsmpEqhxSzOOePHsS+pdxya+0pkQw7m6thsUxNDL7kVDpBiz2iNX5lnwagvhyhUWYu85a8XmZ8ymw== }
engines: { node: '>=14' }
- '@unocss/scope@0.62.3':
+ '@unocss/transformer-directives@0.64.0':
resolution:
- { integrity: sha512-TJGmFfsMrTo8DBJ7CJupIqObpgij+w4jCHMBf1uu0/9jbm63dH6WGcrl3zf5mm6UBTeLmB0RwJ8K4hs7LtrBDQ== }
+ { integrity: sha512-+e2bDEQMEsfq4KZ2R+GQNrEv0bL3E1KbXGPQXUiMGitmZzzagDfIBk9VTP3gNhU+hgTaWtjXlReeap1eSmwKGQ== }
- '@unocss/transformer-directives@0.62.3':
+ '@unocss/transformer-variant-group@0.64.0':
resolution:
- { integrity: sha512-HqHwFOA7DfxD/A1ROZIp8Dr8iZcE0z4w3VQtViWPQ89Fqmb7p2wCPGekk+8yW5PAltpynvHE4ahJEto5xjdg6w== }
+ { integrity: sha512-c4CN+W8ShBhGIma3KHHcBe7CRljRwZ0f5UamRrUIMs28a2jfa1TlPlr/4Ke5b6icr0mwTGajJEUaPanOK0Fp1A== }
- '@unocss/transformer-variant-group@0.62.3':
+ '@unocss/vite@0.64.0':
resolution:
- { integrity: sha512-oNX1SdfWemz0GWGSXACu8NevM0t2l44j2ancnooNkNz3l1+z1nbn4vFwfsJCOqOaoVm4ZqxaiQ8HIx81ZSiU1A== }
-
- '@unocss/vite@0.62.3':
- resolution:
- { integrity: sha512-RrqF6Go8s0BGpwRfkOiLuO+n3CUE/CXxGqb0ipbUARhmNWJlekE3YPfayqImSEnCcImpaPgtVGv6Y0u3kLGG/w== }
+ { integrity: sha512-QrfXlI8YcIaqQc4WRVrLbCho8eEi5pjs1/C8AwnUHGximEDN6MZNUk0htjo4QZ+50IA2b4RrYdz1N3875bJoFg== }
peerDependencies:
vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
@@ -2419,9 +2517,9 @@ packages:
resolution:
{ integrity: sha512-9nF4PdUle+5ta4W5SyZdLCCmFd37uVimSjg1evcTqKJCyvCEEj12WKzOSBNak6r4im4J4iYXKH1OWpUV5LBYFg== }
- css-tree@2.3.1:
+ css-tree@3.0.1:
resolution:
- { integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw== }
+ { integrity: sha512-8Fxxv+tGhORlshCdCwnNJytvlvq46sOLSYEx2ZIGurahWvMucSRnyjPA3AmrMq4VPRYbHVpWj5VkiVasrM2H4Q== }
engines: { node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0 }
cssesc@3.0.0:
@@ -2616,6 +2714,12 @@ packages:
{ integrity: sha512-Mc7QhQ8s+cLrnUfU/Ji94vG/r8M26m8f++vyres4ZoojaRDpZ1eSIh/EpzLNwlWuvzSZ3UbDFspjFvTDXe6e/g== }
engines: { node: '>=12.20' }
+ detect-libc@1.0.3:
+ resolution:
+ { integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg== }
+ engines: { node: '>=0.10' }
+ hasBin: true
+
dir-glob@3.0.1:
resolution:
{ integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== }
@@ -2983,9 +3087,9 @@ packages:
resolution:
{ integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== }
- fdir@6.3.0:
+ fdir@6.4.2:
resolution:
- { integrity: sha512-QOnuT+BOtivR77wYvCWHfGt9s4Pz1VIMbD463vegT5MLqNXy8rYFT/lPVEqf/bhYeT6qmqrNHhsX+rWwe3rOCQ== }
+ { integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ== }
peerDependencies:
picomatch: ^3 || ^4
peerDependenciesMeta:
@@ -3134,9 +3238,9 @@ packages:
{ integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== }
engines: { node: '>= 0.4' }
- get-tsconfig@4.8.0:
+ get-tsconfig@4.8.1:
resolution:
- { integrity: sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw== }
+ { integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg== }
get-uri@6.0.3:
resolution:
@@ -4001,9 +4105,9 @@ packages:
resolution:
{ integrity: sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw== }
- mdn-data@2.0.30:
+ mdn-data@2.12.1:
resolution:
- { integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA== }
+ { integrity: sha512-rsfnCbOHjqrhWxwt5/wtSLzpoKTzW7OXdT5lLOIH1OTYhWu9rRJveGq0sKvDZODABH7RX+uoR+DYcpFnq4Tf6Q== }
meow@12.1.1:
resolution:
@@ -4182,6 +4286,10 @@ packages:
{ integrity: sha512-NHDDGYudnvRutt/VhKFlX26IotXe1w0cmkDm6JGquh5bz/bDTw0LufSmH/GxTjEdpHEO+bVKFTwdrcGa/9XlKQ== }
engines: { node: ^12.20.0 || ^14.13.1 || >=16.0.0 }
+ node-addon-api@7.1.1:
+ resolution:
+ { integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ== }
+
node-bitmap@0.0.1:
resolution:
{ integrity: sha512-Jx5lPaaLdIaOsj2mVLWMWulXF6GQVdyLvNSxmiYCvZ8Ma2hfKX0POoR2kgKOqz+oFsRreq0yYZjQ2wjE9VNzCA== }
@@ -4789,9 +4897,9 @@ packages:
resolution:
{ integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== }
- sass@1.77.6:
+ sass@1.80.6:
resolution:
- { integrity: sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q== }
+ { integrity: sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg== }
engines: { node: '>=14.0.0' }
hasBin: true
@@ -4902,11 +5010,6 @@ packages:
{ integrity: sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw== }
engines: { node: '>= 10.0.0', npm: '>= 3.0.0' }
- source-map-js@1.2.0:
- resolution:
- { integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== }
- engines: { node: '>=0.10.0' }
-
source-map-js@1.2.1:
resolution:
{ integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== }
@@ -5090,9 +5193,9 @@ packages:
resolution:
{ integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== }
- tinyglobby@0.2.6:
+ tinyglobby@0.2.10:
resolution:
- { integrity: sha512-NbBoFBpqfcgd1tCiO8Lkfdk+xrA7mlLR9zgvZcZWQQwU63XAfUePyd6wZBaU93Hqw347lHnwFzttAkemHzzz4g== }
+ { integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew== }
engines: { node: '>=12.0.0' }
tmp@0.0.33:
@@ -5139,9 +5242,9 @@ packages:
resolution:
{ integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== }
- tsx@4.19.0:
+ tsx@4.19.2:
resolution:
- { integrity: sha512-bV30kM7bsLZKZIOCHeMNVMJ32/LuJzLVajkQI/qf92J2Qr08ueLQvW00PUZGiuLPP760UINwupgUj8qrSCPUKg== }
+ { integrity: sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g== }
engines: { node: '>=18.0.0' }
hasBin: true
@@ -5459,6 +5562,12 @@ packages:
peerDependencies:
eslint: '>=6.0.0'
+ vue-flow-layout@0.1.1:
+ resolution:
+ { integrity: sha512-JdgRRUVrN0Y2GosA0M68DEbKlXMqJ7FQgsK8CjQD2vxvNSqAU6PZEpi4cfcTVtfM2GVOMjHo7GKKLbXxOBqDqA== }
+ peerDependencies:
+ vue: ^3.4.37
+
vue-router@4.4.3:
resolution:
{ integrity: sha512-sv6wmNKx2j3aqJQDMxLFzs/u/mjA9Z5LCgy6BE0f7yFWMjrPLnS/sPNn8ARY/FXw6byV18EFutn5lTO6+UsV5A== }
@@ -6468,6 +6577,67 @@ snapshots:
'@oxlint/win32-x64@0.2.18':
optional: true
+ '@parcel/watcher-android-arm64@2.5.0':
+ optional: true
+
+ '@parcel/watcher-darwin-arm64@2.5.0':
+ optional: true
+
+ '@parcel/watcher-darwin-x64@2.5.0':
+ optional: true
+
+ '@parcel/watcher-freebsd-x64@2.5.0':
+ optional: true
+
+ '@parcel/watcher-linux-arm-glibc@2.5.0':
+ optional: true
+
+ '@parcel/watcher-linux-arm-musl@2.5.0':
+ optional: true
+
+ '@parcel/watcher-linux-arm64-glibc@2.5.0':
+ optional: true
+
+ '@parcel/watcher-linux-arm64-musl@2.5.0':
+ optional: true
+
+ '@parcel/watcher-linux-x64-glibc@2.5.0':
+ optional: true
+
+ '@parcel/watcher-linux-x64-musl@2.5.0':
+ optional: true
+
+ '@parcel/watcher-win32-arm64@2.5.0':
+ optional: true
+
+ '@parcel/watcher-win32-ia32@2.5.0':
+ optional: true
+
+ '@parcel/watcher-win32-x64@2.5.0':
+ optional: true
+
+ '@parcel/watcher@2.5.0':
+ dependencies:
+ detect-libc: 1.0.3
+ is-glob: 4.0.3
+ micromatch: 4.0.8
+ node-addon-api: 7.1.1
+ optionalDependencies:
+ '@parcel/watcher-android-arm64': 2.5.0
+ '@parcel/watcher-darwin-arm64': 2.5.0
+ '@parcel/watcher-darwin-x64': 2.5.0
+ '@parcel/watcher-freebsd-x64': 2.5.0
+ '@parcel/watcher-linux-arm-glibc': 2.5.0
+ '@parcel/watcher-linux-arm-musl': 2.5.0
+ '@parcel/watcher-linux-arm64-glibc': 2.5.0
+ '@parcel/watcher-linux-arm64-musl': 2.5.0
+ '@parcel/watcher-linux-x64-glibc': 2.5.0
+ '@parcel/watcher-linux-x64-musl': 2.5.0
+ '@parcel/watcher-win32-arm64': 2.5.0
+ '@parcel/watcher-win32-ia32': 2.5.0
+ '@parcel/watcher-win32-x64': 2.5.0
+ optional: true
+
'@pkgr/core@0.1.1': {}
'@pnpm/config.env-replace@1.1.0': {}
@@ -6482,7 +6652,7 @@ snapshots:
'@pnpm/network.ca-file': 1.0.2
config-chain: 1.1.13
- '@polka/url@1.0.0-next.25': {}
+ '@polka/url@1.0.0-next.28': {}
'@release-it/bumper@6.0.1(release-it@17.10.0(typescript@5.6.2))':
dependencies:
@@ -6805,94 +6975,94 @@ snapshots:
'@ungap/structured-clone@1.2.0': {}
- '@unocss/config@0.62.3':
+ '@unocss/config@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
+ '@unocss/core': 0.64.0
unconfig: 0.5.5
transitivePeerDependencies:
- supports-color
- '@unocss/core@0.62.3': {}
+ '@unocss/core@0.64.0': {}
- '@unocss/extractor-arbitrary-variants@0.62.3':
+ '@unocss/extractor-arbitrary-variants@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
+ '@unocss/core': 0.64.0
- '@unocss/inspector@0.62.3':
+ '@unocss/inspector@0.64.0(vue@3.5.11(typescript@5.6.2))':
dependencies:
- '@unocss/core': 0.62.3
- '@unocss/rule-utils': 0.62.3
+ '@unocss/core': 0.64.0
+ '@unocss/rule-utils': 0.64.0
gzip-size: 6.0.0
sirv: 2.0.4
+ vue-flow-layout: 0.1.1(vue@3.5.11(typescript@5.6.2))
+ transitivePeerDependencies:
+ - vue
- '@unocss/preset-mini@0.62.3':
+ '@unocss/preset-mini@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
- '@unocss/extractor-arbitrary-variants': 0.62.3
- '@unocss/rule-utils': 0.62.3
+ '@unocss/core': 0.64.0
+ '@unocss/extractor-arbitrary-variants': 0.64.0
+ '@unocss/rule-utils': 0.64.0
- '@unocss/preset-uno@0.62.3':
+ '@unocss/preset-uno@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
- '@unocss/preset-mini': 0.62.3
- '@unocss/preset-wind': 0.62.3
- '@unocss/rule-utils': 0.62.3
+ '@unocss/core': 0.64.0
+ '@unocss/preset-mini': 0.64.0
+ '@unocss/preset-wind': 0.64.0
+ '@unocss/rule-utils': 0.64.0
- '@unocss/preset-wind@0.62.3':
+ '@unocss/preset-wind@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
- '@unocss/preset-mini': 0.62.3
- '@unocss/rule-utils': 0.62.3
+ '@unocss/core': 0.64.0
+ '@unocss/preset-mini': 0.64.0
+ '@unocss/rule-utils': 0.64.0
- '@unocss/reset@0.62.3': {}
+ '@unocss/reset@0.64.0': {}
- '@unocss/rule-utils@0.62.3':
+ '@unocss/rule-utils@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
- magic-string: 0.30.11
+ '@unocss/core': 0.64.0
+ magic-string: 0.30.12
- '@unocss/scope@0.62.3': {}
-
- '@unocss/transformer-directives@0.62.3':
+ '@unocss/transformer-directives@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
- '@unocss/rule-utils': 0.62.3
- css-tree: 2.3.1
+ '@unocss/core': 0.64.0
+ '@unocss/rule-utils': 0.64.0
+ css-tree: 3.0.1
- '@unocss/transformer-variant-group@0.62.3':
+ '@unocss/transformer-variant-group@0.64.0':
dependencies:
- '@unocss/core': 0.62.3
+ '@unocss/core': 0.64.0
- '@unocss/vite@0.62.3(rollup@4.24.3)(vite@5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))':
+ '@unocss/vite@0.64.0(rollup@4.24.3)(vite@5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))':
dependencies:
'@ampproject/remapping': 2.3.0
- '@rollup/pluginutils': 5.1.0(rollup@4.24.3)
- '@unocss/config': 0.62.3
- '@unocss/core': 0.62.3
- '@unocss/inspector': 0.62.3
- '@unocss/scope': 0.62.3
- '@unocss/transformer-directives': 0.62.3
+ '@rollup/pluginutils': 5.1.3(rollup@4.24.3)
+ '@unocss/config': 0.64.0
+ '@unocss/core': 0.64.0
+ '@unocss/inspector': 0.64.0(vue@3.5.11(typescript@5.6.2))
chokidar: 3.6.0
- magic-string: 0.30.11
- tinyglobby: 0.2.6
- vite: 5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5)
+ magic-string: 0.30.12
+ tinyglobby: 0.2.10
+ vite: 5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5)
transitivePeerDependencies:
- rollup
- supports-color
+ - vue
- '@vitejs/plugin-vue-jsx@4.0.0(vite@5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))':
+ '@vitejs/plugin-vue-jsx@4.0.0(vite@5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))':
dependencies:
'@babel/core': 7.25.2
'@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2)
'@vue/babel-plugin-jsx': 1.2.2(@babel/core@7.25.2)
- vite: 5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5)
+ vite: 5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5)
vue: 3.5.11(typescript@5.6.2)
transitivePeerDependencies:
- supports-color
- '@vitejs/plugin-vue@5.1.2(vite@5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))':
+ '@vitejs/plugin-vue@5.1.2(vite@5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5))(vue@3.5.11(typescript@5.6.2))':
dependencies:
- vite: 5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5)
+ vite: 5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5)
vue: 3.5.11(typescript@5.6.2)
'@volar/language-core@2.4.1':
@@ -7574,9 +7744,9 @@ snapshots:
'@emotion/hash': 0.8.0
csstype: 3.0.11
- css-tree@2.3.1:
+ css-tree@3.0.1:
dependencies:
- mdn-data: 2.0.30
+ mdn-data: 2.12.1
source-map-js: 1.2.1
cssesc@3.0.0: {}
@@ -7708,6 +7878,9 @@ snapshots:
detect-indent@7.0.1: {}
+ detect-libc@1.0.3:
+ optional: true
+
dir-glob@3.0.1:
dependencies:
path-type: 4.0.0
@@ -8138,7 +8311,7 @@ snapshots:
dependencies:
reusify: 1.0.4
- fdir@6.3.0(picomatch@4.0.2):
+ fdir@6.4.2(picomatch@4.0.2):
optionalDependencies:
picomatch: 4.0.2
@@ -8275,7 +8448,7 @@ snapshots:
es-errors: 1.3.0
get-intrinsic: 1.2.4
- get-tsconfig@4.8.0:
+ get-tsconfig@4.8.1:
dependencies:
resolve-pkg-maps: 1.0.0
@@ -8522,7 +8695,7 @@ snapshots:
jiti: 2.0.0-beta.3
jiti-v1: jiti@1.21.6
pathe: 1.1.2
- tsx: 4.19.0
+ tsx: 4.19.2
transitivePeerDependencies:
- supports-color
@@ -8932,7 +9105,7 @@ snapshots:
dependencies:
'@jridgewell/sourcemap-codec': 1.5.0
- mdn-data@2.0.30: {}
+ mdn-data@2.12.1: {}
meow@12.1.1: {}
@@ -9065,6 +9238,9 @@ snapshots:
dependencies:
type-fest: 2.19.0
+ node-addon-api@7.1.1:
+ optional: true
+
node-bitmap@0.0.1: {}
node-fetch-native@1.6.4: {}
@@ -9639,11 +9815,13 @@ snapshots:
safer-buffer@2.1.2: {}
- sass@1.77.6:
+ sass@1.80.6:
dependencies:
- chokidar: 3.6.0
+ chokidar: 4.0.1
immutable: 4.3.7
- source-map-js: 1.2.0
+ source-map-js: 1.2.1
+ optionalDependencies:
+ '@parcel/watcher': 2.5.0
scule@1.3.0: {}
@@ -9698,7 +9876,7 @@ snapshots:
sirv@2.0.4:
dependencies:
- '@polka/url': 1.0.0-next.25
+ '@polka/url': 1.0.0-next.28
mrmime: 2.0.0
totalist: 3.0.1
@@ -9733,8 +9911,6 @@ snapshots:
ip-address: 9.0.5
smart-buffer: 4.2.0
- source-map-js@1.2.0: {}
-
source-map-js@1.2.1: {}
source-map-support@0.5.21:
@@ -9880,9 +10056,9 @@ snapshots:
through@2.3.8: {}
- tinyglobby@0.2.6:
+ tinyglobby@0.2.10:
dependencies:
- fdir: 6.3.0(picomatch@4.0.2)
+ fdir: 6.4.2(picomatch@4.0.2)
picomatch: 4.0.2
tmp@0.0.33:
@@ -9917,10 +10093,10 @@ snapshots:
tslib@2.6.3: {}
- tsx@4.19.0:
+ tsx@4.19.2:
dependencies:
esbuild: 0.23.1
- get-tsconfig: 4.8.0
+ get-tsconfig: 4.8.1
optionalDependencies:
fsevents: 2.3.3
@@ -10182,7 +10358,7 @@ snapshots:
core-util-is: 1.0.2
extsprintf: 1.3.0
- vite@5.4.10(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5):
+ vite@5.4.10(@types/node@20.14.15)(sass@1.80.6)(terser@5.31.5):
dependencies:
esbuild: 0.21.5
postcss: 8.4.47
@@ -10190,7 +10366,7 @@ snapshots:
optionalDependencies:
'@types/node': 20.14.15
fsevents: 2.3.3
- sass: 1.77.6
+ sass: 1.80.6
terser: 5.31.5
vooks@0.2.12(vue@3.5.11(typescript@5.6.2)):
@@ -10221,6 +10397,10 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ vue-flow-layout@0.1.1(vue@3.5.11(typescript@5.6.2)):
+ dependencies:
+ vue: 3.5.11(typescript@5.6.2)
+
vue-router@4.4.3(vue@3.5.11(typescript@5.6.2)):
dependencies:
'@vue/devtools-api': 6.6.3
diff --git a/src/components/common/ContextMenu.vue b/src/components/common/ContextMenu.vue
index 53b4d93..40766e2 100644
--- a/src/components/common/ContextMenu.vue
+++ b/src/components/common/ContextMenu.vue
@@ -167,6 +167,7 @@ const handleAfterEnter = (el: any) => {
diff --git a/src/layout/center/style.scss b/src/layout/center/style.scss
index ffd37a3..121aed4 100644
--- a/src/layout/center/style.scss
+++ b/src/layout/center/style.scss
@@ -1,3 +1,5 @@
+@use '@/styles/scss/global/variable.scss' as *;
+
.resizable {
height: 100%;
position: relative;
diff --git a/src/layout/left/components/ActionList.vue b/src/layout/left/components/ActionList.vue
index 60f4518..21f4c78 100644
--- a/src/layout/left/components/ActionList.vue
+++ b/src/layout/left/components/ActionList.vue
@@ -355,7 +355,7 @@ onMounted(() => {
})
diff --git a/src/layout/left/components/definePlugins/Card.vue b/src/layout/left/components/definePlugins/Card.vue
index 9674adf..6ca7328 100644
--- a/src/layout/left/components/definePlugins/Card.vue
+++ b/src/layout/left/components/definePlugins/Card.vue
@@ -230,6 +230,7 @@ onUnmounted(() => {
diff --git a/src/layout/left/style.scss b/src/layout/left/style.scss
index 30107d0..cc7968a 100644
--- a/src/layout/left/style.scss
+++ b/src/layout/left/style.scss
@@ -1,3 +1,5 @@
+@use '@/styles/scss/global/variable.scss' as *;
+
@mixin action() {
&:not(.active):hover {
background: var(--left-bg-hover);
diff --git a/src/views/homeWindow/more/settings/index.vue b/src/views/homeWindow/more/settings/index.vue
index 98baae3..1a0cac7 100644
--- a/src/views/homeWindow/more/settings/index.vue
+++ b/src/views/homeWindow/more/settings/index.vue
@@ -93,6 +93,7 @@ onMounted(async () => {
From f626a96c1abfb00e07d53fceec12ea3cdd1faca0 Mon Sep 17 00:00:00 2001
From: Dawn <2439646234@qq.com>
Date: Fri, 15 Nov 2024 14:55:16 +0800
Subject: [PATCH 05/12] =?UTF-8?q?fix(view):=20:bug:=20=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=8A=9F=E8=83=BD=E6=BC=8F=E6=B4=9E=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=20(#38)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix(view): :bug: 修复打开独立窗口后主窗口消息窗口无法打开问题
* fix(service): :bug: 修复请求参数错误问题
* feat(view): :sparkles: 优化登录
增加账号密码登录功能
请求增加中断
优化自动登录
简化请求接口
---------
Co-authored-by: ZOL4789 <44133469+ZOL4789@users.noreply.github.com>
---
.env.development | 4 +-
.vscode/tasks.json | 13 +++
src/enums/index.ts | 10 +-
src/layout/left/config.tsx | 14 ++-
src/model/User.ts | 16 +++
src/router/index.ts | 5 +
src/services/apis.ts | 37 +++++--
src/services/http.ts | 7 +-
src/services/request.ts | 23 ++---
src/services/types.ts | 4 +
src/services/urls.ts | 13 ++-
src/stores/chat.ts | 6 +-
src/stores/contacts.ts | 4 +-
src/stores/group.ts | 8 +-
src/stores/loginHistory.ts | 10 +-
src/typings/components.d.ts | 2 -
src/views/loginWindow/Login.vue | 117 ++++++++++++++++------
src/views/loginWindow/QRCode.vue | 2 +-
src/views/registerWindow/Register.vue | 137 ++++++++++++++++++++++++++
vite.config.ts | 2 +-
20 files changed, 354 insertions(+), 80 deletions(-)
create mode 100644 .vscode/tasks.json
create mode 100644 src/model/User.ts
create mode 100644 src/views/registerWindow/Register.vue
diff --git a/.env.development b/.env.development
index 2444f4f..31d22f8 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
# 后端服务地址
-VITE_SERVICE_URL="https://hulaspark.com"
+VITE_SERVICE_URL="http://localhost:9190"
# websocket服务地址
-VITE_WEBSOCKET_URL="wss://hulaspark.com/websocket"
+VITE_WEBSOCKET_URL="ws://localhost:8090/websocket"
# 项目标题
VITE_APP_TITLE="HuLa—IM"
# 项目名称
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..77e49c5
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,13 @@
+{
+ "version": "2.0.0",
+ "tasks": [
+ {
+ "type": "npm",
+ "script": "tauri:build:debug",
+ "group": "build",
+ "problemMatcher": [],
+ "label": "npm: tauri:build:debug",
+ "detail": "tauri build --debug"
+ }
+ ]
+}
diff --git a/src/enums/index.ts b/src/enums/index.ts
index e9ad41c..bf568c4 100644
--- a/src/enums/index.ts
+++ b/src/enums/index.ts
@@ -21,13 +21,15 @@ export enum RCodeEnum {
/**URL*/
export enum URLEnum {
/**用户*/
- USER = '/api/user',
+ USER = '/user',
+ /**Token*/
+ TOKEN = '/token',
/**聊天*/
- CHAT = '/api/chat',
+ CHAT = '/chat',
/**房间*/
- ROOM = '/api/room',
+ ROOM = '/room',
/**oss*/
- OSS = '/api/oss'
+ OSS = '/oss'
}
/** tauri原生跨窗口通信时传输的类型 */
diff --git a/src/layout/left/config.tsx b/src/layout/left/config.tsx
index c0ccb59..de06c43 100644
--- a/src/layout/left/config.tsx
+++ b/src/layout/left/config.tsx
@@ -2,9 +2,13 @@ import { useWindow } from '@/hooks/useWindow.ts'
import { MittEnum, ModalEnum, PluginEnum } from '@/enums'
import Mitt from '@/utils/Bus.ts'
import { useLogin } from '@/hooks/useLogin.ts'
+import { useSettingStore } from '@/stores/setting.ts'
+import apis from '@/services/apis.ts'
const { createWebviewWindow } = useWindow()
const { logout } = useLogin()
+const settingStore = useSettingStore()
+const { login } = storeToRefs(settingStore)
/**
* 这里的顶部的操作栏使用pinia写入了localstorage中
*/
@@ -89,7 +93,15 @@ const moreList = ref
扫码登录
- 移除账号
+ 移除账号
更多选项
注册账号
+
+ 注册账号
+
忘记密码
账密登录
- 注册账号
+ 注册账号
+
+ 已阅读并同意
+ 服务协议
+ 和
+ HuLa隐私保护指引
+
+ 账号登录
+
+ 扫码登录
+
在线状态
diff --git a/src/components/rightBox/chatBox/ChatMain.vue b/src/components/rightBox/chatBox/ChatMain.vue
index 430876b..d8551f0 100644
--- a/src/components/rightBox/chatBox/ChatMain.vue
+++ b/src/components/rightBox/chatBox/ChatMain.vue
@@ -94,18 +94,27 @@
:content="item"
:menu="chatStore.isGroup ? optionsList : void 0"
:special-menu="report">
+
-
+ {{ avatarExists }}
+
+
+
-
+
- ![]()
+
+ {{ avatarExists }}
+
+
+
+
{{ login.accountInfo.name }}
@@ -77,6 +104,7 @@
diff --git a/src/views/loginWindow/QRCode.vue b/src/views/loginWindow/QRCode.vue
index 31d8d22..609e7f8 100644
--- a/src/views/loginWindow/QRCode.vue
+++ b/src/views/loginWindow/QRCode.vue
@@ -1,7 +1,7 @@
-
@@ -36,7 +36,9 @@
diff --git a/src/views/homeWindow/Mail.vue b/src/views/mailWindow/index.vue
similarity index 100%
rename from src/views/homeWindow/Mail.vue
rename to src/views/mailWindow/index.vue
diff --git a/src/views/homeWindow/more/settings/Foot.vue b/src/views/moreWindow/settings/Foot.vue
similarity index 93%
rename from src/views/homeWindow/more/settings/Foot.vue
rename to src/views/moreWindow/settings/Foot.vue
index d47ff09..decb640 100644
--- a/src/views/homeWindow/more/settings/Foot.vue
+++ b/src/views/moreWindow/settings/Foot.vue
@@ -8,7 +8,7 @@
-
+
-
+
diff --git a/src/views/homeWindow/more/settings/config.ts b/src/views/moreWindow/settings/config.ts
similarity index 100%
rename from src/views/homeWindow/more/settings/config.ts
rename to src/views/moreWindow/settings/config.ts
diff --git a/src/views/homeWindow/more/settings/index.vue b/src/views/moreWindow/settings/index.vue
similarity index 97%
rename from src/views/homeWindow/more/settings/index.vue
rename to src/views/moreWindow/settings/index.vue
index 1a0cac7..91fa04f 100644
--- a/src/views/homeWindow/more/settings/index.vue
+++ b/src/views/moreWindow/settings/index.vue
@@ -62,7 +62,7 @@
import router from '@/router'
import { sideOptions } from './config.ts'
import { useSettingStore } from '@/stores/setting.ts'
-import Foot from '@/views/homeWindow/more/settings/Foot.vue'
+import Foot from '@/views/moreWindow/settings/Foot.vue'
import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow'
const settingStore = useSettingStore()
@@ -93,7 +93,7 @@ onMounted(async () => {
From 46265275e52fd30090a3d07a98f1023e9960b18d Mon Sep 17 00:00:00 2001
From: nongyehong <2439646234@qq.com>
Date: Mon, 18 Nov 2024 22:36:39 +0800
Subject: [PATCH 10/12] =?UTF-8?q?fix(store):=20:bug:=20=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=8E=A5=E5=8F=A3=E7=9A=84store=E5=B0=81?=
=?UTF-8?q?=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
修复重复请求的问题
---
.../rightBox/chatBox/ChatSidebar.vue | 29 +++++++++++++++++--
src/enums/index.ts | 2 +-
src/hooks/useChatMain.ts | 4 +--
src/layout/left/components/InfoEdit.vue | 17 +++++------
src/layout/left/hook.ts | 13 +++------
src/services/apis.ts | 2 --
src/services/types.ts | 6 ++--
src/services/urls.ts | 1 -
src/services/webSocket.ts | 9 +++---
src/stores/cached.ts | 3 +-
src/stores/chat.ts | 4 +--
src/stores/contacts.ts | 6 ++--
src/stores/group.ts | 22 +++++++-------
src/stores/loginHistory.ts | 1 -
src/stores/user.ts | 1 -
src/stores/ws.ts | 2 --
src/views/homeWindow/message/index.vue | 4 +--
src/views/loginWindow/Login.vue | 8 ++---
18 files changed, 73 insertions(+), 61 deletions(-)
diff --git a/src/components/rightBox/chatBox/ChatSidebar.vue b/src/components/rightBox/chatBox/ChatSidebar.vue
index c41f495..9c48c62 100644
--- a/src/components/rightBox/chatBox/ChatSidebar.vue
+++ b/src/components/rightBox/chatBox/ChatSidebar.vue
@@ -19,7 +19,7 @@
@@ -36,7 +36,9 @@
账密登录
- 注册账号
+
+ 注册账号
+
GitHub 给添加星标
在 GitHub 为我们点亮星标
@@ -40,7 +40,11 @@
分享您宝贵的建议
在 GitHub 分享您宝贵的反馈
diff --git a/src/views/homeWindow/more/settings/General.vue b/src/views/moreWindow/settings/General.vue
similarity index 100%
rename from src/views/homeWindow/more/settings/General.vue
rename to src/views/moreWindow/settings/General.vue
diff --git a/src/views/homeWindow/more/settings/LoginSetting.vue b/src/views/moreWindow/settings/LoginSetting.vue
similarity index 100%
rename from src/views/homeWindow/more/settings/LoginSetting.vue
rename to src/views/moreWindow/settings/LoginSetting.vue
diff --git a/src/views/homeWindow/more/settings/Versatile.vue b/src/views/moreWindow/settings/Versatile.vue
similarity index 95%
rename from src/views/homeWindow/more/settings/Versatile.vue
rename to src/views/moreWindow/settings/Versatile.vue
index 6cc29ae..499e8a4 100644
--- a/src/views/homeWindow/more/settings/Versatile.vue
+++ b/src/views/moreWindow/settings/Versatile.vue
@@ -27,7 +27,7 @@
@click="handleVersatile('simple')"
:class="{ 'outline outline-2 outline-[--border-active-color] outline-offset': themes.versatile === 'simple' }"
class="w-108px h-84px flex-col-center gap-10px cursor-pointer rounded-8px bg-#f1f1f1">
- 
+ 
极简素雅
@@ -127,6 +128,7 @@ import { useDebounceFn } from '@vueuse/core'
const groupStore = useGroupStore()
const globalStore = useGlobalStore()
const groupUserList = computed(() => groupStore.userList)
+console.log('groupUserList', groupUserList.value)
const userList = computed(() => {
return groupUserList.value.map((item: UserItem) => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -149,6 +151,16 @@ const isCollapsed = ref(true)
const { optionsList, report, selectKey } = useChatMain()
const { handlePopoverUpdate } = usePopover(selectKey, 'image-chat-sidebar')
+watch(userList, (newVal) => {
+ console.log('newVal', newVal)
+ // 如果正在搜索，则应用搜索过滤
+ if (searchRef.value) {
+ filteredUserList.value = newVal.filter((user) => user.name.toLowerCase().includes(searchRef.value.toLowerCase()))
+ } else {
+ filteredUserList.value = newVal
+ }
+})
+
const handleSelect = () => {
isSearch.value = !isSearch.value
nextTick(() => {
@@ -175,6 +187,19 @@ const handleSearch = useDebounceFn((value: string) => {
filteredUserList.value = userList.value.filter((user) => user.name.toLowerCase().includes(value.toLowerCase()))
}, 10)
+/**
+ * 处理滚动事件
+ * @param event 滚动事件
+ */
+const handleScroll = (event: Event) => {
+ const target = event.target as HTMLElement
+ const isBottom = target.scrollHeight - target.scrollTop === target.clientHeight
+
+ if (isBottom && !groupStore.userListOptions.loading) {
+ groupStore.loadMoreGroupMembers()
+ }
+}
+
onMounted(() => {
Mitt.on(`${MittEnum.INFO_POPOVER}-Sidebar`, (event: any) => {
selectKey.value = event.uid
diff --git a/src/enums/index.ts b/src/enums/index.ts
index bf568c4..491d137 100644
--- a/src/enums/index.ts
+++ b/src/enums/index.ts
@@ -173,7 +173,7 @@ export enum PowerEnum {
ADMIN
}
-export enum IsYetEnum {
+export enum IsYesEnum {
NO,
YES
}
diff --git a/src/hooks/useChatMain.ts b/src/hooks/useChatMain.ts
index 3fadc2d..be8d170 100644
--- a/src/hooks/useChatMain.ts
+++ b/src/hooks/useChatMain.ts
@@ -13,7 +13,7 @@ export const useChatMain = (activeItem?: SessionItem) => {
const { removeTag, userUid } = useCommon()
const globalStore = useGlobalStore()
const chatStore = useChatStore()
- const userInfo = useUserStore()?.userInfo
+ const userStore = useUserStore()?.userInfo
// const userInfo = useUserStore()?.userInfo
// const chatMessageList = computed(() => chatStore.chatMessageList)
const messageOptions = computed(() => chatStore.currentMessageOptions)
@@ -92,7 +92,7 @@ export const useChatMain = (activeItem?: SessionItem) => {
if (isDiffNow({ time: item.message.sendTime, unit: 'minute', diff: 2 })) return
// 判断自己是否是发送者或者是否是管理员
const isCurrentUser = item.fromUser.uid === userUid.value
- const isAdmin = userInfo?.power === PowerEnum.ADMIN
+ const isAdmin = userStore?.power === PowerEnum.ADMIN
return isCurrentUser || isAdmin
}
}
diff --git a/src/layout/left/components/InfoEdit.vue b/src/layout/left/components/InfoEdit.vue
index 57c4043..b3334dd 100644
--- a/src/layout/left/components/InfoEdit.vue
+++ b/src/layout/left/components/InfoEdit.vue
@@ -80,7 +80,7 @@
-
-
+
+
佩戴
@@ -114,13 +114,15 @@
diff --git a/src/layout/left/hook.ts b/src/layout/left/hook.ts
index 7b1c4c0..9e2f7d6 100644
--- a/src/layout/left/hook.ts
+++ b/src/layout/left/hook.ts
@@ -3,7 +3,7 @@ import { useSettingStore } from '@/stores/setting.ts'
import { useUserStore } from '@/stores/user.ts'
import { useCachedStore } from '@/stores/cached.ts'
import { onlineStatus } from '@/stores/onlineStatus.ts'
-import { EventEnum, IsYetEnum, MittEnum, MsgEnum, PluginEnum, ThemeEnum } from '@/enums'
+import { EventEnum, IsYesEnum, MittEnum, MsgEnum, PluginEnum, ThemeEnum } from '@/enums'
import { BadgeType, UserInfoType } from '@/services/types.ts'
import { useChatStore } from '@/stores/chat.ts'
import { useUserInfo } from '@/hooks/useCached.ts'
@@ -37,19 +37,18 @@ export const leftHook = () => {
/** 已打开窗口的列表 */
const openWindowsList = ref(new Set())
/** 编辑资料弹窗 */
- // TODO 这里考虑是否查接口查实时的用户信息还是直接查本地存储的用户信息 (nyh -> 2024-05-05 01:12:36)
const editInfo = ref<{
show: boolean
- content: UserInfoType
+ content: Partial
badgeList: BadgeType[]
}>({
show: false,
- content: {} as UserInfoType,
+ content: {},
badgeList: []
})
/** 当前用户佩戴的徽章 */
const currentBadge = computed(() =>
- editInfo.value.badgeList.find((item) => item.obtain === IsYetEnum.YES && item.wearing === IsYetEnum.YES)
+ editInfo.value.badgeList.find((item) => item.obtain === IsYesEnum.YES && item.wearing === IsYesEnum.YES)
)
const chatStore = useChatStore()
const sessionList = computed(() =>
@@ -134,10 +133,6 @@ export const leftHook = () => {
if (!badge?.id) return
await apis.setUserBadge(badge.id)
window.$message.success('佩戴成功')
- /** 获取用户信息 */
- apis.getUserInfo().then((res) => {
- editInfo.value.content = res as any
- })
}
/* 打开并且创建modal */
diff --git a/src/services/apis.ts b/src/services/apis.ts
index b087e63..50b8b1b 100644
--- a/src/services/apis.ts
+++ b/src/services/apis.ts
@@ -28,8 +28,6 @@ const PUT = (url: string, params?: any, abort?: AbortController) => request.p
const DELETE = (url: string, params?: any, abort?: AbortController) => request.delete(url, params, abort)
export default {
- /** 获取用户信息 */
- getUserInfo: (): Promise => GET(urls.getUserInfo),
/** 获取群成员列表 */
getGroupList: (params?: any) => GET>(urls.getGroupUserList, params),
/** 获取群成员统计 */
diff --git a/src/services/types.ts b/src/services/types.ts
index 31644d1..807a9b5 100644
--- a/src/services/types.ts
+++ b/src/services/types.ts
@@ -3,7 +3,7 @@
* 注意：请使用TSDoc规范进行注释，以便在使用时能够获得良好提示。
* @see TSDoc规范https://tsdoc.org/
**/
-import { ActEnum, IsYetEnum, MarkEnum, MsgEnum, OnlineEnum, RoomTypeEnum, SexEnum } from '@/enums'
+import { ActEnum, IsYesEnum, MarkEnum, MsgEnum, OnlineEnum, RoomTypeEnum, SexEnum } from '@/enums'
/**响应请求体*/
export type ServiceResponse = {
@@ -160,9 +160,9 @@ export type BadgeType = {
// 徽章图标
img: string
// 是否拥有 0否 1是
- obtain: IsYetEnum
+ obtain: IsYesEnum
// 是否佩戴 0否 1是
- wearing: IsYetEnum
+ wearing: IsYesEnum
}
export type MarkItemType = {
diff --git a/src/services/urls.ts b/src/services/urls.ts
index 94245d2..d9c5dc9 100644
--- a/src/services/urls.ts
+++ b/src/services/urls.ts
@@ -6,7 +6,6 @@ const prefix = VITE_SERVICE_URL
export default {
// 用户相关
- getUserInfo: `${prefix + URLEnum.USER}/userInfo`, // 获取用户信息
getBadgeList: `${prefix + URLEnum.USER}/badges`, // 获取徽章列表
getMemberStatistic: `${prefix + URLEnum.CHAT}/public/member/statistic`,
getUserInfoBatch: `${prefix + URLEnum.USER}/public/summary/userInfo/batch`,
diff --git a/src/services/webSocket.ts b/src/services/webSocket.ts
index 06a3335..2c718d9 100644
--- a/src/services/webSocket.ts
+++ b/src/services/webSocket.ts
@@ -3,7 +3,6 @@ import { useUserStore } from '@/stores/user'
import { useChatStore } from '@/stores/chat'
import { useGroupStore } from '@/stores/group'
import { useGlobalStore } from '@/stores/global'
-import { useEmojiStore } from '@/stores/emoji'
import { WsResponseMessageType } from '@/utils/wsType'
import type { LoginSuccessResType, LoginInitResType, WsReqMsgContentType, OnStatusChangeType } from '@/utils/wsType'
import type { MessageType, MarkItemType, RevokedMsgType } from '@/services/types'
@@ -108,7 +107,6 @@ class WS {
const chatStore = useChatStore()
const groupStore = useGroupStore()
const globalStore = useGlobalStore()
- const emojiStore = useEmojiStore()
switch (params.type) {
// 获取登录二维码
case WsResponseMessageType.LoginQrCode: {
@@ -126,7 +124,6 @@ class WS {
case WsResponseMessageType.LoginSuccess: {
userStore.isSign = true
const { token, ...rest } = params.data as LoginSuccessResType
- Mitt.emit(WsResEnum.LOGIN_SUCCESS, params.data)
// FIXME 可以不需要赋值了，单独请求了接口。
userStore.userInfo = { ...userStore.userInfo, ...rest }
localStorage.setItem('USER_INFO', JSON.stringify(rest))
@@ -149,8 +146,9 @@ class WS {
])
// 获取用户详情
await chatStore.getSessionList(true)
- // 自定义表情列表
- await emojiStore.getEmojiList()
+ // TODO 先不获取 emoji 列表，当我点击 emoji 按钮的时候再获取
+ // await emojiStore.getEmojiList()
+ Mitt.emit(WsResEnum.LOGIN_SUCCESS, params.data)
break
}
// 收到消息
@@ -165,6 +163,7 @@ class WS {
groupStore.countInfo.onlineNum = data.onlineNum
// groupStore.countInfo.totalNum = data.totalNum
groupStore.batchUpdateUserStatus(data.changeList)
+ console.log('收到用户下线通知', data)
break
}
// 用户 token 过期
diff --git a/src/stores/cached.ts b/src/stores/cached.ts
index 7e816a6..cbc8c70 100644
--- a/src/stores/cached.ts
+++ b/src/stores/cached.ts
@@ -70,6 +70,7 @@ export const useCachedStore = defineStore('cached', () => {
})
.filter((item) => !item.lastModifyTime || isDiffNow10Min(item.lastModifyTime))
if (!result.length) return
+ // TODO 批量请求徽章详情当翻历史记录的时候会导致发送很多请求，需要优化，可以直接存储到本地
const data = await apis.getBadgesBatch(result)
data?.forEach(
(item: CacheBadgeItem) =>
@@ -93,7 +94,7 @@ export const useCachedStore = defineStore('cached', () => {
const getGroupAtUserBaseInfo = async () => {
if (currentRoomId.value === 1) return
- currentAtUsersList.value = await apis.getAllUserBaseInfo({ params: { roomId: currentRoomId.value } })
+ currentAtUsersList.value = await apis.getAllUserBaseInfo({ roomId: currentRoomId.value })
}
/**
diff --git a/src/stores/chat.ts b/src/stores/chat.ts
index 5e3c35e..afdba4a 100644
--- a/src/stores/chat.ts
+++ b/src/stores/chat.ts
@@ -124,7 +124,7 @@ export const useChatStore = defineStore('chat', () => {
if (currentRoomType.value === RoomTypeEnum.GROUP) {
groupStore.getGroupUserList(true)
groupStore.getCountStatistic()
- // cachedStore.getGroupAtUserBaseInfo()
+ cachedStore.getGroupAtUserBaseInfo()
}
}
@@ -218,7 +218,7 @@ export const useChatStore = defineStore('chat', () => {
// 初始化所有用户基本信息
// userStore.isSign && (await cachedStore.initAllUserBaseInfo())
// 联系人列表
- await contactStore.getContactList(true)
+ await contactStore.getContactList()
}
}
diff --git a/src/stores/contacts.ts b/src/stores/contacts.ts
index 8432e10..b335ad9 100644
--- a/src/stores/contacts.ts
+++ b/src/stores/contacts.ts
@@ -84,11 +84,11 @@ export const useContactStore = defineStore('contact', () => {
/** 接受好友请求 */
const onAcceptFriend = (applyId: number) => {
// 同意好友申请
- apis.applyFriendRequest({ applyId }).then(() => {
+ apis.applyFriendRequest({ applyId }).then(async () => {
// 刷新好友申请列表
- getRequestFriendsList(true)
+ await getRequestFriendsList(true)
// 刷新好友列表
- getContactList(true)
+ await getContactList(true)
// 标识为可以发消息的人
if (globalStore.currentSelectedContact) {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
diff --git a/src/stores/group.ts b/src/stores/group.ts
index 72aaa7c..2c0affe 100644
--- a/src/stores/group.ts
+++ b/src/stores/group.ts
@@ -82,18 +82,14 @@ export const useGroupStore = defineStore('group', () => {
roomId: currentRoomId.value
})
- // 移动端控制显隐
- const showGroupList = ref(false)
-
// 获取群成员
const getGroupUserList = async (refresh = false) => {
- const res = await apis.getGroupList({
+ const data = await apis.getGroupList({
pageSize: pageSize,
cursor: refresh ? '' : userListOptions.cursor,
roomId: currentRoomId.value
})
- if (!res) return
- const data = res
+ if (!data) return
const tempNew = cloneDeep(uniqueUserList(refresh ? data.list : [...data.list, ...userList.value]))
tempNew.sort(sorAction)
userList.value = tempNew
@@ -114,9 +110,11 @@ export const useGroupStore = defineStore('group', () => {
}
// 加载更多群成员
- const loadMore = async () => {
- if (userListOptions.isLast) return
+ const loadMoreGroupMembers = async () => {
+ if (userListOptions.isLast || userListOptions.loading) return
+ userListOptions.loading = true
await getGroupUserList()
+ userListOptions.loading = false
}
// 更新用户在线状态
@@ -128,7 +126,12 @@ export const useGroupStore = defineStore('group', () => {
findIndex > -1 && (tempNew[findIndex].activeStatus = curUser.activeStatus)
}
tempNew.sort(sorAction)
+ // TODO: 这里的数据为什么前后不一致
userList.value = tempNew
+ console.log(userList.value)
+ setTimeout(() => {
+ console.log(userList.value)
+ }, 3000)
}
// 过滤掉小黑子
@@ -187,13 +190,12 @@ export const useGroupStore = defineStore('group', () => {
return {
userList,
userListOptions,
- loadMore,
+ loadMoreGroupMembers,
getGroupUserList,
getCountStatistic,
currentLordId,
countInfo,
batchUpdateUserStatus,
- showGroupList,
filterUser,
adminUidList,
adminList,
diff --git a/src/stores/loginHistory.ts b/src/stores/loginHistory.ts
index 8089e6e..864575f 100644
--- a/src/stores/loginHistory.ts
+++ b/src/stores/loginHistory.ts
@@ -1,4 +1,3 @@
-import { ref } from 'vue'
import { defineStore } from 'pinia'
import { StoresEnum } from '@/enums'
diff --git a/src/stores/user.ts b/src/stores/user.ts
index acf921f..092b314 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -1,4 +1,3 @@
-import { ref } from 'vue'
import apis from '@/services/apis'
import { defineStore } from 'pinia'
import type { UserInfoType } from '@/services/types'
diff --git a/src/stores/ws.ts b/src/stores/ws.ts
index ed3d379..bc447c5 100644
--- a/src/stores/ws.ts
+++ b/src/stores/ws.ts
@@ -1,6 +1,4 @@
-import { ref } from 'vue'
import { defineStore } from 'pinia'
-
import wsIns from '@/services/webSocket.ts'
import { WsRequestMsgType } from '@/utils/wsType'
diff --git a/src/views/homeWindow/message/index.vue b/src/views/homeWindow/message/index.vue
index d40a284..42e231f 100644
--- a/src/views/homeWindow/message/index.vue
+++ b/src/views/homeWindow/message/index.vue
@@ -20,7 +20,7 @@
- {{ item.name.slice(0, 1) }}
+ {{ item.name?.slice(0, 1) }}
@@ -127,7 +127,7 @@ watchEffect(() => {
onBeforeMount(() => {
// 请求回话列表
- chatStore.getSessionList(true)
+ chatStore.getSessionList()
})
onMounted(() => {
diff --git a/src/views/loginWindow/Login.vue b/src/views/loginWindow/Login.vue
index 89f72c6..e7f95d3 100644
--- a/src/views/loginWindow/Login.vue
+++ b/src/views/loginWindow/Login.vue
@@ -56,7 +56,7 @@
- {{ item.name.slice(0, 1) }}
+ {{ item.name?.slice(0, 1) }}
{{ item.account }}