From 696c4a7a2f006675599c41d9c69ba96fe33e7d3b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 21 Mar 2024 09:38:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=8F=8D=E5=A4=8D=E7=82=B9=E5=87=BB=E6=A0=91=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/utils/treeSortUtils.ts        | 12 +++++++-----
 .../src/views/common/DeResourceTree.vue              |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/core-frontend/src/utils/treeSortUtils.ts b/core/core-frontend/src/utils/treeSortUtils.ts
index 8e605dba8d..8e29fa8756 100644
--- a/core/core-frontend/src/utils/treeSortUtils.ts
+++ b/core/core-frontend/src/utils/treeSortUtils.ts
@@ -1,23 +1,25 @@
 import { BusiTreeNode } from '@/models/tree/TreeNode'
 import _ from 'lodash'
 
-export default function treeSort(tree: BusiTreeNode[], sortType: string, historySortType: string) {
+export default function treeSort(tree: BusiTreeNode[], sortType: string) {
   const result = _.cloneDeep(tree)
-  sortPer(result, sortType, historySortType)
+  sortPer(result, sortType)
   _.forEach(result, node => {
     if (node.children && node.children.length > 0) {
-      sortPer(node.children, sortType, historySortType)
+      sortPer(node.children, sortType)
     }
   })
   return result
 }
 
-export const sortPer = (subTree: BusiTreeNode[], sortType: string, historySortType: string) => {
+export const sortPer = (subTree: BusiTreeNode[], sortType: string) => {
   if (sortType === 'name_desc') {
     subTree.sort((a, b) => b.name.localeCompare(a.name, 'zh-Hans-CN', { sensitivity: 'accent' }))
   } else if (sortType === 'name_asc') {
     subTree.sort((a, b) => a.name.localeCompare(b.name, 'zh-Hans-CN', { sensitivity: 'accent' }))
-  } else if (sortType !== historySortType) {
+  } else if (sortType === 'time_asc') {
     return subTree.reverse()
+  } else {
+    return subTree
   }
 }
diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue
index 67f717261a..3634898ddb 100644
--- a/core/core-frontend/src/views/common/DeResourceTree.vue
+++ b/core/core-frontend/src/views/common/DeResourceTree.vue
@@ -60,6 +60,7 @@ const returnMounted = ref(false)
 const state = reactive({
   curSortType: 'time_desc',
   resourceTree: [] as BusiTreeNode[],
+  originResourceTree: [] as BusiTreeNode[],
   folderMenuList: [
     {
       label: '移动到',
@@ -242,6 +243,7 @@ function flatTree(tree: BusiTreeNode[]) {
 }
 
 const afterTreeInit = () => {
+  state.originResourceTree = _.cloneDeep(state.resourceTree)
   mounted.value = true
   if (selectedNodeKey.value && returnMounted.value) {
     expandedArray.value = getDefaultExpandedKeys()
@@ -391,7 +393,7 @@ const getDefaultExpandedKeys = () => {
 }
 
 const sortTypeChange = sortType => {
-  state.resourceTree = treeSort(state.resourceTree, sortType, state.curSortType)
+  state.resourceTree = treeSort(state.originResourceTree, sortType)
   state.curSortType = sortType
 }