Merge pull request #510 from skyclouds2001/dev

Dev
skyclouds2001 · Nov 13, 2023 · 0605df2 · 0605df2
2 parents ef82843 + ac2bad1
commit 0605df2
Show file tree

Hide file tree

Showing 50 changed files with 2,015 additions and 2,647 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -10,12 +10,6 @@ node_modules/
 # Vite Build Output
 dist/
 
-# Vitepress Dev Cache
-docs/.vitepress/cache
-
-# Vitepress Build Output
-docs/.vitepress/dist
-
 # Visual Studio Code
 .vscode/
 

diff --git a/.gitignore b/.gitignore
@@ -10,12 +10,6 @@ node_modules/
 # Vite Build Output
 dist/
 
-# Vitepress Dev Cache
-docs/.vitepress/cache
-
-# Vitepress Build Output
-docs/.vitepress/dist
-
 # Visual Studio Code
 .vscode/
 

diff --git a/.markdownlintignore b/.markdownlintignore
@@ -10,12 +10,6 @@ node_modules/
 # Vite Build Output
 dist/
 
-# Vitepress Dev Cache
-docs/.vitepress/cache
-
-# Vitepress Build Output
-docs/.vitepress/dist
-
 # Visual Studio Code
 .vscode/
 

diff --git a/.npmignore b/.npmignore
@@ -10,12 +10,6 @@ node_modules/
 # Vite Build Output
 dist/
 
-# Vitepress Dev Cache
-docs/.vitepress/cache
-
-# Vitepress Build Output
-docs/.vitepress/dist
-
 # Visual Studio Code
 .vscode/
 

diff --git a/.prettierignore b/.prettierignore
@@ -10,12 +10,6 @@ node_modules/
 # Vite Build Output
 dist/
 
-# Vitepress Dev Cache
-docs/.vitepress/cache
-
-# Vitepress Build Output
-docs/.vitepress/dist
-
 # Visual Studio Code
 .vscode/
 

diff --git a/.stylelintignore b/.stylelintignore
@@ -10,12 +10,6 @@ node_modules/
 # Vite Build Output
 dist/
 
-# Vitepress Dev Cache
-docs/.vitepress/cache
-
-# Vitepress Build Output
-docs/.vitepress/dist
-
 # Visual Studio Code
 .vscode/
 

