From e3aa4d4816c1606d8e48aaebf545e4b51b647e0e Mon Sep 17 00:00:00 2001 From: lyt <1105290566@qq.com> Date: Sat, 30 Oct 2021 21:11:40 +0800 Subject: [PATCH] =?UTF-8?q?'admin-21.10.30:=E4=BF=AE=E5=A4=8D=E6=BC=94?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8CTagsView=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=84=9F=E8=B0=A2=E7=BE=A4=E5=8F=8B?= =?UTF-8?q?@=E5=B0=8F=E6=98=8E=E7=94=BB=E5=AE=B6=E3=80=81@HelloWord'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 26 ++++++++++++------------ src/layout/navBars/tagsView/tagsView.vue | 6 +++--- src/views/pages/steps/index.vue | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 1803e08..4c4dc91 100644 --- a/package.json +++ b/package.json @@ -10,13 +10,13 @@ "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/" }, "dependencies": { - "axios": "^0.23.0", + "axios": "^0.24.0", "countup.js": "^2.0.8", "cropperjs": "^1.5.12", "echarts": "^5.2.1", "echarts-gl": "^2.0.8", "echarts-wordcloud": "^2.0.0", - "element-plus": "^1.1.0-beta.20", + "element-plus": "^1.1.0-beta.24", "jsplumb": "^2.15.6", "mitt": "^3.0.0", "nprogress": "^0.2.0", @@ -32,27 +32,27 @@ "vue-router": "^4.0.12", "vue-web-screen-shot": "^1.2.0", "vuex": "^4.0.2", - "wangeditor": "^4.7.8" + "wangeditor": "^4.7.9" }, "devDependencies": { "@types/axios": "^0.14.0", "@types/clipboard": "^2.0.1", - "@types/node": "^16.11.0", + "@types/node": "^16.11.6", "@types/nprogress": "^0.2.0", "@types/sortablejs": "^1.10.7", - "@typescript-eslint/eslint-plugin": "^5.0.0", - "@typescript-eslint/parser": "^5.0.0", - "@vitejs/plugin-vue": "^1.9.3", + "@typescript-eslint/eslint-plugin": "^5.2.0", + "@typescript-eslint/parser": "^5.2.0", + "@vitejs/plugin-vue": "^1.9.4", "@vue/compiler-sfc": "^3.2.20", "dotenv": "^10.0.0", - "eslint": "^8.0.1", - "eslint-plugin-vue": "^7.19.1", + "eslint": "^8.1.0", + "eslint-plugin-vue": "^8.0.3", "prettier": "^2.4.1", - "sass": "^1.43.2", - "sass-loader": "^12.2.0", + "sass": "^1.43.4", + "sass-loader": "^12.3.0", "typescript": "^4.4.4", - "vite": "^2.6.7", - "vue-eslint-parser": "^7.11.0" + "vite": "^2.6.13", + "vue-eslint-parser": "^8.0.1" }, "browserslist": [ "> 1%", diff --git a/src/layout/navBars/tagsView/tagsView.vue b/src/layout/navBars/tagsView/tagsView.vue index ab1521c..a3243a6 100644 --- a/src/layout/navBars/tagsView/tagsView.vue +++ b/src/layout/navBars/tagsView/tagsView.vue @@ -6,7 +6,7 @@ v-for="(v, k) in tagsViewList" :key="k" class="layout-navbars-tagsview-ul-li" - :data-name="v.name" + :data-url="v.url" :class="{ 'is-active': isActive(v) }" @contextmenu.prevent="onContextmenu(v, $event)" @click="onTagsClick(v, k)" @@ -401,13 +401,13 @@ export default { state.sortable && state.sortable.destroy(); state.sortable = Sortable.create(el, { animation: 300, - dataIdAttr: 'data-name', + dataIdAttr: 'data-url', disabled: getThemeConfig.value.isSortableTagsView ? false : true, onEnd: () => { const sortEndList: any = []; state.sortable.toArray().map((val: any) => { state.tagsViewList.map((v: any) => { - if (v.name === val) sortEndList.push({ ...v }); + if (v.url === val) sortEndList.push({ ...v }); }); }); addBrowserSetSession(sortEndList); diff --git a/src/views/pages/steps/index.vue b/src/views/pages/steps/index.vue index a229b1e..e125451 100644 --- a/src/views/pages/steps/index.vue +++ b/src/views/pages/steps/index.vue @@ -6,9 +6,9 @@ - + - + 下一步