From c124cc7c7d326044d9165c88445353f8e0fa98c9 Mon Sep 17 00:00:00 2001
From: fit2cloudrd <reaperww@gmail.com>
Date: Wed, 20 Apr 2022 19:05:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E9=A2=98=E6=A0=A1=E9=AA=8C=20(#2148)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: 优化视图标题校验

* refactor: 优化视图标题校验

Co-authored-by: wangjiahao <1522128093@qq.com>
---
 .../service/chart/ChartViewService.java       |  7 ------
 .../canvas/custom-component/UserView.vue      |  8 ++++++-
 frontend/src/components/canvas/utils/utils.js | 23 +++++++++++++++++++
 frontend/src/store/index.js                   |  6 +++++
 .../component-style/TitleSelector.vue         | 23 ++++++++-----------
 .../component-style/TitleSelectorAntV.vue     | 19 ++++++---------
 frontend/src/views/chart/group/Group.vue      | 10 ++++++++
 frontend/src/views/panel/edit/index.vue       |  2 ++
 8 files changed, 65 insertions(+), 33 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index c4ae8443aa..f8dc176372 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -128,13 +128,6 @@ public class ChartViewService {
 
     public ChartViewWithBLOBs newOne(ChartViewWithBLOBs chartView) {
         long timestamp = System.currentTimeMillis();
-        // 校验名称
-        ChartViewExample queryExample = new ChartViewExample();
-        queryExample.createCriteria().andSceneIdEqualTo(chartView.getSceneId()).andNameEqualTo(chartView.getName());
-        List<ChartView> result = chartViewMapper.selectByExample(queryExample);
-        if (CollectionUtils.isNotEmpty(result)) {
-            DEException.throwException(Translator.get("theme_name_repeat"));
-        }
         chartView.setUpdateTime(timestamp);
         chartView.setId(UUID.randomUUID().toString());
         chartView.setCreateBy(AuthUtils.getUser().getUsername());
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index c94aa72b4f..0e8f35793e 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -291,7 +291,8 @@ export default {
       'previewCanvasScale',
       'mobileLayoutStatus',
       'componentData',
-      'panelViewDetailsInfo'
+      'panelViewDetailsInfo',
+      'componentViewsData'
     ])
   },
 
@@ -478,6 +479,11 @@ export default {
           // 将视图传入echart组件
           if (response.success) {
             this.chart = response.data
+            if (this.isEdit) {
+              this.componentViewsData[this.chart.id] = {
+                'title': this.chart.title
+              }
+            }
             this.chart['position'] = this.inTab ? 'tab' : 'panel'
             // 记录当前数据
             this.panelViewDetailsInfo[id] = JSON.stringify(this.chart)
diff --git a/frontend/src/components/canvas/utils/utils.js b/frontend/src/components/canvas/utils/utils.js
index 0789e81d58..624e7a9515 100644
--- a/frontend/src/components/canvas/utils/utils.js
+++ b/frontend/src/components/canvas/utils/utils.js
@@ -133,3 +133,26 @@ export function matrixBaseChange(component) {
   return component
 }
 
+export function checkViewTitle(opt, id, tile) {
+  try {
+    const curPanelViewsData = store.state.componentViewsData
+    const curComponentViewNames = []
+    store.state.componentData.forEach(item => {
+      if (item.type === 'view' && item.propValue && item.propValue.viewId) {
+        // 更新时自己的title不加入比较
+        if ((opt === 'update' && id !== item.propValue.viewId) || opt === 'new') {
+          curComponentViewNames.push(curPanelViewsData[item.propValue.viewId].title)
+        }
+      }
+    })
+    if (curComponentViewNames.includes(tile)) {
+      return true
+    } else {
+      return false
+    }
+  } catch (e) {
+    console.log('checkViewTitle error', e)
+    return false
+  }
+}
+
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index dd84cf41e8..9aaef94971 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -50,6 +50,8 @@ const data = {
     componentDataCache: null,
     // 当前展示画布组件数据
     componentData: [],
+    // 当前展示画布视图信息
+    componentViewsData: {},
     // PC布局画布组件数据
     pcComponentData: [],
     // 移动端布局画布组件数据
@@ -180,6 +182,10 @@ const data = {
       Vue.set(state, 'componentData', componentData)
     },
 
+    setComponentViewsData(state, componentViewsData = {}) {
+      Vue.set(state, 'componentViewsData', componentViewsData)
+    },
+
     setPcComponentData(state, pcComponentData = []) {
       Vue.set(state, 'pcComponentData', pcComponentData)
     },
diff --git a/frontend/src/views/chart/components/component-style/TitleSelector.vue b/frontend/src/views/chart/components/component-style/TitleSelector.vue
index edbe488e67..a3ae0d42f7 100644
--- a/frontend/src/views/chart/components/component-style/TitleSelector.vue
+++ b/frontend/src/views/chart/components/component-style/TitleSelector.vue
@@ -50,7 +50,7 @@
 
 <script>
 import { COLOR_PANEL, DEFAULT_TITLE_STYLE } from '../../chart/chart'
-import { checkTitle } from '@/api/chart/chart'
+import { checkViewTitle } from '@/components/canvas/utils/utils'
 
 export default {
   name: 'TitleSelector',
@@ -115,18 +115,15 @@ export default {
         this.titleForm.title = this.chart.title
         return
       }
-      checkTitle({ id: this.chart.id, title: this.titleForm.title, sceneId: this.chart.sceneId }).then((rsp) => {
-        if (rsp.data === 'success') {
-          if (!this.titleForm.show) {
-            this.isSetting = false
-          }
-          this.$emit('onTextChange', this.titleForm)
-        } else {
-          this.$error(this.$t('chart.title_repeat'))
-          this.titleForm.title = this.chart.title
-          return
-        }
-      })
+      if (checkViewTitle('update', this.chart.id, this.titleForm.title)) {
+        this.$error(this.$t('chart.title_repeat'))
+        this.titleForm.title = this.chart.title
+        return
+      }
+      if (!this.titleForm.show) {
+        this.isSetting = false
+      }
+      this.$emit('onTextChange', this.titleForm)
     },
     inputOnInput: function(e) {
       this.$forceUpdate()
diff --git a/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue b/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue
index b67c16d9e4..a7cb50f3a2 100644
--- a/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue
+++ b/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue
@@ -44,6 +44,7 @@
 <script>
 import { COLOR_PANEL, DEFAULT_TITLE_STYLE } from '../../chart/chart'
 import { checkTitle } from '@/api/chart/chart'
+import { checkViewTitle } from '@/components/canvas/utils/utils'
 
 export default {
   name: 'TitleSelectorAntV',
@@ -108,18 +109,12 @@ export default {
         this.titleForm.title = this.chart.title
         return
       }
-      checkTitle({ id: this.chart.id, title: this.titleForm.title, sceneId: this.chart.sceneId }).then((rsp) => {
-        if (rsp.data === 'success') {
-          if (!this.titleForm.show) {
-            this.isSetting = false
-          }
-          this.$emit('onTextChange', this.titleForm)
-        } else {
-          this.$error(this.$t('chart.title_repeat'))
-          this.titleForm.title = this.chart.title
-          return
-        }
-      })
+      if (checkViewTitle('update', this.chart.id, this.titleForm.title)) {
+        this.$error(this.$t('chart.title_repeat'))
+        this.titleForm.title = this.chart.title
+        return
+      }
+      this.$emit('onTextChange', this.titleForm)
     },
     inputOnInput: function(e) {
       this.$forceUpdate()
diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index 74dbb2c809..6fe4be270c 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -314,6 +314,7 @@ import {
   DEFAULT_THRESHOLD,
   DEFAULT_TOTAL
 } from '../chart/chart'
+import { checkViewTitle } from '@/components/canvas/utils/utils'
 
 export default {
   name: 'Group',
@@ -772,6 +773,15 @@ export default {
         })
         return
       }
+
+      if (checkViewTitle('new', null, this.chartName)) {
+        this.$message({
+          showClose: true,
+          message: this.$t('chart.title_repeat'),
+          type: 'error'
+        })
+        return
+      }
       const view = {}
       view.name = this.chartName
       view.title = this.chartName
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 54f7df8c71..f748bc5699 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -661,6 +661,8 @@ export default {
         initPanelData(panelId, function() {
           // 初始化视图缓存
           initViewCache(panelId)
+          // 初始化记录的视图信息
+          _this.$store.commit('setComponentViewsData')
           // 初始化保存状态
           setTimeout(() => {
             _this.$store.commit('refreshSaveStatus')

From 5dd7ac267c0cd81780ab767ef7fdf8288a8f2cfe Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 20 Apr 2022 20:28:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20api=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                       |  2 +-
 frontend/src/lang/tw.js                       |  2 +-
 frontend/src/lang/zh.js                       |  2 +-
 .../system/datasource/DsConfiguration.vue     | 12 ++++------
 frontend/src/views/system/datasource/form.vue | 23 +++++++++++++++++--
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 078a5c4294..1b908c0752 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1377,7 +1377,7 @@ export default {
     priority: 'Advanced setting',
     extra_params: 'Extra JDBC connection string',
     please_input_dataPath: 'Please enter the JsonPath data path',
-    warning: 'Contains invalid datasets',
+    warning: 'Contains invalid table',
     data_table: 'Dataset Table',
     data_table_name: 'Dataset Table name',
     method: 'Request mode',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index fd2574e195..420d0effdd 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1378,7 +1378,7 @@ export default {
     priority: '高級設置',
     extra_params: '額外的JDBC連接字符串',
     please_input_dataPath: '請輸入 JsonPath 數據路徑',
-    warning: '包含無效數據機',
+    warning: '包含無效數據表',
     data_table: '數據表',
     data_table_name: '數據表名稱',
     method: '請求方式',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index f518fe3735..759e36a20c 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1386,7 +1386,7 @@ export default {
     all_compute_mode: '直连、抽取模式',
     extra_params: '额外的JDBC连接字符串',
     please_input_dataPath: '请输入 JsonPath 数据路径',
-    warning: '包含无效数据集',
+    warning: '包含无效数据表',
     data_table: '数据表',
     data_table_name: '数据表名称',
     method: '请求方式',
diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue
index c96ffd6b7a..4ad92c5e2c 100644
--- a/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -43,7 +43,7 @@
             </el-col>
           </el-form-item>
 
-          <el-dialog :title="api_table_title" :visible="editApiItem" :before-close="closeEditItem" width="60%"
+          <el-dialog :title="api_table_title" :visible="edit_api_item" :before-close="closeEditItem" width="60%"
                      class="dialog-css" append-to-body>
             <el-steps :active="active" align-center>
               <el-step title="步骤 1"></el-step>
@@ -204,10 +204,14 @@
 
 import i18n from "@/lang";
 import {checkApiDatasource} from "@/api/system/datasource";
+import ApiHttpRequestForm from '@/views/system/datasource/ApiHttpRequestForm'
+import LayoutContent from '@/components/business/LayoutContent'
 
 export default {
   name: "DsConfiguration",
   components: {
+    ApiHttpRequestForm,
+    LayoutContent
   },
   props: {
     disabled: {
@@ -219,12 +223,6 @@ export default {
     method: String,
     request: {},
     response: {},
-    editApiItem: {
-      type: Boolean,
-      default() {
-        return false;
-      }
-    },
     showScript: {
       type: Boolean,
       default: true,
diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue
index fa7be7ddf0..ccc186aa0c 100644
--- a/frontend/src/views/system/datasource/form.vue
+++ b/frontend/src/views/system/datasource/form.vue
@@ -41,7 +41,7 @@
           </el-select>
         </el-form-item>
 
-      <ds-configuration ref="dsConfig" v-if="!datasourceType.isPlugin" :form="form" :disabled="params && params.id && params.showModel && params.showModel === 'show' && !canEdit" :edit-api-item="edit_api_item"></ds-configuration>
+      <ds-configuration ref="dsConfig" v-if="!datasourceType.isPlugin" :form="form" :disabled="params && params.id && params.showModel && params.showModel === 'show' && !canEdit"></ds-configuration>
       <plugin-com ref="pluginDsConfig" v-if="datasourceType.isPlugin"  :component-name="datasourceType.type" :obj="{form, disabled }" />
 
 
@@ -239,6 +239,7 @@ export default {
     } else {
       this.create()
       if (this.params && this.params.type) {
+        this.setType()
         this.changeType()
       }
     }
@@ -347,6 +348,18 @@ export default {
         }
       })
 
+      let status = null;
+      if(this.datasourceType.isPlugin){
+        status = this.$refs['pluginDsConfig'].callPluginInner({methodName: 'validate'})
+      }else {
+        status =  this.$refs['dsConfig'].$refs['DsConfig'].validate(valid => {
+          status = valid
+        })
+      }
+      if(!status){
+        return;
+      }
+
       this.$refs.dsForm.validate(valid => {
         if (!valid) {
           return false
@@ -411,6 +424,7 @@ export default {
       })
     },
     validaDatasource() {
+      console.log(this.$refs)
       if (!this.form.configuration.schema && this.form.type === 'oracle') {
         this.$message.error(i18n.t('datasource.please_choose_schema'))
         return
@@ -423,7 +437,12 @@ export default {
       if(this.datasourceType.isPlugin){
         status = this.$refs['pluginDsConfig'].callPluginInner({methodName: 'validate'})
       }else {
-        status =  this.$refs['dsConfig'].$refs['DsConfig'].validate
+        this.$refs['dsConfig'].$refs['DsConfig'].validate(valid => {
+          status = valid
+          if(!valid){
+            return
+          }
+        })
       }
       if(!status){
         return;