From 46f8cd634d1e28cede1cf686b51e6abedef0f944 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 23 Jun 2022 10:05:58 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E6=95=B0=E6=8D=AE=E9=A2=84=E8=A7=88tab?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=95=B0=E6=8D=AE=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dataset/data/CalcFieldEdit.vue  |  18 +--
 frontend/src/views/dataset/data/FieldEdit.vue |   4 +
 frontend/src/views/dataset/data/ViewTable.vue | 107 ++++++++++++------
 frontend/src/views/dataset/index.vue          |   1 +
 4 files changed, 89 insertions(+), 41 deletions(-)

diff --git a/frontend/src/views/dataset/data/CalcFieldEdit.vue b/frontend/src/views/dataset/data/CalcFieldEdit.vue
index 0254e15668..e6728bb188 100644
--- a/frontend/src/views/dataset/data/CalcFieldEdit.vue
+++ b/frontend/src/views/dataset/data/CalcFieldEdit.vue
@@ -361,12 +361,15 @@ export default {
         pre[next[from]] = next[to]
         return pre
       }, {})
-      originName.match(/(?<=\[).+?(?=\])/g).forEach(ele => {
-        if (name2Auto) {
-          name2Auto.push(nameIdMap[ele])
-        }
-        name2Id = name2Id.replace(ele, nameIdMap[ele])
-      })
+      const on = originName.match(/(?<=\[).+?(?=\])/g)
+      if (on) {
+        on.forEach(ele => {
+          if (name2Auto) {
+            name2Auto.push(nameIdMap[ele])
+          }
+          name2Id = name2Id.replace(ele, nameIdMap[ele])
+        })
+      }
       return name2Id
     },
 
@@ -382,7 +385,8 @@ export default {
         this.fieldForm.tableId = this.param.id
         this.fieldForm.columnIndex = this.tableFields.dimensionList.length + this.tableFields.quotaList.length
       }
-      post('/dataset/field/save', {...this.fieldForm, originName: this.setNameIdTrans('name', 'id', originName) }).then(response => {
+      post('/dataset/field/save', { ...this.fieldForm, originName: this.setNameIdTrans('name', 'id', originName) }).then(response => {
+        localStorage.setItem('reloadDsData', 'true')
         this.closeCalcField()
       })
     },
diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue
index 7b6703dcd8..29a2fb28ab 100644
--- a/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/frontend/src/views/dataset/data/FieldEdit.vue
@@ -346,8 +346,10 @@ export default {
 
       post('/dataset/field/save', item).then(response => {
         this.initField()
+        localStorage.setItem('reloadDsData', 'true')
       }).catch(res => {
         this.initField()
+        localStorage.setItem('reloadDsData', 'true')
       })
     },
 
@@ -398,6 +400,7 @@ export default {
             showClose: true
           })
           this.initField()
+          localStorage.setItem('reloadDsData', 'true')
         })
       }).catch(() => {
       })
