From 6dcfd0e85530d9bdac0d1e67829a5b92267db8d9 Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Sat, 9 Oct 2021 15:14:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=A2=98=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Vue/package.json                           |  2 +-
 ZR.Vue/src/components/ThemePicker/index.vue   |  1 +
 ZR.Vue/src/components/TopNav/index.vue        |  2 +-
 .../src/layout/components/Settings/index.vue  |  1 -
 ZR.Vue/src/layout/index.vue                   | 44 ++++++++++---------
 ZR.Vue/src/settings.js                        |  4 ++
 ZR.Vue/src/store/modules/settings.js          |  6 +--
 ZR.Vue/src/views/login.vue                    | 10 +++--
 ZR.Vue/src/views/system/menu/index.vue        | 25 +++++++++--
 9 files changed, 61 insertions(+), 34 deletions(-)

diff --git a/ZR.Vue/package.json b/ZR.Vue/package.json
index fce507a..87b4cd3 100644
--- a/ZR.Vue/package.json
+++ b/ZR.Vue/package.json
@@ -58,7 +58,7 @@
     "babel-eslint": "10.1.0",
     "babel-jest": "23.6.0",
     "babel-plugin-dynamic-import-node": "2.3.3",
-    "chalk": "2.4.2",
+    "chalk": "4.1.0",
     "chokidar": "2.1.5",
     "connect": "3.6.6",
     "eslint": "6.7.2",
