From 2d1c222e6b5b0140bf92b522a95728c872075661 Mon Sep 17 00:00:00 2001 From: liweijie0812 <674416404@qq.com> Date: Thu, 16 Mar 2023 20:02:41 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E8=8F=9C=E5=8D=95=E9=AB=98=E4=BA=AE?= =?UTF-8?q?=20(#450)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/components/MenuContent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/components/MenuContent.vue b/src/layouts/components/MenuContent.vue index beb4b6d..2f0ddb0 100644 --- a/src/layouts/components/MenuContent.vue +++ b/src/layouts/components/MenuContent.vue @@ -85,7 +85,7 @@ const getHref = (item: MenuRoute) => { }; const getPath = (item: ListItemType) => { - if (active.value.startsWith(item.path)) { + if (active.value === item.path) { return active.value; } return item.meta?.single ? item.redirect : item.path; From c21994f5fae4080c427c75f9dc30eb1acb124bbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=82=A0=E9=9D=99=E8=90=9D=E8=8E=89?= Date: Tue, 28 Mar 2023 10:27:55 +0800 Subject: [PATCH 2/9] =?UTF-8?q?feat:=20=E6=A0=87=E7=AD=BE=E9=A1=B5?= =?UTF-8?q?=E5=8F=AF=E9=85=8D=E7=BD=AE=E7=A6=81=E6=AD=A2=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=20(#454)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: dump Tdesign version * feat: 标签页可配置禁止拖拽(#430) --- package.json | 30 ++++++++++++------------ src/layouts/components/LayoutContent.vue | 1 + 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 8adc0de..b1323a3 100644 --- a/package.json +++ b/package.json @@ -20,19 +20,19 @@ }, "dependencies": { "@types/nprogress": "^0.2.0", - "axios": "^1.2.6", + "axios": "^1.3.4", "dayjs": "^1.11.7", - "echarts": "5.1.2", + "echarts": "5.4.2", "lodash": "^4.17.21", "nprogress": "^0.2.0", - "pinia": "^2.0.28", - "pinia-plugin-persistedstate": "^3.0.2", - "qrcode.vue": "^3.3.3", - "qs": "^6.11.0", - "tdesign-icons-vue-next": "^0.1.7", - "tdesign-vue-next": "^1.0.8", + "pinia": "^2.0.33", + "pinia-plugin-persistedstate": "^3.1.0", + "qrcode.vue": "^3.3.4", + "qs": "^6.11.1", + "tdesign-icons-vue-next": "^0.1.8", + "tdesign-vue-next": "^1.2.2", "tvision-color": "^1.5.0", - "vue": "^3.2.45", + "vue": "^3.2.47", "vue-clipboard3": "^2.0.0", "vue-router": "~4.1.6" }, @@ -42,12 +42,12 @@ "@types/echarts": "^4.9.16", "@types/lodash": "^4.14.191", "@types/qs": "^6.9.7", - "@types/ws": "^8.5.3", + "@types/ws": "^8.5.4", "@typescript-eslint/eslint-plugin": "^5.47.1", "@typescript-eslint/parser": "^5.47.1", "@vitejs/plugin-vue": "^3.2.0", - "@vitejs/plugin-vue-jsx": "^1.1.7", - "@vue/compiler-sfc": "^3.2.45", + "@vitejs/plugin-vue-jsx": "^1.3.10", + "@vue/compiler-sfc": "^3.2.47", "@vue/eslint-config-typescript": "^11.0.2", "commitizen": "^4.2.4", "cz-conventional-changelog": "^3.3.0", @@ -69,11 +69,11 @@ "stylelint-config-prettier": "~9.0.4", "stylelint-less": "1.0.6", "stylelint-order": "~6.0.1", - "typescript": "~4.9.4", - "vite": "^3.0.3", + "typescript": "~4.9.5", + "vite": "^3.2.5", "vite-plugin-mock": "^2.9.6", "vite-svg-loader": "^4.0.0", - "vue-tsc": "^1.0.19" + "vue-tsc": "^1.2.0" }, "config": { "commitizen": { diff --git a/src/layouts/components/LayoutContent.vue b/src/layouts/components/LayoutContent.vue index 0c9fea9..8cc676b 100644 --- a/src/layouts/components/LayoutContent.vue +++ b/src/layouts/components/LayoutContent.vue @@ -16,6 +16,7 @@ :key="`${routeItem.path}_${index}`" :value="routeItem.path" :removable="!routeItem.isHome" + :draggable="!routeItem.isHome" >