Merge branch 'master' of https://gitlab-pro.ezijing.com/ezijing-web/saas-lab

.eslintrc-auto-import.json

@@ -297,6 +297,7 @@
     "watchThrottled": true,
     "watchTriggerable": true,
     "watchWithFilter": true,
-    "whenever": true
+    "whenever": true,
+    "toValue": true
   }
-}
\ No newline at end of file
+}

auto-imports.d.ts

@@ -4,8 +4,8 @@
 // Generated by unplugin-auto-import
 export {}
 declare global {
-  const $$: typeof import('vue/macros')['$$']
   const $: typeof import('vue/macros')['$']
+  const $$: typeof import('vue/macros')['$$']
   const $computed: typeof import('vue/macros')['$computed']
   const $customRef: typeof import('vue/macros')['$customRef']
   const $ref: typeof import('vue/macros')['$ref']
@@ -103,6 +103,7 @@ declare global {
   const toReactive: typeof import('@vueuse/core')['toReactive']
   const toRef: typeof import('vue')['toRef']
   const toRefs: typeof import('vue')['toRefs']
+  const toValue: typeof import('vue')['toValue']
   const triggerRef: typeof import('vue')['triggerRef']
   const tryOnBeforeMount: typeof import('@vueuse/core')['tryOnBeforeMount']
   const tryOnBeforeUnmount: typeof import('@vueuse/core')['tryOnBeforeUnmount']
@@ -299,5 +300,5 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component,ComponentPublicInstance,ComputedRef,InjectionKey,PropType,Ref,VNode } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode } from 'vue'
 }

package.json

@@ -24,40 +24,40 @@
     "ali-oss": "^6.17.1",
     "axios": "^1.3.3",
     "blueimp-md5": "^2.19.0",
-    "countup.js": "^2.4.2",
+    "countup.js": "^2.6.2",
     "dayjs": "^1.11.7",
     "element-plus": "^2.2.32",
     "file-saver": "^2.0.5",
     "html2pdf.js": "^0.10.1",
     "lodash-es": "^4.17.21",
-    "pinia": "^2.0.32",
+    "pinia": "^2.1.4",
     "ua-parser-js": "^1.0.33",
     "universal-cookie": "^4.0.4",
     "video.js": "^7.21.1",
-    "vue": "^3.2.47",
-    "vue-router": "^4.1.6",
+    "vue": "^3.3.4",
+    "vue-router": "^4.2.2",
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.2.0",
-    "@types/ali-oss": "^6.16.7",
+    "@types/ali-oss": "^6.16.8",
     "@types/blueimp-md5": "^2.18.0",
     "@types/file-saver": "^2.0.5",
-    "@types/lodash-es": "^4.17.6",
-    "@types/node": "^18.11.19",
+    "@types/lodash-es": "^4.17.7",
+    "@types/node": "^20.3.1",
     "@types/ua-parser-js": "^0.7.36",
-    "@types/video.js": "^7.3.51",
-    "@vitejs/plugin-vue": "^4.0.0",
-    "@vue/eslint-config-typescript": "^11.0.2",
+    "@types/video.js": "^7.3.52",
+    "@vitejs/plugin-vue": "^4.2.3",
+    "@vue/eslint-config-typescript": "^11.0.3",
     "@vue/tsconfig": "^0.1.3",
     "chalk": "^5.2.0",
     "eslint": "^8.34.0",
     "eslint-plugin-vue": "^9.9.0",
     "sass": "^1.58.3",
     "typescript": "~4.9.5",
-    "unplugin-auto-import": "^0.14.4",
-    "vite": "^4.1.4",
-    "vite-plugin-checker": "^0.5.6",
-    "vue-tsc": "^1.1.7"
+    "unplugin-auto-import": "^0.16.4",
+    "vite": "^4.3.9",
+    "vite-plugin-checker": "^0.6.0",
+    "vue-tsc": "^1.6.5"
   }
 }