From e7df7ebaed5a8bd6bf8d289359bcb6c96ba243eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B0=B4=E8=90=BD=28YangLei=29?= <lzi.love@icloud.com>
Date: Sat, 3 Jul 2021 16:22:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                   |   3 +-
 .../frame/components/setting/Setting.vue      | 124 +++++++++++++-----
 src/pages/frame/layouts/AdminLayout.vue       |   1 +
 src/pages/home/index.js                       |   3 +
 src/pages/system/view/log/login_log/index.js  |   3 +
 src/router/index.js                           |  32 +++--
 6 files changed, 116 insertions(+), 50 deletions(-)
 create mode 100644 src/pages/home/index.js
 create mode 100644 src/pages/system/view/log/login_log/index.js

diff --git a/src/main.js b/src/main.js
index 32eb188..19ea87b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -33,8 +33,7 @@ const store = new Vuex.Store({
 
 //装载vue-router控件 如果开发时 不用动态可直接修改这里 isAsynRount=false
 Vue.use(Router);
-const isAsynRount = store.state.settingModule.asyncRoutes;
-const options = initRouter(isAsynRount);
+const options = initRouter();
 const router = new Router(options);
 
 //装载vue-i18n控件 如果语言优先级 请直接修改这里localeLang和fallbackLang
diff --git a/src/pages/frame/components/setting/Setting.vue b/src/pages/frame/components/setting/Setting.vue
index e75ee2b..f6622fe 100644
--- a/src/pages/frame/components/setting/Setting.vue
+++ b/src/pages/frame/components/setting/Setting.vue
@@ -1,44 +1,84 @@
 <template>
     <div class="side-setting">
         <setting-item>
-            <a-button @click="saveSetting" type="primary" icon="save">{{$t('save')}}</a-button>
-            <a-button @click="resetSetting" type="dashed" icon="redo" style="float: right">{{$t('reset')}}</a-button>
+            <a-button @click="saveSetting" type="primary" icon="save">{{ $t('save') }}</a-button>
+            <a-button @click="resetSetting" type="dashed" icon="redo" style="float: right">
+                {{ $t('reset') }}
+            </a-button>
         </setting-item>
         <setting-item :title="$t('theme.title')">
-            <img-checkbox-group @change="values => setTheme({...theme, mode: values[0]})" :default-values="[theme.mode]">
-                <img-checkbox :title="$t('theme.dark')" img="https://gw.alipayobjects.com/zos/rmsportal/LCkqqYNmvBEbokSDscrm.svg" value="dark" />
-                <img-checkbox :title="$t('theme.light')" img="https://gw.alipayobjects.com/zos/rmsportal/jpRkZQMyYRryryPNtyIC.svg" value="light" />
-                <img-checkbox :title="$t('theme.night')" img="https://gw.alipayobjects.com/zos/antfincdn/hmKaLQvmY2/LCkqqYNmvBEbokSDscrm.svg" value="night" />
+            <img-checkbox-group
+                @change="values => setTheme({ ...theme, mode: values[0] })"
+                :default-values="[theme.mode]"
+            >
+                <img-checkbox
+                    :title="$t('theme.dark')"
+                    img="https://gw.alipayobjects.com/zos/rmsportal/LCkqqYNmvBEbokSDscrm.svg"
+                    value="dark"
+                />
+                <img-checkbox
+                    :title="$t('theme.light')"
+                    img="https://gw.alipayobjects.com/zos/rmsportal/jpRkZQMyYRryryPNtyIC.svg"
+                    value="light"
+                />
             </img-checkbox-group>
         </setting-item>
         <setting-item :title="$t('theme.color')">
-            <color-checkbox-group @change="(values, colors) => setTheme({...theme, color: colors[0]})" :defaultValues="[palettes.indexOf(theme.color)]" :multiple="false">
-                <color-checkbox v-for="(color, index) in palettes" :key="index" :color="color" :value="index" />
+            <color-checkbox-group
+                @change="(values, colors) => setTheme({ ...theme, color: colors[0] })"
+                :defaultValues="[palettes.indexOf(theme.color)]"
+                :multiple="false"
+            >
+                <color-checkbox
+                    v-for="(color, index) in palettes"
+                    :key="index"
+                    :color="color"
+                    :value="index"
+                />
             </color-checkbox-group>
         </setting-item>
         <a-divider />
         <setting-item :title="$t('navigate.title')">
             <img-checkbox-group @change="values => setLayout(values[0])" :default-values="[layout]">
-                <img-checkbox :title="$t('navigate.side')" img="https://gw.alipayobjects.com/zos/rmsportal/JopDzEhOqwOjeNTXkoje.svg" value="side" />
-                <img-checkbox :title="$t('navigate.head')" img="https://gw.alipayobjects.com/zos/rmsportal/KDNDBbriJhLwuqMoxcAr.svg" value="head" />
-                <img-checkbox :title="$t('navigate.mix')" img="https://gw.alipayobjects.com/zos/antfincdn/x8Ob%26B8cy8/LCkqqYNmvBEbokSDscrm.svg" value="mix" />
+                <img-checkbox
+                    :title="$t('navigate.side')"
+                    img="https://gw.alipayobjects.com/zos/rmsportal/JopDzEhOqwOjeNTXkoje.svg"
+                    value="side"
+                />
+                <img-checkbox
+                    :title="$t('navigate.head')"
+                    img="https://gw.alipayobjects.com/zos/rmsportal/KDNDBbriJhLwuqMoxcAr.svg"
+                    value="head"
+                />
+                <img-checkbox
+                    :title="$t('navigate.mix')"
+                    img="https://gw.alipayobjects.com/zos/antfincdn/x8Ob%26B8cy8/LCkqqYNmvBEbokSDscrm.svg"
+                    value="mix"
+                />
             </img-checkbox-group>
         </setting-item>
         <setting-item>
             <a-list :split="false">
                 <a-list-item>
-                    {{$t('navigate.content.title')}}
-                    <a-select :getPopupContainer="getPopupContainer" :value="pageWidth" @change="setPageWidth" class="select-item" size="small" slot="actions">
-                        <a-select-option value="fluid">{{$t('navigate.content.fluid')}}</a-select-option>
-                        <a-select-option value="fixed">{{$t('navigate.content.fixed')}}</a-select-option>
+                    {{ $t('navigate.content.title') }}
+                    <a-select
+                        :getPopupContainer="getPopupContainer"
+                        :value="pageWidth"
+                        @change="setPageWidth"
+                        class="select-item"
+                        size="small"
+                        slot="actions"
+                    >
+                        <a-select-option value="fluid">{{ $t('navigate.content.fluid') }}</a-select-option>
+                        <a-select-option value="fixed">{{ $t('navigate.content.fixed') }}</a-select-option>
                     </a-select>
                 </a-list-item>
                 <a-list-item>
-                    {{$t('navigate.fixedHeader')}}
+                    {{ $t('navigate.fixedHeader') }}
                     <a-switch :checked="fixedHeader" slot="actions" size="small" @change="setFixedHeader" />
                 </a-list-item>
                 <a-list-item>
-                    {{$t('navigate.fixedSideBar')}}
+                    {{ $t('navigate.fixedSideBar') }}
                     <a-switch :checked="fixedSideBar" slot="actions" size="small" @change="setFixedSideBar" />
                 </a-list-item>
             </a-list>
@@ -47,11 +87,11 @@
         <setting-item :title="$t('other.title')">
             <a-list :split="false">
                 <a-list-item>
-                    {{$t('other.multiPages')}}
+                    {{ $t('other.multiPages') }}
                     <a-switch :checked="multiPage" slot="actions" size="small" @change="setMultiPage" />
                 </a-list-item>
                 <a-list-item>
-                    {{$t('other.hideSetting')}}
+                    {{ $t('other.hideSetting') }}
                     <a-switch :checked="hideSetting" slot="actions" size="small" @change="setHideSetting" />
                 </a-list-item>
             </a-list>
@@ -60,24 +100,46 @@
         <setting-item :title="$t('animate.title')">
             <a-list :split="false">
                 <a-list-item>
-                    {{$t('animate.disable')}}
-                    <a-switch :checked="animate.disabled" slot="actions" size="small" @change="val => setAnimate({...animate, disabled: val})" />
+                    {{ $t('animate.disable') }}
+                    <a-switch
+                        :checked="animate.disabled"
+                        slot="actions"
+                        size="small"
+                        @change="val => setAnimate({ ...animate, disabled: val })"
+                    />
                 </a-list-item>
                 <a-list-item>
-                    {{$t('animate.effect')}}
-                    <a-select :value="animate.name" :getPopupContainer="getPopupContainer" @change="val => setAnimate({...animate, name: val})" class="select-item" size="small" slot="actions">
-                        <a-select-option :key="index" :value="item.name" v-for="(item, index) in animates">{{item.alias}}</a-select-option>
+                    {{ $t('animate.effect') }}
+                    <a-select
+                        :value="animate.name"
+                        :getPopupContainer="getPopupContainer"
+                        @change="val => setAnimate({ ...animate, name: val })"
+                        class="select-item"
+                        size="small"
+                        slot="actions"
+                    >
+                        <a-select-option :key="index" :value="item.name" v-for="(item, index) in animates">{{
+                            item.alias
+                        }}</a-select-option>
                     </a-select>
                 </a-list-item>
                 <a-list-item>
-                    {{$t('animate.direction')}}
-                    <a-select :value="animate.direction" :getPopupContainer="getPopupContainer" @change="val => setAnimate({...animate, direction: val})" class="select-item" size="small" slot="actions">
-                        <a-select-option :key="index" :value="item" v-for="(item, index) in directions">{{item}}</a-select-option>
+                    {{ $t('animate.direction') }}
+                    <a-select
+                        :value="animate.direction"
+                        :getPopupContainer="getPopupContainer"
+                        @change="val => setAnimate({ ...animate, direction: val })"
+                        class="select-item"
+                        size="small"
+                        slot="actions"
+                    >
+                        <a-select-option :key="index" :value="item" v-for="(item, index) in directions">{{
+                            item
+                        }}</a-select-option>
                     </a-select>
                 </a-list-item>
             </a-list>
         </setting-item>
-
     </div>
 </template>
 
@@ -176,7 +238,7 @@ export default {
     },
     computed: {
         directions() {
-            return this.animates.find((item) => item.name == this.animate.name).directions;
+            return this.animates.find(item => item.name == this.animate.name).directions;
         },
         ...mapState('settingModule', [
             'theme',
@@ -192,7 +254,7 @@ export default {
         ]),
     },
     watch: {
-        'animate.name': function (val) {
+        'animate.name': function(val) {
             this.setAnimate({ name: val, direction: this.directions[0] });
         },
     },
@@ -220,7 +282,7 @@ export default {
             let config = {};
             let mySetting = this.$store.state.settingModule;
             let dftSetting = local ? settingConfig : settingConfig;
-            Object.keys(mySetting).forEach((key) => {
+            Object.keys(mySetting).forEach(key => {
                 const dftValue = dftSetting[key],
                     myValue = mySetting[key];
                 if (dftValue != undefined && !fastEqual(dftValue, myValue)) {
diff --git a/src/pages/frame/layouts/AdminLayout.vue b/src/pages/frame/layouts/AdminLayout.vue
index ad47f97..3995470 100644
--- a/src/pages/frame/layouts/AdminLayout.vue
+++ b/src/pages/frame/layouts/AdminLayout.vue
@@ -170,6 +170,7 @@ export default {
 
 <style lang="less" scoped>
 .admin-layout {
+    height: 100%;
     .side-menu {
         &.fixed-side {
             position: fixed;
diff --git a/src/pages/home/index.js b/src/pages/home/index.js
new file mode 100644
index 0000000..946277d
--- /dev/null
+++ b/src/pages/home/index.js
@@ -0,0 +1,3 @@
+import Home from './index.vue';
+
+export default Home;
diff --git a/src/pages/system/view/log/login_log/index.js b/src/pages/system/view/log/login_log/index.js
new file mode 100644
index 0000000..01758dd
--- /dev/null
+++ b/src/pages/system/view/log/login_log/index.js
@@ -0,0 +1,3 @@
+import LoginLog from './index.vue';
+
+export default LoginLog;
diff --git a/src/router/index.js b/src/router/index.js
index d0a8df5..ce84d89 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,19 +1,18 @@
 import syncConfig from './config';
-import asyncConfig from './async/config.async';
 import { formatRoutes } from '../utils/routerUtil';
 
 // 不需要登录拦截的路由配置
 const loginIgnore = {
-  names: ['404', '403'],      //根据路由名称匹配
-  paths: ['/login'],   //根据路由fullPath匹配
-  /**
-   * 判断路由是否包含在该配置中
-   * @param route vue-router 的 route 对象
-   * @returns {boolean}
-   */
-  includes(route) {
-    return this.names.includes(route.name) || this.paths.includes(route.path)
-  }
+    names: ['404', '403'], //根据路由名称匹配
+    paths: ['/login'], //根据路由fullPath匹配
+    /**
+     * 判断路由是否包含在该配置中
+     * @param route vue-router 的 route 对象
+     * @returns {boolean}
+     */
+    includes(route) {
+        return this.names.includes(route.name) || this.paths.includes(route.path);
+    },
 };
 
 /**
@@ -21,11 +20,10 @@ const loginIgnore = {
  * @param isAsync 是否异步路由模式
  * @returns {options.routes}
  */
-function initRouter(isAsync) {
-  const options = isAsync ? asyncConfig : syncConfig;
-  formatRoutes(options.routes);
-  return options;
+function initRouter() {
+    const options = syncConfig;
+    formatRoutes(options.routes);
+    return options;
 }
 
-
-export {loginIgnore , initRouter}
+export { loginIgnore, initRouter };
-- 
GitLab