From 4f20d45f9dcb2e1ed29555c61fc92090e3fe12e5 Mon Sep 17 00:00:00 2001 From: Vben Date: Thu, 17 Jun 2021 21:43:53 +0800 Subject: [PATCH] chore: type optimization --- .vscode/settings.json | 32 ++--- package.json | 12 +- src/components/Dropdown/src/Dropdown.vue | 2 +- .../FlowChart/src/FlowChartToolbar.vue | 2 +- src/components/Form/src/BasicForm.vue | 15 ++- src/components/Upload/src/UploadModal.vue | 2 +- src/hooks/component/useFormItem.ts | 2 +- .../default/tabs/components/TabContent.vue | 4 +- src/layouts/page/transition.ts | 10 +- .../demo/page/account/center/Application.vue | 2 +- .../demo/page/account/center/Article.vue | 6 +- .../demo/page/account/center/Project.vue | 2 +- src/views/demo/page/account/center/index.vue | 4 +- src/views/demo/page/desc/high/index.vue | 4 +- src/views/demo/page/list/card/index.vue | 2 +- src/views/demo/page/list/search/index.vue | 2 +- src/views/sys/login/useLogin.ts | 5 +- yarn.lock | 110 ++++++++++-------- 18 files changed, 112 insertions(+), 106 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index bbcf8694..83b85b41 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { - "cSpell.words": ["vben", "windi"], "typescript.tsdk": "./node_modules/typescript/lib", + "typescript.enablePromptUseWorkspaceTsdk": true, "volar.tsPlugin": true, "volar.tsPluginStatus": false, //=========================================== @@ -10,23 +10,14 @@ "editor.tabSize": 2, "editor.defaultFormatter": "esbenp.prettier-vscode", "diffEditor.ignoreTrimWhitespace": false, - "editor.trimAutoWhitespace": true, //=========================================== //============= Other ======================= //=========================================== "breadcrumbs.enabled": true, "open-in-browser.default": "chrome", //=========================================== - //============= emmet ======================= - //=========================================== - "emmet.triggerExpansionOnTab": true, - "emmet.showAbbreviationSuggestions": true, - //=========================================== //============= files ======================= //=========================================== - "files.trimTrailingWhitespace": true, - // "files.insertFinalNewline": true, - // "files.trimFinalNewlines": true, "files.eol": "\n", "search.exclude": { "**/node_modules": true, @@ -49,9 +40,14 @@ "CHANGELOG.md": true, "examples": true, "res": true, - "screenshots": true + "screenshots": true, + "yarn-error.log": true, + "**/.yarn": true }, "files.exclude": { + "**/.cache": true, + "**/.editorconfig": true, + "**/.eslintcache": true, "**/bower_components": true, "**/.idea": true, "**/tmp": true, @@ -73,17 +69,6 @@ }, "stylelint.enable": true, "stylelint.packageManager": "yarn", - // =========================================== - // ================ Vetur ==================== - // =========================================== - // "vetur.experimental.templateInterpolationService": true, - // "vetur.format.options.tabSize": 2, - // "vetur.languageFeatures.codeActions": false, - // "vetur.format.defaultFormatterOptions": { - // "js-beautify-html": { - // "wrap_attributes": "force-expand-multiline" - // } - // }, "liveServer.settings.donotShowInfoMsg": true, "telemetry.enableCrashReporter": false, "workbench.settings.enableNaturalLanguageSearch": false, @@ -132,5 +117,6 @@ "i18n-ally.pathMatcher": "{locale}/{namespaces}.{ext}", "i18n-ally.enabledParsers": ["ts"], "i18n-ally.sourceLanguage": "en", - "i18n-ally.enabledFrameworks": ["vue", "react"] + "i18n-ally.enabledFrameworks": ["vue", "react"], + "cSpell.words": ["vben", "windi", "browserslist", "esnext"] } diff --git a/package.json b/package.json index 2a3105e5..5d0c29a2 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,8 @@ }, "dependencies": { "@iconify/iconify": "^2.0.1", - "@logicflow/core": "^0.4.13", - "@logicflow/extension": "^0.4.13", + "@logicflow/core": "^0.4.14", + "@logicflow/extension": "^0.4.14", "@vueuse/core": "^5.0.3", "@zxcvbn-ts/core": "^0.3.0", "ant-design-vue": "2.1.6", @@ -115,11 +115,11 @@ "vite-plugin-compression": "^0.2.5", "vite-plugin-html": "^2.0.7", "vite-plugin-imagemin": "^0.3.2", - "vite-plugin-mock": "^2.7.2", + "vite-plugin-mock": "^2.8.0", "vite-plugin-purge-icons": "^0.7.0", "vite-plugin-pwa": "^0.8.1", - "vite-plugin-style-import": "^0.10.1", - "vite-plugin-svg-icons": "^0.7.0", + "vite-plugin-style-import": "^1.0.0", + "vite-plugin-svg-icons": "^0.7.1", "vite-plugin-theme": "^0.8.1", "vite-plugin-windicss": "^1.0.4", "vue-eslint-parser": "^7.6.0", @@ -128,7 +128,7 @@ "resolutions": { "//": "Used to install imagemin dependencies, because imagemin may not be installed in China. If it is abroad, you can delete it", "bin-wrapper": "npm:bin-wrapper-china", - "rollup": "^2.51.2" + "rollup": "^2.52.0" }, "repository": { "type": "git", diff --git a/src/components/Dropdown/src/Dropdown.vue b/src/components/Dropdown/src/Dropdown.vue index f718f1f8..91dbf501 100644 --- a/src/components/Dropdown/src/Dropdown.vue +++ b/src/components/Dropdown/src/Dropdown.vue @@ -53,7 +53,7 @@ * @type string[] */ trigger: { - type: [Array] as PropType, + type: [Array] as PropType<('contextmenu' | 'click' | 'hover')[]>, default: () => { return ['contextmenu']; }, diff --git a/src/components/FlowChart/src/FlowChartToolbar.vue b/src/components/FlowChart/src/FlowChartToolbar.vue index ea49f896..c88af5ca 100644 --- a/src/components/FlowChart/src/FlowChartToolbar.vue +++ b/src/components/FlowChart/src/FlowChartToolbar.vue @@ -1,6 +1,6 @@