From f7f39c2d2c69e57e46edba86cf0793015d120f02 Mon Sep 17 00:00:00 2001
From: limengnan <420004014@qq.com>
Date: Wed, 25 Jun 2025 08:53:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=EF=BC=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/service/dataset/index.vue     | 49 ++++++-------------
 .../service/datasource/form/index.vue         |  3 +-
 .../application/service/datasource/index.vue  | 32 ++----------
 3 files changed, 21 insertions(+), 63 deletions(-)

diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/index.vue b/core/core-frontend/src/viewsnew/application/service/dataset/index.vue
index 3fe95a8..897e226 100644
--- a/core/core-frontend/src/viewsnew/application/service/dataset/index.vue
+++ b/core/core-frontend/src/viewsnew/application/service/dataset/index.vue
@@ -4,6 +4,7 @@ import icon_dataset from '@/assets/svg/icon_dataset.svg'
 import icon_deleteTrash_outlined from '@/assets/svg/icon_delete-trash_outlined.svg'
 import icon_intoItem_outlined from '@/assets/svg/icon_into-item_outlined.svg'
 import { debounce } from 'lodash-es'
+import Header from '../header.vue'
 import icon_rename_outlined from '@/assets/svg/icon_rename_outlined.svg'
 import dvNewFolder from '@/assets/svg/dv-new-folder.svg'
 import icon_fileAdd_outlined from '@/assets/svg/icon_file-add_outlined.svg'
@@ -19,12 +20,14 @@ import icon_dashboard_outlined from '@/assets/svg/icon_dashboard_outlined.svg'
 import icon_operationAnalysis_outlined from '@/assets/svg/icon_operation-analysis_outlined.svg'
 import icon_download_outlined from '@/assets/svg/icon_download_outlined.svg'
 import icon_edit_outlined from '@/assets/svg/icon_edit_outlined.svg'
