From 313591a5efd3ebb1b25d1eb2a4a59c4b3236ffd7 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Sun, 9 Oct 2022 16:52:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=8E=E9=80=80=E6=97=B6=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E6=98=BE=E7=A4=BA=E9=9D=A2=E5=8C=85=E5=B1=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/Header.vue | 15 +++++++--------
 src/mixins/common.js             |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue
index 60aa6281..5d2a92c7 100644
--- a/src/components/layout/Header.vue
+++ b/src/components/layout/Header.vue
@@ -279,17 +279,16 @@ export default {
       const breadcrumb = breadcrumbMap.find(b => this.route === b.path)
       const thirdMenu = this.getUrlParam(this.curTabState.thirdMenu, '')
       const fourthMenu = this.getUrlParam(this.curTabState.fourthMenu, '')
-      if (breadcrumb.columnValue) {
-        return breadcrumb ? [breadcrumb.parentName, breadcrumb.name, breadcrumb.columnName, breadcrumb.columnValue] : []
-      } else if (breadcrumb.columnName) {
-        return breadcrumb ? [breadcrumb.parentName, breadcrumb.name, breadcrumb.columnName] : []
-      } else if (fourthMenu) {
-        return breadcrumb ? [breadcrumb.parentName, breadcrumb.name, thirdMenu, fourthMenu] : []
+      let result = []
+      if (fourthMenu) {
+        result = breadcrumb ? [breadcrumb.parentName, breadcrumb.name, thirdMenu, fourthMenu] : []
       } else if (thirdMenu) {
-        return breadcrumb ? [breadcrumb.parentName, breadcrumb.name, thirdMenu] : []
+        result = breadcrumb ? [breadcrumb.parentName, breadcrumb.name, thirdMenu] : []
       } else {
-        return breadcrumb ? [breadcrumb.parentName, breadcrumb.name] : []
+        result = breadcrumb ? [breadcrumb.parentName, breadcrumb.name] : []
       }
+      console.info(thirdMenu, fourthMenu, result)
+      return result
     },
     showEntityTypeSelector () {
       return this.$store.getters.getShowEntityTypeSelector
diff --git a/src/mixins/common.js b/src/mixins/common.js
index 89a575b0..62a3cf03 100644
--- a/src/mixins/common.js
+++ b/src/mixins/common.js
@@ -1,6 +1,6 @@
 import { hasButton } from '@/permission'
 import { dateFormatByAppearance } from '@/utils/date-util'
-import {storageKey} from '@/utils/constants'
+import { storageKey } from '@/utils/constants'
 export default {
   data () {
     return {