tongshangming 2 年之前
父節點
當前提交
78931a732a
共有 9 個文件被更改,包括 381 次插入337 次删除
  1. 23 22
      package.json
  2. 302 295
      pnpm-lock.yaml
  3. 19 1
      src/auto-import.d.ts
  4. 4 2
      src/components.d.ts
  5. 1 1
      src/router/asyncRouter.ts
  6. 0 1
      src/views/system/Area.vue
  7. 0 8
      tsconfig.config.json
  8. 16 7
      tsconfig.json
  9. 16 0
      tsconfig.node.json

+ 23 - 22
package.json

@@ -1,6 +1,6 @@
 {
   "name": "fs-admin",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "scripts": {
     "dev": "vite --host",
     "build": "run-p type-check build-only",
@@ -16,46 +16,47 @@
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.4.0",
-    "dayjs": "^1.11.7",
+    "dayjs": "^1.11.8",
     "echarts": "^5.4.2",
     "echarts-wordcloud": "^2.1.0",
-    "element-plus": "^2.3.4",
+    "element-plus": "^2.3.6",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.36",
+    "pinia": "^2.1.3",
     "splitpanes": "^3.1.5",
-    "vue": "^3.3.2",
-    "vue-cropper": "^1.0.8",
-    "vue-router": "^4.2.0",
+    "vue": "^3.3.4",
+    "vue-cropper": "^1.0.9",
+    "vue-router": "^4.2.2",
     "vue3-count-to": "^1.1.2",
     "vuedraggable": "^4.1.0",
-    "vxe-table": "^4.3.14",
-    "xe-utils": "^3.5.7"
+    "vxe-table": "^4.4.1",
+    "xe-utils": "^3.5.10"
   },
   "devDependencies": {
     "@iconify-json/ep": "^1.1.10",
-    "@rushstack/eslint-patch": "^1.2.0",
-    "@types/node": "^16.18.31",
+    "@rushstack/eslint-patch": "^1.3.0",
+    "@tsconfig/node18": "^2.0.1",
+    "@types/node": "^18.16.16",
     "@types/nprogress": "^0.2.0",
     "@types/qs": "^6.9.7",
     "@vitejs/plugin-vue": "^4.2.3",
     "@vitejs/plugin-vue-jsx": "^3.0.1",
     "@vue/eslint-config-prettier": "^7.1.0",
     "@vue/eslint-config-typescript": "^11.0.3",
-    "@vue/tsconfig": "^0.1.3",
-    "eslint": "^8.40.0",
-    "eslint-plugin-vue": "^9.13.0",
+    "@vue/tsconfig": "^0.4.0",
+    "eslint": "^8.42.0",
+    "eslint-plugin-vue": "^9.14.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.8",
     "sass": "^1.62.1",
-    "typescript": "~4.7.4",
-    "unocss": "^0.51.13",
-    "unplugin-auto-import": "^0.11.5",
-    "unplugin-icons": "^0.14.15",
-    "unplugin-vue-components": "^0.22.12",
-    "unplugin-vue-define-options": "^0.11.2",
-    "vite": "^4.3.7",
+    "typescript": "~5.1.3",
+    "unocss": "^0.52.7",
+    "unplugin-auto-import": "^0.16.4",
+    "unplugin-icons": "^0.16.2",
+    "unplugin-vue-components": "^0.25.0",
+    "unplugin-vue-define-options": "^1.3.7",
+    "vite": "^4.3.9",
     "vite-plugin-style-import": "^2.0.0",
     "vite-plugin-svg-icons": "^2.0.1",
     "vue-tsc": "^1.6.5"
   }
-}
+}

文件差異過大導致無法顯示
+ 302 - 295
pnpm-lock.yaml


+ 19 - 1
src/auto-import.d.ts

