From 576150386b5bd7eec08a6628ab7aa37c8e100c00 Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Sat, 13 Feb 2021 15:37:26 +0800
Subject: [PATCH] chore: update layout

---
 CHANGELOG.zh_CN.md                            |  1 +
 .../Application/src/AppLocalePicker.vue       |  1 +
 src/layouts/default/feature/index.vue         |  5 +---
 src/layouts/default/header/index.less         | 15 ++++++------
 src/layouts/default/header/index.vue          | 14 ++++++++---
 src/layouts/default/setting/index.vue         | 23 -------------------
 6 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 2363d54f..996cf9e4 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -9,6 +9,7 @@
 ### ⚡ Performance Improvements
 
 - 调整获取用户信息接口返回值为数组格式
+- 将 error-log 列表固定为系统路由
 
 ### 🐛 Bug Fixes
 
diff --git a/src/components/Application/src/AppLocalePicker.vue b/src/components/Application/src/AppLocalePicker.vue
index 644d2941..22668067 100644
--- a/src/components/Application/src/AppLocalePicker.vue
+++ b/src/components/Application/src/AppLocalePicker.vue
@@ -4,6 +4,7 @@
 -->
 <template>
   <Dropdown
+    placement="bottomCenter"
     :trigger="['click']"
     :dropMenuList="localeList"
     :selectedKeys="selectedKeys"
diff --git a/src/layouts/default/feature/index.vue b/src/layouts/default/feature/index.vue
index 50693761..16b53b19 100644
--- a/src/layouts/default/feature/index.vue
+++ b/src/layouts/default/feature/index.vue
@@ -1,7 +1,6 @@
 <template>
   <LayoutLockPage />
   <BackTop v-if="getUseOpenBackTop" :target="getTarget" />
-  <SettingDrawer v-if="getShowSettingButton" />
 </template>
 <script lang="ts">
   import { defineComponent } from 'vue';
@@ -14,15 +13,13 @@
     components: {
       BackTop,
       LayoutLockPage: createAsyncComponent(() => import('/@/views/sys/lock/index.vue')),
-      SettingDrawer: createAsyncComponent(() => import('/@/layouts/default/setting/index.vue')),
     },
     setup() {
-      const { getUseOpenBackTop, getShowSettingButton } = useRootSetting();
+      const { getUseOpenBackTop } = useRootSetting();
 
       return {
         getTarget: () => document.body,
         getUseOpenBackTop,
-        getShowSettingButton,
       };
     },
   });
diff --git a/src/layouts/default/header/index.less b/src/layouts/default/header/index.less
index cc1a6403..c079dc27 100644
--- a/src/layouts/default/header/index.less
+++ b/src/layouts/default/header/index.less
@@ -1,6 +1,5 @@
 @header-trigger-prefix-cls: ~'@{namespace}-layout-header-trigger';
 @header-prefix-cls: ~'@{namespace}-layout-header';
-@locale-prefix-cls: ~'@{namespace}-app-locale-picker';
 @breadcrumb-prefix-cls: ~'@{namespace}-layout-breadcrumb';
 @logo-prefix-cls: ~'@{namespace}-app-logo';
 
@@ -104,7 +103,7 @@
   &-action {
     display: flex;
     min-width: 180px;
-    padding-right: 12px;
+    // padding-right: 12px;
     align-items: center;
 
     &__item {
@@ -146,13 +145,15 @@
 
     .@{header-prefix-cls}-action {
       &__item {
-        &:hover {
-          background: @header-light-bg-hover-color;
+        color: @text-color-base;
+
+        .app-iconify {
+          padding: 0 10px;
+          font-size: 16px !important;
         }
 
-        .@{locale-prefix-cls} {
-          padding: 0 6px;
-          color: rgba(0, 0, 0, 0.65);
+        &:hover {
+          background: @header-light-bg-hover-color;
         }
       }
 
diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue
index b2eaa4af..c84bf1e7 100644
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@@ -41,14 +41,16 @@
 
       <FullScreen v-if="getShowFullScreen" :class="`${prefixCls}-action__item fullscreen-item`" />
 
-      <UserDropDown :theme="getHeaderTheme" />
-
       <AppLocalePicker
         v-if="getShowLocale"
         :reload="true"
         :showText="false"
         :class="`${prefixCls}-action__item`"
       />
+
+      <UserDropDown :theme="getHeaderTheme" />
+
+      <SettingDrawer v-if="getShowSettingButton" :class="`${prefixCls}-action__item`" />
     </div>
   </Header>
 </template>
@@ -76,6 +78,8 @@
   import { useAppInject } from '/@/hooks/web/useAppInject';
   import { useDesign } from '/@/hooks/web/useDesign';
 
+  import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
+
   export default defineComponent({
     name: 'LayoutHeader',
     components: {
@@ -90,6 +94,9 @@
       Notify,
       AppSearch,
       ErrorAction,
+      SettingDrawer: createAsyncComponent(() => import('/@/layouts/default/setting/index.vue'), {
+        loading: true,
+      }),
     },
     props: {
       fixed: propTypes.bool,
@@ -105,7 +112,7 @@
         getIsMixSidebar,
       } = useMenuSetting();
       const { getShowLocale } = useLocaleSetting();
-      const { getUseErrorHandle } = useRootSetting();
+      const { getUseErrorHandle, getShowSettingButton } = useRootSetting();
 
       const {
         getHeaderTheme,
@@ -167,6 +174,7 @@
         getUseErrorHandle,
         getLogoWidth,
         getIsMixSidebar,
+        getShowSettingButton,
       };
     },
   });
diff --git a/src/layouts/default/setting/index.vue b/src/layouts/default/setting/index.vue
index 8ad7a8c9..68dd3acf 100644
--- a/src/layouts/default/setting/index.vue
+++ b/src/layouts/default/setting/index.vue
@@ -27,26 +27,3 @@
     },
   });
 </script>
-<style lang="less">
-  @prefix-cls: ~'@{namespace}-setting-button';
-
-  .@{prefix-cls} {
-    position: absolute;
-    top: 45%;
-    right: 0;
-    z-index: 10;
-    display: flex;
-    padding: 10px;
-    color: @white;
-    cursor: pointer;
-    background: @primary-color;
-    border-radius: 6px 0 0 6px;
-    justify-content: center;
-    align-items: center;
-
-    svg {
-      width: 1em;
-      height: 1em;
-    }
-  }
-</style>
-- 
GitLab