diff --git a/backend/package.json b/backend/package.json
@@ -40,21 +40,21 @@
     "preview": "node dist/main"
   },
   "dependencies": {
-    "@nestjs/axios": "^3.0.0",
-    "@nestjs/cache-manager": "^2.1.0",
-    "@nestjs/common": "^10.2.7",
+    "@nestjs/axios": "^3.0.1",
+    "@nestjs/cache-manager": "^2.1.1",
+    "@nestjs/common": "^10.2.8",
     "@nestjs/config": "^3.1.1",
-    "@nestjs/core": "^10.2.7",
+    "@nestjs/core": "^10.2.8",
     "@nestjs/devtools-integration": "^0.1.5",
-    "@nestjs/jwt": "^10.1.1",
+    "@nestjs/jwt": "^10.2.0",
     "@nestjs/passport": "^10.0.2",
-    "@nestjs/platform-express": "^10.2.7",
-    "@nestjs/platform-socket.io": "^10.2.7",
+    "@nestjs/platform-express": "^10.2.8",
+    "@nestjs/platform-socket.io": "^10.2.8",
     "@nestjs/schedule": "^4.0.0",
-    "@nestjs/swagger": "^7.1.14",
-    "@nestjs/websockets": "^10.2.7",
+    "@nestjs/swagger": "^7.1.15",
+    "@nestjs/websockets": "^10.2.8",
     "@prisma/client": "5.5.2",
-    "axios": "^1.6.0",
+    "axios": "^1.6.1",
     "bcryptjs": "^2.4.3",
     "cache-manager": "^5.2.4",
     "class-transformer": "^0.5.1",
@@ -72,18 +72,18 @@
     "swagger-ui-express": "^5.0.0"
   },
   "devDependencies": {
-    "@nestjs/cli": "^10.2.0",
-    "@nestjs/schematics": "^10.0.2",
-    "@nestjs/testing": "^10.2.7",
-    "@types/bcryptjs": "^2.4.5",
-    "@types/compression": "^1.7.4",
-    "@types/cookie-parser": "^1.4.5",
-    "@types/express": "^4.17.20",
-    "@types/express-session": "^1.17.9",
-    "@types/multer": "^1.4.9",
-    "@types/node": "^20.8.9",
-    "@types/passport-jwt": "^3.0.12",
-    "@types/supertest": "^2.0.15",
+    "@nestjs/cli": "^10.2.1",
+    "@nestjs/schematics": "^10.0.3",
+    "@nestjs/testing": "^10.2.8",
+    "@types/bcryptjs": "^2.4.6",
+    "@types/compression": "^1.7.5",
+    "@types/cookie-parser": "^1.4.6",
+    "@types/express": "^4.17.21",
+    "@types/express-session": "^1.17.10",
+    "@types/multer": "^1.4.10",
+    "@types/node": "^20.9.0",
+    "@types/passport-jwt": "^3.0.13",
+    "@types/supertest": "^2.0.16",
     "prisma": "^5.5.2",
     "source-map-support": "^0.5.21",
     "supertest": "^6.3.3",

diff --git a/docs/.eslintignore b/docs/.eslintignore
@@ -0,0 +1,3 @@
+# Vitepress
+.vitepress/cache
+.vitepress/dist
diff --git a/docs/.gitignore b/docs/.gitignore
@@ -0,0 +1,3 @@
+# Vitepress
+.vitepress/cache
+.vitepress/dist
diff --git a/docs/.markdownlintignore b/docs/.markdownlintignore
@@ -0,0 +1,3 @@
+# Vitepress
+.vitepress/cache
+.vitepress/dist
diff --git a/docs/.npmignore b/docs/.npmignore
@@ -0,0 +1,3 @@
+# Vitepress
+.vitepress/cache
+.vitepress/dist
diff --git a/docs/.prettierignore b/docs/.prettierignore
@@ -0,0 +1,3 @@
+# Vitepress
+.vitepress/cache
+.vitepress/dist
diff --git a/docs/.stylelintignore b/docs/.stylelintignore
@@ -0,0 +1,3 @@
+# Vitepress
+.vitepress/cache
+.vitepress/dist
diff --git a/frontend/.dockerignore b/frontend/.dockerignore
@@ -10,12 +10,6 @@ node_modules/
 # Vite Build Output
 dist/
 
-# Vitepress Dev Cache
-docs/.vitepress/cache
-
-# Vitepress Build Output
-docs/.vitepress/dist
-
 # Visual Studio Code
 .vscode/
 

diff --git a/frontend/package.json b/frontend/package.json
@@ -43,7 +43,9 @@
   "dependencies": {
     "@element-plus/icons-vue": "^2.1.0",
     "@highlightjs/vue-plugin": "^2.1.0",
+    "@sky-fly/sky-components": "workspace:*",
     "@sky-fly/sky-hooks": "workspace:*",
+    "@sky-fly/sky-types": "workspace:*",
     "@sky-fly/sky-ui": "workspace:*",
     "@toast-ui/chart": "^4.6.1",
     "@toast-ui/editor": "^3.2.2",
@@ -52,34 +54,33 @@
     "@toast-ui/editor-plugin-color-syntax": "^3.1.0",
     "@toast-ui/editor-plugin-table-merged-cell": "^3.1.0",
     "@toast-ui/editor-plugin-uml": "^3.0.1",
-    "@vueuse/core": "^10.5.0",
+    "@vueuse/core": "^10.6.0",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "animate.css": "^4.1.1",
-    "axios": "^1.6.0",
+    "axios": "^1.6.1",
     "axios-retry": "^3.8.1",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.10",
     "docx-preview": "^0.1.20",
     "echarts": "^5.4.3",
-    "element-plus": "^2.4.1",
+    "element-plus": "^2.4.2",
     "highlight.js": "^11.9.0",
     "jsbarcode": "^3.11.5",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
     "mockjs": "^1.1.0",
-    "pdfjs-dist": "^3.11.174",
+    "pdfjs-dist": "^4.0.189",
     "pinia": "^2.1.7",
     "prismjs": "^1.29.0",
     "qrcode": "^1.5.3",
     "socket.io-client": "^4.7.2",
-    "three": "^0.157.0",
+    "three": "^0.158.0",
     "three-subdivide": "^1.1.5",
     "tui-color-picker": "^2.2.8",
-    "vue": "^3.3.7",
-    "vue-i18n": "^9.6.1",
+    "vue": "^3.3.8",
+    "vue-i18n": "^9.6.5",
     "vue-router": "^4.2.5",
-    "web-vitals": "^3.5.0",
     "xlsx": "^0.18.5",
     "xterm": "^5.3.0",
     "xterm-addon-fit": "^0.8.0",
@@ -88,27 +89,27 @@
   },
   "devDependencies": {
     "@iconify/vue": "^4.1.1",
-    "@intlify/unplugin-vue-i18n": "^1.4.0",
+    "@intlify/unplugin-vue-i18n": "^1.5.0",
     "@tailwindcss/aspect-ratio": "^0.4.2",
     "@tailwindcss/container-queries": "^0.1.1",
-    "@tailwindcss/forms": "^0.5.6",
+    "@tailwindcss/forms": "^0.5.7",
     "@tailwindcss/typography": "^0.5.10",
-    "@types/crypto-js": "^4.1.3",
-    "@types/lodash-es": "^4.17.10",
-    "@types/mockjs": "^1.0.9",
-    "@types/qrcode": "^1.5.4",
-    "@types/three": "^0.156.0",
+    "@types/crypto-js": "^4.2.1",
+    "@types/lodash-es": "^4.17.11",
+    "@types/mockjs": "^1.0.10",
+    "@types/qrcode": "^1.5.5",
+    "@types/three": "^0.158.2",
     "@vitejs/plugin-legacy": "^4.1.1",
-    "@vitejs/plugin-vue": "^4.4.0",
+    "@vitejs/plugin-vue": "^4.4.1",
     "@vitejs/plugin-vue-jsx": "^3.0.2",
     "cssnano": "^6.0.1",
     "postcss-import": "^15.1.0",
-    "postcss-preset-env": "^9.2.0",
+    "postcss-preset-env": "^9.3.0",
     "postcss-url": "^10.1.3",
     "rollup-plugin-visualizer": "^5.9.2",
     "sass": "^1.69.5",
     "tailwindcss": "^3.3.5",
-    "terser": "^5.22.0",
+    "terser": "^5.24.0",
     "typescript": "^5.2.2",
     "unplugin-element-plus": "^0.8.0",
     "vite": "^4.5.0",
@@ -117,9 +118,9 @@
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-copy-assets": "workspace:*",
     "vite-plugin-html": "^3.2.0",
-    "vite-plugin-inspect": "^0.7.41",
+    "vite-plugin-inspect": "^0.7.42",
     "vite-plugin-mock": "^3.0.0",
-    "vite-plugin-pwa": "^0.16.5",
+    "vite-plugin-pwa": "^0.16.7",
     "vite-plugin-utils": "workspace:*",
     "vite-svg-loader": "^4.0.0",
     "vue-tsc": "^1.8.22"

diff --git a/frontend/serve/mkcert.exe b/frontend/serve/mkcert.exe
diff --git a/frontend/src/components/layout/SettingDrawer.vue b/frontend/src/components/layout/SettingDrawer.vue
@@ -19,7 +19,7 @@ const { theme } = useTheme()
 
 const { lang } = useLang()
 
-const { isActive, toggle } = useWakeLock()
+const { isWakeLock, toggle } = useWakeLock()
 
 const isShowSettingDrawer = inject(SettingDrawerKey) as Ref<boolean>
 
@@ -73,7 +73,7 @@ const font = useFont()
       <h4 class="font-bold">{{ i18n.t('layout.setting.wake_lock') }}</h4>
     </el-divider>
     <div class="w-full text-center">
-      <el-switch v-model="isActive" inline-prompt name="wake-lock" @change="toggle" />
+      <el-switch v-model="isWakeLock" inline-prompt name="wake-lock" @change="toggle" />
     </div>
 
     <!-- 振动设置控件 -->

diff --git a/frontend/src/hook/index.ts b/frontend/src/hook/index.ts
@@ -11,5 +11,3 @@ export { default as useGrayMode } from './useGrayMode'
 export { default as useLang } from './useLang'
 
 export { default as useTheme } from './useTheme'
-
-export { default as useWebVitals } from './useWebVitals'
diff --git a/frontend/src/hook/useWebVitals.ts b/frontend/src/hook/useWebVitals.ts