diff --git a/package.json b/package.json index 8a606c6..2f921b8 100644 --- a/package.json +++ b/package.json @@ -15,27 +15,27 @@ "url": "https://gitee.com/y_project/RuoYi-Vue.git" }, "dependencies": { - "@element-plus/icons-vue": "1.1.4", - "@vueuse/core": "8.5.0", - "axios": "0.26.1", - "echarts": "5.3.2", - "element-plus": "2.1.8", + "@element-plus/icons-vue": "2.0.10", + "@vueuse/core": "9.5.0", + "axios": "0.27.2", + "echarts": "5.4.0", + "element-plus": "2.2.21", "file-saver": "2.0.5", - "fuse.js": "6.5.3", + "fuse.js": "6.6.2", "js-cookie": "3.0.1", - "jsencrypt": "3.2.1", + "jsencrypt": "3.3.1", "nprogress": "0.2.0", - "pinia": "2.0.14", - "vue": "3.2.37", + "pinia": "2.0.22", + "vue": "3.2.45", "vue-cropper": "1.0.3", - "vue-router": "4.0.14" + "vue-router": "4.1.4" }, "devDependencies": { - "@vitejs/plugin-vue": "2.3.3", - "@vue/compiler-sfc": "3.2.36", - "sass": "1.52.1", - "unplugin-auto-import": "0.8.5", - "vite": "2.9.14", + "@vitejs/plugin-vue": "3.1.0", + "@vue/compiler-sfc": "3.2.45", + "sass": "1.56.1", + "unplugin-auto-import": "0.11.4", + "vite": "3.2.3", "vite-plugin-compression": "0.5.1", "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 6cdc2b6..a7d3ec9 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -60,12 +60,15 @@ color: inherit; } +.el-form .el-form-item__label { + font-weight: 700; +} .el-dialog:not(.is-fullscreen) { margin-top: 6vh !important; } .el-dialog.scrollbar .el-dialog__body { - overflow: auto; + overflow: auto; overflow-x: hidden; max-height: 70vh; padding: 10px 20px 0; diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue index 4b8f206..f7e2654 100644 --- a/src/components/TopNav/index.vue +++ b/src/components/TopNav/index.vue @@ -97,7 +97,9 @@ const activeMenu = computed(() => { if (path !== undefined && path.lastIndexOf("/") > 0 && hideList.indexOf(path) === -1) { const tmpPath = path.substring(1, path.length); activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/")); - appStore.toggleSideBarHide(false); + if (!route.meta.link) { + appStore.toggleSideBarHide(false); + } } else if(!route.children) { activePath = path; appStore.toggleSideBarHide(true); diff --git a/src/layout/components/InnerLink/index.vue b/src/layout/components/InnerLink/index.vue index a1c3ef6..6d77d3a 100644 --- a/src/layout/components/InnerLink/index.vue +++ b/src/layout/components/InnerLink/index.vue @@ -1,5 +1,5 @@