diff --git a/index.html b/index.html index 94f5272f..630352da 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ -
+
diff --git a/package.json b/package.json index adbbe8a1..bf746937 100644 --- a/package.json +++ b/package.json @@ -46,28 +46,31 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "5.1.10", "axios": "^1.4.0", + "codemirror": "^5.65.13", "echarts": "^5.2.2", "element-plus": "^2.3.9", "lodash-es": "^4.17.21", + "mockjs": "^1.1.0", "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.0", "pinia": "^2.0.33", "screenfull": "^6.0.0", + "sortablejs": "^1.15.0", "vue": "^3.3.4", "vue-i18n": "9.2.2", "vue-router": "^4.2.0", - "xlsx": "^0.18.5", - "sortablejs": "^1.15.0", - "codemirror": "^5.65.13" + "xlsx": "^0.18.5" }, "devDependencies": { "@commitlint/cli": "^17.6.3", "@commitlint/config-conventional": "^17.6.3", "@iconify-json/ep": "^1.1.10", + "@types/codemirror": "^5.60.7", "@types/lodash": "^4.14.195", "@types/nprogress": "^0.2.0", "@types/path-browserify": "^1.0.0", + "@types/sortablejs": "^1.15.1", "@typescript-eslint/eslint-plugin": "^5.59.6", "@typescript-eslint/parser": "^5.59.6", "autoprefixer": "^10.4.14", @@ -85,6 +88,7 @@ "postcss-html": "^1.5.0", "postcss-scss": "^4.0.6", "prettier": "^2.8.8", + "rollup-plugin-visualizer": "^5.9.2", "sass": "^1.58.3", "stylelint": "^15.10.2", "stylelint-config-html": "^1.1.0", @@ -99,13 +103,10 @@ "unplugin-icons": "^0.16.1", "unplugin-vue-components": "^0.24.1", "vite": "^4.4.2", - "vite-plugin-svg-icons": "^2.0.1", - "vue-tsc": "^1.7.0 ", "vite-plugin-compression": "^0.5.1", "vite-plugin-mock": "^3.0.0", - "rollup-plugin-visualizer": "^5.9.2", - "@types/codemirror": "^5.60.7", - "@types/sortablejs": "^1.15.1" + "vite-plugin-svg-icons": "^2.0.1", + "vue-tsc": "^1.7.0 " }, "repository": "https://gitee.com/youlaiorg/vue3-element-admin.git", "author": "有来开源组织", diff --git a/src/layout/components/NavBar/NavRight.vue b/src/layout/components/NavBar/NavRight.vue new file mode 100644 index 00000000..82beb4cf --- /dev/null +++ b/src/layout/components/NavBar/NavRight.vue @@ -0,0 +1,120 @@ + + + diff --git a/src/layout/components/NavBar/index.vue b/src/layout/components/NavBar/index.vue new file mode 100644 index 00000000..1f6b70e8 --- /dev/null +++ b/src/layout/components/NavBar/index.vue @@ -0,0 +1,42 @@ + + + + + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue deleted file mode 100644 index d6217dff..00000000 --- a/src/layout/components/Navbar.vue +++ /dev/null @@ -1,158 +0,0 @@ - - - - - diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue index 26daa541..4818ecd5 100644 --- a/src/layout/components/Settings/index.vue +++ b/src/layout/components/Settings/index.vue @@ -34,7 +34,7 @@ const themeColors = ref([ */ function changeThemeColor(color: string) { document.documentElement.style.setProperty("--el-color-primary", color); - settingsStore.changeSetting({ key: "layout", value: color }); + // settingsStore.changeSetting({ key: "layout", value: color }); } onMounted(() => { @@ -94,7 +94,7 @@ onMounted(() => {
  • @@ -106,7 +106,7 @@ onMounted(() => {
  • @@ -118,7 +118,7 @@ onMounted(() => {
  • diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 108e197f..3f4c6401 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -14,7 +14,9 @@ const logo = ref(new URL(`../../../assets/logo.png`, import.meta.url).href);