From dd5ce34902d4ada62f1f5fd69b7a68e479578fff Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 22 Sep 2022 11:25:31 +0800
Subject: [PATCH 01/20] =?UTF-8?q?fix:=20=E9=A2=84=E8=A7=88=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/add/AddApi.vue     |  2 +-
 frontend/src/views/dataset/add/AddDB.vue      |  2 +-
 frontend/src/views/dataset/add/AddSQL.vue     | 36 ++++++++++---------
 frontend/src/views/dataset/add/AddUnion.vue   |  2 +-
 .../views/dataset/add/union/UnionPreview.vue  | 25 +++++++++++--
 frontend/src/views/dataset/group/Group.vue    |  1 -
 6 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/frontend/src/views/dataset/add/AddApi.vue b/frontend/src/views/dataset/add/AddApi.vue
index 6a2c651051..dfa2afb486 100644
--- a/frontend/src/views/dataset/add/AddApi.vue
+++ b/frontend/src/views/dataset/add/AddApi.vue
@@ -281,7 +281,7 @@ export default {
       const that = this
       setTimeout(function() {
         const currentHeight = document.documentElement.clientHeight
-        that.height = currentHeight - 195 - 54
+        that.height = currentHeight - 56 - 64 - 75 - 32 - 24 - 16 - 10
       }, 10)
     },
     setActiveName({ name, datasourceId, enableCheck }) {
diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue
index 06d5c82607..abb2110b63 100644
--- a/frontend/src/views/dataset/add/AddDB.vue
+++ b/frontend/src/views/dataset/add/AddDB.vue
@@ -312,7 +312,7 @@ export default {
       const that = this
       setTimeout(function () {
         const currentHeight = document.documentElement.clientHeight
-        that.height = currentHeight - 195 - 54
+        that.height = currentHeight - 56 - 64 - 75 - 32 - 24 - 16 - 10
       }, 10)
     },
     setActiveName({ name, datasourceId, enableCheck }) {
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index 8fad55ec00..7e237a1848 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -371,7 +371,7 @@ import 'codemirror/addon/hint/sql-hint'
 import 'codemirror/addon/hint/show-hint'
 import { engineMode } from '@/api/system/engine'
 import msgCfm from '@/components/msgCfm/index'
-
+import _ from 'lodash'
 export default {
   name: 'AddSQL',
   components: { codemirror },
@@ -488,6 +488,11 @@ export default {
       handler: function () {
         this.initTableInfo()
       }
+    },
+    sqlHeight: {
+      handler: function () {
+        this.calHeight()
+      }
     }
   },
   mounted() {
@@ -560,14 +565,11 @@ export default {
         this.tableData = response.data
       })
     },
-    calHeight() {
-      const that = this
-      setTimeout(function () {
-        const currentHeight = document.documentElement.clientHeight
-        that.height =
-          currentHeight - 56 - 30 - 26 - 25 - 43 - 160 - 10 - 37 - 20 - 10 - 16
-      }, 10)
-    },
+    calHeight: _.debounce(function() {
+      const sqlHeight = Math.max(this.sqlHeight, 248)
+      const currentHeight = document.documentElement.clientHeight
+      this.height = currentHeight - sqlHeight - 56 - 54 - 36 - 64
+    }, 200),
     initDataSource() {
       listDatasource().then((response) => {
         this.options = response.data.filter((item) => item.type !== 'api')
@@ -636,7 +638,7 @@ export default {
         return
       }
       this.parseVariable()
-      this.loading = true;
+      this.loading = true
       const table = {
         id: this.param.tableId,
         name: this.param.name,
@@ -651,12 +653,14 @@ export default {
           isBase64Encryption: true
         })
       }
-      post('/dataset/table/update', table).then((response) => {
-        this.openMessageSuccess('deDataset.set_saved_successfully')
-        this.cancel()
-      }).finally(() => {
-        this.loading = false;
-      }) 
+      post('/dataset/table/update', table)
+        .then((response) => {
+          this.openMessageSuccess('deDataset.set_saved_successfully')
+          this.cancel()
+        })
+        .finally(() => {
+          this.loading = false
+        })
     },
 
     cancel() {
diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue
index 29b2d09951..5cfd6c541f 100644
--- a/frontend/src/views/dataset/add/AddUnion.vue
+++ b/frontend/src/views/dataset/add/AddUnion.vue
@@ -41,7 +41,7 @@
         }}</span>
         <span @mousedown="mousedownDrag" class="drag"></span>
       </div>
-      <union-preview :table="previewTable" :dataset="dataset" />
+      <union-preview :unionHeight="unionHeight" :table="previewTable" :dataset="dataset" />
     </div>
     <!--选择数据集-->
     <el-drawer
diff --git a/frontend/src/views/dataset/add/union/UnionPreview.vue b/frontend/src/views/dataset/add/union/UnionPreview.vue
index c3e4c21359..ee944c51aa 100644
--- a/frontend/src/views/dataset/add/union/UnionPreview.vue
+++ b/frontend/src/views/dataset/add/union/UnionPreview.vue
@@ -4,7 +4,7 @@
       ref="plxTable"
       size="mini"
       style="width: 100%"
-      height="100%"
+      :height="height"
       :checkbox-config="{ highlight: true }"
       :width-resize="true"
     >
@@ -22,6 +22,7 @@
 
 <script>
 import { post } from '@/api/dataset/dataset'
+import _ from 'lodash'
 
 export default {
   name: 'UnionPreview',
@@ -33,11 +34,15 @@ export default {
     dataset: {
       type: Array,
       required: true
-    }
+    },
+    unionHeight: {
+      type: Number,
+      default: 298
+    },
   },
   data() {
     return {
-      height: 'auto',
+      height: 200,
       fields: [],
       data: []
     }
@@ -45,12 +50,26 @@ export default {
   watch: {
     table: function () {
       this.initPreview()
+    },
+    unionHeight: {
+      handler: function () {
+        this.calHeight()
+      }
     }
   },
   mounted() {
     this.initPreview()
+    this.calHeight()
+    window.onresize = () => {
+      this.calHeight()
+    }
   },
   methods: {
+    calHeight: _.debounce(function() {
+      const unionHeight = Math.max(this.unionHeight, 298)
+      const currentHeight = document.documentElement.clientHeight
+      this.height = currentHeight - unionHeight - 56 - 54 - 36
+    }, 200),
     initPreview() {
       if (this.dataset && this.dataset.length > 0) {
         post('/dataset/table/unionPreview', this.table).then((response) => {
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 141d660b9b..ab2c05e898 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -529,7 +529,6 @@ export default {
   },
   activated() {
     const dataset = this.$refs.datasetTreeRef?.getCurrentNode()
-    if (!dataset) return
     queryAuthModel({ modelType: 'dataset' }, true).then((res) => {
       localStorage.setItem('dataset-tree', JSON.stringify(res.data))
       this.tData = res.data

From 667185689031b0eb0b6189c516bb6cbb1ed98398 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 22 Sep 2022 11:26:31 +0800
Subject: [PATCH 02/20] =?UTF-8?q?refactor:=20=E5=BA=94=E7=94=A8=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=AE=9A=E6=97=B6=E6=95=B0=E6=8D=AE=E9=9B=86=E7=AB=8B?=
 =?UTF-8?q?=E5=8D=B3=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/panel/PanelAppTemplateService.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java b/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java
index 88799a76a6..bc06e7a6e8 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java
@@ -168,6 +168,7 @@ public class PanelAppTemplateService {
             DataSetTableRequest datasetRequest = new DataSetTableRequest();
             BeanUtils.copyBean(datasetRequest, datasetTable);
             datasetRequest.setOptFrom("appApply");
+            datasetRequest.setSyncType("sync_now");
             DatasetTable newDataset = dataSetTableService.save(datasetRequest);
             datasetsRelaMap.put(oldId, newDataset.getId());
         }

From 8859f4c017a4035c7f23be8bf3c31d649339cd08 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 22 Sep 2022 11:46:26 +0800
Subject: [PATCH 03/20] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E9=98=88?=
 =?UTF-8?q?=E5=80=BC=E9=BB=98=E8=AE=A4=E8=83=8C=E6=99=AF=E8=89=B2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/senior/dialog/TableThresholdEdit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue b/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
index 84ff33682a..c06b317fdb 100644
--- a/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
+++ b/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
@@ -139,7 +139,7 @@ export default {
         field: '0',
         value: '',
         color: '#ff0000ff',
-        backgroundColor: '#ffffffff',
+        backgroundColor: '#ffffff00',
         min: '0',
         max: '1'
       },

From aa2cb5eb7790924b88f2da3bf3c7d353338b989e Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 22 Sep 2022 14:20:24 +0800
Subject: [PATCH 04/20] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20echarts?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=A4=96=E8=BE=B9=E8=B7=9D=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                       |   5 +
 frontend/src/lang/tw.js                       |   5 +
 frontend/src/lang/zh.js                       |   5 +
 frontend/src/views/chart/chart/chart.js       |   9 +
 .../src/views/chart/chart/common/common.js    |  27 +++
 frontend/src/views/chart/chart/util.js        | 170 +++++++++++++++--
 .../component-style/MarginSelector.vue        | 171 ++++++++++++++++++
 frontend/src/views/chart/view/ChartEdit.vue   |   5 +
 frontend/src/views/chart/view/ChartStyle.vue  |  21 +++
 9 files changed, 401 insertions(+), 17 deletions(-)
 create mode 100644 frontend/src/views/chart/components/component-style/MarginSelector.vue

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index a46b9dd1be..60c2aa8c91 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -910,6 +910,11 @@ export default {
     password_input_error: 'Original password input error'
   },
   chart: {
+    margin_model: 'Model',
+    margin_model_auto: 'Auto',
+    margin_model_absolute: 'Absolute',
+    margin_model_relative: 'Relative',
+    margin_placeholder: 'Please enter a number from 0-100',
     rich_text_view_result_tips: 'The rich text view selects only the first result',
     rich_text_view: 'Rich Text View',
     view_reset: 'View Reset',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 5df944cb3b..9eaefd1367 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -910,6 +910,11 @@ export default {
     password_input_error: '原始密碼輸入錯誤'
   },
   chart: {
+    margin_model: '模式',
+    margin_model_auto: '自動',
+    margin_model_absolute: '絕對',
+    margin_model_relative: '相對',
+    margin_placeholder: '請輸入0-100數字',
     rich_text_view_result_tips: '富文本只选取第一条结果',
     rich_text_view: '富文本视图',
     view_reset: '視圖重置',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 5a2bf46a75..0cf66591bf 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -909,6 +909,11 @@ export default {
     password_input_error: '原始密码输入错误'
   },
   chart: {
+    margin_model: '模式',
+    margin_model_auto: '自动',
+    margin_model_absolute: '绝对',
+    margin_model_relative: '相对',
+    margin_placeholder: '请输入0-100数字',
     rich_text_view_result_tips: '富文本只选取第一条结果',
     rich_text_view: '富文本视图',
     view_reset: '视图重置',
diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index 43548d3e71..5849768991 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -217,6 +217,15 @@ export const DEFAULT_LEGEND_STYLE = {
     fontSize: '12'
   }
 }
+
+export const DEFAULT_MARGIN_STYLE = {
+  marginModel: 'auto',
+  marginTop: 40,
+  marginBottom: 44,
+  marginLeft: 15,
+  marginRight: 10
+}
+
 export const DEFAULT_XAXIS_STYLE = {
   show: true,
   position: 'bottom',
diff --git a/frontend/src/views/chart/chart/common/common.js b/frontend/src/views/chart/chart/common/common.js
index 38a601ce2a..321c238bc0 100644
--- a/frontend/src/views/chart/chart/common/common.js
+++ b/frontend/src/views/chart/chart/common/common.js
@@ -186,11 +186,38 @@ export function componentStyle(chart_option, chart) {
       chart_option.radar.splitLine = customStyle.split.splitLine
       chart_option.radar.splitArea = customStyle.split.splitArea
     }
+    if (customStyle.margin && customStyle.margin.marginModel && customStyle.margin.marginModel !== 'auto') {
+      const unit = getMarginUnit(customStyle.margin)
+      const result = { containLabel: true }
+      const realUnit = (unit === '%' ? unit : '')
+      if (customStyle.margin.marginTop != null) {
+        result.top = customStyle.margin.marginTop + realUnit
+      }
+      if (customStyle.margin.marginBottom != null) {
+        result.bottom = customStyle.margin.marginBottom + realUnit
+      }
+      if (customStyle.margin.marginLeft != null) {
+        result.left = customStyle.margin.marginLeft + realUnit
+      }
+      if (customStyle.margin.marginRight != null) {
+        result.right = customStyle.margin.marginRight + realUnit
+      }
+      if (!chart_option.grid) {
+        chart_option.grid = {}
+      }
+      Object.assign(chart_option.grid, JSON.parse(JSON.stringify(result)))
+    }
     if (customStyle.background) {
       chart_option.backgroundColor = hexColorToRGBA(customStyle.background.color, customStyle.background.alpha)
     }
   }
 }
+export const getMarginUnit = marginForm => {
+  if (!marginForm.marginModel || marginForm.marginModel === 'auto') return null
+  if (marginForm.marginModel === 'absolute') return 'px'
+  if (marginForm.marginModel === 'relative') return '%'
+  return null
+}
 
 const hexToRgba = (hex, opacity) => {
   let rgbaColor = ''
diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js
index e595f0e5a9..006a267362 100644
--- a/frontend/src/views/chart/chart/util.js
+++ b/frontend/src/views/chart/chart/util.js
@@ -1538,9 +1538,17 @@ export const TYPE_CONFIGS = [
     properties: [
       'color-selector',
       'size-selector',
-      'title-selector'
+      'title-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'quotaColor',
         'dimensionColor'
@@ -1582,9 +1590,17 @@ export const TYPE_CONFIGS = [
     properties: [
       'color-selector',
       'size-selector',
-      'title-selector'
+      'title-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'quotaColor',
         'dimensionColor'
@@ -1627,9 +1643,17 @@ export const TYPE_CONFIGS = [
       'color-selector',
       'size-selector',
       'label-selector',
-      'title-selector'
+      'title-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
@@ -1674,9 +1698,17 @@ export const TYPE_CONFIGS = [
       'x-axis-selector',
       'y-axis-selector',
       'title-selector',
-      'legend-selector'
+      'legend-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
@@ -1754,9 +1786,17 @@ export const TYPE_CONFIGS = [
       'x-axis-selector',
       'y-axis-selector',
       'title-selector',
-      'legend-selector'
+      'legend-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
@@ -1835,9 +1875,17 @@ export const TYPE_CONFIGS = [
       'y-axis-selector',
       'y-axis-ext-selector',
       'title-selector',
-      'legend-selector'
+      'legend-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
@@ -1920,9 +1968,17 @@ export const TYPE_CONFIGS = [
       'x-axis-selector',
       'y-axis-selector',
       'title-selector',
-      'legend-selector'
+      'legend-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
@@ -1999,9 +2055,17 @@ export const TYPE_CONFIGS = [
       'x-axis-selector',
       'y-axis-selector',
       'title-selector',
-      'legend-selector'
+      'legend-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
@@ -2078,9 +2142,17 @@ export const TYPE_CONFIGS = [
       'x-axis-selector',
       'y-axis-selector',
       'title-selector',
-      'legend-selector'
+      'legend-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
@@ -2157,9 +2229,17 @@ export const TYPE_CONFIGS = [
       'x-axis-selector',
       'y-axis-selector',
       'title-selector',
-      'legend-selector'
+      'legend-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
@@ -2236,9 +2316,17 @@ export const TYPE_CONFIGS = [
       'label-selector',
       'tooltip-selector',
       'title-selector',
-      'legend-selector'
+      'legend-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
@@ -2294,9 +2382,17 @@ export const TYPE_CONFIGS = [
       'label-selector',
       'tooltip-selector',
       'title-selector',
-      'legend-selector'
+      'legend-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
@@ -2354,9 +2450,17 @@ export const TYPE_CONFIGS = [
       'tooltip-selector',
       'split-selector',
       'title-selector',
-      'legend-selector'
+      'legend-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
@@ -2417,9 +2521,17 @@ export const TYPE_CONFIGS = [
       'size-selector',
       'label-selector',
       'tooltip-selector',
-      'title-selector'
+      'title-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
@@ -2468,9 +2580,17 @@ export const TYPE_CONFIGS = [
       'x-axis-selector',
       'y-axis-selector',
       'title-selector',
-      'legend-selector'
+      'legend-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
@@ -2544,9 +2664,17 @@ export const TYPE_CONFIGS = [
       'label-selector',
       'tooltip-selector',
       'title-selector',
-      'legend-selector'
+      'legend-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
@@ -2599,9 +2727,17 @@ export const TYPE_CONFIGS = [
       'color-selector',
       'label-selector',
       'tooltip-selector',
-      'title-selector'
+      'title-selector',
+      'margin-selector'
     ],
     propertyInner: {
+      'margin-selector': [
+        'marginModel',
+        'marginTop',
+        'marginBottom',
+        'marginLeft',
+        'marginRight'
+      ],
       'color-selector': [
         'value',
         'custom',
diff --git a/frontend/src/views/chart/components/component-style/MarginSelector.vue b/frontend/src/views/chart/components/component-style/MarginSelector.vue
new file mode 100644
index 0000000000..fc7d8ee65b
--- /dev/null
+++ b/frontend/src/views/chart/components/component-style/MarginSelector.vue
@@ -0,0 +1,171 @@
+<template>
+  <div style="width: 100%">
+    <el-col>
+      <el-form ref="marginForm" :model="marginForm" label-width="80px" size="mini" :rules="rules">
+        <el-form-item v-show="showProperty('marginModel')" :label="$t('chart.margin_model')" class="form-item">
+          <el-radio-group v-model="marginForm.marginModel" size="mini" @change="changeMarginStyle('marginModel')">
+            <el-radio-button label="auto">{{ $t('chart.margin_model_auto') }}</el-radio-button>
+            <el-radio-button label="absolute">{{ $t('chart.margin_model_absolute') }}</el-radio-button>
+            <el-radio-button label="relative">{{ $t('chart.margin_model_relative') }}</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <div v-show="showProperty('marginModel') && marginForm.marginModel !== 'auto'">
+          <el-form-item v-show="showProperty('marginTop')" :label="$t('chart.text_pos_top')" class="form-item" prop="marginTop">
+            <el-input v-model="marginForm.marginTop" :placeholder="$t('chart.margin_placeholder')" oninput="value=value.replace(/[^\d]/g,'')" @change="changeMarginStyle(marginForm.marginTop, 'marginTop')">
+              <template v-if="unitSuffix" slot="append">{{ unitSuffix }}</template>
+            </el-input>
+          </el-form-item>
+
+          <el-form-item v-show="showProperty('marginBottom')" :label="$t('chart.text_pos_bottom')" class="form-item" prop="marginBottom">
+            <el-input v-model="marginForm.marginBottom" :placeholder="$t('chart.margin_placeholder')" oninput="value=value.replace(/[^\d]/g,'')" @change="changeMarginStyle(marginForm.marginBottom, 'marginBottom')">
+              <template v-if="unitSuffix" slot="append">{{ unitSuffix }}</template>
+            </el-input>
+          </el-form-item>
+
+          <el-form-item v-show="showProperty('marginLeft')" :label="$t('chart.text_pos_left')" class="form-item" prop="marginLeft">
+            <el-input v-model="marginForm.marginLeft" :placeholder="$t('chart.margin_placeholder')" oninput="value=value.replace(/[^\d]/g,'')" @change="changeMarginStyle(marginForm.marginLeft, 'marginLeft')">
+              <template v-if="unitSuffix" slot="append">{{ unitSuffix }}</template>
+            </el-input>
+          </el-form-item>
+
+          <el-form-item v-show="showProperty('marginRight')" :label="$t('chart.text_pos_right')" class="form-item" prop="marginRight">
+            <el-input v-model="marginForm.marginRight" :placeholder="$t('chart.margin_placeholder')" oninput="value=value.replace(/[^\d]/g,'')" @change="changeMarginStyle(marginForm.marginRight, 'marginRight')">
+              <template v-if="unitSuffix" slot="append">{{ unitSuffix }}</template>
+            </el-input>
+          </el-form-item>
+
+        </div>
+      </el-form>
+    </el-col>
+  </div>
+</template>
+
+<script>
+import { DEFAULT_MARGIN_STYLE } from '../../chart/chart'
+import { getMarginUnit } from '@/views/chart/chart/common/common'
+export default {
+  name: 'MarginSelector',
+  props: {
+    param: {
+      type: Object,
+      required: true
+    },
+    chart: {
+      type: Object,
+      required: true
+    },
+    propertyInner: {
+      type: Array,
+      required: false,
+      default: function() {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      marginForm: JSON.parse(JSON.stringify(DEFAULT_MARGIN_STYLE)),
+      rules: {
+        marginTop: [
+          { validator: this.validateMarginNumber, trigger: ['blur', 'change'] }
+        ],
+        marginBottom: [
+          { validator: this.validateMarginNumber, trigger: ['blur', 'change'] }
+        ],
+        marginLeft: [
+          { validator: this.validateMarginNumber, trigger: ['blur', 'change'] }
+        ],
+        marginRight: [
+          { validator: this.validateMarginNumber, trigger: ['blur', 'change'] }
+        ]
+      }
+    }
+  },
+  computed: {
+    unitSuffix() {
+      return getMarginUnit(this.marginForm)
+    }
+  },
+  watch: {
+    'chart': {
+      handler: function() {
+        this.initData()
+      }
+    }
+  },
+  mounted() {
+    this.initData()
+  },
+  methods: {
+    initData() {
+      const chart = JSON.parse(JSON.stringify(this.chart))
+      if (chart.customStyle) {
+        let customStyle = null
+        if (Object.prototype.toString.call(chart.customStyle) === '[object Object]') {
+          customStyle = JSON.parse(JSON.stringify(chart.customStyle))
+        } else {
+          customStyle = JSON.parse(chart.customStyle)
+        }
+        if (customStyle.margin) {
+          this.marginForm = customStyle.margin
+        }
+      }
+    },
+
+    changeMarginStyle(value, modifyName) {
+      this.marginForm['modifyName'] = modifyName
+      this.$emit('onMarginChange', this.marginForm)
+    },
+    showProperty(property) {
+      return this.propertyInner.includes(property)
+    },
+    validateMarginNumber(rule, value, callBack) {
+      if (value == null || value === '') {
+        callBack()
+        return
+      }
+      if (value < 0 || value > 100) {
+        callBack(new Error(this.$t('chart.margin_placeholder')))
+        this.marginForm[rule.field] = 0
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.shape-item{
+  padding: 6px;
+  border: none;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.form-item-slider ::v-deep .el-form-item__label{
+  font-size: 12px;
+  line-height: 38px;
+}
+.form-item ::v-deep .el-form-item__label{
+  font-size: 12px;
+}
+.el-select-dropdown__item{
+  padding: 0 20px;
+}
+  span{
+    font-size: 12px
+  }
+  .el-form-item{
+    margin-bottom: 6px;
+  }
+
+.switch-style{
+  position: absolute;
+  right: 10px;
+  margin-top: -4px;
+}
+.color-picker-style{
+  cursor: pointer;
+  z-index: 1003;
+}
+</style>
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index e44b1daa2b..61dd8a8ca0 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -757,6 +757,7 @@
             @onChangeSplitForm="onChangeSplitForm"
             @onTextChange="onTextChange"
             @onLegendChange="onLegendChange"
+            @onMarginChange="onMarginChange"
             @onChangeBackgroundForm="onChangeBackgroundForm"
           />
         </el-tab-pane>
@@ -1999,6 +2000,10 @@ export default {
       this.view.customStyle.legend = val
       this.calcStyle()
     },
+    onMarginChange(val) {
+      this.view.customStyle.margin = val
+      this.calcStyle()
+    },
 
     onLabelChange(val) {
       this.view.customAttr.label = val
diff --git a/frontend/src/views/chart/view/ChartStyle.vue b/frontend/src/views/chart/view/ChartStyle.vue
index 77894e2236..8e41267a75 100644
--- a/frontend/src/views/chart/view/ChartStyle.vue
+++ b/frontend/src/views/chart/view/ChartStyle.vue
@@ -260,6 +260,21 @@
               @onChangeBackgroundForm="onChangeBackgroundForm($event,'background-color-selector')"
             />
           </el-collapse-item>
+          <el-collapse-item
+            v-show="showPropertiesCollapse(['margin-selector'])"
+            name="margin"
+            :title="$t('panel.margin')"
+          >
+            <margin-selector
+              v-if="showProperties('margin-selector')"
+              :param="param"
+              class="attr-selector"
+              :chart="chart"
+              :property-inner="propertyInnerAll['margin-selector']"
+              @onMarginChange="onMarginChange($event,'margin-selector')"
+            />
+
+          </el-collapse-item>
         </el-collapse>
       </el-row>
     </div>
@@ -284,6 +299,7 @@ import YAxisExtSelectorAntV from '@/views/chart/components/component-style/YAxis
 import TitleSelector from '@/views/chart/components/component-style/TitleSelector'
 import TitleSelectorAntV from '@/views/chart/components/component-style/TitleSelectorAntV'
 import LegendSelector from '@/views/chart/components/component-style/LegendSelector'
+import MarginSelector from '@/views/chart/components/component-style/MarginSelector'
 import LegendSelectorAntV from '@/views/chart/components/component-style/LegendSelectorAntV'
 import BackgroundColorSelector from '@/views/chart/components/component-style/BackgroundColorSelector'
 import SplitSelector from '@/views/chart/components/component-style/SplitSelector'
@@ -314,6 +330,7 @@ export default {
     SizeSelectorAntV,
     SizeSelector,
     ColorSelector,
+    MarginSelector,
     PluginCom
   },
   props: {
@@ -432,6 +449,10 @@ export default {
       val['propertyName'] = propertyName
       this.$emit('onLegendChange', val)
     },
+    onMarginChange(val, propertyName) {
+      val['propertyName'] = propertyName
+      this.$emit('onMarginChange', val)
+    },
     onChangeBackgroundForm(val, propertyName) {
       val['propertyName'] = propertyName
       this.$emit('onChangeBackgroundForm', val)

From d90a49716c60ad7f3be253e82ea8738b5d3c4244 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 22 Sep 2022 14:57:38 +0800
Subject: [PATCH 05/20] =?UTF-8?q?fix:=20=E6=8F=92=E4=BB=B6=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=20=E8=A1=A8=E6=A0=BC=E8=AE=B0=E5=BF=86select?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/gridTable/index.vue        |  4 +++-
 frontend/src/lang/en.js                            |  2 +-
 frontend/src/styles/index.scss                     |  8 ++++++++
 frontend/src/views/system/task/DatasetTaskList.vue | 14 +++++++++++---
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/gridTable/index.vue b/frontend/src/components/gridTable/index.vue
index ab75046091..178f927aa7 100644
--- a/frontend/src/components/gridTable/index.vue
+++ b/frontend/src/components/gridTable/index.vue
@@ -25,7 +25,6 @@
 </template>
 
 <script>
-import { log } from '@antv/g2plot/lib/utils';
 import tableBody from "./tableBody";
 export default {
   components: { tableBody },
@@ -112,6 +111,9 @@ export default {
     },
   },
   methods: {
+    toggleRowSelection(row) {
+      this.$refs.table.toggleRowSelection(row, true);
+    },
     handlerSelected(multipleSelection) {
       this.multipleSelectionCach = [
         ...this.multipleSelectionCach,
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index a46b9dd1be..d3ed1ac200 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -445,7 +445,7 @@ export default {
     cost: 'cost',
     developer: 'developer',
     edition: 'edition',
-    installation_time: 'Installation time:'
+    installation_time: 'Install time'
   },
   table: {
     dynamicTips1: 'Fixed header, sorted by header order',
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 730a435bd9..00ec60e2c7 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -1389,6 +1389,14 @@ div:focus {
     width: 2px;
     background: #3370ff;
   }
+
+  .explain {
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 20px;
+    margin-left: 8px;
+    color: var(--deTextSecondary, #646a73);
+  }
 }
 
 .de-foot {
diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index c71a903ed5..3c99b740f2 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -104,6 +104,7 @@
         @selection-change="handleSelectionChange"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
+        ref="multipleTable"
       >
         <el-table-column type="selection" width="55" />
         <el-table-column
@@ -507,11 +508,18 @@ export default {
       const { currentPage, pageSize } = this.paginationConfig;
       datasetTaskList(currentPage, pageSize, param, showLoading).then(
         (response) => {
+          const multipleSelection = this.multipleSelection.map(ele => ele.id)
           this.data = response.data.listObject;
-          // this.data.forEach((item) => {
-          //   this.taskStatus(item);
-          // });
           this.paginationConfig.total = response.data.itemCount;
+          if (multipleSelection.length) {
+            this.$nextTick(() => {
+              this.data.forEach(row => {
+                if (multipleSelection.includes(row.id)) {
+                  this.$refs.multipleTable.toggleRowSelection(row);
+                }
+              });
+            })
+          }
         }
       );
     },

From f7f8f0ab1be1a686a2d5394a1a2c4a49b1c807b9 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 22 Sep 2022 16:21:07 +0800
Subject: [PATCH 06/20] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/datasource/DsMain.vue    |   3 +-
 .../src/views/system/datasource/DsTree.vue    | 450 +++++++++---------
 2 files changed, 239 insertions(+), 214 deletions(-)

diff --git a/frontend/src/views/system/datasource/DsMain.vue b/frontend/src/views/system/datasource/DsMain.vue
index 25d96e55e9..0e8d885d3a 100644
--- a/frontend/src/views/system/datasource/DsMain.vue
+++ b/frontend/src/views/system/datasource/DsMain.vue
@@ -121,10 +121,9 @@ export default {
 <style scoped lang="scss">
 .de-ds-container {
   height: 100%;
-  // height: calc(100vh - 56px);
   width: 100%;
   overflow: hidden;
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
   display: flex;
   box-sizing: border-box;
   .el-empty {
diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index ac396184f0..cdbea3c930 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -3,7 +3,7 @@
     <el-col>
       <el-row class="title-css" v-show="showView === 'Datasource'">
         <el-col class="title-text" :span="12">
-          {{ $t("commons.datasource") }}
+          {{ $t('commons.datasource') }}
         </el-col>
         <el-col class="title-operate" :span="12">
           <el-tooltip
@@ -111,7 +111,11 @@
                   v-if="data.type === 'folder'"
                   effect="dark"
                   :content="
-                    $t(showView === 'Driver' ? 'driver.add' : 'datasource.add_data_source')
+                    $t(
+                      showView === 'Driver'
+                        ? 'driver.add'
+                        : 'datasource.add_data_source'
+                    )
                   "
                   placement="top"
                 >
@@ -133,11 +137,11 @@
                     <slot>
                       <el-dropdown-item command="edit">
                         <i class="el-icon-edit"></i>
-                        {{ $t("chart.edit") }}
+                        {{ $t('chart.edit') }}
                       </el-dropdown-item>
                       <el-dropdown-item command="delete">
                         <i class="el-icon-delete"></i>
-                        {{ $t("chart.delete") }}
+                        {{ $t('chart.delete') }}
                       </el-dropdown-item>
                     </slot>
                   </el-dropdown-menu>
@@ -166,7 +170,10 @@
           :rules="rule"
         >
           <el-form-item :label="$t('datasource.driver_name')" prop="name">
-            <el-input v-model="driverForm.name" :placeholder="$t('fu.search_bar.please_input')" />
+            <el-input
+              v-model="driverForm.name"
+              :placeholder="$t('fu.search_bar.please_input')"
+            />
           </el-form-item>
           <el-form-item :label="$t('datasource.drive_type')" prop="type">
             <el-select
@@ -189,9 +196,9 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <deBtn secondary @click="close()">{{ $t("commons.cancel") }}</deBtn>
+          <deBtn secondary @click="close()">{{ $t('commons.cancel') }}</deBtn>
           <deBtn type="primary" size="mini" @click="saveDriver(driverForm)"
-            >{{ $t("commons.save") }}
+            >{{ $t('commons.save') }}
           </deBtn>
         </div>
       </el-dialog>
@@ -204,34 +211,43 @@
         class="de-dialog-form"
         append-to-body
       >
-        <el-tabs v-model="tabActive" @tab-click="changeTab">
+        <el-tabs v-model="tabActive">
           <el-tab-pane :label="$t('datasource.all')" name="all"> </el-tab-pane>
-          <el-tab-pane :label="$t('datasource.relational_database')" name="reDb"> </el-tab-pane>
-          <el-tab-pane :label="$t('datasource.non_relational_database')" name="noReDb">
+          <el-tab-pane
+            :label="$t('datasource.relational_database')"
+            name="RDBMS"
+          >
+          </el-tab-pane>
+          <el-tab-pane
+            :label="$t('datasource.non_relational_database')"
+            name="NORDBMS"
+          >
+          </el-tab-pane>
+          <el-tab-pane :label="$t('datasource.other')" name="OTHER">
           </el-tab-pane>
-          <el-tab-pane :label="$t('datasource.other')" name="other"> </el-tab-pane>
-          <div class="db-container">
-            <div
-              @click="addDb(db)"
-              v-for="db in dsTypes"
-              :key="db.type"
-              class="db-card"
-            >
-              <img
-                src="https://gimg3.baidu.com/search/src=http%3A%2F%2Fgips0.baidu.com%2Fit%2Fu%3D3429312337%2C2430696955%26fm%3D3030%26app%3D3030%26f%3DJPEG%3Fw%3D121%26h%3D74%26s%3D51321C7281B1598818E875C1030010B0&refer=http%3A%2F%2Fwww.baidu.com&app=2021&size=f242,150&n=0&g=0n&q=100&fmt=auto?sec=1662483600&t=53d1d1fe51561bb626c94ce63b5b31b8"
-                alt=""
-              />
-              <p class="db-name">{{ db.name }}</p>
-            </div>
-          </div>
         </el-tabs>
+        <div class="db-container">
+          <div
+            @click="addDb(db)"
+            v-for="(db, index) in databaseList"
+            :key="db.type"
+            class="db-card"
+            :class="[{ marLeft: index % 4 === 0 }]"
+          >
+            <img
+              src="https://gimg3.baidu.com/search/src=http%3A%2F%2Fgips0.baidu.com%2Fit%2Fu%3D3429312337%2C2430696955%26fm%3D3030%26app%3D3030%26f%3DJPEG%3Fw%3D121%26h%3D74%26s%3D51321C7281B1598818E875C1030010B0&refer=http%3A%2F%2Fwww.baidu.com&app=2021&size=f242,150&n=0&g=0n&q=100&fmt=auto?sec=1662483600&t=53d1d1fe51561bb626c94ce63b5b31b8"
+              alt=""
+            />
+            <p class="db-name">{{ db.name }}</p>
+          </div>
+        </div>
       </el-dialog>
     </el-col>
   </el-col>
 </template>
 <script>
-import { mapGetters } from "vuex";
-import i18n from "@/lang";
+import { mapGetters } from 'vuex'
+import i18n from '@/lang'
 import {
   listDatasource,
   listDatasourceByType,
@@ -241,368 +257,371 @@ import {
   addDriver,
   delDriver,
   listDriverByType,
-  updateDriver,
-} from "@/api/system/datasource";
-import { ApplicationContext } from "@/utils/ApplicationContext";
-import deTextarea from "@/components/deCustomCm/deTextarea.vue";
-import msgCfm from "@/components/msgCfm";
+  updateDriver
+} from '@/api/system/datasource'
+import { ApplicationContext } from '@/utils/ApplicationContext'
+import deTextarea from '@/components/deCustomCm/deTextarea.vue'
+import msgCfm from '@/components/msgCfm'
 export default {
-  name: "DsTree",
+  name: 'DsTree',
   mixins: [msgCfm],
   components: { deTextarea },
   props: {
     datasource: {
       type: Object,
-      default: null,
-    },
+      default: null
+    }
   },
   data() {
     return {
-      tabActive: "all",
+      tabActive: 'all',
       dsTypeRelate: false,
       expandedArray: [],
       tData: [],
       dsTypes: [],
       dsTypesForDriver: [],
       showSearchInput: false,
-      key: "",
-      showView: "Datasource",
-      dialogTitle: "",
+      key: '',
+      showView: 'Datasource',
+      dialogTitle: '',
       editDriver: false,
       driverForm: {
-        name: "",
-        desc: "",
-        type: "",
+        name: '',
+        desc: '',
+        type: ''
       },
       params: {},
       rule: {
         name: [
           {
             required: true,
-            message: i18n.t("datasource.input_name"),
-            trigger: "blur",
+            message: i18n.t('datasource.input_name'),
+            trigger: 'blur'
           },
           {
             min: 2,
             max: 50,
-            message: i18n.t("datasource.input_limit_2_25", [2, 25]),
-            trigger: "blur",
-          },
+            message: i18n.t('datasource.input_limit_2_25', [2, 25]),
+            trigger: 'blur'
+          }
         ],
         desc: [
           {
             required: true,
-            message: i18n.t("datasource.input_name"),
-            trigger: "blur",
+            message: i18n.t('datasource.input_name'),
+            trigger: 'blur'
           },
           {
             min: 2,
             max: 200,
-            message: i18n.t("datasource.input_limit_2_25", [2, 25]),
-            trigger: "blur",
-          },
+            message: i18n.t('datasource.input_limit_2_25', [2, 25]),
+            trigger: 'blur'
+          }
         ],
         type: [
           {
             required: true,
-            message: i18n.t("datasource.please_choose_type"),
-            trigger: "blur",
-          },
-        ],
-      },
-    };
+            message: i18n.t('datasource.please_choose_type'),
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
   },
   watch: {
     key(val) {
-      this.$refs.myDsTree.filter(val);
-    },
+      this.$refs.myDsTree.filter(val)
+    }
   },
   computed: {
-    ...mapGetters(["user"]),
+    ...mapGetters(['user']),
+    databaseList() {
+      if (this.tabActive === 'all') {
+        return this.dsTypes
+      }
+      return this.dsTypes.filter(
+        (ele) => ele.databaseClassification === this.tabActive
+      )
+    }
   },
   created() {
-    this.queryTreeDatas();
-    this.datasourceTypes();
+    this.queryTreeDatas()
+    this.datasourceTypes()
   },
   methods: {
-    changeTab() {},
     filterNode(value, data) {
-      if (!value) return true;
-      return data.name.indexOf(value) !== -1;
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
     },
     showSearchWidget() {
-      this.showSearchInput = true;
+      this.showSearchInput = true
     },
     closeSearchWidget() {
-      this.key = "";
-      this.showSearchInput = false;
+      this.key = ''
+      this.showSearchInput = false
     },
     queryTreeDatas() {
-      if (this.showView === "Datasource") {
+      if (this.showView === 'Datasource') {
         listDatasource().then((res) => {
-          this.tData = this.buildTree(res.data);
-        });
+          this.tData = this.buildTree(res.data)
+        })
       }
-      if (this.showView === "Driver") {
+      if (this.showView === 'Driver') {
         listDrivers().then((res) => {
-          this.tData = this.buildTree(res.data);
-        });
+          this.tData = this.buildTree(res.data)
+        })
       }
     },
     datasourceTypes() {
       listDatasourceType().then((res) => {
-        this.dsTypes = res.data;
+        this.dsTypes = res.data
         this.dsTypes.forEach((item) => {
           if (item.isJdbc) {
-            this.dsTypesForDriver.push(item);
+            this.dsTypesForDriver.push(item)
           }
-        });
-      });
+        })
+      })
     },
     refreshType(datasource) {
       const method =
-        this.showView === "Datasource"
-          ? listDatasourceByType
-          : listDriverByType;
-      let typeData = [];
+        this.showView === 'Datasource' ? listDatasourceByType : listDriverByType
+      let typeData = []
       method(datasource.type).then((res) => {
-        typeData = this.buildTree(res.data);
+        typeData = this.buildTree(res.data)
         if (typeData.length === 0) {
           const index = this.tData.findIndex((item) => {
             if (item.id === datasource.type) {
-              return true;
+              return true
             }
-          });
-          this.tData.splice(index, 1);
+          })
+          this.tData.splice(index, 1)
         } else {
-          let find = false;
+          let find = false
           for (let index = 0; index < this.tData.length; index++) {
             if (typeData[0].id === this.tData[index].id) {
-              this.tData[index].children = typeData[0].children;
+              this.tData[index].children = typeData[0].children
               for (let i = 0; i < this.tData[index].children.length; i++) {
                 if (this.tData[index].children[i].id === datasource.id) {
-                  this.showInfo({ data: this.tData[index].children[i] });
+                  this.showInfo({ data: this.tData[index].children[i] })
                 }
               }
-              find = true;
+              find = true
             }
           }
           if (!find) {
-            this.tData.push(typeData[0]);
+            this.tData.push(typeData[0])
           }
         }
-      });
+      })
     },
     buildTree(array) {
-      const types = {};
-      const newArr = [];
+      const types = {}
+      const newArr = []
       for (let index = 0; index < array.length; index++) {
-        const element = array[index];
+        const element = array[index]
         if (this.msgNodeId) {
           if (element.id === this.msgNodeId) {
-            element.msgNode = true;
+            element.msgNode = true
           }
         }
         if (!(element.type in types)) {
-          types[element.type] = [];
+          types[element.type] = []
           newArr.push({
             id: element.type,
             name: element.typeDesc,
-            type: "folder",
-            children: types[element.type],
-          });
+            type: 'folder',
+            children: types[element.type]
+          })
         }
-        types[element.type].push(element);
+        types[element.type].push(element)
       }
-      return newArr;
+      return newArr
     },
     addFolder() {
-      if (this.showView === "Driver") {
-        this.dialogTitle = this.$t("datasource.add_driver");
-        this.editDriver = true;
-        this.switchMain("DriverForm", {}, this.tData, this.dsTypes);
+      if (this.showView === 'Driver') {
+        this.dialogTitle = this.$t('datasource.add_driver')
+        this.editDriver = true
+        this.switchMain('DriverForm', {}, this.tData, this.dsTypes)
       } else {
-        this.dsTypeRelate = true;
+        this.dsTypeRelate = true
       }
     },
     addDriver() {
-      this.dialogTitle = this.$t("datasource.add_driver");
-      this.editDriver = true;
+      this.dialogTitle = this.$t('datasource.add_driver')
+      this.editDriver = true
     },
     driverMgm() {
-      this.$emit("switch-main", {});
-      this.$emit("switch-mgm", "driverMgm");
-      this.showView = "Driver";
-      this.expandedArray = [];
-      this.tData = [];
-      this.queryTreeDatas();
+      this.$emit('switch-main', {})
+      this.$emit('switch-mgm', 'driverMgm')
+      this.showView = 'Driver'
+      this.expandedArray = []
+      this.tData = []
+      this.queryTreeDatas()
     },
     dsMgm() {
-      this.$emit("switch-main", {});
-      this.showView = "Datasource";
-      this.expandedArray = [];
-      this.tData = [];
-      this.queryTreeDatas();
+      this.$emit('switch-main', {})
+      this.showView = 'Datasource'
+      this.expandedArray = []
+      this.tData = []
+      this.queryTreeDatas()
     },
     addDb({ type }) {
       this.$router.push({
-        path: "/ds-form",
-        query: { type },
-      });
+        path: '/ds-form',
+        query: { type }
+      })
     },
     addFolderWithType(data) {
-      if (this.showView === "Driver") {
-        this.driverForm.type = data.id;
-        this.dialogTitle = this.$t("datasource.add_driver");
-        this.editDriver = true;
+      if (this.showView === 'Driver') {
+        this.driverForm.type = data.id
+        this.dialogTitle = this.$t('datasource.add_driver')
+        this.editDriver = true
       } else {
         this.$router.push({
-          path: "/ds-form",
-          query: { type: data.id },
-        });
+          path: '/ds-form',
+          query: { type: data.id }
+        })
       }
     },
     nodeClick(node, data) {
-      if (node.type === "folder") return;
-      this.showInfo(data);
+      if (node.type === 'folder') return
+      this.showInfo(data)
     },
     clickFileMore(param) {
-      const { optType, data } = param;
+      const { optType, data } = param
       switch (optType) {
-        case "edit":
-          this.edit(data);
-          break;
-        case "delete":
-          this._handleDelete(data);
-          break;
+        case 'edit':
+          this.edit(data)
+          break
+        case 'delete':
+          this._handleDelete(data)
+          break
         default:
-          break;
+          break
       }
     },
     showInfo(row) {
-      if (this.showView === "Driver") {
-        const param = { ...row.data, ...{ showModel: "show" } };
+      if (this.showView === 'Driver') {
+        const param = { ...row.data, ...{ showModel: 'show' } }
         this.switchMain(
-          this.showView === "Datasource" ? "DsForm" : "DriverForm",
+          this.showView === 'Datasource' ? 'DsForm' : 'DriverForm',
           param,
           this.tData,
           this.dsTypes
-        );
+        )
       } else {
-        this.switchMain("dsTable", row.data);
+        this.switchMain('dsTable', row.data)
       }
     },
     handleCommand(type, data) {
       switch (type) {
-        case "edit":
-          this._handleEditer(data);
-          break;
-        case "delete":
-          this._handleDelete(data);
-          break;
+        case 'edit':
+          this._handleEditer(data)
+          break
+        case 'delete':
+          this._handleDelete(data)
+          break
         default:
-          break;
+          break
       }
     },
     _handleEditer(row) {
-      if (this.showView === "Datasource") {
-        const param = { ...row, ...{ showModel: "show" } };
-        this.switchMain(
-          'DsForm',
-          param,
-          this.tData,
-          this.dsTypes
-        );
+      if (this.showView === 'Datasource') {
+        const param = { ...row, ...{ showModel: 'show' } }
+        this.switchMain('DsForm', param, this.tData, this.dsTypes)
         return
       }
-      this.editDriver = true;
-      this.dialogTitle = this.$t('datasource.edit_driver');
-      this.driverForm = row;
+      this.editDriver = true
+      this.dialogTitle = this.$t('datasource.edit_driver')
+      this.driverForm = row
     },
     _handleDelete(datasource) {
       const params = {
-        title: this.showView === "Datasource" ? 'datasource.this_data_source' : 'datasource.delete_this_driver',
+        title:
+          this.showView === 'Datasource'
+            ? 'datasource.this_data_source'
+            : 'datasource.delete_this_driver',
         cb: () => {
-          let method = delDriver;
-          let parma = { type: datasource.type, id: datasource.id };
-          if (this.showView === "Datasource") {
-            method = delDs;
-            parma = datasource.id;
+          let method = delDriver
+          let parma = { type: datasource.type, id: datasource.id }
+          if (this.showView === 'Datasource') {
+            method = delDs
+            parma = datasource.id
           }
           method(parma).then((res) => {
             if (res.success) {
-              this.openMessageSuccess("commons.delete_success");
-              this.switchMain("", {}, this.tData, this.dsTypes);
-              this.refreshType(datasource);
+              this.openMessageSuccess('commons.delete_success')
+              this.switchMain('', {}, this.tData, this.dsTypes)
+              this.refreshType(datasource)
             } else {
-              this.openMessageSuccess(res.message, "error")
+              this.openMessageSuccess(res.message, 'error')
             }
-          });
+          })
         }
       }
       this.handlerConfirm(params)
     },
     switchMain(component, componentParam, tData, dsTypes) {
-      if (component === "DsForm") {
-        const { id, type, showModel } = componentParam;
+      if (component === 'DsForm') {
+        const { id, type, showModel } = componentParam
         this.$router.push({
-          path: "/ds-form",
+          path: '/ds-form',
           query: {
             id,
             type,
             showModel,
-            msgNodeId: this.msgNodeId,
-          },
-        });
-        return;
+            msgNodeId: this.msgNodeId
+          }
+        })
+        return
       }
-      this.$emit("switch-main", {
+      this.$emit('switch-main', {
         component,
         componentParam,
         tData,
-        dsTypes,
-      });
+        dsTypes
+      })
     },
     markInvalid(msgParam) {
-      const param = JSON.parse(msgParam);
-      const msgNodeId = param.id;
-      this.msgNodeId = msgNodeId;
+      const param = JSON.parse(msgParam)
+      const msgNodeId = param.id
+      this.msgNodeId = msgNodeId
       this.$nextTick(() => {
         this.tData.forEach((folder) => {
-          const nodes = folder.children;
+          const nodes = folder.children
           nodes.forEach((node) => {
             if (node.id === msgNodeId) {
-              node.msgNode = true;
+              node.msgNode = true
             }
-          });
-        });
-      });
+          })
+        })
+      })
     },
     close() {
-      this.$refs["driverForm"].resetFields();
-      this.editDriver = false;
+      this.$refs['driverForm'].resetFields()
+      this.editDriver = false
       this.driverForm = {
-        name: "",
-        desc: "",
-        type: "",
-      };
+        name: '',
+        desc: '',
+        type: ''
+      }
     },
     saveDriver(driverForm) {
-      this.$refs["driverForm"].validate((valid) => {
+      this.$refs['driverForm'].validate((valid) => {
         if (valid) {
-          const req = driverForm.id ?  updateDriver : addDriver;
+          const req = driverForm.id ? updateDriver : addDriver
           req(driverForm).then((res) => {
-            this.openMessageSuccess("dataset.save_success")
-            this.refreshType(driverForm);
-            this.close();
-          });
+            this.openMessageSuccess('dataset.save_success')
+            this.refreshType(driverForm)
+            this.close()
+          })
         } else {
-          return false;
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 .custom-tree-container {
@@ -660,8 +679,10 @@ export default {
   max-height: 674px;
   overflow-y: auto;
   display: flex;
-  justify-content: space-between;
   flex-wrap: wrap;
+  margin-top: -3px;
+  position: relative;
+  z-index: 10;
   .db-card {
     height: 193px;
     width: 270px;
@@ -670,7 +691,8 @@ export default {
     background: #ffffff;
     border: 1px solid #dee0e3;
     border-radius: 4px;
-    margin-top: 24px;
+    margin-bottom: 24px;
+    margin-left: 22px;
     img {
       width: 100%;
       height: 154.58px;
@@ -689,5 +711,9 @@ export default {
       box-shadow: 0px 6px 24px rgba(31, 35, 41, 0.08);
     }
   }
+
+  .marLeft {
+    margin-left: 0;
+  }
 }
 </style>
\ No newline at end of file

From 4693f78671d262c40bc5e0148b137dffe9ad7c46 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 22 Sep 2022 17:17:39 +0800
Subject: [PATCH 07/20] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/DataSetTableController.java         | 12 +++++++-----
 .../service/dataset/DataSetTableService.java    | 17 +++++++++++------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
index aca169acb0..e2afd79b56 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
@@ -23,6 +23,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -44,8 +46,8 @@ public class DataSetTableController {
     }, logical = Logical.AND)
     @ApiOperation("批量保存")
     @PostMapping("batchAdd")
-    public void batchAdd(@RequestBody List<DataSetTableRequest> datasetTable) throws Exception {
-        dataSetTableService.batchInsert(datasetTable);
+    public List<DatasetTable> batchAdd(@RequestBody List<DataSetTableRequest> datasetTable) throws Exception {
+        return dataSetTableService.batchInsert(datasetTable);
     }
 
     @DePermissions(value = {
@@ -55,11 +57,11 @@ public class DataSetTableController {
     }, logical = Logical.AND)
     @ApiOperation("更新")
     @PostMapping("update")
-    public void save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
+    public List<DatasetTable> save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
         if (datasetTable.getType().equalsIgnoreCase("excel")) {
-            dataSetTableService.saveExcel(datasetTable);
+            return dataSetTableService.saveExcel(datasetTable);
         } else {
-            dataSetTableService.save(datasetTable);
+            return Collections.singletonList(dataSetTableService.save(datasetTable));
         }
     }
 
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 7835eada20..d97a57efdf 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -145,16 +145,18 @@ public class DataSetTableService {
     private static Logger logger = LoggerFactory.getLogger(ClassloaderResponsity.class);
 
     @DeCleaner(value = DePermissionType.DATASET, key = "sceneId")
-    public void batchInsert(List<DataSetTableRequest> datasetTable) throws Exception {
+    public List<DatasetTable> batchInsert(List<DataSetTableRequest> datasetTable) throws Exception {
         // 保存之前校验table名称
         checkNames(datasetTable);
+        List<DatasetTable> list = new ArrayList<>();
         for (DataSetTableRequest table : datasetTable) {
-            save(table);
+            list.add(save(table));
             // 清理权限缓存
             CacheUtils.removeAll(AuthConstants.USER_DATASET_NAME);
             CacheUtils.removeAll(AuthConstants.ROLE_DATASET_NAME);
             CacheUtils.removeAll(AuthConstants.DEPT_DATASET_NAME);
         }
+        return list;
     }
 
     private void extractData(DataSetTableRequest datasetTable) throws Exception {
@@ -176,10 +178,11 @@ public class DataSetTableService {
 
     @Transactional(propagation = Propagation.NOT_SUPPORTED)
     @DeCleaner(value = DePermissionType.DATASET, key = "sceneId")
-    public void saveExcel(DataSetTableRequest datasetTable) throws Exception {
+    public List<DatasetTable> saveExcel(DataSetTableRequest datasetTable) throws Exception {
         List<String> datasetIdList = new ArrayList<>();
 
         if (StringUtils.isEmpty(datasetTable.getId())) {
+            List<DatasetTable> list = new ArrayList<>();
             if (datasetTable.isMergeSheet()) {
                 Map<String, List<ExcelSheetData>> map = datasetTable.getSheets().stream()
                         .collect(Collectors.groupingBy(ExcelSheetData::getFieldsMd5));
@@ -208,6 +211,7 @@ public class DataSetTableService {
                     sysAuthService.copyAuth(sheetTable.getId(), SysAuthConstants.AUTH_SOURCE_TYPE_DATASET);
                     saveExcelTableField(sheetTable.getId(), excelSheetDataList.get(0).getFields(), true);
                     datasetIdList.add(sheetTable.getId());
+                    list.add(sheetTable);
                     DeLogUtils.save(SysLogConstants.OPERATE_TYPE.CREATE, SysLogConstants.SOURCE_TYPE.DATASET, datasetTable.getId(), datasetTable.getSceneId(), null, null);
                 }
                 datasetIdList.forEach(datasetId -> {
@@ -239,16 +243,16 @@ public class DataSetTableService {
                     sysAuthService.copyAuth(sheetTable.getId(), SysAuthConstants.AUTH_SOURCE_TYPE_DATASET);
                     saveExcelTableField(sheetTable.getId(), sheet.getFields(), true);
                     datasetIdList.add(sheetTable.getId());
+                    list.add(sheetTable);
                     DeLogUtils.save(SysLogConstants.OPERATE_TYPE.MODIFY, SysLogConstants.SOURCE_TYPE.DATASET, datasetTable.getId(), datasetTable.getSceneId(), null, null);
                 }
                 datasetIdList.forEach(datasetId -> {
                     commonThreadPool.addTask(() -> extractDataService.extractExcelData(datasetId, "all_scope", "初始导入",
                             null, datasetIdList));
                 });
-
-
             }
-            return;
+
+            return list;
         }
 
         List<ExcelSheetData> excelSheetDataList = new ArrayList<>();
@@ -287,6 +291,7 @@ public class DataSetTableService {
                     null, Arrays.asList(datasetTable.getId())));
         }
         DeLogUtils.save(SysLogConstants.OPERATE_TYPE.MODIFY, SysLogConstants.SOURCE_TYPE.DATASET, datasetTable.getId(), datasetTable.getSceneId(), null, null);
+        return Collections.singletonList(datasetTable);
     }
 
     @DeCleaner(value = DePermissionType.DATASET, key = "sceneId")

From 6506ce9d7cdda7950494a692f9ac5ff3e08c9fe3 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 22 Sep 2022 17:24:23 +0800
Subject: [PATCH 08/20] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/controller/dataset/DataSetTableController.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
index e2afd79b56..8c36e7f45b 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

From ffc82716113350023566b73f59d0211118ee4b5c Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Fri, 23 Sep 2022 11:17:18 +0800
Subject: [PATCH 09/20] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=20=E8=BF=94=E5=9B=9E=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E9=9B=86=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90bug=20=E8=B7=AF=E7=94=B1=E5=88=87=E6=8D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/App.vue                          |  2 +-
 frontend/src/views/dataset/add/AddApi.vue     | 13 ++--
 frontend/src/views/dataset/add/AddDB.vue      | 14 ++--
 frontend/src/views/dataset/add/AddExcel.vue   | 16 ++--
 frontend/src/views/dataset/add/AddSQL.vue     | 10 +--
 frontend/src/views/dataset/add/AddUnion.vue   |  7 +-
 frontend/src/views/dataset/add/cancelMix.js   | 19 +++++
 frontend/src/views/dataset/group/Group.vue    | 31 ++++++--
 .../src/views/system/datasource/dsTable.vue   | 78 +++++--------------
 9 files changed, 88 insertions(+), 102 deletions(-)
 create mode 100644 frontend/src/views/dataset/add/cancelMix.js

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index a0dbbb58fb..08daceb3a4 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -3,7 +3,7 @@
     <keep-alive>
       <router-view v-if="['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
     </keep-alive>
-    <router-view v-if="!['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
+    <router-view :key="key" v-if="!['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
     <plugin-com v-show="false" ref="de-theme" component-name="ThemeSetting" />
   </div>
 </template>
diff --git a/frontend/src/views/dataset/add/AddApi.vue b/frontend/src/views/dataset/add/AddApi.vue
index dfa2afb486..bc36beabc7 100644
--- a/frontend/src/views/dataset/add/AddApi.vue
+++ b/frontend/src/views/dataset/add/AddApi.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="dataset-api">
-    <p v-if="!showLeft" class="arrow-right" @click="showLeft = true">
+    <p v-show="!showLeft" class="arrow-right" @click="showLeft = true">
       <i class="el-icon-d-arrow-right" />
     </p>
-    <div v-else class="table-list">
+    <div v-show="showLeft" class="table-list">
       <p class="select-ds">
         {{ $t('deDataset.select_data_source') }}
         <i class="el-icon-d-arrow-left" @click="showLeft = false" />
@@ -153,9 +153,11 @@
 <script>
 import { listApiDatasource, post, isKettleRunning } from '@/api/dataset/dataset'
 import { dbPreview, engineMode } from '@/api/system/engine'
+import cancelMix from './cancelMix'
 
 export default {
   name: 'AddApi',
+  mixins: [cancelMix],
   props: {
     param: {
       type: Object,
@@ -350,17 +352,12 @@ export default {
       post('/dataset/table/batchAdd', tables)
         .then((response) => {
           this.openMessageSuccess('deDataset.set_saved_successfully')
-          this.cancel()
+          this.cancel(response.data)
         })
         .finally(() => {
           this.loading = false
         })
     },
-
-    cancel() {
-      this.$router.push('/dataset/index')
-    },
-
     dataReset() {
       this.searchTable = ''
       this.options = []
diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue
index abb2110b63..eebf33070d 100644
--- a/frontend/src/views/dataset/add/AddDB.vue
+++ b/frontend/src/views/dataset/add/AddDB.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="dataset-db" v-loading="loading">
-    <p v-if="!showLeft" @click="showLeft = true" class="arrow-right">
+    <p v-show="!showLeft" @click="showLeft = true" class="arrow-right">
       <i class="el-icon-d-arrow-right"></i>
     </p>
-    <div class="table-list" v-else>
+    <div class="table-list" v-show="showLeft">
       <p class="select-ds">
         {{ $t('deDataset.select_data_source') }}
         <i @click="showLeft = false" class="el-icon-d-arrow-left"></i>
@@ -158,10 +158,10 @@
 import { listDatasource, post, isKettleRunning } from '@/api/dataset/dataset'
 import { engineMode, dbPreview } from '@/api/system/engine'
 import msgCfm from '@/components/msgCfm/index'
-
+import cancelMix from './cancelMix'
 export default {
   name: 'AddDB',
-  mixins: [msgCfm],
+  mixins: [ msgCfm, cancelMix],
   props: {
     param: {
       type: Object,
@@ -368,16 +368,12 @@ export default {
       post('/dataset/table/batchAdd', tables)
         .then((response) => {
           this.openMessageSuccess('deDataset.set_saved_successfully')
-          this.cancel()
+          this.cancel(response.data)
         })
         .finally(() => {
           this.loading = false
         })
     },
-
-    cancel() {
-      this.$router.back()
-    },
     dataReset() {
       this.searchTable = ''
       this.options = []
diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
index e625892a5d..d85a267def 100644
--- a/frontend/src/views/dataset/add/AddExcel.vue
+++ b/frontend/src/views/dataset/add/AddExcel.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="dataset-excel" v-loading="loading">
-    <p v-if="!showLeft" @click="showLeft = true" class="arrow-right">
+    <p v-show="!showLeft" @click="showLeft = true" class="arrow-right">
       <i class="el-icon-d-arrow-right"></i>
     </p>
-    <div v-else class="table-list">
+    <div v-show="showLeft" class="table-list">
       <p class="select-ds">
         <span
           >{{ $t('deDataset.select_data_table ') }}
@@ -192,12 +192,13 @@ import i18n from '@/lang'
 import { $alert, $confirm } from '@/utils/message'
 import store from '@/store'
 import msgCfm from '@/components/msgCfm/index'
+import cancelMix from './cancelMix'
 
 const token = getToken()
 
 export default {
   name: 'AddExcel',
-  mixins: [msgCfm],
+  mixins: [ msgCfm, cancelMix],
   props: {
     param: {
       type: Object,
@@ -500,7 +501,7 @@ export default {
             this.loading = true
             post('/dataset/table/update', table).then((response) => {
               this.openMessageSuccess('deDataset.set_saved_successfully')
-              this.cancel()
+              this.cancel(response.data)
             })
           })
           .catch((action) => {
@@ -512,7 +513,7 @@ export default {
             post('/dataset/table/update', table)
               .then((response) => {
                 this.openMessageSuccess('deDataset.set_saved_successfully')
-                this.cancel()
+                this.cancel(response.data)
               })
               .finally(() => {
                 this.loading = false
@@ -526,16 +527,13 @@ export default {
         post('/dataset/table/update', table)
           .then((response) => {
             this.openMessageSuccess('deDataset.set_saved_successfully')
-            this.cancel()
+            this.cancel(response.data)
           })
           .finally(() => {
             this.loading = false
           })
       }
     },
-    cancel() {
-      this.$router.back()
-    },
     dataReset() {
       this.searchTable = ''
       this.options = []
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index 7e237a1848..7837dc9077 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -371,11 +371,12 @@ import 'codemirror/addon/hint/sql-hint'
 import 'codemirror/addon/hint/show-hint'
 import { engineMode } from '@/api/system/engine'
 import msgCfm from '@/components/msgCfm/index'
+import cancelMix from './cancelMix'
 import _ from 'lodash'
 export default {
   name: 'AddSQL',
   components: { codemirror },
-  mixins: [msgCfm],
+  mixins: [ msgCfm, cancelMix],
   props: {
     param: {
       type: Object,
@@ -656,17 +657,12 @@ export default {
       post('/dataset/table/update', table)
         .then((response) => {
           this.openMessageSuccess('deDataset.set_saved_successfully')
-          this.cancel()
+          this.cancel(response.data)
         })
         .finally(() => {
           this.loading = false
         })
     },
-
-    cancel() {
-      this.$router.push('/dataset/index')
-    },
-
     showSQL(val) {
       this.sql = val || ''
     },
diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue
index 5cfd6c541f..d5d860917c 100644
--- a/frontend/src/views/dataset/add/AddUnion.vue
+++ b/frontend/src/views/dataset/add/AddUnion.vue
@@ -107,8 +107,10 @@ import datasetTree from '@/views/dataset/common/datasetTree'
 import UnionEdit from '@/views/dataset/add/union/UnionEdit'
 import { post } from '@/api/dataset/dataset'
 import UnionPreview from '@/views/dataset/add/union/UnionPreview'
+import cancelMix from './cancelMix'
 export default {
   name: 'AddUnion',
+  mixins: [cancelMix],
   components: {
     UnionPreview,
     UnionEdit,
@@ -218,14 +220,11 @@ export default {
       }
       post('/dataset/table/update', table).then((response) => {
         this.$emit('saveSuccess', table)
-        this.cancel()
+        this.cancel(response.data)
       }).finally(() => {
         this.loading = false;
       }) 
     },
-    cancel() {
-      this.$router.back()
-    },
     selectDs() {
       this.selectDsDialog = true
     },
diff --git a/frontend/src/views/dataset/add/cancelMix.js b/frontend/src/views/dataset/add/cancelMix.js
new file mode 100644
index 0000000000..7b70a200e4
--- /dev/null
+++ b/frontend/src/views/dataset/add/cancelMix.js
@@ -0,0 +1,19 @@
+export default {
+    methods: {
+        cancel(arr = []) {
+            if (arr.length === 1) {
+                const [dataset] = arr;
+                const { id, name } = dataset;
+                this.$router.push({
+                    name: 'dataset',
+                    params: {
+                        id,
+                        name
+                    }
+                })
+            } else {
+                this.$router.back()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index ab2c05e898..bbac9249ca 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -222,10 +222,7 @@
                   />
                 </span>
                 <span
-                  v-if="
-                    data.modelInnerType === 'db' ||
-                    data.modelInnerType === 'sql'
-                  "
+                  v-if="['db', 'sql'].includes(data.modelInnerType)"
                 >
                   <span v-if="data.mode === 0" style="margin-left: 6px"
                     ><i class="el-icon-s-operation"
@@ -241,6 +238,7 @@
                     overflow: hidden;
                     text-overflow: ellipsis;
                   "
+                  :class="[{ 'de-fill-block': !['db', 'sql'].includes(data.modelInnerType)}]"
                   :title="data.name"
                   >{{ data.name }}</span
                 >
@@ -498,6 +496,7 @@ export default {
       },
       isTreeSearch: false,
       kettleRunning: false,
+      pageCreated: false,
       engineMode: 'local',
       searchPids: [], // 查询命中的pid
       filterText: '',
@@ -528,13 +527,17 @@ export default {
     }
   },
   activated() {
+    if (!this.pageCreated) return;
     const dataset = this.$refs.datasetTreeRef?.getCurrentNode()
+    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 (dataset) {
+        if (id && name.includes(this.filterText)) {
+          this.dfsTableData(this.tData, id)
+        } else if (dataset) {
           this.$refs.datasetTreeRef?.setCurrentNode(dataset)
           this.nodeClick(dataset)
         }
@@ -542,6 +545,7 @@ export default {
     })
   },
   created() {
+    this.pageCreated = true;
     this.kettleState()
     engineMode().then((res) => {
       this.engineMode = res.data
@@ -552,6 +556,19 @@ export default {
     this.refresh()
   },
   methods: {
+    dfsTableData(arr, id) {
+      arr.some(ele => {
+        if(ele.id === id) {
+          this.$refs.datasetTreeRef?.setCurrentNode(ele)
+          this.nodeClick(ele)
+          this.expandedArray.push(id)
+          return true
+        } else if (ele.children?.length) {
+          this.dfsTableData(ele.children, id)
+        }
+        return false
+      });
+    },
     nameRepeat(value) {
       if (!this.fileList || this.fileList.length === 0) {
         return false
@@ -978,8 +995,8 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.search-input {
-  padding: 12px 0;
+.de-fill-block {
+  margin-left: 35px !important;
 }
 
 .custom-tree-container {
diff --git a/frontend/src/views/system/datasource/dsTable.vue b/frontend/src/views/system/datasource/dsTable.vue
index 3a1db9d51c..c3bd80c703 100644
--- a/frontend/src/views/system/datasource/dsTable.vue
+++ b/frontend/src/views/system/datasource/dsTable.vue
@@ -20,13 +20,10 @@
       </el-col>
     </el-row>
     <div class="table-container">
-      <grid-table
+      <el-table
         v-loading="loading"
-        :tableData="tableData"
-        :columns="[]"
-        :pagination="paginationConfig"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
+        :data="filterTable"
+        :style="{ width: '100%' }"
       >
         <el-table-column
           key="name"
@@ -34,28 +31,20 @@
           :label="$t('datasource.table_name')"
         />
         <el-table-column
-          slot="__operation"
           :label="$t('commons.operating')"
-          key="__operation"
           fixed="right"
-          width="168"
+          width="108"
         >
           <template slot-scope="scope">
-            <el-button
-              @click="createtDataset(scope.row)"
-              class="text-btn mar3 mar6"
-              type="text"
-              >{{ $t("datasource.create_dataset") }}</el-button
-            >
             <el-button
               @click="selectDataset(scope.row)"
-              class="text-btn"
+              class="de-text-btn mar3"
               type="text"
               >{{ $t("dataset.detail") }}</el-button
             >
           </template>
         </el-table-column>
-      </grid-table>
+      </el-table>
     </div>
     <el-drawer
       :title="$t('dataset.detail')"
@@ -106,11 +95,9 @@
 
 <script>
 import keyEnter from "@/components/msgCfm/keyEnter.js";
-import GridTable from "@/components/gridTable/index.vue";
 import {dsTable, post} from "@/api/dataset/dataset";
 export default {
   mixins: [keyEnter],
-  components: { GridTable },
   props: {
     params: {
       type: Object,
@@ -123,22 +110,18 @@ export default {
       dsTableDetail: {},
       nikeName: "",
       loading: false,
-      paginationConfig: {
-        currentPage: 1,
-        pageSize: 10,
-        total: 0,
-      },
-      dsTableData: [{date: 1}],
-      tableData: [{ name: 1 }],
+      dsTableData: [],
+      tableData: [],
+      filterTable: []
     };
   },
   created() {
-    post('/datasource/getTables/' + this.params.id, {}).then((response) => {
-      this.tableData = response.data
-    })
+    this.search()
   },
   methods: {
-    createtDataset(row) {},
+    initSearch() {
+      this.filterTable = this.tableData.filter(ele => ele.name.includes(this.nikeName))
+    },
     selectDataset(row) {
       this.dsTableDetail = row;
       this.userDrawer = true;
@@ -148,36 +131,14 @@ export default {
         this.dsTableData = response.data
       })
     },
-    handleSizeChange(pageSize) {
-      this.paginationConfig.currentPage = 1;
-      this.paginationConfig.pageSize = pageSize;
-      this.search();
-    },
-    handleCurrentChange(currentPage) {
-      this.paginationConfig.currentPage = currentPage;
-      this.search();
-    },
-    initSearch() {
-      this.handleCurrentChange(1);
-    },
     search() {
       this.loading = true;
-      const param = {
-        conditions: [],
-      };
-      if (this.nikeName) {
-        param.conditions.push({
-          field: `dataset_table_task.name`,
-          operator: "like",
-          value: this.nikeName,
-        });
-      }
-      const { currentPage, pageSize } = this.paginationConfig;
-      dsTable(currentPage, pageSize, this.params.id).then((response) => {
-        this.tableData = response.data.listObject;
-        this.paginationConfig.total = response.data.itemCount;
+      post('/datasource/getTables/' + this.params.id, {}).then((response) => {
+        this.tableData = response.data
+        this.initSearch()
+      }).finally(() => {
         this.loading = false;
-      });
+      })
     },
   },
 };
@@ -204,6 +165,9 @@ export default {
   height: 100%;
   padding: 10px 14px;
   box-sizing: border-box;
+  .mar3 {
+    margin-left: -5px;
+  }
   .table-name {
     font-family: PingFang SC;
     font-size: 16px;

From ea17177c0833eb1ed87fbe3e130e05a29e09f8e1 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 23 Sep 2022 12:46:39 +0800
Subject: [PATCH 10/20] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE):=20=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/i18n/messages_en_US.properties  |  2 +
 .../resources/i18n/messages_zh_CN.properties  |  2 +
 .../resources/i18n/messages_zh_TW.properties  |  2 +
 .../components/business/DeLayoutContent.vue   |  2 +-
 frontend/src/views/system/SysParam/index.vue  | 45 -------------------
 frontend/src/views/system/plugin/dynamic.vue  | 24 ++++++----
 6 files changed, 22 insertions(+), 55 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index a096a7ff41..afd8a15af0 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -15,6 +15,8 @@
 \u5220\u9664\u89D2\u8272=Delete Role
 \u5220\u9664\u8FDE\u63A5=Delete Connection
 \u663E\u793A\u8BBE\u7F6E=Display
+\u5E73\u53F0\u5BF9\u63A5=Platform Docking
+\u8BA4\u8BC1\u8BBE\u7F6E=Authentication Setting
 \u7CFB\u7EDF\u53C2\u6570=System Param
 \u53C2\u6570\u7BA1\u7406=Parameter
 \u6570\u636E\u6E90=Data Source
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index d0dc945e12..e0efdd38d8 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -15,6 +15,8 @@
 \u5220\u9664\u89D2\u8272=\u5220\u9664\u89D2\u8272
 \u5220\u9664\u8FDE\u63A5=\u5220\u9664\u8FDE\u63A5
 \u663E\u793A\u8BBE\u7F6E=\u663E\u793A\u8BBE\u7F6E
+\u5E73\u53F0\u5BF9\u63A5=\u5E73\u53F0\u5BF9\u63A5
+\u8BA4\u8BC1\u8BBE\u7F6E=\u8BA4\u8BC1\u8BBE\u7F6E
 \u7CFB\u7EDF\u53C2\u6570=\u7CFB\u7EDF\u53C2\u6570
 \u53C2\u6570\u7BA1\u7406=\u53C2\u6570\u7BA1\u7406
 \u6570\u636E\u6E90=\u6570\u636E\u6E90
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 84c61b385e..022e0606ac 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -15,6 +15,8 @@
 \u5220\u9664\u89D2\u8272=\u522A\u9664\u89D2\u8272
 \u522A\u9664\u8FDE\u63A5=\u522A\u9664\u93C8\u63A5
 \u663E\u793A\u8BBE\u7F6E=\u986F\u793A\u8A2D\u7F6E
+\u5E73\u53F0\u5BF9\u63A5=\u5E73\u81FA\u5C0D\u63A5
+\u8BA4\u8BC1\u8BBE\u7F6E=\u8A8D\u8B49\u8A2D\u7F6E
 \u7CFB\u7EDF\u53C2\u6570=\u7CFB\u7D71\u53C3\u6578
 \u53C2\u6570\u7BA1\u7406=\u53C3\u6578\u7BA1\u7406
 \u6570\u636E\u6E90=\u6578\u64DA\u6E90
diff --git a/frontend/src/components/business/DeLayoutContent.vue b/frontend/src/components/business/DeLayoutContent.vue
index 8d4afc52b5..6c71c60ab5 100644
--- a/frontend/src/components/business/DeLayoutContent.vue
+++ b/frontend/src/components/business/DeLayoutContent.vue
@@ -34,7 +34,7 @@ export default {
       return backPath || backName || backTo
     },
     needInnerPadding() {
-      return ['sys-task-email', 'system-dept', 'system-dept-form', 'system-auth', 'sys-appearance', 'system-param', 'system-template', "sys-task-dataset", "sys-msg-web-all", "system-plugin"].includes(this.$route.name)
+      return ['sys-identification', 'sys-abutment', 'sys-task-email', 'system-dept', 'system-dept-form', 'system-auth', 'sys-appearance', 'system-param', 'system-template', "sys-task-dataset", "sys-msg-web-all", "system-plugin"].includes(this.$route.name)
     }
   }
 }
diff --git a/frontend/src/views/system/SysParam/index.vue b/frontend/src/views/system/SysParam/index.vue
index cfd202494c..3d79ce875a 100644
--- a/frontend/src/views/system/SysParam/index.vue
+++ b/frontend/src/views/system/SysParam/index.vue
@@ -18,20 +18,6 @@
 
         <el-tab-pane :lazy="true" :label="$t('sysParams.map')" name="ten" />
 
-        <el-tab-pane
-          v-if="isPluginLoaded"
-          :lazy="true"
-          :label="$t('sysParams.ldap')"
-          name="fourth"
-        />
-
-        <el-tab-pane
-          v-if="isPluginLoaded"
-          :lazy="true"
-          :label="$t('sysParams.oidc')"
-          name="five"
-        />
-
         <el-tab-pane
           v-if="engineMode === 'simple'"
           :lazy="true"
@@ -52,31 +38,6 @@
           :label="$t('system_parameter_setting.kettle_setting')"
           name="eight"
         />
-
-        <el-tab-pane
-          v-if="isPluginLoaded"
-          :lazy="true"
-          :label="$t('sysParams.cas')"
-          name="nine"
-        />
-        <el-tab-pane
-          v-if="isPluginLoaded"
-          :lazy="true"
-          :label="$t('wecom.title')"
-          name="eleven"
-        />
-        <el-tab-pane
-          v-if="isPluginLoaded"
-          :lazy="true"
-          :label="$t('dingtalk.title')"
-          name="twelve"
-        />
-        <el-tab-pane
-          v-if="isPluginLoaded"
-          :lazy="true"
-          :label="$t('lark.title')"
-          name="thirteen"
-        />
       </el-tabs>
       <div
         class="tabs-container"
@@ -86,15 +47,9 @@
           <basic-setting v-if="activeName === 'zero'" :is-plugin-loaded="isPluginLoaded" />
           <email-setting v-if="activeName === 'first'" />
           <map-setting v-if="activeName === 'ten'" ref="mapSetting" />
-          <plugin-com v-if="activeName === 'fourth'" ref="DisplaySetting" component-name="LdapSetting" />
-          <plugin-com v-if="activeName === 'five'" ref="DisplaySetting" component-name="SsoSetting" />
           <simple-mode v-if="activeName === 'six'" />
           <cluster-mode v-if="activeName === 'seven'" />
           <kettle-setting v-if="activeName === 'eight'" />
-          <plugin-com v-if="activeName === 'nine'" ref="CasSetting" component-name="CasSetting" />
-          <plugin-com v-if="activeName === 'eleven'" ref="WecomSetting" component-name="WecomSetting" />
-          <plugin-com v-if="activeName === 'twelve'" ref="DingtalkSetting" component-name="DingtalkSetting" />
-          <plugin-com v-if="activeName === 'thirteen'" ref="LarkSetting" component-name="LarkSetting" />
         </div>
       </div>
     </div>
diff --git a/frontend/src/views/system/plugin/dynamic.vue b/frontend/src/views/system/plugin/dynamic.vue
index fcf9437f14..afdc2252a6 100644
--- a/frontend/src/views/system/plugin/dynamic.vue
+++ b/frontend/src/views/system/plugin/dynamic.vue
@@ -25,7 +25,7 @@ import DeLayoutContent from '@/components/business/DeLayoutContent'
 import AsyncComponent from '@/components/AsyncComponent'
 import i18n from '@/lang'
 import bus from '@/utils/bus'
-import { execute } from '@/api/system/dynamic'
+import { execute, get } from '@/api/system/dynamic'
 export default {
   name: 'Dynamic',
   components: {
@@ -56,18 +56,24 @@ export default {
       innerLoadingNames: ['SystemDept', 'SystemRole', 'SystemAuth']
     }
   },
-  created() {
-    if (this.jsname && this.menuid) {
-      this.showAsync = true
-      this.url = this.baseUrl + this.menuid
-      //   this.url = 'http://localhost:8081/PluginDemo.js'
-    //   this.url = 'http://localhost:8081/SystemParam.js'
-    } else {
-      this.showAsync = false
+  watch: {
+    'menuid' : function() {
+      this.init()
     }
   },
+  created() {
+   this.init()
+  },
 
   methods: {
+    init() {
+      if (this.jsname && this.menuid) {
+        this.showAsync = true
+        this.url = this.baseUrl + this.menuid
+      } else {
+        this.showAsync = false
+      }
+    },
     // hasLicense
     executeAxios(options) {
       execute(options).then(res => {

From 7f0c7496013490935fae1343906f915428f59ba7 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 23 Sep 2022 14:14:32 +0800
Subject: [PATCH 11/20] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E5=A4=96=E8=A7=82=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=88=87=E6=8D=A2=E5=AF=BC=E8=87=B4=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/App.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index a0dbbb58fb..78effadf68 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,9 +1,9 @@
 <template>
   <div id="app">
     <keep-alive>
-      <router-view v-if="['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
+      <router-view v-show="['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
     </keep-alive>
-    <router-view v-if="!['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
+    <router-view v-show="!['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
     <plugin-com v-show="false" ref="de-theme" component-name="ThemeSetting" />
   </div>
 </template>

From e656b04b24fe88a023cb38ee75baf96de3177e51 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Fri, 23 Sep 2022 14:59:29 +0800
Subject: [PATCH 12/20] =?UTF-8?q?fix:=20=E8=A7=86=E5=9B=BE=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=20=E8=BE=B9=E6=A1=86=E8=89=B2=E5=80=BC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/styles/index.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 00ec60e2c7..9c91893a70 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -639,7 +639,7 @@ div:focus {
 .blackTheme .el-radio-button__inner {
   background-color: var(--TableBG);
   color: var(--TableColor);
-  border: var(--TableBorder);
+  border-color: var(--TableBorderColor);
 }
 
 .blackTheme .el-loading-mask {

From e73deb62b6b675b280801aaf9c31ce6e45e79a2b Mon Sep 17 00:00:00 2001
From: fit2cloudrd <reaperww@gmail.com>
Date: Fri, 23 Sep 2022 15:03:07 +0800
Subject: [PATCH 13/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9Fdemo=E7=94=A8=E6=88=B7=E6=B2=A1=E6=9C=89=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=AE=98=E6=96=B9=E6=95=B0=E6=8D=AE=E9=9B=86=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98=20(#3165)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(系统配置): 修复外观配置菜单切换导致路由刷新问题

* fix: 修复系统demo用户没有部分官方数据集权限问题

Co-authored-by: wangjiahao <1522128093@qq.com>
---
 backend/src/main/resources/db/migration/V40__1.15.sql | 5 +++++
 1 file changed, 5 insertions(+)

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..cad7dec77c 100644
--- a/backend/src/main/resources/db/migration/V40__1.15.sql
+++ b/backend/src/main/resources/db/migration/V40__1.15.sql
@@ -121,3 +121,8 @@ ALTER TABLE `sys_user_assist`
     ADD COLUMN `dingtalk_id` varchar(255) NULL COMMENT '钉钉账号' AFTER `wecom_id`,
     ADD COLUMN `lark_id` varchar(255) NULL COMMENT '飞书账号' AFTER `dingtalk_id`;
 
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`, `copy_id`) VALUES ('d55c4585-3b0a-11ed-8009-0242ac130005', '379c3124-7a30-4c1b-8ae4-de23eaf34b71', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1663915323000, NULL, NULL, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`, `copy_id`) VALUES ('d55c4c0d-3b0a-11ed-8009-0242ac130005', '379c3124-7a30-4c1b-8ae4-de23eaf34b71', 'i18n_auth_manage', 3, 0, 'manage', '基础权限-管理', 'admin', 1663915323000, NULL, NULL, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`, `copy_id`) VALUES ('d55c4d88-3b0a-11ed-8009-0242ac130005', '379c3124-7a30-4c1b-8ae4-de23eaf34b71', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1663915323000, NULL, NULL, NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`) VALUES ('379c3124-7a30-4c1b-8ae4-de23eaf34b71', 'bdfcc324-1181-46a6-b681-a453517c4ffa', 'dataset', '2', 'user', 1663915323123, NULL, 'admin', NULL, NULL, NULL);
+

From e0fe6119482631a9341f9ec56d455dbdc1b1c69e Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Fri, 23 Sep 2022 16:27:12 +0800
Subject: [PATCH 14/20] =?UTF-8?q?fix:=20=E8=B7=AF=E7=94=B1=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/App.vue                       | 15 +++-----
 frontend/src/layout/components/AppMain.vue | 35 +++++++++---------
 frontend/src/views/dataset/group/Group.vue | 42 ++++++++++------------
 3 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 78effadf68..4c83f5c23f 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,10 +1,7 @@
 <template>
   <div id="app">
-    <keep-alive>
-      <router-view v-show="['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
-    </keep-alive>
-    <router-view v-show="!['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
-    <plugin-com v-show="false" ref="de-theme" component-name="ThemeSetting" />
+    <router-view/>
+    <plugin-com v-show="false" ref="de-theme" component-name="ThemeSetting"/>
   </div>
 </template>
 
@@ -13,11 +10,9 @@ import PluginCom from '@/views/system/plugin/PluginCom'
 
 export default {
   name: 'App',
-  components: { PluginCom },
-  computed: {
-    key() {
-      return this.$route.path
-    }
+  components: {PluginCom},
+  beforeCreate() {
+
   }
 }
 </script>
diff --git a/frontend/src/layout/components/AppMain.vue b/frontend/src/layout/components/AppMain.vue
index 732bbab7c8..1fe3409c83 100644
--- a/frontend/src/layout/components/AppMain.vue
+++ b/frontend/src/layout/components/AppMain.vue
@@ -2,10 +2,7 @@
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
       <el-main class="ms-main-container">
-        <keep-alive>
-          <router-view v-if="['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
-        </keep-alive>
-        <router-view v-if="!['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
+        <router-view :key="key" />
       </el-main>
     </transition>
   </section>
@@ -23,24 +20,24 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.app-main {
-  height: 100%;
-}
+    .app-main {
+        height: 100%;
+    }
 
-.fixed-header + .app-main {
-  padding-top: 50px;
-}
+    .fixed-header + .app-main {
+        padding-top: 50px;
+    }
 
-.ms-main-container {
-  height: 100%;
-  padding: 0 !important;
-}
+    .ms-main-container {
+        height: 100%;
+        padding: 0 !important;
+    }
 </style>
 
 <style lang="scss">
-.el-popup-parent--hidden {
-  .fixed-header {
-    padding-right: 15px;
-  }
-}
+    .el-popup-parent--hidden {
+        .fixed-header {
+            padding-right: 15px;
+        }
+    }
 </style>
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index bbac9249ca..2629544d46 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -221,9 +221,7 @@
                     class="ds-icon-api"
                   />
                 </span>
-                <span
-                  v-if="['db', 'sql'].includes(data.modelInnerType)"
-                >
+                <span v-if="['db', 'sql'].includes(data.modelInnerType)">
                   <span v-if="data.mode === 0" style="margin-left: 6px"
                     ><i class="el-icon-s-operation"
                   /></span>
@@ -238,7 +236,13 @@
                     overflow: hidden;
                     text-overflow: ellipsis;
                   "
-                  :class="[{ 'de-fill-block': !['db', 'sql'].includes(data.modelInnerType)}]"
+                  :class="[
+                    {
+                      'de-fill-block': !['db', 'sql'].includes(
+                        data.modelInnerType
+                      )
+                    }
+                  ]"
                   :title="data.name"
                   >{{ data.name }}</span
                 >
@@ -496,7 +500,6 @@ export default {
       },
       isTreeSearch: false,
       kettleRunning: false,
-      pageCreated: false,
       engineMode: 'local',
       searchPids: [], // 查询命中的pid
       filterText: '',
@@ -526,9 +529,13 @@ export default {
       this.$refs.datasetTreeRef.filter(this.filterText)
     }
   },
-  activated() {
-    if (!this.pageCreated) return;
-    const dataset = this.$refs.datasetTreeRef?.getCurrentNode()
+  created() {
+    this.kettleState()
+    engineMode().then((res) => {
+      this.engineMode = res.data
+    })
+  },
+  mounted() {
     const { id, name } = this.$route.params
     queryAuthModel({ modelType: 'dataset' }, true).then((res) => {
       localStorage.setItem('dataset-tree', JSON.stringify(res.data))
@@ -537,28 +544,15 @@ export default {
         this.$refs.datasetTreeRef?.filter(this.filterText)
         if (id && name.includes(this.filterText)) {
           this.dfsTableData(this.tData, id)
-        } else if (dataset) {
-          this.$refs.datasetTreeRef?.setCurrentNode(dataset)
-          this.nodeClick(dataset)
         }
       })
     })
-  },
-  created() {
-    this.pageCreated = true;
-    this.kettleState()
-    engineMode().then((res) => {
-      this.engineMode = res.data
-    })
-  },
-  mounted() {
-    this.treeNode(true)
     this.refresh()
   },
   methods: {
     dfsTableData(arr, id) {
-      arr.some(ele => {
-        if(ele.id === id) {
+      arr.some((ele) => {
+        if (ele.id === id) {
           this.$refs.datasetTreeRef?.setCurrentNode(ele)
           this.nodeClick(ele)
           this.expandedArray.push(id)
@@ -567,7 +561,7 @@ export default {
           this.dfsTableData(ele.children, id)
         }
         return false
-      });
+      })
     },
     nameRepeat(value) {
       if (!this.fileList || this.fileList.length === 0) {

From e39dd4fe8a86714f5c763547b74d9b6d5d44c268 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Fri, 23 Sep 2022 17:49:28 +0800
Subject: [PATCH 15/20] =?UTF-8?q?fix:=20=E5=AD=97=E6=AE=B5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/data/FieldEdit.vue   |  2 +-
 frontend/src/views/system/datasource/DsForm.vue | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue
index 13ae6bae6c..7da11cf244 100644
--- a/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/frontend/src/views/dataset/data/FieldEdit.vue
@@ -307,7 +307,7 @@
                   class="de-text-btn"
                   style="margin-left: 8px"
                   @click="editField(scope.row)"
-                  >{{ $t('deDataset.dataset.edit') }}</el-button
+                  >{{ $t('dataset.edit') }}</el-button
                 >
                 <el-dropdown
                   size="medium"
diff --git a/frontend/src/views/system/datasource/DsForm.vue b/frontend/src/views/system/datasource/DsForm.vue
index f74a99a5db..22a32311f1 100644
--- a/frontend/src/views/system/datasource/DsForm.vue
+++ b/frontend/src/views/system/datasource/DsForm.vue
@@ -49,15 +49,6 @@
             @click="validaDatasource"
             >{{ $t('commons.validate') }}
           </deBtn>
-          <deBtn
-            v-if="
-              formType === 'add' ||
-              hasDataPermission('manage', params.privileges)
-            "
-            type="primary"
-            @click="changeEdit"
-            >{{ $t('commons.edit') }}
-          </deBtn>
         </template>
       </div>
     </div>
@@ -498,6 +489,7 @@ export default {
         this.params.showModel &&
         this.params.showModel === 'show' &&
         !this.canEdit
+      this.changeEdit()
     },
     reset() {
       this.$refs.dsForm.resetFields()

From feb67dba6ec3e07e3700fe039cca9e839fdb0087 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 23 Sep 2022 18:10:03 +0800
Subject: [PATCH 16/20] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B1=87=E6=80=BB=E8=A1=A8=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=AD=97=E6=AE=B5=E5=90=8E=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E8=B7=B3=E8=BD=AC=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=9C=AA=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/custom-component/DeRichTextView.vue   | 2 +-
 frontend/src/views/panel/LinkJumpSet/index.vue              | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/DeRichTextView.vue b/frontend/src/components/canvas/custom-component/DeRichTextView.vue
index 5ccbf081b9..1c78d8ac4f 100644
--- a/frontend/src/components/canvas/custom-component/DeRichTextView.vue
+++ b/frontend/src/components/canvas/custom-component/DeRichTextView.vue
@@ -194,8 +194,8 @@ export default {
       if (this.editStatus&&this.canEdit===false) {
         this.canEdit = true
         this.element['editing'] = true
-        this.reShow()
         this.myValue = this.element.propValue.textValue
+        this.reShow()
       }
     },
     reShow() {
diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue
index 26cef164c6..62c567cce5 100644
--- a/frontend/src/views/panel/LinkJumpSet/index.vue
+++ b/frontend/src/views/panel/LinkJumpSet/index.vue
@@ -362,8 +362,10 @@ export default {
       const checkAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields
       let checkJumpStr
       if (chartDetails.type === 'table-pivot') {
-        checkJumpStr = chartDetails.yaxis + chartDetails.yaxisExt
-      } else {
+        checkJumpStr = chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields
+      }else if(chartDetails.type === 'table-info') {
+        checkJumpStr = chartDetails.xaxis + chartDetails.drillFields
+      }else {
         checkJumpStr = checkAllAxisStr
       }
       // 获取可关联的仪表板

From 4b4e9f135f76046555d1b9cf10f374ed7610fb3a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 23 Sep 2022 18:12:52 +0800
Subject: [PATCH 17/20] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E5=AD=97=E7=BB=84=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AD=97=E5=8F=B7=E6=97=B6=E6=95=B0=E5=AD=97=E5=8F=98?=
 =?UTF-8?q?=E5=8A=A8=E5=BC=82=E5=B8=B8=20#3099?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/TextAttr.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue
index 6ebdf399ca..ab6926eefb 100644
--- a/frontend/src/components/canvas/components/TextAttr.vue
+++ b/frontend/src/components/canvas/components/TextAttr.vue
@@ -218,7 +218,7 @@ export default {
       innerOpacity: 0,
       mainWidthOffset: 600,
       initFontSize: 12,
-      miniFontSize: 12,
+      miniFontSize: 0,
       maxFontSize: 128,
       textAlignOptions: [
         {

From 4356d01c33f839a03875621b96a01289329706d1 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 23 Sep 2022 18:31:49 +0800
Subject: [PATCH 18/20] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/i18n/messages_en_US.properties | 1 +
 backend/src/main/resources/i18n/messages_zh_CN.properties | 1 +
 backend/src/main/resources/i18n/messages_zh_TW.properties | 1 +
 frontend/src/lang/en.js                                   | 4 ++--
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index afd8a15af0..f7592ca718 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -43,6 +43,7 @@
 \u91CD\u7F6E\u5BC6\u7801=Reset Password
 \u5173\u4E8E=About Us
 \u9996\u9875=Home Page
+\u7528\u6237key=User Key
 i18n_auth_view=View
 i18n_auth_use=Use
 i18n_auth_export=Export
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index e0efdd38d8..946d37a153 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -43,6 +43,7 @@
 \u91CD\u7F6E\u5BC6\u7801=\u91CD\u7F6E\u5BC6\u7801
 \u5173\u4E8E=\u5173\u4E8E
 \u9996\u9875=\u9996\u9875
+\u7528\u6237key=\u7528\u6237key
 i18n_auth_view=\u67E5\u770B
 i18n_auth_use=\u4F7F\u7528
 i18n_auth_export=\u5BFC\u51FA
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 022e0606ac..eddffe3e99 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -43,6 +43,7 @@
 \u91CD\u7F6E\u5BC6\u7801=\u91CD\u7F6E\u5BC6\u78BC
 \u5173\u4E8E=\u95DC\u65BC
 \u9996\u9875=\u9996\u9801
+\u7528\u6237key=\u7528\u6236key
 i18n_auth_view=\u67E5\u770B
 i18n_auth_use=\u4F7F\u7528
 i18n_auth_export=\u5C0E\u51FA
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index a46b9dd1be..3ad71ba535 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1633,8 +1633,8 @@ export default {
       desensitization: 'Desensitization'
     },
     row_permissions: 'Row Permissions',
-    column_permissions: '列权限',
-    row_column_permissions: '行列权限',
+    column_permissions: 'Column Permissions',
+    row_column_permissions: 'Row And Column Permissions',
     union_data: 'Union Dataset',
     add_union_table: 'Add Union Dataset',
     edit_union: 'Edit Union Dataset',

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 19/20] =?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 20/20] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E6=80=BB=E6=9D=A1=E6=95=B0=20=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E5=8A=A0=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() {