@@ -1,4 +1,7 @@
-// Generated by 'unplugin-auto-import'
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-auto-import
 export {}
 declare global {
   const EffectScope: typeof import('vue')['EffectScope']
@@ -18,7 +21,9 @@ declare global {
   const createInjectionState: typeof import('@vueuse/core')['createInjectionState']
   const createPinia: typeof import('pinia')['createPinia']
   const createReactiveFn: typeof import('@vueuse/core')['createReactiveFn']
+  const createReusableTemplate: typeof import('@vueuse/core')['createReusableTemplate']
   const createSharedComposable: typeof import('@vueuse/core')['createSharedComposable']
+  const createTemplatePromise: typeof import('@vueuse/core')['createTemplatePromise']
   const createUnrefFn: typeof import('@vueuse/core')['createUnrefFn']
   const customRef: typeof import('vue')['customRef']
   const debouncedRef: typeof import('@vueuse/core')['debouncedRef']
@@ -101,6 +106,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']
@@ -111,11 +117,14 @@ declare global {
   const unrefElement: typeof import('@vueuse/core')['unrefElement']
   const until: typeof import('@vueuse/core')['until']
   const useActiveElement: typeof import('@vueuse/core')['useActiveElement']
+  const useAnimate: typeof import('@vueuse/core')['useAnimate']
+  const useArrayDifference: typeof import('@vueuse/core')['useArrayDifference']
   const useArrayEvery: typeof import('@vueuse/core')['useArrayEvery']
   const useArrayFilter: typeof import('@vueuse/core')['useArrayFilter']
   const useArrayFind: typeof import('@vueuse/core')['useArrayFind']
   const useArrayFindIndex: typeof import('@vueuse/core')['useArrayFindIndex']
   const useArrayFindLast: typeof import('@vueuse/core')['useArrayFindLast']
+  const useArrayIncludes: typeof import('@vueuse/core')['useArrayIncludes']
   const useArrayJoin: typeof import('@vueuse/core')['useArrayJoin']
   const useArrayMap: typeof import('@vueuse/core')['useArrayMap']
   const useArrayReduce: typeof import('@vueuse/core')['useArrayReduce']
@@ -202,6 +211,8 @@ declare global {
   const useOnline: typeof import('@vueuse/core')['useOnline']
   const usePageLeave: typeof import('@vueuse/core')['usePageLeave']
   const useParallax: typeof import('@vueuse/core')['useParallax']
+  const useParentElement: typeof import('@vueuse/core')['useParentElement']
+  const usePerformanceObserver: typeof import('@vueuse/core')['usePerformanceObserver']
   const usePermission: typeof import('@vueuse/core')['usePermission']
   const usePointer: typeof import('@vueuse/core')['usePointer']
   const usePointerLock: typeof import('@vueuse/core')['usePointerLock']
@@ -269,8 +280,10 @@ declare global {
   const watchArray: typeof import('@vueuse/core')['watchArray']
   const watchAtMost: typeof import('@vueuse/core')['watchAtMost']
   const watchDebounced: typeof import('@vueuse/core')['watchDebounced']
+  const watchDeep: typeof import('@vueuse/core')['watchDeep']
   const watchEffect: typeof import('vue')['watchEffect']
   const watchIgnorable: typeof import('@vueuse/core')['watchIgnorable']
+  const watchImmediate: typeof import('@vueuse/core')['watchImmediate']
   const watchOnce: typeof import('@vueuse/core')['watchOnce']
   const watchPausable: typeof import('@vueuse/core')['watchPausable']
   const watchPostEffect: typeof import('vue')['watchPostEffect']
@@ -280,3 +293,8 @@ declare global {
   const watchWithFilter: typeof import('@vueuse/core')['watchWithFilter']
   const whenever: typeof import('@vueuse/core')['whenever']
 }
+// for type re-export
+declare global {
+  // @ts-ignore
+  export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode } from 'vue'
+}

+ 4 - 2
src/components.d.ts

@@ -1,5 +1,7 @@
-// generated by unplugin-vue-components
-// We suggest you to commit this file into source control
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
 import '@vue/runtime-core'
 

+ 1 - 1
src/router/asyncRouter.ts

@@ -24,7 +24,7 @@ const asyncRouter: RouteRecordRaw[] = [
     name: 'workflow',
     component: () => import('@/views/workflow/Workflow.vue'),
     meta: {
-      title: '表单与流程设计',
+      title: '流程管理',
       icon: 'Notebook'
     }
   },

+ 0 - 1
src/views/system/Area.vue

@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import PaneModel from '@/components/splitpanes/PaneModel.vue'
-import type { FormRules } from 'element-plus'
 import { ElTree } from 'element-plus'
 import type { BasicForm, ICRUD } from '@/types/form'
 import { getAreaList } from '@/api/area'

+ 0 - 8
tsconfig.config.json

@@ -1,8 +0,0 @@
-{
-  "extends": "@vue/tsconfig/tsconfig.node.json",
-  "include": ["vite.config.*", "vitest.config.*", "cypress.config.*"],
-  "compilerOptions": {
-    "composite": true,
-    "types": ["node"]
-  }
-}

+ 16 - 7
tsconfig.json

@@ -1,18 +1,27 @@
 {
-  "extends": "@vue/tsconfig/tsconfig.web.json",
-  "include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
+  "include": [
+    "env.d.ts",
+    "src/**/*",
+    "src/**/*.vue"
+  ],
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./src/*"]
+      "@/*": [
+        "./src/*"
+      ]
     },
-    "types": ["element-plus/global","unplugin-vue-define-options/macros-global"],
+    "types": [
+      "element-plus/global",
+      "unplugin-vue-define-options/macros-global"
+    ],
     "jsx": "preserve",
+    "moduleResolution": "node"
   },
-
   "references": [
     {
-      "path": "./tsconfig.config.json"
+      "path": "./tsconfig.node.json"
     }
   ]
-}
+}

+ 16 - 0
tsconfig.node.json

@@ -0,0 +1,16 @@
+{
+  "extends": "@tsconfig/node18/tsconfig.json",
+  "include": [
+    "vite.config.*",
+    "vitest.config.*",
+    "cypress.config.*",
+    "playwright.config.*"
+  ],
+  "compilerOptions": {
+    "composite": true,
+    "module": "ESNext",
+    "types": [
+      "node"
+    ]
+  }
+}

部分文件因文件數量過多而無法顯示