From 73dd7bec01db73bd9ce2fc167e8226b4311c96d9 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 23 Sep 2022 18:35:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?revert:=20=E6=9A=82=E6=97=B6=E5=B1=8F?=
 =?UTF-8?q?=E8=94=BD=E5=BA=94=E7=94=A8=E5=B8=82=E5=9C=BA=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/db/migration/V40__1.15.sql | 2 --
 1 file changed, 2 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V40__1.15.sql b/backend/src/main/resources/db/migration/V40__1.15.sql
index b4b31501c6..add04004e1 100644
--- a/backend/src/main/resources/db/migration/V40__1.15.sql
+++ b/backend/src/main/resources/db/migration/V40__1.15.sql
@@ -26,8 +26,6 @@ INSERT INTO `task_instance` (`task_id`) VALUES ('Datasource_check_status');
 
 
 update sys_menu set menu_sort=10 where menu_id=1;
-INSERT INTO `sys_menu` (`menu_id`, `pid`, `sub_count`, `type`, `title`, `name`, `component`, `menu_sort`, `icon`, `path`, `i_frame`, `cache`, `hidden`, `permission`, `create_by`, `update_by`, `create_time`, `update_time`) VALUES (41, 1, 1, 1, '应用管理', 'system-app-template', 'panel/appTemplate/index', 13, 'sys-param', 'panel/appTemplate/index', 0, 0, 0, NULL, NULL, NULL, NULL, 1620444227389);
-INSERT INTO `sys_menu` (`menu_id`, `pid`, `sub_count`, `type`, `title`, `name`, `component`, `menu_sort`, `icon`, `path`, `i_frame`, `cache`, `hidden`, `permission`, `create_by`, `update_by`, `create_time`, `update_time`) VALUES (203, 0, 0, 1, '应用市场', 'app-template-market', 'panel/appTemplateMarket/index', 6, 'dashboard', '/appTemplateMarket', 0, 0, 0, NULL, NULL, NULL, NULL, 1620444227389);
 -- ----------------------------
 -- Table structure for panel_app_template
 -- ----------------------------

From 8f90e9bfe2c348f4e681b06fe7a4a1a71d3f62f4 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Mon, 26 Sep 2022 10:09:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E6=80=BB?=
 =?UTF-8?q?=E6=9D=A1=E6=95=B0=20=E6=95=B0=E6=8D=AE=E9=9B=86=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BDloading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dataset/data/TabDataPreview.vue | 22 +--------
 frontend/src/views/dataset/group/Group.vue    | 47 ++++++++++++-------
 2 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/frontend/src/views/dataset/data/TabDataPreview.vue b/frontend/src/views/dataset/data/TabDataPreview.vue
index b72ce33586..c964b5875a 100644
--- a/frontend/src/views/dataset/data/TabDataPreview.vue
+++ b/frontend/src/views/dataset/data/TabDataPreview.vue
@@ -1,26 +1,6 @@
 <template>
   <el-col>
     <div class="table-count">
-      <span v-if="['excel', 'custom', 'union'].includes(table.type)">
-        <span v-if="page.total <= currentPage.show">
-          {{ $t('dataset.preview_total') }}
-          <span class="span-number">{{ page.total }}</span>
-          {{ $t('dataset.preview_item') }}
-        </span>
-        <span v-if="page.total > currentPage.show">
-          {{ $t('dataset.preview_show') }}
-          <span class="span-number">{{ currentPage.show }}</span>
-          {{ $t('dataset.preview_item') }}
-          ，{{ $t('dataset.preview_total') }}
-          <span class="span-number">{{ page.total }}</span>
-          {{ $t('dataset.preview_item') }}
-        </span>
-      </span>
-      <span v-if="['db', 'sql'].includes(table.type)">
-        {{ $t('dataset.preview_show') }}
-        <span class="span-number">{{ page.total }}</span>
-        {{ $t('dataset.preview_item') }}
-      </span>
       <span class="title-text" style="width: 100px"
         >{{ $t('deDataset.display') }} {{ form.row }}
         {{ $t('deDataset.row') }}</span
@@ -197,7 +177,7 @@ export default {
   line-height: 22px;
   margin: 4px 0;
   .title-text {
-    margin: 0 5px 0 16px;
+    margin: 0 5px 0 0;
   }
 }
 </style>
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 2629544d46..9261a9e947 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -69,7 +69,7 @@
       </el-row>
       <el-col class="custom-tree-container de-tree">
         <div class="block">
-          <div v-if="!tData.length" class="no-tdata">
+          <div v-if="!tData.length && !treeLoading" class="no-tdata">
             {{ $t('deDataset.no_dataset_click') }}
             <span @click="() => clickAdd()" class="no-tdata-new">{{
               $t('deDataset.create')
@@ -424,6 +424,7 @@ export default {
   data() {
     return {
       sceneMode: false,
+      treeLoading: false,
       dialogTitle: '',
       search: '',
       editGroup: false,
@@ -537,16 +538,21 @@ export default {
   },
   mounted() {
     const { id, name } = this.$route.params
-    queryAuthModel({ modelType: 'dataset' }, true).then((res) => {
-      localStorage.setItem('dataset-tree', JSON.stringify(res.data))
-      this.tData = res.data
-      this.$nextTick(() => {
-        this.$refs.datasetTreeRef?.filter(this.filterText)
-        if (id && name.includes(this.filterText)) {
-          this.dfsTableData(this.tData, id)
-        }
+    this.treeLoading = true
+    queryAuthModel({ modelType: 'dataset' }, true)
+      .then((res) => {
+        localStorage.setItem('dataset-tree', JSON.stringify(res.data))
+        this.tData = res.data
+        this.$nextTick(() => {
+          this.$refs.datasetTreeRef?.filter(this.filterText)
+          if (id && name.includes(this.filterText)) {
+            this.dfsTableData(this.tData, id)
+          }
+        })
+      })
+      .finally(() => {
+        this.treeLoading = false
       })
-    })
     this.refresh()
   },
   methods: {
@@ -765,15 +771,20 @@ export default {
       if (userCache) {
         this.tData = JSON.parse(modelInfo)
       }
-      queryAuthModel({ modelType: 'dataset' }, !userCache).then((res) => {
-        localStorage.setItem('dataset-tree', JSON.stringify(res.data))
-        if (!userCache) {
-          this.tData = res.data
-        }
-        this.$nextTick(() => {
-          this.$refs.datasetTreeRef?.filter(this.filterText)
+      this.treeLoading = true
+      queryAuthModel({ modelType: 'dataset' }, !userCache)
+        .then((res) => {
+          localStorage.setItem('dataset-tree', JSON.stringify(res.data))
+          if (!userCache) {
+            this.tData = res.data
+          }
+          this.$nextTick(() => {
+            this.$refs.datasetTreeRef?.filter(this.filterText)
+          })
+        })
+        .finally(() => {
+          this.treeLoading = false
         })
-      })
     },
 
     tableTree() {