From b455cb16f6cafef2c33424322f01b03f7dc76134 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 6 Dec 2024 09:53:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE-=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F=E6=96=B9=E5=BC=8F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core-frontend/src/views/common/DeResourceTree.vue |  9 +++++++--
 .../src/views/visualized/data/dataset/index.vue       |  9 +++++++--
 .../src/views/visualized/data/datasource/index.vue    | 11 ++++++++---
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue
index 870d7d6995..9529650679 100644
--- a/core/core-frontend/src/views/common/DeResourceTree.vue
+++ b/core/core-frontend/src/views/common/DeResourceTree.vue
@@ -520,12 +520,17 @@ const sortTypeTip = computed(() => {
   return sortList.find(ele => ele.value === state.curSortType).name
 })
 
-const sortTypeChange = sortType => {
+const handleSortTypeChange = sortType => {
   state.resourceTree = treeSort(state.originResourceTree, sortType)
   state.curSortType = sortType
   wsCache.set('TreeSort-' + curCanvasType.value, state.curSortType)
 }
 
+const sortTypeChange = sortType => {
+  state.resourceTree = treeSort(state.originResourceTree, sortType)
+  state.curSortType = sortType
+}
+
 watch(filterText, val => {
   resourceListTree.value.filter(val)
 })
@@ -628,7 +633,7 @@ defineExpose({
           </el-icon>
         </template>
       </el-input>
-      <el-dropdown @command="sortTypeChange" trigger="click">
+      <el-dropdown @command="handleSortTypeChange" trigger="click">
         <el-icon class="filter-icon-span">
           <el-tooltip :offset="16" effect="dark" :content="sortTypeTip" placement="top">
             <Icon v-if="state.curSortType.includes('asc')" name="dv-sort-asc" class="opt-icon"
diff --git a/core/core-frontend/src/views/visualized/data/dataset/index.vue b/core/core-frontend/src/views/visualized/data/dataset/index.vue
index 1ef8651a76..7bf03d2e50 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue
@@ -158,12 +158,17 @@ const resourceOptFinish = param => {
 
 const originResourceTree = shallowRef([])
 
-const sortTypeChange = sortType => {
+const handleSortTypeChange = sortType => {
   state.datasetTree = treeSort(originResourceTree.value, sortType)
   state.curSortType = sortType
   wsCache.set('TreeSort-dataset', state.curSortType)
 }
 
+const sortTypeChange = sortType => {
+  state.datasetTree = treeSort(originResourceTree.value, sortType)
+  state.curSortType = sortType
+}
+
 const resourceCreate = (pid, name) => {
   // 新建基础信息
   const newResourceId = guid()
@@ -847,7 +852,7 @@ const getMenuList = (val: boolean) => {
               </el-icon>
             </template>
           </el-input>
-          <el-dropdown @command="sortTypeChange" trigger="click">
+          <el-dropdown @command="handleSortTypeChange" trigger="click">
             <el-icon class="filter-icon-span">
               <el-tooltip :offset="16" effect="dark" :content="sortTypeTip" placement="top">
                 <Icon name="dv-sort-asc" class="opt-icon"
diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index 570d343040..218c63685d 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -213,11 +213,16 @@ const selectDataset = row => {
 
 const originResourceTree = shallowRef([])
 
-const sortTypeChange = sortType => {
+const handleSortTypeChange = sortType => {
   state.datasourceTree = treeSort(originResourceTree.value, sortType)
   state.curSortType = sortType
   wsCache.set('TreeSort-datasource', state.curSortType)
 }
+
+const sortTypeChange = sortType => {
+  state.datasourceTree = treeSort(originResourceTree.value, sortType)
+  state.curSortType = sortType
+}
 const handleSizeChange = pageSize => {
   state.paginationConfig.currentPage = 1
   state.paginationConfig.pageSize = pageSize
@@ -473,7 +478,7 @@ const listDs = () => {
   rawDatasourceList.value = []
   dsLoading.value = true
   let curSortType = sortList[Number(wsCache.get('TreeSort-backend')) ?? 1].value
-  curSortType = wsCache.get('TreeSort-dataset') ?? curSortType
+  curSortType = wsCache.get('TreeSort-datasource') ?? curSortType
   const request = { busiFlag: 'datasource' } as BusiTreeRequest
   interactiveStore
     .setInteractive(request)
@@ -1093,7 +1098,7 @@ const getMenuList = (val: boolean) => {
               </el-icon>
             </template>
           </el-input>
-          <el-dropdown @command="sortTypeChange" trigger="click">
+          <el-dropdown @command="handleSortTypeChange" trigger="click">
             <el-icon class="filter-icon-span">
               <el-tooltip :offset="16" effect="dark" :content="sortTypeTip" placement="top">
                 <Icon name="dv-sort-asc" class="opt-icon"