Merge branch '3.x' of https://gitlab.yiring.com/basic/basic-uniapp-v3 into dev_fzm

package.json

@@ -117,7 +117,6 @@
         "@types/crypto-js": "^4.1.1",
         "@types/lodash-es": "^4.17.8",
         "@types/node": "^20.5.0",
-        "@types/prettier": "^2.7.3",
         "@types/qs": "^6.9.7",
         "@types/stompjs": "^2.3.5",
         "@types/urijs": "^1.19.19",
@@ -138,7 +137,7 @@
         "jest": "27.0.4",
         "jest-environment-node": "27.5.1",
         "less": "^4.2.0",
-        "lint-staged": "^13.3.0",
+        "lint-staged": "^14.0.0",
         "npm-run-all": "^4.1.5",
         "picocolors": "^1.0.0",
         "pont-engine": "^1.5.12",

pnpm-lock.yaml

@@ -151,9 +151,6 @@ devDependencies:
   '@types/node':
     specifier: ^20.5.0
     version: 20.5.0
-  '@types/prettier':
-    specifier: ^2.7.3
-    version: 2.7.3
   '@types/qs':
     specifier: ^6.9.7
     version: 6.9.7
@@ -215,8 +212,8 @@ devDependencies:
     specifier: ^4.2.0
     version: 4.2.0
   lint-staged:
-    specifier: ^13.3.0
-    version: 13.3.0
+    specifier: ^14.0.0
+    version: 14.0.0
   npm-run-all:
     specifier: ^4.1.5
     version: 4.1.5
@@ -3572,8 +3569,8 @@ packages:
     engines: {node: '>=6.0.0'}
     dev: false
 
-  /@meoc/utils@0.2.5:
-    resolution: {integrity: sha512-xRL8RKHjKj+IwTfWmyQFNngL2CuayGC3/d4kDuXNe0Iv1/VLs0cekrKZP1jDD79M3Eti4/lD9zhZYMBAOFIMDg==}
+  /@meoc/utils@0.2.6:
+    resolution: {integrity: sha512-cSEiO7ub6mt+cRXV8TiEhwWSLepmo3I0KF390H91sHwjCVx/HS7lpV5Ip8bkx07GocFxAT5syNTbddQxAFohXQ==}
     dependencies:
       dayjs: 1.11.9
     dev: true
@@ -9738,8 +9735,8 @@ packages:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
     dev: true
 
-  /lint-staged@13.3.0:
-    resolution: {integrity: sha512-mPRtrYnipYYv1FEE134ufbWpeggNTo+O/UPzngoaKzbzHAthvR55am+8GfHTnqNRQVRRrYQLGW9ZyUoD7DsBHQ==}
+  /lint-staged@14.0.0:
+    resolution: {integrity: sha512-0tLf0pqZYkar/wu3nTctk4rVIG+d7PanDYv4/IQR4qwdqfQkTDziLRFnqMcLuLBTuUqmcLwsHPD2EjQ18d/oaA==}
     engines: {node: ^16.14.0 || >=18.0.0}
     hasBin: true
     dependencies:
@@ -12781,7 +12778,7 @@ packages:
   /unplugin-transform-class@0.4.1:
     resolution: {integrity: sha512-0I8NmOxPcCftvzLJ5tzUaGKpfXHycdAgbEUT8AbxrCFO1bUSuAKKPSLQ3FYfp+ECOFvwPotII7OLaziCHzy9Vw==}
     dependencies:
-      '@meoc/utils': 0.2.5
+      '@meoc/utils': 0.2.6
       '@rollup/pluginutils': 5.0.3
       unplugin: 1.4.0
     transitivePeerDependencies:
@@ -12791,7 +12788,7 @@ packages:
   /unplugin-transform-class@0.5.1:
     resolution: {integrity: sha512-v3TvmVFsosuq6GXyelcr1lPsgDVcAQiWE7NA6JezVjUUdiSjDvnZYQf8x6hCm1+Ouh5dg3QvCZ57o8la/svDNA==}
     dependencies:
-      '@meoc/utils': 0.2.5
+      '@meoc/utils': 0.2.6
       '@rollup/pluginutils': 5.0.3
       unplugin: 1.4.0
     transitivePeerDependencies:

src/hooks/app/useConcealedExit.ts

@@ -7,7 +7,7 @@ export function useConcealedExit(max = 10) {
     const maxTapCount = max
     const count = ref(0)
 
-    let loop: NodeJS.Timer
+    let loop: NodeJS.Timeout
 
     // 隐藏退出功能计数
     function exit() {