From 349d1978b154f6e9e74e36de7cc56a2ca261d0b0 Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Thu, 22 Oct 2020 00:14:11 +0800
Subject: [PATCH] fix: fix missing page refresh parameters

---
 src/components/Breadcrumb/Breadcrumb.vue      |  2 +-
 src/components/Form/src/BasicForm.vue         |  2 +-
 src/components/Menu/src/index.less            |  4 +--
 src/design/var/index.less                     |  2 +-
 src/hooks/web/useTabs.ts                      | 14 +++++++--
 src/layouts/default/LayoutHeader.tsx          | 14 +++------
 .../actions/notice/NoticeActionItem.vue       | 31 ++++++++++---------
 src/layouts/default/index.less                | 18 +++++++----
 src/layouts/default/multitabs/index.less      | 17 ++++++++++
 src/layouts/default/multitabs/index.tsx       | 14 ++++++++-
 src/settings/projectSetting.ts                |  2 +-
 11 files changed, 81 insertions(+), 39 deletions(-)

diff --git a/src/components/Breadcrumb/Breadcrumb.vue b/src/components/Breadcrumb/Breadcrumb.vue
index b37bd043..f57849fd 100644
--- a/src/components/Breadcrumb/Breadcrumb.vue
+++ b/src/components/Breadcrumb/Breadcrumb.vue
@@ -37,7 +37,7 @@
   .breadcrumb {
     height: @header-height;
     padding-right: 20px;
-    font-size: 14px;
+    font-size: 12px;
     line-height: @header-height;
     // line-height: 1;
 
diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue
index 41727c57..0288bd85 100644
--- a/src/components/Form/src/BasicForm.vue
+++ b/src/components/Form/src/BasicForm.vue
@@ -74,7 +74,7 @@
 
       const getMergePropsRef = computed(
         (): FormProps => {
-          return deepMerge(props, unref(propsRef));
+          return deepMerge(cloneDeep(props), unref(propsRef));
         }
       );
       // 获取表单基本配置
diff --git a/src/components/Menu/src/index.less b/src/components/Menu/src/index.less
index 09c63c62..e6fcec7c 100644
--- a/src/components/Menu/src/index.less
+++ b/src/components/Menu/src/index.less
@@ -118,7 +118,7 @@
         .ant-menu-submenu-open,
         .ant-menu-item-selected,
         .ant-menu-submenu-selected {
-          color: @white !important;
+          color: @primary-color !important;
           border-bottom: 3px solid @primary-color;
         }
 
@@ -127,7 +127,7 @@
         .ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open,
         .ant-menu-submenu-active,
         .ant-menu-submenu-title:hover {
-          color: @white !important;
+          color: @primary-color !important;
           border-bottom: 3px solid @primary-color;
         }
 
diff --git a/src/design/var/index.less b/src/design/var/index.less
index cc256f46..a9736c91 100644
--- a/src/design/var/index.less
+++ b/src/design/var/index.less
@@ -6,7 +6,7 @@
 @multiple-height: 36px;
 
 // headers
-@header-height: 42px;
+@header-height: 36px;
 
 // logo width
 @logo-width: 40px;
diff --git a/src/hooks/web/useTabs.ts b/src/hooks/web/useTabs.ts
index 02e5a1e4..7199ec71 100644
--- a/src/hooks/web/useTabs.ts
+++ b/src/hooks/web/useTabs.ts
@@ -90,15 +90,25 @@ export function useTabs() {
     closeOther: () => canIUseFn() && closeOther(tabStore.getCurrentTab),
     closeCurrent: () => canIUseFn() && closeCurrent(tabStore.getCurrentTab),
     resetCache: () => canIUseFn() && resetCache(),
-    addTab: (path: PageEnum, goTo = false, replace = false) => {
+    addTab: (
+      path: PageEnum | string,
+      goTo = false,
+      opt?: { replace?: boolean; query?: any; params?: any }
+    ) => {
       const to = getTo(path);
 
       if (!to) return;
       useTimeout(() => {
         tabStore.addTabByPathAction();
       }, 0);
+      const { replace, query = {}, params = {} } = opt || {};
       activeKeyRef.value = path;
-      goTo && replace ? router.replace : router.push(path);
+      const data = {
+        path,
+        query,
+        params,
+      };
+      goTo && replace ? router.replace(data) : router.push(data);
     },
     activeKeyRef,
   };
diff --git a/src/layouts/default/LayoutHeader.tsx b/src/layouts/default/LayoutHeader.tsx
index dad20dcc..709cda28 100644
--- a/src/layouts/default/LayoutHeader.tsx
+++ b/src/layouts/default/LayoutHeader.tsx
@@ -20,7 +20,6 @@ import { GITHUB_URL } from '/@/settings/siteSetting';
 import LockAction from './actions/LockActionItem';
 import { useModal } from '/@/components/Modal/index';
 import { errorStore } from '/@/store/modules/error';
-import { useGo } from '/@/hooks/web/usePage';
 import { useWindowSizeFn } from '/@/hooks/event/useWindowSize';
 import NoticeAction from './actions/notice/NoticeActionItem.vue';
 
@@ -28,11 +27,10 @@ export default defineComponent({
   name: 'DefaultLayoutHeader',
   setup() {
     const widthRef = ref(200);
-    const { refreshPage } = useTabs();
+    const { refreshPage, addTab } = useTabs();
     const [register, { openModal }] = useModal();
     const { toggleFullscreen, isFullscreenRef } = useFullscreen();
 
-    const go = useGo();
     const getProjectConfigRef = computed(() => {
       return appStore.getProjectConfig;
     });
@@ -72,7 +70,7 @@ export default defineComponent({
 
     function handleToErrorList() {
       errorStore.commitErrorListCountState(0);
-      go('/exception/error-log');
+      addTab('/exception/error-log', true);
     }
 
     /**
@@ -175,12 +173,8 @@ export default defineComponent({
                   <div>
                     <Tooltip>
                       {{
-                        title: () => '消息中心',
-                        default: () => (
-                          <div class={`layout-header__action-item`}>
-                            <NoticeAction />
-                          </div>
-                        ),
+                        title: () => '消息通知',
+                        default: () => <NoticeAction />,
                       }}
                     </Tooltip>
                   </div>
diff --git a/src/layouts/default/actions/notice/NoticeActionItem.vue b/src/layouts/default/actions/notice/NoticeActionItem.vue
index 03bdc33c..52b0a498 100644
--- a/src/layouts/default/actions/notice/NoticeActionItem.vue
+++ b/src/layouts/default/actions/notice/NoticeActionItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="layout-header__action-item notify-action">
     <Popover title="" trigger="click">
       <Badge :count="count" :numberStyle="numberStyle">
         <BellOutlined class="layout-header__action-icon" />
@@ -43,22 +43,25 @@
     },
   });
 </script>
-<style lang="less" scoped>
-  /deep/ .ant-tabs-tab {
-    padding-top: 8px;
-    margin-right: 12px;
-  }
+<style lang="less">
+  .notify-action {
+    padding-top: 2px;
 
-  /deep/ .ant-tabs-content {
-    width: 300px;
-  }
+    .ant-tabs-content {
+      width: 300px;
+    }
 
-  /deep/ .ant-badge {
-    font-size: 18px;
+    .ant-badge {
+      font-size: 18px;
 
-    .ant-badge-multiple-words {
-      padding: 0 4px;
-      transform: translate(26%, -48%);
+      .ant-badge-multiple-words {
+        padding: 0 4px;
+        transform: translate(26%, -40%);
+      }
+
+      svg {
+        width: 0.9em;
+      }
     }
   }
 </style>
diff --git a/src/layouts/default/index.less b/src/layouts/default/index.less
index 9b368ef7..5d2a726e 100644
--- a/src/layouts/default/index.less
+++ b/src/layouts/default/index.less
@@ -194,6 +194,11 @@
   }
 }
 
+.ant-layout-header {
+  height: @header-height;
+  line-height: @header-height;
+}
+
 .layout-header {
   display: flex;
   height: @header-height;
@@ -336,12 +341,12 @@
       display: flex;
       align-items: center;
       height: @header-height;
-      font-size: 1.3em;
+      font-size: 1.1em;
       cursor: pointer;
     }
 
     &-icon {
-      padding: 0 12px;
+      padding: 0 8px;
     }
   }
 
@@ -362,13 +367,14 @@
 .user-dropdown {
   display: flex;
   height: 100%;
+  font-size: 12px;
   cursor: pointer;
   align-items: center;
 
   img {
-    width: 32px;
-    height: 32px;
-    margin-right: 24px;
+    width: 26px;
+    height: 26px;
+    margin-right: 16px;
   }
 
   &__header {
@@ -404,7 +410,7 @@
   }
 
   &__name {
-    font-size: 14px;
+    font-size: 12px;
   }
 
   &__desc {
diff --git a/src/layouts/default/multitabs/index.less b/src/layouts/default/multitabs/index.less
index b4a62b13..da898226 100644
--- a/src/layouts/default/multitabs/index.less
+++ b/src/layouts/default/multitabs/index.less
@@ -7,6 +7,19 @@
     height: @multiple-height;
   }
 
+  // .ant-tabs:not(.ant-tabs-card) {
+  //   .ant-tabs-nav-container {
+  //     height: @multiple-height;
+  //     background: @white;
+  //   }
+
+  //   .ant-tabs-tab {
+  //     font-size: 14px;
+  //     line-height: 1.5515;
+  //     background: @white;
+  //   }
+  // }
+
   .ant-tabs.ant-tabs-card {
     .ant-tabs-card-bar {
       height: @multiple-height;
@@ -114,6 +127,10 @@
   }
 }
 
+.ant-tabs-extra-content {
+  line-height: @multiple-height;
+}
+
 .multiple-tabs-content {
   &__extra {
     display: inline-block;
diff --git a/src/layouts/default/multitabs/index.tsx b/src/layouts/default/multitabs/index.tsx
index 27b8bac7..b8434f72 100644
--- a/src/layouts/default/multitabs/index.tsx
+++ b/src/layouts/default/multitabs/index.tsx
@@ -35,7 +35,11 @@ export default defineComponent({
     const { currentRoute } = useRouter();
     const { addTab, activeKeyRef } = useTabs();
     onMounted(() => {
-      addTab(unref(currentRoute).path as PageEnum);
+      const route = unref(currentRoute);
+      addTab(unref(currentRoute).path as PageEnum, false, {
+        query: route.query,
+        params: route.params,
+      });
     });
 
     // 当前激活tab
@@ -60,6 +64,14 @@ export default defineComponent({
         // 监听路由的话虽然可以，但是路由切换的时间会造成卡顿现象？
         // 使用useTab的addTab的话，当用户手动调转，需要自行调用addTab
         // tabStore.commitAddTab((unref(currentRoute) as unknown) as AppRouteRecordRaw);
+        // const { affix } = currentRoute.value.meta || {};
+        // if (affix) return;
+        // const hasInTab = tabStore.getTabsState.some(
+        //   (item) => item.fullPath === currentRoute.value.fullPath
+        // );
+        // if (!hasInTab) {
+        //   tabStore.commitAddTab((unref(currentRoute) as unknown) as AppRouteRecordRaw);
+        // }
       },
       {
         immediate: true,
diff --git a/src/settings/projectSetting.ts b/src/settings/projectSetting.ts
index 1f016d71..c6484986 100644
--- a/src/settings/projectSetting.ts
+++ b/src/settings/projectSetting.ts
@@ -96,7 +96,7 @@ const setting: ProjectConfig = {
   showBreadCrumb: true,
 
   // 使用error-handler-plugin
-  useErrorHandle: isProdMode(),
+  useErrorHandle: true,
 
   //  开启页面切换动画
   openRouterTransition: true,
-- 
GitLab