From 5a1f3ecdc258d10f843a338a60a75ce4228a3537 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 18 Dec 2024 10:48:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=A0=91=E6=8E=92=E5=BA=8F=E5=92=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E6=A0=91=E7=9A=84=E8=AE=BE=E7=BD=AE=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=20#14111?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualized/data/dataset/form/CreatDsGroup.vue   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue b/core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue
index 49ba2d26dc..07160b8c68 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup>
 import dvFolder from '@/assets/svg/dv-folder.svg'
 import icon_searchOutline_outlined from '@/assets/svg/icon_search-outline_outlined.svg'
-import { ref, reactive, computed, watch, nextTick } from 'vue'
+import { ref, reactive, computed, watch, nextTick, unref } from 'vue'
+import treeSort from '@/utils/treeSortUtils'
+import { useCache } from '@/hooks/web/useCache'
 import { ElMessage } from 'element-plus-secondary'
+import { cloneDeep } from 'lodash-es'
 import { useI18n } from '@/hooks/web/useI18n'
 import {
   getDatasetTree,
@@ -28,7 +31,7 @@ export interface Tree {
   children?: Tree[]
 }
 const { t } = useI18n()
-
+const { wsCache } = useCache()
 const state = reactive({
   tData: [],
   nameList: []
@@ -137,6 +140,8 @@ const formatRootMiss = (id: string | number, treeData: Tree[]) => {
   }
   return id
 }
+const originResourceTree = ref([])
+const sortList = ['time_asc', 'time_desc', 'name_asc', 'name_desc']
 const createInit = (type, data: Tree, exec, name: string) => {
   pid.value = ''
   id.value = ''
@@ -156,6 +161,10 @@ const createInit = (type, data: Tree, exec, name: string) => {
     getDatasetTree(request).then(res => {
       dfs(res as unknown as Tree[])
       state.tData = (res as unknown as Tree[]) || []
+      let curSortType = sortList[Number(wsCache.get('TreeSort-backend')) ?? 1]
+      curSortType = wsCache.get('TreeSort-dataset') ?? curSortType
+      originResourceTree.value = cloneDeep(unref(state.tData))
+      state.tData = treeSort(originResourceTree.value, curSortType)
       if (state.tData.length && state.tData[0].name === 'root' && state.tData[0].id === '0') {
         state.tData[0].name = t('data_set.data_set')
       }