From c905456c10b22799373908abddf7b3400cb6c79e Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Fri, 13 Sep 2024 17:01:05 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E9=9D=A2=E5=8C=85?=
 =?UTF-8?q?=E6=A0=91=E9=94=99=E8=AF=AF=EF=BC=8C=E9=83=A8=E9=97=A8=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/navBars/breadcrumb/breadcrumb.vue | 61 +++++++++++++++-----
 src/views/system/dept/component/editDept.vue |  2 +-
 src/views/system/dept/index.vue              |  2 +-
 3 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/src/layout/navBars/breadcrumb/breadcrumb.vue b/src/layout/navBars/breadcrumb/breadcrumb.vue
index e858386..b1bdd18 100644
--- a/src/layout/navBars/breadcrumb/breadcrumb.vue
+++ b/src/layout/navBars/breadcrumb/breadcrumb.vue
@@ -8,7 +8,7 @@
 		/>
 		<el-breadcrumb class="layout-navbars-breadcrumb-hide">
 			<transition-group name="breadcrumb">
-				<el-breadcrumb-item v-for="(v, k) in breadcrumbList" :key="!v.meta.tagsViewName ? v.meta.title : v.meta.tagsViewName">
+				<el-breadcrumb-item v-for="(v, k) in breadcrumbList" :key="v.path">
 					<span v-if="k === breadcrumbList.length - 1" class="layout-navbars-breadcrumb-span">
 						<SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="themeConfig.isBreadcrumbIcon" />
 						<div v-if="!v.meta.tagsViewName">{{ $t(v.meta.title) }}</div>
@@ -24,10 +24,9 @@
 </template>
 
 <script setup lang="ts">
-import { toRefs, reactive, computed, onMounted, defineComponent } from 'vue';
+import { toRefs, reactive, computed, onMounted } from 'vue';
 import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router';
 import { Local } from '/@/utils/storage';
-import other from '/@/utils/other';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { useRoutesList } from '/@/stores/routesList';
@@ -78,17 +77,49 @@ const setLocalThemeConfig = () => {
 };
 // 处理面包屑数据
 const getBreadcrumbList = (arr: Array<string>) => {
-  arr.forEach((item: any) => {
-    state.routeSplit.forEach((v: any, k: number, arrs: any) => {
-      if (state.routeSplitFirst === item.path) {
-        state.routeSplitFirst += `/${arrs[state.routeSplitIndex]}`;
-        state.breadcrumbList.push(item);
-        state.routeSplitIndex++;
-        if (item.children) getBreadcrumbList(item.children);
-      }
-    });
-  });
+  let parents :any[] = []
+  arr.map((item:any)=>{
+    parents.push(...getBreadcrumbParent(item,route.path,null))
+    if(parents.length>0){
+      return
+    }
+  })
+  parents.push(route)
+  parents = uniqueByPath(parents)
+  state.breadcrumbList = parents
 };
+const getBreadcrumbParent = (item:any,path:string,parent:any)=>{
+  const parents:any[] = []
+  if(item.path==path){
+    if(parent){
+      parents.push(parent)
+    }
+    return parents
+  }
+  if(item.children){
+    for(let i=0;i<item.children.length;i++){
+      const res = getBreadcrumbParent(item.children[i],path,item)
+      if(res && res.length>0){
+        parents.push(item,...res)
+        return parents
+      }
+    }
+  }
+  return parents
+}
+const  uniqueByPath = (arr:any[]) => {
+  let seen:any = {}; // 用来存储已见过的name
+  let result:any[] = []; // 存储去重后的结果
+
+  arr.forEach(item => {
+    if (!seen[item.path]) { // 如果name还没见过
+      seen[item.path] = true; // 标记为已见过
+      result.push(item); // 添加到结果数组
+    }
+  });
+
+  return result;
+}
 // 当前路由字符串切割成数组，并删除第一项空内容
 const initRouteSplit = (path: string) => {
   if (!themeConfig.value.isBreadcrumb) return false;
@@ -98,8 +129,8 @@ const initRouteSplit = (path: string) => {
   state.routeSplitFirst = `/${state.routeSplit[0]}`;
   state.routeSplitIndex = 1;
   getBreadcrumbList(routesList.value);
-  if (route.name === 'home' || (route.name === 'notFound' && state.breadcrumbList.length > 1)) state.breadcrumbList.shift();
-  if (state.breadcrumbList.length > 0) state.breadcrumbList[state.breadcrumbList.length - 1].meta.tagsViewName = other.setTagsViewNameI18n(route);
+  //if (route.name === 'home' || (route.name === 'notFound' && state.breadcrumbList.length > 1)) state.breadcrumbList.shift();
+  //if (state.breadcrumbList.length > 0) state.breadcrumbList[state.breadcrumbList.length - 1].meta.tagsViewName = other.setTagsViewNameI18n(route);
 };
 // 页面加载时
 onMounted(() => {
diff --git a/src/views/system/dept/component/editDept.vue b/src/views/system/dept/component/editDept.vue
index cbd0f70..525d0a5 100644
--- a/src/views/system/dept/component/editDept.vue
+++ b/src/views/system/dept/component/editDept.vue
@@ -131,7 +131,7 @@ const { isShowDialog, ruleForm, deptData,rules } = toRefs(state);
 const openDialog = (row?: RuleFormState|number) => {
   resetForm()
   getDeptList().then((res:any)=>{
-    state.deptData =  proxy.handleTree(res.data.deptList??[], "deptId","parentId");
+    state.deptData =  proxy.handleTree(res.data.deptList??[], "deptId","parentId",'children',true);
   });
   if(row && typeof row === "object"){
     state.ruleForm = row;
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index a69076d..5c1cac2 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -108,7 +108,7 @@ const initTableData = () => {
 };
 const deptList = ()=>{
   getDeptList(state.tableData.param).then((res:any)=>{
-    state.tableData.data = proxy.handleTree(res.data.deptList??[], "deptId","parentId");
+    state.tableData.data = proxy.handleTree(res.data.deptList??[], "deptId","parentId",'children',true);
   });
 };
 // 打开新增菜单弹窗