diff --git a/.vscode/settings.json b/.vscode/settings.json index 096d7ad9f49f1740e2066bce2e566209643ca508..bbcf86946598f5383c459f9fb8eef501eb7e30bc 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -25,8 +25,8 @@ //============= files ======================= //=========================================== "files.trimTrailingWhitespace": true, - "files.insertFinalNewline": true, - "files.trimFinalNewlines": true, + // "files.insertFinalNewline": true, + // "files.trimFinalNewlines": true, "files.eol": "\n", "search.exclude": { "**/node_modules": true, @@ -76,14 +76,14 @@ // =========================================== // ================ 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" - } - }, + // "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, diff --git a/build/vite/plugin/compress.ts b/build/vite/plugin/compress.ts index 45583be2e19ff1eadee39b3e0ce5c38cbf76f0bb..9563679c4bc7c92dfc6889ea9c4725ce54deb8af 100644 --- a/build/vite/plugin/compress.ts +++ b/build/vite/plugin/compress.ts @@ -8,7 +8,7 @@ import compressPlugin from 'vite-plugin-compression'; export function configCompressPlugin( compress: 'gzip' | 'brotli' | 'none', - deleteOriginFile: boolean = false + deleteOriginFile = false ): Plugin | Plugin[] { const compressList = compress.split(','); diff --git a/package.json b/package.json index ee4601fe951673b003aaf0678e0e97c3aea99a1d..bb78fd4ef2235b00f7bd9d326892efd23565ac92 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "devDependencies": { "@commitlint/cli": "^12.1.4", "@commitlint/config-conventional": "^12.1.4", - "@iconify/json": "^1.1.350", + "@iconify/json": "^1.1.353", "@purge-icons/generated": "^0.7.0", "@types/codemirror": "^5.60.0", "@types/crypto-js": "^4.0.1", @@ -71,7 +71,7 @@ "@types/inquirer": "^7.3.1", "@types/lodash-es": "^4.17.4", "@types/mockjs": "^1.0.3", - "@types/node": "^15.12.0", + "@types/node": "^15.12.1", "@types/nprogress": "^0.2.0", "@types/qrcode": "^1.4.0", "@types/qs": "^6.9.6", @@ -87,12 +87,12 @@ "conventional-changelog-cli": "^2.1.1", "cross-env": "^7.0.3", "dotenv": "^10.0.0", - "eslint": "^7.27.0", + "eslint": "^7.28.0", "eslint-config-prettier": "^8.3.0", "eslint-define-config": "^1.0.8", "eslint-plugin-prettier": "^3.4.0", "eslint-plugin-vue": "^7.10.0", - "esno": "^0.6.0", + "esno": "^0.7.0", "fs-extra": "^10.0.0", "http-server": "^0.12.3", "husky": "^6.0.0", @@ -101,7 +101,7 @@ "less": "^4.1.1", "lint-staged": "^11.0.0", "postcss": "^8.3.0", - "prettier": "^2.3.0", + "prettier": "^2.3.1", "pretty-quick": "^3.1.0", "rimraf": "^3.0.2", "rollup-plugin-visualizer": "5.5.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.50.6" + "rollup": "^2.51.0" }, "repository": { "type": "git", diff --git a/src/components/Button/src/BasicButton.vue b/src/components/Button/src/BasicButton.vue index 8d349e8d8c9c0aa49369c0afbdc60d369457538e..d4fadbcb08126ee0931f500d34aad8c12809c90e 100644 --- a/src/components/Button/src/BasicButton.vue +++ b/src/components/Button/src/BasicButton.vue @@ -1,47 +1,49 @@ diff --git a/src/components/Button/src/PopConfirmButton.vue b/src/components/Button/src/PopConfirmButton.vue index 7691cf6077cbda8b01cd30a4599cbca929784d46..4e546a05eb75c207921b8696173062a0de539c03 100644 --- a/src/components/Button/src/PopConfirmButton.vue +++ b/src/components/Button/src/PopConfirmButton.vue @@ -1,31 +1,33 @@