diff --git a/ZR.Vue/src/components/ThemePicker/index.vue b/ZR.Vue/src/components/ThemePicker/index.vue
index bf13c28..d8f9d1e 100644
--- a/ZR.Vue/src/components/ThemePicker/index.vue
+++ b/ZR.Vue/src/components/ThemePicker/index.vue
@@ -42,6 +42,7 @@ export default {
 
   methods: {
     async setTheme(val) {
+      console.log('%c setTheme Color','color:' + val)
       const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
       if (typeof val !== 'string') return
       const themeCluster = this.getThemeCluster(val.replace('#', ''))
diff --git a/ZR.Vue/src/components/TopNav/index.vue b/ZR.Vue/src/components/TopNav/index.vue
index 8cc019e..32358ef 100644
--- a/ZR.Vue/src/components/TopNav/index.vue
+++ b/ZR.Vue/src/components/TopNav/index.vue
@@ -8,7 +8,7 @@
     </template>
 
     <!-- 顶部菜单超出数量折叠 -->
-    <el-submenu index="more" v-if="topMenus.length > visibleNumber">
+    <el-submenu :style="{'--theme': theme}" index="more" v-if="topMenus.length > visibleNumber">
       <template slot="title">更多菜单</template>
       <template v-for="(item, index) in topMenus">
         <el-menu-item :index="item.path" :key="index" v-if="index >= visibleNumber">
diff --git a/ZR.Vue/src/layout/components/Settings/index.vue b/ZR.Vue/src/layout/components/Settings/index.vue
index 895042e..a5dc190 100644
--- a/ZR.Vue/src/layout/components/Settings/index.vue
+++ b/ZR.Vue/src/layout/components/Settings/index.vue
@@ -135,7 +135,6 @@ export default {
             "theme":"${this.theme}"
           }`
       );
-      this.msgSuccess("保存成功");
       setTimeout(loading.close(), 2000);
     },
     resetSetting() {
diff --git a/ZR.Vue/src/layout/index.vue b/ZR.Vue/src/layout/index.vue
index 330b460..fb51949 100644
--- a/ZR.Vue/src/layout/index.vue
+++ b/ZR.Vue/src/layout/index.vue
@@ -16,47 +16,51 @@
 </template>
 
 <script>
-import RightPanel from '@/components/RightPanel'
-import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import { mapState } from 'vuex'
+import RightPanel from "@/components/RightPanel";
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from "./components";
+import ResizeMixin from "./mixin/ResizeHandler";
+import { mapState } from "vuex";
+import variables from "@/assets/styles/variables.scss";
 
 export default {
-  name: 'Layout',
+  name: "Layout",
   components: {
     AppMain,
     Navbar,
     RightPanel,
     Settings,
     Sidebar,
-    TagsView
+    TagsView,
   },
   mixins: [ResizeMixin],
   computed: {
     ...mapState({
-      theme: state => state.settings.theme,
-      sideTheme: state => state.settings.sideTheme,
-      sidebar: state => state.app.sidebar,
-      device: state => state.app.device,
-      showSettings: state => state.settings.showSettings,
-      needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader
+      theme: (state) => state.settings.theme,
+      sideTheme: (state) => state.settings.sideTheme,
+      sidebar: (state) => state.app.sidebar,
+      device: (state) => state.app.device,
+      showSettings: (state) => state.settings.showSettings,
+      needTagsView: (state) => state.settings.tagsView,
+      fixedHeader: (state) => state.settings.fixedHeader,
     }),
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
+        mobile: this.device === "mobile",
+      };
+    },
+    variables() {
+      return variables;
+    },
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
-    }
-  }
-}
+      this.$store.dispatch("app/closeSideBar", { withoutAnimation: false });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/ZR.Vue/src/settings.js b/ZR.Vue/src/settings.js
index 2728c75..1a1fb56 100644
--- a/ZR.Vue/src/settings.js
+++ b/ZR.Vue/src/settings.js
@@ -1,5 +1,9 @@
 module.exports = {
   title: 'ZrAdmin.NET',
+  /**
+   * 主题颜色
+   */
+  theme: '#409EFF',
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
    */
diff --git a/ZR.Vue/src/store/modules/settings.js b/ZR.Vue/src/store/modules/settings.js
index 8e90e89..978c024 100644
--- a/ZR.Vue/src/store/modules/settings.js
+++ b/ZR.Vue/src/store/modules/settings.js
@@ -1,11 +1,11 @@
 import defaultSettings from '@/settings'
 
-const { sideTheme, showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings
+const { theme, sideTheme, showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings
 
 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
 const state = {
-  theme: storageSetting.theme || '#409EFF',
-  sideTheme: storageSetting.sideTheme || sideTheme,
+  theme: storageSetting.theme || theme,//主题颜色
+  sideTheme: storageSetting.sideTheme || sideTheme,//侧边主题样式
   showSettings: showSettings,
   tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
   fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
diff --git a/ZR.Vue/src/views/login.vue b/ZR.Vue/src/views/login.vue
index 38c059e..213211c 100644
--- a/ZR.Vue/src/views/login.vue
+++ b/ZR.Vue/src/views/login.vue
@@ -149,18 +149,20 @@ export default {
   height: 100%;
   // background-image: url("../assets/image/login-background.jpg");
   background-size: cover;
-  background-color: #2d3a4b;
+  background-color: rgba(56,157,170,.82);
 }
 .title {
   margin: 0px auto 30px auto;
   text-align: center;
-  color: #707070;
+  // color: #707070;
+  color: #fff;
 }
 
 .login-form {
   border-radius: 6px;
-  background: #ffffff;
-  width: 400px;
+  // background: #ffffff;
+  background-color: hsla(0,0%,100%,.3);
+  width: 350px;
   padding: 25px 25px 5px 25px;
   .el-input {
     height: 38px;
diff --git a/ZR.Vue/src/views/system/menu/index.vue b/ZR.Vue/src/views/system/menu/index.vue
index dc1d0f2..1388f79 100644
--- a/ZR.Vue/src/views/system/menu/index.vue
+++ b/ZR.Vue/src/views/system/menu/index.vue
@@ -18,12 +18,17 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']">新增</el-button>
-        <el-button type="primary" plain icon="el-icon-edit" size="mini" @click="handleShowSort" v-hasPermi="['system:menu:changeSort']">修改排序</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="el-icon-edit" size="mini" @click="handleShowSort" v-hasPermi="['system:menu:changeSort']">修改排序</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="menuList" row-key="menuId" border :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+    <el-table v-if="refreshTable" v-loading="loading" :data="menuList" :default-expand-all="isExpandAll" row-key="menuId" border :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
       <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
       <el-table-column prop="icon" label="图标" align="center" width="80">
         <template slot-scope="scope">
@@ -50,8 +55,8 @@
       <el-table-column prop="visible" label="显示" :formatter="visibleFormat" width="70"></el-table-column>
       <el-table-column prop="status" label="状态" width="70">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.status === '0'" >正常</el-tag>
-          <el-tag type="warning" v-else >停用</el-tag>
+          <el-tag v-if="scope.row.status === '0'">正常</el-tag>
+          <el-tag type="warning" v-else>停用</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center">
@@ -229,6 +234,10 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否展开，默认全部折叠
+      isExpandAll: false,
+      // 重新渲染表格状态
+      refreshTable: true,
       // 显示状态数据字典
       visibleOptions: [],
       // 菜单状态数据字典
@@ -424,6 +433,14 @@ export default {
     handleShowSort() {
       this.showEditSort = !this.showEditSort;
     },
+    //展开/折叠操作
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
   },
 };
 </script>