diff --git a/vue-admin-wonderful-next/package.json b/vue-admin-wonderful-next/package.json index dbe136a..bed7864 100644 --- a/vue-admin-wonderful-next/package.json +++ b/vue-admin-wonderful-next/package.json @@ -6,14 +6,14 @@ "build": "vite build" }, "dependencies": { - "element-plus": "^v1.0.1-beta.17", + "element-plus": "^v1.0.1-beta.19", "sortablejs": "^1.10.2", - "vue": "^3.0.4", - "vue-router": "^4.0.1" + "vue": "^3.0.5", + "vue-router": "^4.0.2" }, "devDependencies": { "@types/sortablejs": "^1.10.6", - "@vue/compiler-sfc": "^3.0.4", + "@vue/compiler-sfc": "^3.0.5", "sass": "^1.30.0", "sass-loader": "^10.1.0", "typescript": "^4.1.2", diff --git a/vue-admin-wonderful-next/src/main.ts b/vue-admin-wonderful-next/src/main.ts index 071a4a0..e340a98 100644 --- a/vue-admin-wonderful-next/src/main.ts +++ b/vue-admin-wonderful-next/src/main.ts @@ -5,7 +5,6 @@ import router from './router' import ElementPlus from 'element-plus' import 'element-plus/lib/theme-chalk/index.css' import '/@/theme/index.scss' -import { locale } from 'element-plus' - -createApp(App).use(router).use(ElementPlus, { locale }).mount('#app') +import lang from 'element-plus/lib/locale/lang/zh-cn' +createApp(App).use(router).use(ElementPlus, { locale: lang }).mount('#app') \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/theme/app.scss b/vue-admin-wonderful-next/src/theme/app.scss index 7cc7c12..2cbba89 100644 --- a/vue-admin-wonderful-next/src/theme/app.scss +++ b/vue-admin-wonderful-next/src/theme/app.scss @@ -4,6 +4,7 @@ margin: 0; padding: 0; box-sizing: border-box; + outline: none !important; } html, @@ -53,6 +54,22 @@ body, } } +/* element plus 全局样式 +------------------------------- */ +.layout-breadcrumb-seting { + .el-drawer__header { + padding: 0 15px !important; + height: 50px; + display: flex; + align-items: center; + margin-bottom: 0 !important; + border-bottom: 1px solid rgb(230, 230, 230); + } + .el-divider { + background-color: rgb(230, 230, 230); + } +} + /* 宽高 100% ------------------------------- */ .w100 { diff --git a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/seting.vue b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/seting.vue deleted file mode 100644 index 88596f7..0000000 --- a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/seting.vue +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue new file mode 100644 index 0000000..bc06234 --- /dev/null +++ b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue @@ -0,0 +1,364 @@ + + + + + \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/user.vue b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/user.vue index 5599d21..b6bb2c3 100644 --- a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/user.vue +++ b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/user.vue @@ -1,7 +1,7 @@ + diff --git a/vue-admin-wonderful-next/src/views/layout/navBars/tagsView/contextmenu.vue b/vue-admin-wonderful-next/src/views/layout/navBars/tagsView/contextmenu.vue index bb28710..ee18f5b 100644 --- a/vue-admin-wonderful-next/src/views/layout/navBars/tagsView/contextmenu.vue +++ b/vue-admin-wonderful-next/src/views/layout/navBars/tagsView/contextmenu.vue @@ -1,7 +1,8 @@