From-wh пре 2 година
родитељ
комит
e7dbd1eabb

+ 12 - 4
template/admin/src/layout/navBars/breadcrumb/setings.vue

@@ -362,6 +362,8 @@ export default {
         if (['classic', 'transverse'].includes(this.getThemeConfig.layout)) {
         if (['classic', 'transverse'].includes(this.getThemeConfig.layout)) {
           themeSelect['--prev-bg-topBar'] = '#282c34';
           themeSelect['--prev-bg-topBar'] = '#282c34';
           themeSelect['--prev-bg-topBarColor'] = '#fff';
           themeSelect['--prev-bg-topBarColor'] = '#fff';
+          themeSelect['--prev-bg-menuBarColor'] = '#fff';
+          themeSelect['--prev-MenuActiveColor'] = '#fff';
         } else if (this.getThemeConfig.layout === 'columns') {
         } else if (this.getThemeConfig.layout === 'columns') {
           themeSelect['--prev-bg-topBar'] = '#fff';
           themeSelect['--prev-bg-topBar'] = '#fff';
           themeSelect['--prev-bg-topBarColor'] = '#515a6e';
           themeSelect['--prev-bg-topBarColor'] = '#515a6e';
@@ -370,15 +372,19 @@ export default {
           if (val == 'theme-1') {
           if (val == 'theme-1') {
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#e8f4ff';
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#e8f4ff';
             themeSelect['--prev-color-primary'] = '#1890ff';
             themeSelect['--prev-color-primary'] = '#1890ff';
+            themeSelect['--prev-MenuActiveColor'] = '#1890ff';
           } else if (val == 'theme-3') {
           } else if (val == 'theme-3') {
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#ecf8f3';
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#ecf8f3';
             themeSelect['--prev-color-primary'] = '#41b584';
             themeSelect['--prev-color-primary'] = '#41b584';
+            themeSelect['--prev-MenuActiveColor'] = '#fff';
           } else if (val == 'theme-5') {
           } else if (val == 'theme-5') {
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#f0eefe';
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#f0eefe';
             themeSelect['--prev-color-primary'] = '#6954f0';
             themeSelect['--prev-color-primary'] = '#6954f0';
+            themeSelect['--prev-MenuActiveColor'] = '#6954f0';
           } else if (val == 'theme-7') {
           } else if (val == 'theme-7') {
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#feedeb';
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#feedeb';
             themeSelect['--prev-color-primary'] = '#f34d37';
             themeSelect['--prev-color-primary'] = '#f34d37';
+            themeSelect['--prev-MenuActiveColor'] = '#f34d37';
           }
           }
         } else {
         } else {
           if (val == 'theme-1') {
           if (val == 'theme-1') {
@@ -393,20 +399,22 @@ export default {
             themeSelect['--prev-bg-menuBar'] = '#282c34';
             themeSelect['--prev-bg-menuBar'] = '#282c34';
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#41b584';
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#41b584';
             themeSelect['--prev-color-primary'] = '#fff';
             themeSelect['--prev-color-primary'] = '#fff';
-            themeSelect['--prev-bg-topBarColor'] = '#515a6e';
+            themeSelect['--prev-bg-topBar'] = '#fff';
+            themeSelect['--prev-bg-topBarColor'] = '#282c34';
             themeSelect['--prev-bg-menuBarColor'] = '#fff';
             themeSelect['--prev-bg-menuBarColor'] = '#fff';
             themeSelect['--prev-MenuActiveColor'] = '#fff';
             themeSelect['--prev-MenuActiveColor'] = '#fff';
           } else if (val == 'theme-5') {
           } else if (val == 'theme-5') {
             themeSelect['--prev-bg-menuBar'] = '#282c34';
             themeSelect['--prev-bg-menuBar'] = '#282c34';
-            themeSelect['--prev-bg-topBarColor'] = '#282c34';
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#6954f0';
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#6954f0';
+            themeSelect['--prev-bg-topBarColor'] = '#282c34';
             themeSelect['--prev-color-primary'] = '#fff';
             themeSelect['--prev-color-primary'] = '#fff';
             themeSelect['--prev-bg-menuBarColor'] = '#fff';
             themeSelect['--prev-bg-menuBarColor'] = '#fff';
             themeSelect['--prev-MenuActiveColor'] = '#fff';
             themeSelect['--prev-MenuActiveColor'] = '#fff';
           } else if (val == 'theme-7') {
           } else if (val == 'theme-7') {
             themeSelect['--prev-bg-menuBar'] = '#282c34';
             themeSelect['--prev-bg-menuBar'] = '#282c34';
-            themeSelect['--prev-bg-topBarColor'] = '#515a6e';
-            themeSelect['--prev-bg-menu-hover-ba-color'] = '#f34d37'; 
+            themeSelect['--prev-bg-topBar'] = '#fff';
+            themeSelect['--prev-bg-topBarColor'] = '#282c34';
+            themeSelect['--prev-bg-menu-hover-ba-color'] = '#f34d37';
             themeSelect['--prev-color-primary'] = '#fff';
             themeSelect['--prev-color-primary'] = '#fff';
             themeSelect['--prev-bg-menuBarColor'] = '#fff';
             themeSelect['--prev-bg-menuBarColor'] = '#fff';
             themeSelect['--prev-MenuActiveColor'] = '#fff';
             themeSelect['--prev-MenuActiveColor'] = '#fff';

+ 1 - 0
template/admin/src/theme/app.scss

@@ -37,6 +37,7 @@
   --prev-border-color-lighter: #ebeef5;
   --prev-border-color-lighter: #ebeef5;
   --prev-border-color-extra-light: #f2f6fc;
   --prev-border-color-extra-light: #f2f6fc;
   --prev-tag-active-color: #fff;
   --prev-tag-active-color: #fff;
+  --prev-MenuActiveColor: #fff;
 }
 }
 
 
 html,
 html,

+ 4 - 1
template/admin/src/theme/element.scss

@@ -154,7 +154,7 @@
   color: var(--prev-MenuActiveColor) !important;
   color: var(--prev-MenuActiveColor) !important;
   background-color: var(--prev-bg-menu-hover-ba-color) !important;
   background-color: var(--prev-bg-menu-hover-ba-color) !important;
   i {
   i {
-    color: var(--prev-MenuActiveColor) !important;
+    color: var(--prev-color-primary) !important;
   }
   }
 }
 }
 // 鼠标 hover 时颜色
 // 鼠标 hover 时颜色
@@ -165,6 +165,9 @@
 .el-menu-item.is-active {
 .el-menu-item.is-active {
   color: var(--prev-MenuActiveColor) !important;
   color: var(--prev-MenuActiveColor) !important;
   //   background-color: var(--prev-bg-menu-hover-ba-color) !important;
   //   background-color: var(--prev-bg-menu-hover-ba-color) !important;
+  .el-submenu__title i {
+    color: var(--prev-color-primary) !important;
+  }
 }
 }
 .el-menu-item.is-active,
 .el-menu-item.is-active,
 .el-sub-menu.is-active .el-sub-menu__title,
 .el-sub-menu.is-active .el-sub-menu__title,