@@ -411,6 +414,7 @@ export default {
       }).then(() => {
         this.isSyncField = true
         post('/dataset/table/syncField/' + this.param.id, null).then(response => {
+          localStorage.setItem('reloadDsData', 'true')
           setTimeout(() => {
             this.isSyncField = false
             this.initField()
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index 5001f9bab2..4810573dcf 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -14,14 +14,22 @@
         @show="showTab"
         @hide="hideTab"
       >
-        <dataset-chart-detail type="dataset" :data="table" :tab-status="tabStatus"/>
+        <dataset-chart-detail type="dataset" :data="table" :tab-status="tabStatus" />
         <!--        <svg-icon slot="reference" class="title-text" icon-class="more_v" style="cursor: pointer;" />-->
-        <i slot="reference" class="el-icon-warning icon-class"
-           style="margin-left: 4px;cursor: pointer;font-size: 14px;"/>
+        <i
+          slot="reference"
+          class="el-icon-warning icon-class"
+          style="margin-left: 4px;cursor: pointer;font-size: 14px;"
+        />
       </el-popover>
       <el-row v-if="hasDataPermission('manage',param.privileges)" style="float: right">
-        <el-dropdown v-if="table.type ==='excel'" style="margin-right: 10px;" size="small" trigger="click"
-                     @command="clickEditExcel">
+        <el-dropdown
+          v-if="table.type ==='excel'"
+          style="margin-right: 10px;"
+          size="small"
+          trigger="click"
+          @command="clickEditExcel"
+        >
           <el-button size="mini">
             {{ $t('dataset.edit_excel') }}
           </el-button>
@@ -45,53 +53,80 @@
         </el-button>
       </el-row>
     </el-row>
-    <el-divider/>
+    <el-divider />
 
     <el-tabs v-model="tabActive" @tab-click="tabClick">
       <el-tab-pane :label="$t('dataset.data_preview')" name="dataPreview">
-        <tab-data-preview :param="param" :table="table" :fields="fields" :data="data" :page="page"
-                          :form="tableViewRowForm" @reSearch="reSearch"/>
+        <tab-data-preview
+          :param="param"
+          :table="table"
+          :fields="fields"
+          :data="data"
+          :page="page"
+          :form="tableViewRowForm"
+          @reSearch="reSearch"
+        />
       </el-tab-pane>
       <el-tab-pane :label="$t('dataset.field_manage')" :lazy="true" name="fieldEdit">
-        <field-edit v-if="tabActive === 'fieldEdit'" :param="param" :table="table"/>
+        <field-edit v-if="tabActive === 'fieldEdit'" :param="param" :table="table" />
       </el-tab-pane>
       <el-tab-pane
         v-if="!hideCustomDs && table.type !== 'union' && table.type !== 'custom' && !(table.type === 'sql' && table.mode === 0)"
-        :label="$t('dataset.join_view')" name="joinView">
-        <union-view :param="param" :table="table"/>
+        :label="$t('dataset.join_view')"
+        name="joinView"
+      >
+        <union-view :param="param" :table="table" />
       </el-tab-pane>
       <el-tab-pane
         v-if="table.mode === 1 && (table.type === 'excel' || table.type === 'db' || table.type === 'sql' || table.type === 'api')"
-        :label="$t('dataset.update_info')" name="updateInfo">
-        <update-info v-if="tabActive=='updateInfo'" :param="param" :table="table"/>
+        :label="$t('dataset.update_info')"
+        name="updateInfo"
+      >
+        <update-info v-if="tabActive=='updateInfo'" :param="param" :table="table" />
       </el-tab-pane>
-      <el-tab-pane v-if="isPluginLoaded && hasDataPermission('manage',param.privileges)" :lazy="true"
-                   :label="$t('dataset.row_permissions')" name="rowPermissions">
-        <plugin-com v-if="isPluginLoaded && tabActive=='rowPermissions'" ref="RowPermissions"
-                    component-name="RowPermissions" :obj="table"/>
+      <el-tab-pane
+        v-if="isPluginLoaded && hasDataPermission('manage',param.privileges)"
+        :lazy="true"
+        :label="$t('dataset.row_permissions')"
+        name="rowPermissions"
+      >
+        <plugin-com
+          v-if="isPluginLoaded && tabActive=='rowPermissions'"
+          ref="RowPermissions"
+          component-name="RowPermissions"
+          :obj="table"
+        />
       </el-tab-pane>
-      <el-tab-pane v-if="isPluginLoaded && hasDataPermission('manage',param.privileges)" :lazy="true"
-                   :label="$t('dataset.column_permissions')" name="columnPermissions">
-        <plugin-com v-if="isPluginLoaded && tabActive=='columnPermissions'" ref="ColumnPermissions"
-                    component-name="ColumnPermissions" :obj="table"/>
+      <el-tab-pane
+        v-if="isPluginLoaded && hasDataPermission('manage',param.privileges)"
+        :lazy="true"
+        :label="$t('dataset.column_permissions')"
+        name="columnPermissions"
+      >
+        <plugin-com
+          v-if="isPluginLoaded && tabActive=='columnPermissions'"
+          ref="ColumnPermissions"
+          component-name="ColumnPermissions"
+          :obj="table"
+        />
       </el-tab-pane>
     </el-tabs>
   </el-row>
 </template>
 
 <script>
-import {post} from '@/api/dataset/dataset'
+import { post } from '@/api/dataset/dataset'
 import TabDataPreview from './TabDataPreview'
 import UpdateInfo from './UpdateInfo'
 import DatasetChartDetail from '../common/DatasetChartDetail'
 import UnionView from './UnionView'
 import FieldEdit from './FieldEdit'
-import {pluginLoaded} from '@/api/user'
+import { pluginLoaded } from '@/api/user'
 import PluginCom from '@/views/system/plugin/PluginCom'
 
 export default {
   name: 'ViewTable',
-  components: {FieldEdit, UnionView, DatasetChartDetail, UpdateInfo, TabDataPreview, PluginCom},
+  components: { FieldEdit, UnionView, DatasetChartDetail, UpdateInfo, TabDataPreview, PluginCom },
   props: {
     param: {
       type: Object,
@@ -121,12 +156,12 @@ export default {
     }
   },
   computed: {
-    hideCustomDs: function () {
+    hideCustomDs: function() {
       return this.$store.getters.hideCustomDs
     }
   },
   watch: {
-    'param': function () {
+    'param': function() {
       this.tabActive = 'dataPreview'
       this.initTable(this.param.id)
     }
@@ -168,7 +203,7 @@ export default {
           this.table = response.data
           this.initPreviewData(this.page)
         }).catch(res => {
-          this.$emit('switchComponent', {name: ''})
+          this.$emit('switchComponent', { name: '' })
         })
       }
     },
@@ -202,25 +237,25 @@ export default {
     },
 
     edit() {
-      this.$emit('switchComponent', {name: 'FieldEdit', param: {table: this.table}})
+      this.$emit('switchComponent', { name: 'FieldEdit', param: { table: this.table }})
     },
 
     editSql() {
       this.$emit('switchComponent', {
         name: 'AddSQL',
-        param: {id: this.table.sceneId, tableId: this.table.id, table: this.table}
+        param: { id: this.table.sceneId, tableId: this.table.id, table: this.table }
       })
     },
     editCustom() {
       this.$emit('switchComponent', {
         name: 'AddCustom',
-        param: {id: this.table.sceneId, tableId: this.table.id, table: this.table}
+        param: { id: this.table.sceneId, tableId: this.table.id, table: this.table }
       })
     },
     editUnion() {
       this.$emit('switchComponent', {
         name: 'AddUnion',
-        param: {id: this.table.sceneId, tableId: this.table.id, table: this.table}
+        param: { id: this.table.sceneId, tableId: this.table.id, table: this.table }
       })
     },
 
@@ -241,13 +276,13 @@ export default {
         case '0':
           this.$emit('switchComponent', {
             name: 'AddExcel',
-            param: {id: this.table.sceneId, tableId: this.table.id, editType: 0, table: this.table}
+            param: { id: this.table.sceneId, tableId: this.table.id, editType: 0, table: this.table }
           })
           break
         case '1':
           this.$emit('switchComponent', {
             name: 'AddExcel',
-            param: {id: this.table.sceneId, tableId: this.table.id, editType: 1, table: this.table}
+            param: { id: this.table.sceneId, tableId: this.table.id, editType: 1, table: this.table }
           })
           break
       }
@@ -273,7 +308,11 @@ export default {
 
     tabClick() {
       if (this.tabActive === 'dataPreview') {
-        this.initTable(this.param.id)
+        const reload = localStorage.getItem('reloadDsData')
+        if (reload === 'true') {
+          localStorage.setItem('reloadDsData', 'false')
+          this.initTable(this.param.id)
+        }
       }
     }
   }
diff --git a/frontend/src/views/dataset/index.vue b/frontend/src/views/dataset/index.vue
index 46eb2fa035..781794da76 100644
--- a/frontend/src/views/dataset/index.vue
+++ b/frontend/src/views/dataset/index.vue
@@ -49,6 +49,7 @@ export default {
   },
   methods: {
     initDs() {
+      localStorage.setItem('reloadDsData', 'false')
       checkCustomDs().then(res => {
         this.$store.dispatch('dataset/setHideCustomDs', res.data)
       })