From 4ea513790416c9c5bb6efd5596312eb8ec5a533c Mon Sep 17 00:00:00 2001 From: xingyuv Date: Tue, 7 Mar 2023 09:33:53 +0800 Subject: [PATCH 1/8] chore: update deps --- package.json | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index ab8683a5..d0f62967 100644 --- a/package.json +++ b/package.json @@ -29,12 +29,12 @@ "@form-create/designer": "^3.1.0", "@form-create/element-ui": "^3.1.17", "@iconify/iconify": "^3.1.0", - "@vueuse/core": "^9.12.0", + "@vueuse/core": "^9.13.0", "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.10", "@zxcvbn-ts/core": "^2.2.1", "animate.css": "^4.1.1", - "axios": "^1.3.3", + "axios": "^1.3.4", "bpmn-js-token-simulation": "^0.10.0", "camunda-bpmn-moddle": "^7.0.1", "cropperjs": "^1.5.13", @@ -43,18 +43,18 @@ "diagram-js": "^11.6.0", "echarts": "^5.4.1", "echarts-wordcloud": "^2.1.0", - "element-plus": "2.2.30", - "fast-xml-parser": "^4.1.2", + "element-plus": "2.2.34", + "fast-xml-parser": "^4.1.3", "highlight.js": "^11.7.0", "intro.js": "^6.0.0", - "jsencrypt": "^3.3.1", + "jsencrypt": "^3.3.2", "lodash-es": "^4.17.21", "min-dash": "^4.0.0", "mitt": "^3.0.0", "nprogress": "^0.2.0", - "pinia": "^2.0.30", + "pinia": "^2.0.33", "qrcode": "^1.5.1", - "qs": "^6.11.0", + "qs": "^6.11.1", "steady-xml": "^0.1.0", "url": "^0.11.0", "vue": "3.2.47", @@ -68,19 +68,19 @@ "xml-js": "^1.6.11" }, "devDependencies": { - "@commitlint/cli": "^17.4.3", - "@commitlint/config-conventional": "^17.4.3", - "@iconify/json": "^2.2.21", + "@commitlint/cli": "^17.4.4", + "@commitlint/config-conventional": "^17.4.4", + "@iconify/json": "^2.2.31", "@intlify/unplugin-vue-i18n": "^0.8.2", "@purge-icons/generated": "^0.9.0", - "@types/intro.js": "^5.1.0", + "@types/intro.js": "^5.1.1", "@types/lodash-es": "^4.17.6", - "@types/node": "^18.13.0", + "@types/node": "^18.14.6", "@types/nprogress": "^0.2.0", "@types/qrcode": "^1.5.0", "@types/qs": "^6.9.7", - "@typescript-eslint/eslint-plugin": "^5.52.0", - "@typescript-eslint/parser": "^5.52.0", + "@typescript-eslint/eslint-plugin": "^5.54.1", + "@typescript-eslint/parser": "^5.54.1", "@vitejs/plugin-legacy": "^4.0.1", "@vitejs/plugin-vue": "^4.0.0", "@vitejs/plugin-vue-jsx": "^3.0.0", @@ -88,8 +88,8 @@ "bpmn-js": "^8.9.0", "bpmn-js-properties-panel": "^0.46.0", "consola": "^2.15.3", - "eslint": "^8.34.0", - "eslint-config-prettier": "^8.6.0", + "eslint": "^8.35.0", + "eslint-config-prettier": "^8.7.0", "eslint-define-config": "^1.15.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-vue": "^9.9.0", @@ -98,21 +98,21 @@ "postcss-html": "^1.5.0", "postcss-scss": "^4.0.6", "prettier": "^2.8.4", - "rimraf": "^4.1.2", - "rollup": "^3.15.0", - "sass": "^1.58.1", - "stylelint": "^15.1.0", + "rimraf": "^4.3.1", + "rollup": "^3.18.0", + "sass": "^1.58.3", + "stylelint": "^15.2.0", "stylelint-config-html": "^1.1.0", "stylelint-config-prettier": "^9.0.5", "stylelint-config-recommended": "^10.0.1", "stylelint-config-standard": "^30.0.1", "stylelint-order": "^6.0.2", - "terser": "^5.16.3", + "terser": "^5.16.5", "typescript": "4.9.5", - "unplugin-auto-import": "^0.14.2", - "unplugin-element-plus": "^0.6.0", - "unplugin-vue-components": "^0.23.0", - "vite": "4.1.1", + "unplugin-auto-import": "^0.15.1", + "unplugin-element-plus": "^0.7.0", + "unplugin-vue-components": "^0.24.1", + "vite": "4.1.4", "vite-plugin-compression": "^0.5.1", "vite-plugin-ejs": "^1.6.4", "vite-plugin-eslint": "^1.8.1", @@ -121,7 +121,7 @@ "vite-plugin-svg-icons": "^2.0.1", "vite-plugin-vue-setup-extend": "^0.4.0", "vite-plugin-windicss": "^1.8.10", - "vue-tsc": "^1.0.24", + "vue-tsc": "^1.2.0", "windicss": "^3.5.6" }, "engines": { From 0cb57e5a51cd22f839c635aa188e472883ed03c5 Mon Sep 17 00:00:00 2001 From: xingyuv Date: Tue, 7 Mar 2023 09:35:44 +0800 Subject: [PATCH 2/8] dcos: update deps --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 96bdd51b..b3e9cc78 100644 --- a/README.md +++ b/README.md @@ -36,16 +36,16 @@ | 框架 | 说明 | 版本 | |----------------------------------------------------------------------|------------------|--------| | [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.2.47 | -| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.1.1 | -| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.30 | +| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.1.4 | +| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.34 | | [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 4.9.5 | -| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.30 | -| [vueuse](https://vueuse.org/) | 常用工具集 | 9.12.0 | +| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.33 | +| [vueuse](https://vueuse.org/) | 常用工具集 | 9.13.0 | | [vxe-table](https://vxetable.cn/) | Vue 最强表单 | 4.3.10 | | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 | | [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.1.6 | | [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6 | -| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.0.1 | +| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.0 | | [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 | ## 开发工具 From 01971a94b477047d734284205660087ea5e7b218 Mon Sep 17 00:00:00 2001 From: xingyuv Date: Tue, 7 Mar 2023 09:37:59 +0800 Subject: [PATCH 3/8] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E5=88=87=E6=8D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/ThemeSwitch/src/ThemeSwitch.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/layout/components/ThemeSwitch/src/ThemeSwitch.vue b/src/layout/components/ThemeSwitch/src/ThemeSwitch.vue index 1af67cf0..45243011 100644 --- a/src/layout/components/ThemeSwitch/src/ThemeSwitch.vue +++ b/src/layout/components/ThemeSwitch/src/ThemeSwitch.vue @@ -37,3 +37,8 @@ const themeChange = (val: boolean) => { @change="themeChange" /> + From 65e365253443b8b763992b4cc0fc3c20b01871c9 Mon Sep 17 00:00:00 2001 From: xingyuv Date: Tue, 7 Mar 2023 09:38:58 +0800 Subject: [PATCH 4/8] =?UTF-8?q?style:=20=E6=8A=BD=E5=B1=89=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/index.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/styles/index.scss b/src/styles/index.scss index d53c2a6c..39c4c4da 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -6,6 +6,11 @@ margin-left: 2px !important; } +// 解决抽屉弹出时，body宽度变化的问题 +.el-popup-parent--hidden { + width: 100% !important; +} + /* nprogress 适配 element-plus 的主题色 */ #nprogress { & .bar { From 004d214a11aeca50f3d6ce5ef873c0284a775254 Mon Sep 17 00:00:00 2001 From: xingyuv Date: Tue, 7 Mar 2023 09:41:01 +0800 Subject: [PATCH 5/8] fix: bugs --- src/components/Descriptions/src/Descriptions.vue | 8 +++++++- src/hooks/web/useCrudSchemas.ts | 2 +- src/layout/components/TagsView/src/TagsView.vue | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index d6cea87a..fca37000 100644 --- a/src/components/Descriptions/src/Descriptions.vue +++ b/src/components/Descriptions/src/Descriptions.vue @@ -109,7 +109,13 @@ const toggleClick = () => { v-bind="getBindItemValue(item)" >