From d4302627e88a3ceab437fbb0552c27d1ccd9634c Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Thu, 16 Sep 2021 23:16:54 +0800 Subject: [PATCH 1/6] refactor: use setup refactor --- src/App.vue | 41 ++- src/layout/components/screenfull/index.vue | 23 +- src/views/editor/index.vue | 69 ++-- src/views/error/401.vue | 24 +- src/views/error/404.vue | 32 +- src/views/flow-chart/index.vue | 133 ++++---- src/views/login.vue | 123 ++++---- src/views/permission/button/index.vue | 42 +-- src/views/permission/page/index.vue | 55 ++-- src/views/redirect.vue | 40 +-- src/views/register.vue | 102 +++--- src/views/welcome.vue | 346 ++++++++++----------- tsconfig.json | 32 +- 13 files changed, 462 insertions(+), 600 deletions(-) diff --git a/src/App.vue b/src/App.vue index c7cca7c00..da0171ad4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,28 +1,25 @@ - - - - - - - + + + + + + diff --git a/src/layout/components/screenfull/index.vue b/src/layout/components/screenfull/index.vue index d01adfa64..924b966bd 100644 --- a/src/layout/components/screenfull/index.vue +++ b/src/layout/components/screenfull/index.vue @@ -1,3 +1,9 @@ + + - - diff --git a/src/views/permission/page/index.vue b/src/views/permission/page/index.vue index ab2b2efcd..866fbc229 100644 --- a/src/views/permission/page/index.vue +++ b/src/views/permission/page/index.vue @@ -1,3 +1,26 @@ + + @@ -10,35 +33,3 @@ 切换角色 - - diff --git a/src/views/redirect.vue b/src/views/redirect.vue index ffec73747..57206495b 100644 --- a/src/views/redirect.vue +++ b/src/views/redirect.vue @@ -1,26 +1,20 @@ + + - diff --git a/src/views/register.vue b/src/views/register.vue index 86ee7fdda..5676117e6 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -1,3 +1,47 @@ + + - - diff --git a/src/views/welcome.vue b/src/views/welcome.vue index f0f0a2f12..b64e38ed5 100644 --- a/src/views/welcome.vue +++ b/src/views/welcome.vue @@ -1,3 +1,170 @@ + + @@ -26,185 +193,6 @@ - - diff --git a/tsconfig.json b/tsconfig.json index 335bf5be0..d1c251b11 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,10 +2,10 @@ "compilerOptions": { "target": "esnext", "module": "esnext", + "moduleResolution": "node", "strict": false, "jsx": "preserve", "importHelpers": true, - "moduleResolution": "node", "experimentalDecorators": true, "strictFunctionTypes": false, "skipLibCheck": true, From 85f4917f26ba3d538f5cfed13e6dec3da0a4ce9a Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Sat, 18 Sep 2021 22:24:52 +0800 Subject: [PATCH 4/6] refactor: use setup refactor --- .eslintrc.js | 14 + package.json | 10 +- src/components/ReBreadCrumb/src/index.vue | 105 +- src/components/ReFlop/src/index.vue | 247 ++-- src/components/ReFlowChart/src/Control.vue | 189 ++- src/components/ReFlowChart/src/DataDialog.vue | 26 +- src/components/ReFlowChart/src/NodePanel.vue | 66 +- src/components/ReHamBurger/src/index.vue | 49 +- src/components/ReInfo/index.vue | 211 ++-- src/components/ReMap/index.ts | 10 +- src/components/ReMap/src/Amap.vue | 225 ++-- src/components/ReMap/src/BaiduMap.vue | 14 - src/components/ReSeamlessScroll/src/index.vue | 1042 ++++++++--------- src/components/ReSeamlessScroll/src/utils.ts | 2 +- tsconfig.json | 2 +- types/global.d.ts | 13 +- types/index.d.ts | 4 + yarn.lock | 124 +- 18 files changed, 1139 insertions(+), 1214 deletions(-) delete mode 100644 src/components/ReMap/src/BaiduMap.vue diff --git a/.eslintrc.js b/.eslintrc.js index d3376c526..c098167c3 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -11,6 +11,20 @@ module.exports = { $shallowRef: "readonly", $computed: "readonly", + // index.d.ts + // global.d.ts + Fn: "readonly", + PromiseFn: "readonly", + RefType: "readonly", + LabelValueOptions: "readonly", + EmitType: "readonly", + TargetContext: "readonly", + ComponentElRef: "readonly", + ComponentRef: "readonly", + ElRef: "readonly", + global: "readonly", + ForDataType: "readonly", + // script setup defineProps: "readonly", defineEmits: "readonly", diff --git a/package.json b/package.json index a442f2012..713fe2c8e 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "build": "rimraf dist && cross-env vite build", "preview": "vite preview", "preview:build": "yarn build && vite preview", - "clean:cache": "rm -rf node_modules && rm -rf .eslintcache && yarn cache clean && yarn install", + "clean:cache": "rm -rf node_modules && rm -rf .eslintcache && yarn cache clean && yarn", "lint:eslint": "eslint --cache --max-warnings 0 \"{src,mock}/**/*.{vue,ts,tsx}\" --fix", "lint:prettier": "prettier --write \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"", "lint:stylelint": "stylelint --cache --fix \"**/*.{vue,css,scss,postcss,less}\" --cache --cache-location node_modules/.cache/stylelint/", @@ -21,7 +21,7 @@ "@amap/amap-jsapi-loader": "^1.0.1", "@logicflow/core": "^0.4.6", "@logicflow/extension": "^0.4.6", - "@vueuse/core": "^6.0.0", + "@vueuse/core": "^6.4.1", "animate.css": "^4.1.1", "await-to-js": "^3.0.0", "axios": "^0.21.1", @@ -43,11 +43,11 @@ "responsive-storage": "^1.0.9", "sortablejs": "1.13.0", "v-contextmenu": "^3.0.0", - "vue": "^3.2.11", + "vue": "^3.2.12", "vue-i18n": "^9.2.0-beta.3", "vue-json-pretty": "^2.0.2", "vue-router": "^4.0.11", - "vue-types": "^4.0.3", + "vue-types": "^4.1.0", "vuedraggable": "^4.1.0", "vxe-table": "^4.0.27", "wangeditor": "^4.7.7", @@ -66,7 +66,7 @@ "@typescript-eslint/parser": "^4.31.0", "@vitejs/plugin-vue": "^1.6.0", "@vitejs/plugin-vue-jsx": "^1.1.7", - "@vue/compiler-sfc": "^3.2.11", + "@vue/compiler-sfc": "^3.2.12", "@vue/eslint-config-prettier": "^6.0.0", "@vue/eslint-config-typescript": "^7.0.0", "autoprefixer": "^10.2.4", diff --git a/src/components/ReBreadCrumb/src/index.vue b/src/components/ReBreadCrumb/src/index.vue index 1c570ba36..1679baf05 100644 --- a/src/components/ReBreadCrumb/src/index.vue +++ b/src/components/ReBreadCrumb/src/index.vue @@ -1,3 +1,52 @@ + + @@ -15,62 +64,6 @@ - - diff --git a/src/components/ReInfo/index.vue b/src/components/ReInfo/index.vue index 7161ba111..13d48e86e 100644 --- a/src/components/ReInfo/index.vue +++ b/src/components/ReInfo/index.vue @@ -1,3 +1,97 @@ + + @@ -47,123 +141,6 @@ - - diff --git a/src/components/ReSeamlessScroll/src/index.vue b/src/components/ReSeamlessScroll/src/index.vue index a8ec26eb6..6d855b8fd 100644 --- a/src/components/ReSeamlessScroll/src/index.vue +++ b/src/components/ReSeamlessScroll/src/index.vue @@ -1,3 +1,495 @@ + + - - diff --git a/src/components/ReSeamlessScroll/src/utils.ts b/src/components/ReSeamlessScroll/src/utils.ts index 52178c73c..021a65d18 100644 --- a/src/components/ReSeamlessScroll/src/utils.ts +++ b/src/components/ReSeamlessScroll/src/utils.ts @@ -2,7 +2,7 @@ * @desc AnimationFrame简单兼容hack */ export const animationFrame = () => { - window.cancelAnimationFrame = (function () { + window.cancelAnimationFrame = (() => { return ( window.cancelAnimationFrame || window.webkitCancelAnimationFrame || diff --git a/tsconfig.json b/tsconfig.json index d1c251b11..808e2507a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -24,7 +24,7 @@ "/#/*": ["types/*"] }, "types": ["node", "vite/client"], - "typeRoots": ["./node_modules/@types/", "./types"] + "typeRoots": ["./node_modules/@types/", "./types", "./vue-types"] }, "include": [ "src/**/*.ts", diff --git a/types/global.d.ts b/types/global.d.ts index 815212d5e..aca224dca 100644 --- a/types/global.d.ts +++ b/types/global.d.ts @@ -20,13 +20,14 @@ declare global { // Global vue app instance __APP__: App; webkitCancelAnimationFrame: (handle: number) => void; + mozCancelAnimationFrame: (handle: number) => void; + oCancelAnimationFrame: (handle: number) => void; + msCancelAnimationFrame: (handle: number) => void; + webkitRequestAnimationFrame: (callback: FrameRequestCallback) => number; - mozCancelAnimationFrame: (id?: string) => any; - oCancelAnimationFrame: (id?: string) => any; - msCancelAnimationFrame: (id?: string) => any; - mozRequestAnimationFrame: (id?: string) => any; - oRequestAnimationFrame: (id?: string) => any; - msRequestAnimationFrame: (id?: string) => any; + mozRequestAnimationFrame: (callback: FrameRequestCallback) => number; + oRequestAnimationFrame: (callback: FrameRequestCallback) => number; + msRequestAnimationFrame: (callback: FrameRequestCallback) => number; } // vue diff --git a/types/index.d.ts b/types/index.d.ts index 314e07fc2..7c8b94ef8 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -25,3 +25,7 @@ declare type ComponentRef = ComponentElRef | null; declare type ElRef = Nullable; + +declare type ForDataType = { + [P in T]?: ForDataType; +}; diff --git a/yarn.lock b/yarn.lock index 3c86bf323..b9ed8aff6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -786,6 +786,17 @@ estree-walker "^2.0.2" source-map "^0.6.1" +"@vue/compiler-core@3.2.12": + version "3.2.12" + resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.12.tgz#23998d6986a45e1ab0424130cc0ad00e33da1101" + integrity sha512-IGJ0JmrAaAl5KBBegPAKkoXvsfDFgN/h7K1t/+0MxqpZF1fTDVUOp3tG7q9gWa7fwzGEaIsPhjtT5C3qztdLKg== + dependencies: + "@babel/parser" "^7.15.0" + "@babel/types" "^7.15.0" + "@vue/shared" "3.2.12" + estree-walker "^2.0.2" + source-map "^0.6.1" + "@vue/compiler-dom@3.2.11": version "3.2.11" resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.11.tgz#d066f8e1f1812b4e881593819ade0fe6d654c776" @@ -794,7 +805,15 @@ "@vue/compiler-core" "3.2.11" "@vue/shared" "3.2.11" -"@vue/compiler-sfc@^3.0.11", "@vue/compiler-sfc@^3.2.11": +"@vue/compiler-dom@3.2.12": + version "3.2.12" + resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.12.tgz#d6ba00114e73adb8b18940c3ff18797cc2b0514f" + integrity sha512-MulvKilA2USm8ubPfvXvNY55HVTn+zHERsXeNg437TXrmM4FRCis6zjWW47QZ3ZyxEkCdqOmuiFCtXbpnuthyw== + dependencies: + "@vue/compiler-core" "3.2.12" + "@vue/shared" "3.2.12" + +"@vue/compiler-sfc@^3.0.11": version "3.2.11" resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.11.tgz#628fa12238760d9b9b339ac2e125a759224fadbf" integrity sha512-cUIaS8mgJrQ6yucj2AupWAwBRITK3W/a8wCOn9g5fJGtOl8h4APY8vN3lzP8HIJDyEeRF3I8SfRhL+oX97kSnw== @@ -818,6 +837,30 @@ postcss-selector-parser "^6.0.4" source-map "^0.6.1" +"@vue/compiler-sfc@^3.2.12": + version "3.2.12" + resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.12.tgz#39555550d96051508753ba934f7260dc5ee5211e" + integrity sha512-EjzeMQ7H2ICj+JRw2buSFXTocdCg8e5yWQTlNM/6h/u68sTwMbIfiOJBFEwBhG/wCG7Nb6Nnz888AfHTU3hdrA== + dependencies: + "@babel/parser" "^7.15.0" + "@babel/types" "^7.15.0" + "@types/estree" "^0.0.48" + "@vue/compiler-core" "3.2.12" + "@vue/compiler-dom" "3.2.12" + "@vue/compiler-ssr" "3.2.12" + "@vue/ref-transform" "3.2.12" + "@vue/shared" "3.2.12" + consolidate "^0.16.0" + estree-walker "^2.0.2" + hash-sum "^2.0.0" + lru-cache "^5.1.1" + magic-string "^0.25.7" + merge-source-map "^1.1.0" + postcss "^8.1.10" + postcss-modules "^4.0.0" + postcss-selector-parser "^6.0.4" + source-map "^0.6.1" + "@vue/compiler-ssr@3.2.11": version "3.2.11" resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.11.tgz#702cef3429651645bdbe09fe5962803b5a621abb" @@ -826,6 +869,14 @@ "@vue/compiler-dom" "3.2.11" "@vue/shared" "3.2.11" +"@vue/compiler-ssr@3.2.12": + version "3.2.12" + resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.12.tgz#32e5d4bc31c371c125b43e9d07b8a8f70442b080" + integrity sha512-sY+VbLQ17FPr1CgirnqEgY+jbC7wI5c2Ma6u8le0+b4UKMYF9urI2pybAZc1nKz6O78FWA3OSnQFxTTLppe+9Q== + dependencies: + "@vue/compiler-dom" "3.2.12" + "@vue/shared" "3.2.12" + "@vue/devtools-api@^6.0.0-beta.13", "@vue/devtools-api@^6.0.0-beta.14", "@vue/devtools-api@^6.0.0-beta.15": version "6.0.0-beta.15" resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.15.tgz#ad7cb384e062f165bcf9c83732125bffbc2ad83d" @@ -852,6 +903,13 @@ dependencies: "@vue/shared" "3.2.11" +"@vue/reactivity@3.2.12": + version "3.2.12" + resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.12.tgz#b482a737cbdc891f9b1ec3100f3c1804b56d080b" + integrity sha512-Lr5CTQjFm5mT/6DGnVNhptmba/Qg1DbD6eNWWmiHLMlpPt4q2ww9A2orEjVw0qNcdTJ04JLPEVAz5jhTZTCfIg== + dependencies: + "@vue/shared" "3.2.12" + "@vue/ref-transform@3.2.11": version "3.2.11" resolved "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.11.tgz#4d282b9570d1485a73e7bf5d57cce27b4a7aa690" @@ -863,6 +921,17 @@ estree-walker "^2.0.2" magic-string "^0.25.7" +"@vue/ref-transform@3.2.12": + version "3.2.12" + resolved "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.12.tgz#6f7fa46dd84447ddcf54adfb1b689b1cf4243de0" + integrity sha512-lS7TDda61iSf3ljokXVfN0VbOsQdmpST6MZLjxzBydFCECCJaEAr6o+K8VZ7NhUCSrl+gKXHpdXxmcvwdk66aQ== + dependencies: + "@babel/parser" "^7.15.0" + "@vue/compiler-core" "3.2.12" + "@vue/shared" "3.2.12" + estree-walker "^2.0.2" + magic-string "^0.25.7" + "@vue/runtime-core@3.2.11": version "3.2.11" resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.11.tgz#0dbe801be4bd0bfde253226797e7d304c8fdda30" @@ -871,6 +940,14 @@ "@vue/reactivity" "3.2.11" "@vue/shared" "3.2.11" +"@vue/runtime-core@3.2.12": + version "3.2.12" + resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.12.tgz#422662fd5b85f787222d2aea840264ba97e84a13" + integrity sha512-LO+ztgcmsomavYUaSq7BTteh8pmnUmvUnXUFVYdlcg3VCdYRS0ImlclpYsNHqjAk2gU+H09dr2PP0kL961xUfQ== + dependencies: + "@vue/reactivity" "3.2.12" + "@vue/shared" "3.2.12" + "@vue/runtime-dom@3.2.11": version "3.2.11" resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.11.tgz#04f9054a9e64bdf156c2fc22cad67cfaa8b84616" @@ -880,17 +957,31 @@ "@vue/shared" "3.2.11" csstype "^2.6.8" +"@vue/runtime-dom@3.2.12": + version "3.2.12" + resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.12.tgz#d9fe865dca36f9ca33ba327afdeb89ae2aa03f4c" + integrity sha512-+NSDqivgihvoPYbKFDmzFu1tW7SOzwc7r0b7T8vsJtooVPGxwtfAFZ6wyLtteOXXrCpyTR3kpyTCIp31uY7aJg== + dependencies: + "@vue/runtime-core" "3.2.12" + "@vue/shared" "3.2.12" + csstype "^2.6.8" + "@vue/shared@3.2.11": version "3.2.11" resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.11.tgz#01899f54949caf1ac241de397bd17069632574de" integrity sha512-ovfXAsSsCvV9JVceWjkqC/7OF5HbgLOtCWjCIosmPGG8lxbPuavhIxRH1dTx4Dg9xLgRTNLvI3pVxG4ItQZekg== -"@vueuse/core@^6.0.0": - version "6.3.3" - resolved "https://registry.npmjs.org/@vueuse/core/-/core-6.3.3.tgz#0682c01b50d28e91d3d76f27278600ee1692fa24" - integrity sha512-qa/0WYqcvqFKQmlkgsLGlXBrYcQeUi3fzHMIaxsD/lO/zm0IWBSN8CTFu91LwER5qNYs4DGhU5pu7jOdrTzAIQ== +"@vue/shared@3.2.12": + version "3.2.12" + resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.12.tgz#304064a4b56fc6c7b9169d80e9ee62ecb4bf0a1c" + integrity sha512-5CkaifUCJwcTuru7FDwKFacPJuEoGUTw0LKSa5bw40B23s0TS+MGlYR1285nbV/ju3QUGlA6d6PD+GJkWy7uFg== + +"@vueuse/core@^6.4.1": + version "6.4.1" + resolved "https://registry.npmjs.org/@vueuse/core/-/core-6.4.1.tgz#21416997a23bfb4924a5082ed6fa959027f80d04" + integrity sha512-FRFeEPVq77gcMZP0mCloJY+lyHJaUQmUMaPp5fBds3fs/BbkAt7HTMMizFKHWDVjbmA20vBOjmC9tTnfD+DdEA== dependencies: - "@vueuse/shared" "6.3.3" + "@vueuse/shared" "6.4.1" vue-demi "*" "@vueuse/core@~6.1.0": @@ -908,10 +999,10 @@ dependencies: vue-demi "*" -"@vueuse/shared@6.3.3": - version "6.3.3" - resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-6.3.3.tgz#4e5c600ad1ed5bf2a8630ad0bd38edb1f4269f37" - integrity sha512-2+YPRhFNUXEhhvKNTWBtNU6hGkft9+mfYSVjI4hZu2U8KDbNNKF/215lBPzMYI2twScDtPsAssQ+vu5t9PBy0g== +"@vueuse/shared@6.4.1": + version "6.4.1" + resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-6.4.1.tgz#5bc84be107cead84e11c21d2c57b1e9f2c376975" + integrity sha512-zsaYxxZwACQbMmGg+UBjPUVemi325sDdnnB0mn+PNizE0fVC57B+vbLgdj45NBmr6P4nw6a0Y2rMupebwDWsdw== dependencies: vue-demi "*" @@ -4498,14 +4589,14 @@ vue-router@^4.0.11: dependencies: "@vue/devtools-api" "^6.0.0-beta.14" -vue-types@^4.0.3: +vue-types@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/vue-types/-/vue-types-4.1.0.tgz#8dcbbaccf9d5c3815449ac7cb8ae5864454cfff0" integrity sha512-oPAeKKx5vY5Q8c7lMQPQyrBIbmWQGael5XEHqO1f+Y3V/RUZNuISz7KxI4woGjh79Vy/gDDaPX9j9zKYpaaA2g== dependencies: is-plain-object "5.0.0" -vue@^3.1.1, vue@^3.2.11: +vue@^3.1.1: version "3.2.11" resolved "https://registry.npmjs.org/vue/-/vue-3.2.11.tgz#6b92295048df705ddac558fd3e3ed553e55e57c8" integrity sha512-JkI3/eIgfk4E0f/p319TD3EZgOwBQfftgnkRsXlT7OrRyyiyoyUXn6embPGZXSBxD3LoZ9SWhJoxLhFh5AleeA== @@ -4514,6 +4605,15 @@ vue@^3.1.1, vue@^3.2.11: "@vue/runtime-dom" "3.2.11" "@vue/shared" "3.2.11" +vue@^3.2.12: + version "3.2.12" + resolved "https://registry.npmjs.org/vue/-/vue-3.2.12.tgz#b44f55506fb6a7c4b65635e609deb5f9368aa2ce" + integrity sha512-VV14HtubmB56uuQaSvLkJZgoocPiN8CJI3zZA9y8h7q/Z5hcknDIFkbq5d8ku0ukZ6AJPQqMsZWcq0qryF0jgg== + dependencies: + "@vue/compiler-dom" "3.2.12" + "@vue/runtime-dom" "3.2.12" + "@vue/shared" "3.2.12" + vuedraggable@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz#edece68adb8a4d9e06accff9dfc9040e66852270" From afff1d677bb5066d65c86e0f3c925ed60666ba7d Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Sun, 19 Sep 2021 01:12:46 +0800 Subject: [PATCH 5/6] refactor: use setup refactor --- .eslintignore | 2 +- .eslintrc.js | 1 + package.json | 2 +- src/components/ReCropper/src/index.tsx | 71 +++++++++++++------------ src/components/ReFlop/src/Filpper.tsx | 24 +++++---- src/components/ReInfo/index.vue | 2 + src/components/ReSelector/src/index.tsx | 56 +++++++++---------- src/config/index.ts | 2 +- src/main.ts | 17 +++--- src/plugins/i18n/config.ts | 1 + src/plugins/vxe-table/index.ts | 3 +- src/router/index.ts | 20 ++++--- src/utils/algorithm/index.ts | 1 - src/utils/http/config.ts | 3 +- src/utils/operate/index.ts | 10 ++-- src/utils/progress/index.ts | 15 ++++-- src/views/components/cropping/index.vue | 2 + tsconfig.json | 2 +- 18 files changed, 128 insertions(+), 106 deletions(-) diff --git a/.eslintignore b/.eslintignore index da1f2b188..74756295d 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,4 +1,4 @@ public dist *.d.ts -package.json +package.json \ No newline at end of file diff --git a/.eslintrc.js b/.eslintrc.js index c098167c3..f414aa0bb 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -24,6 +24,7 @@ module.exports = { ElRef: "readonly", global: "readonly", ForDataType: "readonly", + ComponentRoutes: "readonly", // script setup defineProps: "readonly", diff --git a/package.json b/package.json index 713fe2c8e..42f75e7ba 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "lint:stylelint": "stylelint --cache --fix \"**/*.{vue,css,scss,postcss,less}\" --cache --cache-location node_modules/.cache/stylelint/", "lint:lint-staged": "lint-staged -c ./.husky/lintstagedrc.js", "lint:pretty": "pretty-quick --staged", - "lint:all": "yarn lint:eslint && yarn lint:prettier && yarn lint:stylelint && yarn lint:pretty", + "lint": "yarn lint:eslint && yarn lint:prettier && yarn lint:stylelint && yarn lint:pretty", "prepare": "husky install" }, "dependencies": { diff --git a/src/components/ReCropper/src/index.tsx b/src/components/ReCropper/src/index.tsx index d26b4e752..b0d404ac4 100644 --- a/src/components/ReCropper/src/index.tsx +++ b/src/components/ReCropper/src/index.tsx @@ -1,5 +1,4 @@ import type { CSSProperties } from "vue"; - import { defineComponent, onBeforeMount, @@ -40,46 +39,48 @@ const defaultOptions: Cropper.Options = { rotatable: true }; -export default defineComponent({ - name: "Cropper", - props: { - src: { - type: String, - required: true - }, - alt: { - type: String - }, - width: { - type: [String, Number], - default: "" - }, - height: { - type: [String, Number], - default: "360px" - }, - crossorigin: { - type: String || Object, - default: undefined - }, - imageStyle: { - type: Object as PropType, - default() { - return {}; - } - }, - options: { - type: Object as PropType, - default() { - return {}; - } +const props = { + src: { + type: String, + required: true + }, + alt: { + type: String + }, + width: { + type: [String, Number], + default: "" + }, + height: { + type: [String, Number], + default: "360px" + }, + crossorigin: { + type: String || Object, + default: undefined + }, + imageStyle: { + type: Object as PropType, + default() { + return {}; } }, + options: { + type: Object as PropType, + default() { + return {}; + } + } +}; + +export default defineComponent({ + name: "Cropper", + props, setup(props) { const cropper: any = ref>(null); const imgElRef = templateRef("imgElRef", null); - const isReady = ref(false); + const isReady = ref(false); const getImageStyle = computed((): CSSProperties => { return { diff --git a/src/components/ReFlop/src/Filpper.tsx b/src/components/ReFlop/src/Filpper.tsx index 05904f12f..c62b67041 100644 --- a/src/components/ReFlop/src/Filpper.tsx +++ b/src/components/ReFlop/src/Filpper.tsx @@ -2,19 +2,21 @@ import { defineComponent, ref } from "vue"; import { propTypes } from "/@/utils/propTypes"; import "./filpper.css"; +const props = { + // front paper text + // 前牌文字 + frontText: propTypes.number.def(0), + // back paper text + // 后牌文字 + backText: propTypes.number.def(1), + // flipping duration, please be consistent with the CSS animation-duration value. + // 翻牌动画时间,与CSS中设置的animation-duration保持一致 + duration: propTypes.number.def(600) +}; + export default defineComponent({ name: "Filpper", - props: { - // front paper text - // 前牌文字 - frontText: propTypes.number.def(0), - // back paper text - // 后牌文字 - backText: propTypes.number.def(1), - // flipping duration, please be consistent with the CSS animation-duration value. - // 翻牌动画时间,与CSS中设置的animation-duration保持一致 - duration: propTypes.number.def(600) - }, + props, setup(props) { // eslint-disable-next-line vue/no-setup-props-destructure const { frontText, backText, duration } = props; diff --git a/src/components/ReInfo/index.vue b/src/components/ReInfo/index.vue index 13d48e86e..3ba657d29 100644 --- a/src/components/ReInfo/index.vue +++ b/src/components/ReInfo/index.vue @@ -58,6 +58,7 @@ const rules: Object = ref({ // 点击登录或注册 const onBehavior = (evt: Object): void => { + // @ts-expect-error instance.refs.ruleForm.validate((valid: boolean) => { if (valid) { emit("onBehavior", evt); @@ -74,6 +75,7 @@ const refreshVerify = (): void => { // 表单重置 const resetForm = (): void => { + // @ts-expect-error instance.refs.ruleForm.resetFields(); }; diff --git a/src/components/ReSelector/src/index.tsx b/src/components/ReSelector/src/index.tsx index 32f5dd78b..e8d3d7d39 100644 --- a/src/components/ReSelector/src/index.tsx +++ b/src/components/ReSelector/src/index.tsx @@ -21,35 +21,37 @@ let overList = []; // 存放第一个选中的元素和最后一个选中元素,只能存放这两个元素 let selectedList = []; -export default defineComponent({ - name: "Selector", - props: { - HsKey: { - type: Number || String, - default: 0 - }, - disabled: { - type: Boolean, - default: false - }, - value: { - type: Number, - default: 0 - }, - max: { - type: Array, - default() { - return [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; - } - }, - // 回显数据的索引,长度必须是2 - echo: { - type: Array, - default() { - return []; - } +const props = { + HsKey: { + type: Number || String, + default: 0 + }, + disabled: { + type: Boolean, + default: false + }, + value: { + type: Number, + default: 0 + }, + max: { + type: Array, + default() { + return [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; } }, + // 回显数据的索引,长度必须是2 + echo: { + type: Array, + default() { + return []; + } + } +}; + +export default defineComponent({ + name: "Selector", + props, emits: ["selectedVal"], setup(props, { emit }) { const instance = getCurrentInstance(); diff --git a/src/config/index.ts b/src/config/index.ts index 6072b5bd0..e51b86a60 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -1,6 +1,6 @@ let config: object = {}; -const setConfig = (cfg?: any) => { +const setConfig = (cfg?: unknown) => { config = Object.assign(config, cfg); }; diff --git a/src/main.ts b/src/main.ts index e3cfc1a1b..e2fc3149e 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,19 +1,17 @@ -import { createApp, Directive } from "vue"; import App from "./App.vue"; import router from "./router"; import { setupStore } from "/@/store"; - -import { useElementPlus } from "../src/plugins/element-plus"; -import { useTable } from "../src/plugins/vxe-table"; +import { createApp, Directive } from "vue"; import { usI18n } from "../src/plugins/i18n"; +import { useTable } from "../src/plugins/vxe-table"; +import { useElementPlus } from "../src/plugins/element-plus"; +import "animate.css"; // 导入公共样式 import "./style/index.scss"; // 导入字体图标 import "./assets/iconfont/iconfont.js"; import "./assets/iconfont/iconfont.css"; -import "animate.css"; - import "v-contextmenu/dist/themes/default.css"; import { setConfig, getConfig } from "./config"; @@ -25,7 +23,7 @@ app.config.globalProperties.$config = getConfig(); // 响应式storage import Storage from "responsive-storage"; - +// @ts-ignore app.use(Storage, { // 默认显示首页tag routesInStorage: { @@ -58,7 +56,7 @@ Object.keys(directives).forEach(key => { }); // 获取项目动态全局配置 -export const getServerConfig = async (): Promise => { +export const getServerConfig = async (): Promise => { return axios({ baseURL: "", method: "get", @@ -87,10 +85,7 @@ export const getServerConfig = async (): Promise => { getServerConfig().then(async () => { setupStore(app); - app.use(router).use(useElementPlus).use(useTable).use(usI18n); - await router.isReady(); - app.mount("#app"); }); diff --git a/src/plugins/i18n/config.ts b/src/plugins/i18n/config.ts index 0f90c934b..02fac41c3 100644 --- a/src/plugins/i18n/config.ts +++ b/src/plugins/i18n/config.ts @@ -7,6 +7,7 @@ import enVxeTable from "vxe-table/lib/locale/lang/en-US"; import enLocale from "element-plus/lib/locale/lang/en"; import zhLocale from "element-plus/lib/locale/lang/zh-cn"; +// 导航菜单配置 export const menusConfig = { zh: { message: { diff --git a/src/plugins/vxe-table/index.ts b/src/plugins/vxe-table/index.ts index 572a04513..7c94f0c99 100644 --- a/src/plugins/vxe-table/index.ts +++ b/src/plugins/vxe-table/index.ts @@ -1,7 +1,7 @@ +import "xe-utils"; import { App } from "vue"; import { i18n } from "../i18n/index"; import "font-awesome/css/font-awesome.css"; -import "xe-utils"; import { // 核心 VXETable, @@ -62,6 +62,7 @@ VXETable.setup({ clearable: true }, // 对组件内置的提示语进行国际化翻译 + // @ts-ignore i18n: (key, args) => i18n.global.t(key, args), // 可选,对参数中的列头、校验提示..等进行自动翻译(只对支持国际化的有效) translate(key, args) { diff --git a/src/router/index.ts b/src/router/index.ts index e8fce1051..434db5fdb 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,5 +1,11 @@ -import { createRouter, createWebHashHistory, Router } from "vue-router"; +import { + createRouter, + createWebHashHistory, + Router, + RouteComponent +} from "vue-router"; +import Layout from "/@/layout/index.vue"; import homeRouter from "./modules/home"; import flowChartRouter from "./modules/flowchart"; import editorRouter from "./modules/editor"; @@ -9,17 +15,15 @@ import errorRouter from "./modules/error"; import externalLink from "./modules/externalLink"; import remainingRouter from "./modules/remaining"; //静态路由 -import { storageSession } from "../utils/storage"; import { i18n } from "/@/plugins/i18n"; +import { getAsyncRoutes } from "/@/api/routes"; +import { storageSession } from "../utils/storage"; import { usePermissionStoreHook } from "/@/store/modules/permission"; -import { getAsyncRoutes } from "/@/api/routes"; - -import Layout from "/@/layout/index.vue"; // https://cn.vitejs.dev/guide/features.html#glob-import const modulesRoutes = import.meta.glob("/src/views/*/*/*.vue"); -const constantRoutes: Array = [ +const constantRoutes: Array = [ homeRouter, flowChartRouter, editorRouter, @@ -125,8 +129,10 @@ const whiteList = ["/login", "/register"]; router.beforeEach((to, _from, next) => { const name = storageSession.getItem("info"); NProgress.start(); + // @ts-ignore const { t } = i18n.global; - to.meta.title ? (document.title = t(to.meta.title)) : ""; // 动态title + // @ts-ignore + to.meta.title ? (document.title = t(to.meta.title)) : ""; if (name) { if (_from?.name) { next(); diff --git a/src/utils/algorithm/index.ts b/src/utils/algorithm/index.ts index d8ac4dbc2..66db5e98c 100644 --- a/src/utils/algorithm/index.ts +++ b/src/utils/algorithm/index.ts @@ -10,7 +10,6 @@ class algorithmProxy implements ProxyAlgorithm { return Object.keys(val) .map(v => { return { - // @ts-ignore ...val[v], key: v }; diff --git a/src/utils/http/config.ts b/src/utils/http/config.ts index 1eeda688d..a4c3845fb 100644 --- a/src/utils/http/config.ts +++ b/src/utils/http/config.ts @@ -5,7 +5,8 @@ import { excludeProps } from "./utils"; */ export const defaultConfig: AxiosRequestConfig = { baseURL: "", - timeout: 10000, //10秒超时 + //10秒超时 + timeout: 10000, headers: { Accept: "application/json, text/plain, */*", "Content-Type": "application/json", diff --git a/src/utils/operate/index.ts b/src/utils/operate/index.ts index f6b9f8ec4..5b12d9645 100644 --- a/src/utils/operate/index.ts +++ b/src/utils/operate/index.ts @@ -1,8 +1,12 @@ -export const hasClass = (ele: Element, cls: string): any => { +export const hasClass = (ele: RefType, cls: string): any => { return !!ele.className.match(new RegExp("(\\s|^)" + cls + "(\\s|$)")); }; -export const addClass = (ele: Element, cls: string, extracls?: string): any => { +export const addClass = ( + ele: RefType, + cls: string, + extracls?: string +): any => { if (!hasClass(ele, cls)) ele.className += " " + cls; if (extracls) { if (!hasClass(ele, extracls)) ele.className += " " + extracls; @@ -10,7 +14,7 @@ export const addClass = (ele: Element, cls: string, extracls?: string): any => { }; export const removeClass = ( - ele: Element, + ele: RefType, cls: string, extracls?: string ): any => { diff --git a/src/utils/progress/index.ts b/src/utils/progress/index.ts index 6b29db4ab..5d9fbfca7 100644 --- a/src/utils/progress/index.ts +++ b/src/utils/progress/index.ts @@ -2,11 +2,16 @@ import NProgress from "nprogress"; import "nprogress/nprogress.css"; NProgress.configure({ - easing: "ease", // 动画方式 - speed: 500, // 递增进度条的速度 - showSpinner: true, // 是否显示加载ico - trickleSpeed: 200, // 自动递增间隔 - minimum: 0.3 // 初始化时的最小百分比 + // 动画方式 + easing: "ease", + // 递增进度条的速度 + speed: 500, + // 是否显示加载ico + showSpinner: true, + // 自动递增间隔 + trickleSpeed: 200, + // 初始化时的最小百分比 + minimum: 0.3 }); export default NProgress; diff --git a/src/views/components/cropping/index.vue b/src/views/components/cropping/index.vue index 25cabf53c..5f1b3d948 100644 --- a/src/views/components/cropping/index.vue +++ b/src/views/components/cropping/index.vue @@ -9,11 +9,13 @@ let cropperImg = ref(""); const onCropper = (): void => { nextTick(() => { + // @ts-expect-error instance.refs.refCropper.cropper.getCroppedCanvas().toBlob(blob => { let fileReader: FileReader = new FileReader(); fileReader.onloadend = (e: ProgressEvent) => { // @ts-ignore cropperImg.value = e.target.result; + // @ts-expect-error info.value = instance.refs.refCropper.cropper.getData(); }; fileReader.readAsDataURL(blob); diff --git a/tsconfig.json b/tsconfig.json index 808e2507a..d1c251b11 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -24,7 +24,7 @@ "/#/*": ["types/*"] }, "types": ["node", "vite/client"], - "typeRoots": ["./node_modules/@types/", "./types", "./vue-types"] + "typeRoots": ["./node_modules/@types/", "./types"] }, "include": [ "src/**/*.ts", From 8bb67d4a5a8b5e93334fd3e95e95351c95ed9aa4 Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Sun, 19 Sep 2021 15:39:44 +0800 Subject: [PATCH 6/6] refactor: setup version complete --- package.json | 4 +- src/components/ReHamBurger/src/index.vue | 3 +- src/utils/operate/index.ts | 2 +- yarn.lock | 104 +---------------------- 4 files changed, 6 insertions(+), 107 deletions(-) diff --git a/package.json b/package.json index 42f75e7ba..2e03da190 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "responsive-storage": "^1.0.9", "sortablejs": "1.13.0", "v-contextmenu": "^3.0.0", - "vue": "^3.2.12", + "vue": "3.2.11", "vue-i18n": "^9.2.0-beta.3", "vue-json-pretty": "^2.0.2", "vue-router": "^4.0.11", @@ -66,7 +66,7 @@ "@typescript-eslint/parser": "^4.31.0", "@vitejs/plugin-vue": "^1.6.0", "@vitejs/plugin-vue-jsx": "^1.1.7", - "@vue/compiler-sfc": "^3.2.12", + "@vue/compiler-sfc": "3.2.11", "@vue/eslint-config-prettier": "^6.0.0", "@vue/eslint-config-typescript": "^7.0.0", "autoprefixer": "^10.2.4", diff --git a/src/components/ReHamBurger/src/index.vue b/src/components/ReHamBurger/src/index.vue index c6d448147..8e97718c4 100644 --- a/src/components/ReHamBurger/src/index.vue +++ b/src/components/ReHamBurger/src/index.vue @@ -19,8 +19,7 @@ const toggleClick = () => { ): any => { const targetEl = target || document.body; let { className } = targetEl; diff --git a/yarn.lock b/yarn.lock index b9ed8aff6..37ba41222 100644 --- a/yarn.lock +++ b/yarn.lock @@ -786,17 +786,6 @@ estree-walker "^2.0.2" source-map "^0.6.1" -"@vue/compiler-core@3.2.12": - version "3.2.12" - resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.12.tgz#23998d6986a45e1ab0424130cc0ad00e33da1101" - integrity sha512-IGJ0JmrAaAl5KBBegPAKkoXvsfDFgN/h7K1t/+0MxqpZF1fTDVUOp3tG7q9gWa7fwzGEaIsPhjtT5C3qztdLKg== - dependencies: - "@babel/parser" "^7.15.0" - "@babel/types" "^7.15.0" - "@vue/shared" "3.2.12" - estree-walker "^2.0.2" - source-map "^0.6.1" - "@vue/compiler-dom@3.2.11": version "3.2.11" resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.11.tgz#d066f8e1f1812b4e881593819ade0fe6d654c776" @@ -805,15 +794,7 @@ "@vue/compiler-core" "3.2.11" "@vue/shared" "3.2.11" -"@vue/compiler-dom@3.2.12": - version "3.2.12" - resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.12.tgz#d6ba00114e73adb8b18940c3ff18797cc2b0514f" - integrity sha512-MulvKilA2USm8ubPfvXvNY55HVTn+zHERsXeNg437TXrmM4FRCis6zjWW47QZ3ZyxEkCdqOmuiFCtXbpnuthyw== - dependencies: - "@vue/compiler-core" "3.2.12" - "@vue/shared" "3.2.12" - -"@vue/compiler-sfc@^3.0.11": +"@vue/compiler-sfc@3.2.11", "@vue/compiler-sfc@^3.0.11": version "3.2.11" resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.11.tgz#628fa12238760d9b9b339ac2e125a759224fadbf" integrity sha512-cUIaS8mgJrQ6yucj2AupWAwBRITK3W/a8wCOn9g5fJGtOl8h4APY8vN3lzP8HIJDyEeRF3I8SfRhL+oX97kSnw== @@ -837,30 +818,6 @@ postcss-selector-parser "^6.0.4" source-map "^0.6.1" -"@vue/compiler-sfc@^3.2.12": - version "3.2.12" - resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.12.tgz#39555550d96051508753ba934f7260dc5ee5211e" - integrity sha512-EjzeMQ7H2ICj+JRw2buSFXTocdCg8e5yWQTlNM/6h/u68sTwMbIfiOJBFEwBhG/wCG7Nb6Nnz888AfHTU3hdrA== - dependencies: - "@babel/parser" "^7.15.0" - "@babel/types" "^7.15.0" - "@types/estree" "^0.0.48" - "@vue/compiler-core" "3.2.12" - "@vue/compiler-dom" "3.2.12" - "@vue/compiler-ssr" "3.2.12" - "@vue/ref-transform" "3.2.12" - "@vue/shared" "3.2.12" - consolidate "^0.16.0" - estree-walker "^2.0.2" - hash-sum "^2.0.0" - lru-cache "^5.1.1" - magic-string "^0.25.7" - merge-source-map "^1.1.0" - postcss "^8.1.10" - postcss-modules "^4.0.0" - postcss-selector-parser "^6.0.4" - source-map "^0.6.1" - "@vue/compiler-ssr@3.2.11": version "3.2.11" resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.11.tgz#702cef3429651645bdbe09fe5962803b5a621abb" @@ -869,14 +826,6 @@ "@vue/compiler-dom" "3.2.11" "@vue/shared" "3.2.11" -"@vue/compiler-ssr@3.2.12": - version "3.2.12" - resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.12.tgz#32e5d4bc31c371c125b43e9d07b8a8f70442b080" - integrity sha512-sY+VbLQ17FPr1CgirnqEgY+jbC7wI5c2Ma6u8le0+b4UKMYF9urI2pybAZc1nKz6O78FWA3OSnQFxTTLppe+9Q== - dependencies: - "@vue/compiler-dom" "3.2.12" - "@vue/shared" "3.2.12" - "@vue/devtools-api@^6.0.0-beta.13", "@vue/devtools-api@^6.0.0-beta.14", "@vue/devtools-api@^6.0.0-beta.15": version "6.0.0-beta.15" resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.15.tgz#ad7cb384e062f165bcf9c83732125bffbc2ad83d" @@ -903,13 +852,6 @@ dependencies: "@vue/shared" "3.2.11" -"@vue/reactivity@3.2.12": - version "3.2.12" - resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.12.tgz#b482a737cbdc891f9b1ec3100f3c1804b56d080b" - integrity sha512-Lr5CTQjFm5mT/6DGnVNhptmba/Qg1DbD6eNWWmiHLMlpPt4q2ww9A2orEjVw0qNcdTJ04JLPEVAz5jhTZTCfIg== - dependencies: - "@vue/shared" "3.2.12" - "@vue/ref-transform@3.2.11": version "3.2.11" resolved "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.11.tgz#4d282b9570d1485a73e7bf5d57cce27b4a7aa690" @@ -921,17 +863,6 @@ estree-walker "^2.0.2" magic-string "^0.25.7" -"@vue/ref-transform@3.2.12": - version "3.2.12" - resolved "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.12.tgz#6f7fa46dd84447ddcf54adfb1b689b1cf4243de0" - integrity sha512-lS7TDda61iSf3ljokXVfN0VbOsQdmpST6MZLjxzBydFCECCJaEAr6o+K8VZ7NhUCSrl+gKXHpdXxmcvwdk66aQ== - dependencies: - "@babel/parser" "^7.15.0" - "@vue/compiler-core" "3.2.12" - "@vue/shared" "3.2.12" - estree-walker "^2.0.2" - magic-string "^0.25.7" - "@vue/runtime-core@3.2.11": version "3.2.11" resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.11.tgz#0dbe801be4bd0bfde253226797e7d304c8fdda30" @@ -940,14 +871,6 @@ "@vue/reactivity" "3.2.11" "@vue/shared" "3.2.11" -"@vue/runtime-core@3.2.12": - version "3.2.12" - resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.12.tgz#422662fd5b85f787222d2aea840264ba97e84a13" - integrity sha512-LO+ztgcmsomavYUaSq7BTteh8pmnUmvUnXUFVYdlcg3VCdYRS0ImlclpYsNHqjAk2gU+H09dr2PP0kL961xUfQ== - dependencies: - "@vue/reactivity" "3.2.12" - "@vue/shared" "3.2.12" - "@vue/runtime-dom@3.2.11": version "3.2.11" resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.11.tgz#04f9054a9e64bdf156c2fc22cad67cfaa8b84616" @@ -957,25 +880,11 @@ "@vue/shared" "3.2.11" csstype "^2.6.8" -"@vue/runtime-dom@3.2.12": - version "3.2.12" - resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.12.tgz#d9fe865dca36f9ca33ba327afdeb89ae2aa03f4c" - integrity sha512-+NSDqivgihvoPYbKFDmzFu1tW7SOzwc7r0b7T8vsJtooVPGxwtfAFZ6wyLtteOXXrCpyTR3kpyTCIp31uY7aJg== - dependencies: - "@vue/runtime-core" "3.2.12" - "@vue/shared" "3.2.12" - csstype "^2.6.8" - "@vue/shared@3.2.11": version "3.2.11" resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.11.tgz#01899f54949caf1ac241de397bd17069632574de" integrity sha512-ovfXAsSsCvV9JVceWjkqC/7OF5HbgLOtCWjCIosmPGG8lxbPuavhIxRH1dTx4Dg9xLgRTNLvI3pVxG4ItQZekg== -"@vue/shared@3.2.12": - version "3.2.12" - resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.12.tgz#304064a4b56fc6c7b9169d80e9ee62ecb4bf0a1c" - integrity sha512-5CkaifUCJwcTuru7FDwKFacPJuEoGUTw0LKSa5bw40B23s0TS+MGlYR1285nbV/ju3QUGlA6d6PD+GJkWy7uFg== - "@vueuse/core@^6.4.1": version "6.4.1" resolved "https://registry.npmjs.org/@vueuse/core/-/core-6.4.1.tgz#21416997a23bfb4924a5082ed6fa959027f80d04" @@ -4596,7 +4505,7 @@ vue-types@^4.1.0: dependencies: is-plain-object "5.0.0" -vue@^3.1.1: +vue@3.2.11, vue@^3.1.1: version "3.2.11" resolved "https://registry.npmjs.org/vue/-/vue-3.2.11.tgz#6b92295048df705ddac558fd3e3ed553e55e57c8" integrity sha512-JkI3/eIgfk4E0f/p319TD3EZgOwBQfftgnkRsXlT7OrRyyiyoyUXn6embPGZXSBxD3LoZ9SWhJoxLhFh5AleeA== @@ -4605,15 +4514,6 @@ vue@^3.1.1: "@vue/runtime-dom" "3.2.11" "@vue/shared" "3.2.11" -vue@^3.2.12: - version "3.2.12" - resolved "https://registry.npmjs.org/vue/-/vue-3.2.12.tgz#b44f55506fb6a7c4b65635e609deb5f9368aa2ce" - integrity sha512-VV14HtubmB56uuQaSvLkJZgoocPiN8CJI3zZA9y8h7q/Z5hcknDIFkbq5d8ku0ukZ6AJPQqMsZWcq0qryF0jgg== - dependencies: - "@vue/compiler-dom" "3.2.12" - "@vue/runtime-dom" "3.2.12" - "@vue/shared" "3.2.12" - vuedraggable@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz#edece68adb8a4d9e06accff9dfc9040e66852270"