+import { findApplicationById } from "@/api/application/application"
 import { useI18n } from '@/hooks/web/useI18n'
 import {
   ref,
   reactive,
   shallowRef,
   computed,
+  onMounted,
   watch,
   onBeforeMount,
   nextTick,
@@ -152,8 +155,6 @@ const datasetTableFiled = ref([])
 provide('filedList', datasetTableFiled)
 
 const nickName = ref('')
-const router = useRouter()
-const route = useRoute()
 const state = reactive({
   datasetTree: [] as BusiTreeNode[],
   curSortType: 'time_desc'
@@ -887,34 +888,6 @@ const proxyAllowDrop = debounce((arg1, arg2) => {
               </el-icon>
             </template>
           </el-input>
-          <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"
-                  ><dvSortAsc v-if="state.curSortType.includes('asc')" class="svg-icon opt-icon"
-                /></Icon>
-              </el-tooltip>
-              <el-tooltip :offset="16" effect="dark" :content="sortTypeTip" placement="top">
-                <Icon name="dv-sort-desc" class="opt-icon"
-                  ><dvSortDesc v-if="state.curSortType.includes('desc')" class="svg-icon"
-                /></Icon>
-              </el-tooltip>
-            </el-icon>
-            <template #dropdown>
-              <el-dropdown-menu style="width: 246px">
-                <template :key="ele.value" v-for="ele in sortList">
-                  <el-dropdown-item
-                    class="ed-select-dropdown__item"
-                    :class="ele.value === state.curSortType && 'selected'"
-                    :command="ele.value"
-                  >
-                    {{ ele.name }}
-                  </el-dropdown-item>
-                  <li v-if="ele.divided" class="ed-dropdown-menu__item--divided"></li>
-                </template>
-              </el-dropdown-menu>
-            </template>
-          </el-dropdown>
         </div>
 
         <el-scrollbar class="custom-tree">
@@ -1064,11 +1037,12 @@ const proxyAllowDrop = debounce((arg1, arg2) => {
                     key="structPreview"
                     :columns="columns"
                     v-loading="dataPreviewLoading"
+                    header-class="header-cell"
                     :data="tableData"
-                    header-class="excel-header-cell"
                     :width="width"
                     :height="height"
                     fixed
+                    border
                     ><template #empty>
                       <empty-background
                         :description="t('data_set.no_data')"
@@ -1081,6 +1055,7 @@ const proxyAllowDrop = debounce((arg1, arg2) => {
                 <el-table
                   v-loading="dataPreviewLoading"
                   class="dataset-preview_table"
+                  header-class="header-cell"
                   :data="tableData"
                   @row-click="rowClick"
                   key="dataPreview"
@@ -1133,6 +1108,9 @@ const proxyAllowDrop = debounce((arg1, arg2) => {
               />
             </div>
           </template>
+          <div v-if="activeName === 'dataPreview'" class="preview-num">
+            {{ t('data_set.pieces_in_total', { msg: total }) }}
+          </div>
         </div>
       </template>
       <template v-else-if="mounted">
@@ -1425,6 +1403,11 @@ const proxyAllowDrop = debounce((arg1, arg2) => {
   }
 }
 
+.custom-tree {
+  height: calc(100vh - 172px);
+  padding: 0 8px;
+}
+
 .custom-tree-node {
   width: calc(100% - 30px);
   display: flex;
@@ -1688,7 +1671,7 @@ border-right: 1px solid rgba(54, 54, 54, 1)
   color: #F2F4F5;
 }
 .ed-message-box{
-  background: #212121 ;
+  background: #212121;
 }
 .ed-message-box__content{
   color: #ffffff;
@@ -1778,4 +1761,4 @@ border-right: 1px solid rgba(54, 54, 54, 1)
 .tree-cont::-webkit-scrollbar-corner {
   background: #3f3f3f !important;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/core/core-frontend/src/viewsnew/application/service/datasource/form/index.vue b/core/core-frontend/src/viewsnew/application/service/datasource/form/index.vue
index c86692b..3ba89cd 100644
--- a/core/core-frontend/src/viewsnew/application/service/datasource/form/index.vue
+++ b/core/core-frontend/src/viewsnew/application/service/datasource/form/index.vue
@@ -22,7 +22,7 @@ import { Base64 } from 'js-base64'
 import type { Param } from './ExcelDetail.vue'
 import type { Configuration, ApiConfiguration, SyncSetting } from './option'
 import { dsTypes, typeList, nameMap } from './option'
-import { useRouter } from 'vue-router'
+import { useRouter,useRoute } from 'vue-router'
 import { uuid } from 'vue-uuid'
 import { useEmitt } from '@/hooks/web/useEmitt'
 import FinishPage from '../FinishPage.vue'
@@ -67,7 +67,6 @@ interface Form {
 
 const { t } = useI18n()
 const creatDsFolder = ref()
-const router = useRouter()
 const { wsCache } = useCache()
 const dsLoading = ref(false)
 let isFormUpdate = false
diff --git a/core/core-frontend/src/viewsnew/application/service/datasource/index.vue b/core/core-frontend/src/viewsnew/application/service/datasource/index.vue
index 2bd454b..f7917da 100644
--- a/core/core-frontend/src/viewsnew/application/service/datasource/index.vue
+++ b/core/core-frontend/src/viewsnew/application/service/datasource/index.vue
@@ -1,4 +1,6 @@
 <script lang="tsx" setup>
+import Header from '../header.vue'
+import { findApplicationById } from "@/api/application/application";
 import icon_down_outlined1 from '@/assets/svg/icon_down_outlined-1.svg'
 import icon_down_outlined from '@/assets/svg/icon_down_outlined.svg'
 import icon_copy_filled from '@/assets/svg/icon_copy_filled.svg'
@@ -1103,6 +1105,7 @@ const getMenuList = (val: boolean) => {
 </script>
 
 <template>
+  <Header :projectInfo="projectInfo"/>
   <div class="datasource-manage" v-loading="dsLoading">
     <ArrowSide
       :style="{ left: (sideTreeStatus ? width - 12 : 0) + 'px' }"
@@ -1148,34 +1151,7 @@ const getMenuList = (val: boolean) => {
               </el-icon>
             </template>
           </el-input>
-          <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"
-                  ><dvSortAsc v-if="state.curSortType.includes('asc')" class="svg-icon opt-icon"
-                /></Icon>
-              </el-tooltip>
-              <el-tooltip :offset="16" effect="dark" :content="sortTypeTip" placement="top">
-                <Icon name="dv-sort-desc" class="opt-icon"
-                  ><dvSortDesc v-if="state.curSortType.includes('desc')" class="svg-icon opt-icon"
-                /></Icon>
-              </el-tooltip>
-            </el-icon>
-            <template #dropdown>
-              <el-dropdown-menu style="width: 246px">
-                <template :key="ele.value" v-for="ele in sortList">
-                  <el-dropdown-item
-                    class="ed-select-dropdown__item"
-                    :class="ele.value === state.curSortType && 'selected'"
-                    :command="ele.value"
-                  >
-                    {{ ele.name }}
-                  </el-dropdown-item>
-                  <li v-if="ele.divided" class="ed-dropdown-menu__item--divided"></li>
-                </template>
-              </el-dropdown-menu>
-            </template>
-          </el-dropdown>
+        
         </div>
         <el-scrollbar @scroll="handleScroll" ref="scrollbarRef" class="custom-tree">
           <el-tree