From 3edd250c9bc2e393eda7acbfd681edb0bb90c164 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 30 May 2022 15:18:55 +0800
Subject: [PATCH 01/13] =?UTF-8?q?refactor:=20=E8=A7=86=E5=9B=BE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=BF=AB=E9=80=9F=E5=88=A0=E9=99=A4=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/components/drag-item/ChartDragItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/components/drag-item/ChartDragItem.vue b/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
index 0f77f73cb9..134968c658 100644
--- a/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
+++ b/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
@@ -272,6 +272,6 @@ export default {
     margin-left: 4px;
     color: #878d9f;
     position: absolute;
-    right: 25px;
+    right: 40px;
   }
 </style>

From fa49b2763edb002439af698f8d5bef32dbb0f08d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 30 May 2022 17:08:37 +0800
Subject: [PATCH 02/13] =?UTF-8?q?refactor:=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E8=AE=BE=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/custom-component/UserView.vue      | 25 ++++++++++++-------
 frontend/src/views/chart/view/ChartEdit.vue   | 17 +++++++------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index bb6b9fd515..53fc6f05ff 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -545,14 +545,7 @@ export default {
           // 将视图传入echart组件
           if (response.success) {
             this.chart = response.data
-            if (this.isEdit) {
-              this.componentViewsData[this.chart.id] = {
-                'title': this.chart.title,
-                'render': this.chart.render,
-                'type': this.chart.type,
-                'isPlugin': this.chart.isPlugin
-              }
-            }
+            this.getDataOnly(response.data)
             this.chart['position'] = this.inTab ? 'tab' : 'panel'
             // 记录当前数据
             this.panelViewDetailsInfo[id] = JSON.stringify(this.chart)
@@ -609,7 +602,6 @@ export default {
       tableChart.customStyle = JSON.stringify(tableChart.customStyle)
       eventBus.$emit('openChartDetailsDialog', { chart: this.chart, tableChart: tableChart })
     },
-
     chartClick(param) {
       if (this.drillClickDimensionList.length < this.chart.drillFields.length - 1) {
         (this.chart.type === 'map' || this.chart.type === 'buddle-map') && this.sendToChildren(param)
@@ -863,6 +855,21 @@ export default {
         }
         this.mergeScale()
       }
+    },
+    getDataOnly(sourceResponseData) {
+      if (this.isEdit) {
+        if ((this.filter.filter && this.filter.filter.length) || (this.filter.linkageFilters && this.filter.linkageFilters.length)) {
+          viewData(this.chart.id, this.panelInfo.id, {
+            filter: [],
+            drill: [],
+            queryFrom: 'panel'
+          }).then(response => {
+            this.componentViewsData[this.chart.id] = response.data
+          })
+        } else {
+          this.componentViewsData[this.chart.id] = sourceResponseData
+        }
+      }
     }
   }
 }
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 4874cd3f03..4ca7b6734e 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1191,7 +1191,7 @@ export default {
       return this.chartConfig ? this.chartConfig.propertyInner : null
     },
     chartType() {
-      return this.chart.type
+      return this.chart ? this.chart.type : null
     },
     panelInfo() {
       return this.$store.state.panel.panelInfo
@@ -1199,7 +1199,8 @@ export default {
     ...mapState([
       'curComponent',
       'panelViewEditInfo',
-      'allViewRender'
+      'allViewRender',
+      'componentViewsData'
     ])
     /* pluginRenderOptions() {
       const plugins = localStorage.getItem('plugin-views') && JSON.parse(localStorage.getItem('plugin-views')) || []
@@ -1238,6 +1239,9 @@ export default {
     }
   },
   created() {
+    this.bindPluginEvent()
+    this.initFromPanel()
+    this.chartInit()
     const plugins = localStorage.getItem('plugin-views') && JSON.parse(localStorage.getItem('plugin-views'))
     if (plugins) {
       this.loadPluginType()
@@ -1253,9 +1257,6 @@ export default {
     }
   },
   mounted() {
-    this.bindPluginEvent()
-    this.initFromPanel()
-    this.chartInit()
   },
   activated() {
   },
@@ -1282,7 +1283,9 @@ export default {
       this.resetDrill()
       this.initFromPanel()
       this.getChart(this.param.id)
-      this.getData(this.param.id)
+      if (this.componentViewsData[this.param.id]) {
+        this.chart = this.componentViewsData[this.param.id]
+      }
     },
     bindPluginEvent() {
       bus.$on('show-dimension-edit-filter', this.showDimensionEditFilter)
@@ -1599,7 +1602,7 @@ export default {
       const view = this.buildParam(true, 'chart', false, switchType)
       if (!view) return
       viewEditSave(this.panelInfo.id, view).then(() => {
-        this.getData(this.param.id)
+        // this.getData(this.param.id)
         bus.$emit('view-in-cache', { type: 'propChange', viewId: this.param.id })
       })
     },

From ea3fa03350056f82af2650fb697671a19488a866 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 30 May 2022 17:53:55 +0800
Subject: [PATCH 03/13] =?UTF-8?q?refactor:=20=E8=A7=86=E5=9B=BE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=BF=AB=E9=80=9F=E5=88=A0=E9=99=A4=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/components/drag-item/ChartDragItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/components/drag-item/ChartDragItem.vue b/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
index 134968c658..1f0343777d 100644
--- a/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
+++ b/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
@@ -257,7 +257,7 @@ export default {
 
   .item-span-style{
     display: inline-block;
-    width: 100px;
+    width: 80px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;

From fefa99da662acc07f832601a670cdd79e30f1276 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 30 May 2022 17:54:21 +0800
Subject: [PATCH 04/13] =?UTF-8?q?revert:=20=E6=81=A2=E5=A4=8D=E8=AF=AF?=
 =?UTF-8?q?=E5=88=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/components/component-style/XAxisSelectorAntV.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue b/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
index fc352ee843..ae1c84dee0 100644
--- a/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
+++ b/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
@@ -71,7 +71,7 @@
           </el-form-item>
           <span v-show="showProperty('axisLabel') && axisForm.axisLabel.show">
             <el-form-item :label="$t('chart.axis_label_color')" class="form-item">
-              <el-color-picker class="el-color-picker" :predefine="predefineColors" @change="changeXAxisStyle('axisLabel')" />
+              <el-color-picker v-model="axisForm.axisLabel.color" class="el-color-picker" :predefine="predefineColors" @change="changeXAxisStyle('axisLabel')" />
             </el-form-item>
             <el-form-item :label="$t('chart.axis_label_rotate')" class="form-item form-item-slider">
               <el-slider v-model="axisForm.axisLabel.rotate" show-input :show-input-controls="false" :min="-90" :max="90" input-size="mini" @change="changeXAxisStyle('axisLabel')" />

From 57a7d491db1a14b67a556dc2d36f8346b879bdb4 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 30 May 2022 18:01:31 +0800
Subject: [PATCH 05/13] =?UTF-8?q?fix:=20=E5=A4=8D=E5=88=B6=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=EF=BC=8C=E6=8C=87=E6=A0=87=E5=8D=A1=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml | 2 ++
 frontend/src/views/chart/chart/gauge/gauge.js                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml b/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml
index 7fc57a374f..68b45e2614 100644
--- a/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml
@@ -365,6 +365,7 @@
                                 custom_filter,
                                 drill_fields,
                                 SNAPSHOT,
+                                senior,
                                 data_from)
         SELECT pv_copy.chart_view_id AS id,
                `name`,
@@ -392,6 +393,7 @@
                custom_filter,
                drill_fields,
                SNAPSHOT,
+               senior,
                data_from
         FROM (
                  SELECT panel_id,
diff --git a/frontend/src/views/chart/chart/gauge/gauge.js b/frontend/src/views/chart/chart/gauge/gauge.js
index 477d155d4d..9c45f7f8d7 100644
--- a/frontend/src/views/chart/chart/gauge/gauge.js
+++ b/frontend/src/views/chart/chart/gauge/gauge.js
@@ -130,7 +130,7 @@ export function baseGaugeOption(chart_option, chart, scale = 1) {
       }
     }
   }
-  console.log(chart_option.series[0])
+  // console.log(chart_option.series[0])
   // console.log(chart_option);
   componentStyle(chart_option, chart)
   return chart_option

From 8c6731bd87f1b86e9df45bc146fa2c99e26563a7 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 30 May 2022 18:10:57 +0800
Subject: [PATCH 06/13] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=AC=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue         |  3 +++
 .../canvas/components/Editor/index.vue           | 16 ++++++++++++++++
 .../canvas/custom-component/UserView.vue         |  4 ++++
 3 files changed, 23 insertions(+)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index bf683a80d9..98add1ebf9 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -751,6 +751,9 @@ export default {
       }
       return [null, null]
     },
+    triggerPluginEdit(e) {
+      this.elementMouseDown(e)
+    },
     // 元素触摸按下
     elementTouchDown(e) {
       eventsFor = events.touch
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index e48d8a95fc..c5c50d1b3e 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -100,6 +100,7 @@
         :h="getShapeStyleIntDeDrag(item.style,'height')"
         :canvas-style-data="canvasStyleData"
         @input="handleInput"
+        @trigger-plugin-edit="pluginEditHandler"
       />
     </de-drag>
     <!--拖拽阴影部分-->
@@ -1067,6 +1068,21 @@ export default {
   created() {
   },
   methods: {
+    pluginEditHandler({ e, id }) {
+      let index = -1
+      for (let i = 0; i < this.componentData.length; i++) {
+        const item = this.componentData[i]
+        const itemId = item.id
+        if (id === itemId) {
+          index = i
+          break
+        }
+      }
+      if (index >= 0) {
+        const _this = this
+        _this.$refs.deDragRef && _this.$refs.deDragRef[index] && _this.$refs.deDragRef[index].triggerPluginEdit && _this.$refs.deDragRef[index].triggerPluginEdit(e)
+      }
+    },
     linkageActiveCheck(item) {
       return this.linkageSettingStatus && item === this.curLinkageView
     },
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index e0643d2f80..ddb9b58a5b 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -36,6 +36,7 @@
       class="chart-class"
       @onChartClick="chartClick"
       @onJumpClick="jumpClick"
+      @trigger-edit-click="pluginEditHandler"
     />
     <chart-component
       v-else-if="charViewShowFlag"
@@ -417,6 +418,9 @@ export default {
     }
   },
   methods: {
+    pluginEditHandler(e) {
+      this.$emit('trigger-plugin-edit', { e, id: this.element.id })
+    },
     batchOptChange(param) {
       if (this.curBatchOptComponents.includes(this.element.propValue.viewId)) {
         this.$store.state.styleChangeTimes++

From b9c265febb7f29d9571eb0921ce4c1381d29306e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 30 May 2022 18:35:01 +0800
Subject: [PATCH 07/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E5=8D=A1=EF=BC=8C=E6=97=B6=E9=97=B4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=86=85=E8=BE=B9=E8=B7=9D=E8=AE=BE=E7=BD=AE=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/custom-component/component-list.js   | 3 +--
 frontend/src/views/chart/components/normal/LabelNormalText.vue | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js
index dc16d07ba3..ca788f5547 100644
--- a/frontend/src/components/canvas/custom-component/component-list.js
+++ b/frontend/src/components/canvas/custom-component/component-list.js
@@ -411,8 +411,7 @@ const list = [
       verticalAlign: 'middle',
       borderStyle: 'solid',
       borderColor: '#000000',
-      time_margin: 0,
-      padding: 10
+      time_margin: 0
     },
     formatInfo: {
       openMode: '0',
diff --git a/frontend/src/views/chart/components/normal/LabelNormalText.vue b/frontend/src/views/chart/components/normal/LabelNormalText.vue
index b60dc5ac2e..5da713827e 100644
--- a/frontend/src/views/chart/components/normal/LabelNormalText.vue
+++ b/frontend/src/views/chart/components/normal/LabelNormalText.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="tableContainer" :style="bg_class" style="padding: 8px;width: 100%;height: 100%;overflow: hidden;">
+  <div ref="tableContainer" :style="bg_class" style="width: 100%;height: 100%;overflow: hidden;">
     <view-track-bar ref="viewTrack" :track-menu="trackMenu" class="track-bar" :style="trackBarStyleTime" @trackClick="trackClick" />
     <p v-show="title_show" ref="title" :style="title_class">{{ chart.title }}</p>
     <div

From 107afad074c2e6f48340204c24cda24ae6cb6863 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 30 May 2022 18:59:23 +0800
Subject: [PATCH 08/13] =?UTF-8?q?style:=20=E4=B8=8B=E6=9E=B6=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/Editor/Preview.vue  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 517ca5e989..6e15a7685b 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -2,10 +2,11 @@
   <div class="bg" :style="customStyle" @scroll="canvasScroll">
     <div id="canvasInfoMain" ref="canvasInfoMain" :style="canvasInfoMainStyle">
       <el-row v-if="showUnpublishedArea" class="custom-position">
-        <pre>
-            <svg-icon icon-class="unpublished" style="font-size: 75px" />
-            {{ $t('panel.panel_off') }}
-        </pre>
+        <div style="text-align: center">
+          <svg-icon icon-class="unpublished" style="font-size: 75px" />
+          <br>
+          <span>{{ $t('panel.panel_off') }}</span>
+        </div>
       </el-row>
       <el-row v-else-if="componentDataShow.length===0" class="custom-position">
         {{ $t('panel.panelNull') }}

From d49f617c91cb0179b9c64f5c10ce6b0e820d79c6 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 30 May 2022 21:23:03 +0800
Subject: [PATCH 09/13] =?UTF-8?q?fix:=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=A9=B1=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../provider/datasource/JdbcProvider.java     | 13 +++++++-
 .../service/datasource/DriverService.java     | 30 +++++++++++++------
 .../resources/i18n/messages_en_US.properties  |  3 +-
 .../resources/i18n/messages_zh_CN.properties  |  1 +
 .../resources/i18n/messages_zh_TW.properties  |  3 +-
 5 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
index 93bc11b59d..851bdfc197 100644
--- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
+++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
@@ -79,7 +79,18 @@ public class JdbcProvider extends DefaultJdbcProvider {
         List<TableField> list = new LinkedList<>();
         try (Connection connection = getConnectionFromPool(datasourceRequest)) {
             if (datasourceRequest.getDatasource().getType().equalsIgnoreCase("oracle")) {
-                Method setRemarksReporting = extendedJdbcClassLoader.loadClass("oracle.jdbc.driver.OracleConnection").getMethod("setRemarksReporting", boolean.class);
+                ExtendedJdbcClassLoader classLoader;
+                String driverClass;
+                OracleConfiguration oracleConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfiguration.class);
+                if (isDefaultClassLoader(oracleConfiguration.getCustomDriver())) {
+                    classLoader = extendedJdbcClassLoader;
+                    driverClass = oracleConfiguration.getDriver();
+                } else {
+                    DeDriver deDriver = deDriverMapper.selectByPrimaryKey(oracleConfiguration.getCustomDriver());
+                    classLoader = getCustomJdbcClassLoader(deDriver);
+                    driverClass = deDriver.getDriverClass();
+                }
+                Method setRemarksReporting = classLoader.loadClass(driverClass).getMethod("setRemarksReporting", boolean.class);
                 setRemarksReporting.invoke(((DruidPooledConnection) connection).getConnection(), true);
             }
             DatabaseMetaData databaseMetaData = connection.getMetaData();
diff --git a/backend/src/main/java/io/dataease/service/datasource/DriverService.java b/backend/src/main/java/io/dataease/service/datasource/DriverService.java
index 663d49c997..df44a4fef3 100644
--- a/backend/src/main/java/io/dataease/service/datasource/DriverService.java
+++ b/backend/src/main/java/io/dataease/service/datasource/DriverService.java
@@ -1,5 +1,6 @@
 package io.dataease.service.datasource;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.google.gson.Gson;
 import io.dataease.commons.constants.SysLogConstants;
 import io.dataease.commons.utils.BeanUtils;
@@ -8,14 +9,13 @@ import io.dataease.commons.utils.DeLogUtils;
 import io.dataease.dto.DriverDTO;
 import io.dataease.dto.SysLogDTO;
 import io.dataease.i18n.Translator;
-import io.dataease.plugins.common.base.domain.Datasource;
-import io.dataease.plugins.common.base.domain.DeDriver;
-import io.dataease.plugins.common.base.domain.DeDriverDetails;
-import io.dataease.plugins.common.base.domain.DeDriverDetailsExample;
+import io.dataease.plugins.common.base.domain.*;
 import io.dataease.plugins.common.base.mapper.DeDriverDetailsMapper;
 import io.dataease.plugins.common.base.mapper.DeDriverMapper;
 import io.dataease.plugins.datasource.entity.JdbcConfiguration;
+import io.dataease.plugins.datasource.provider.DefaultJdbcProvider;
 import io.dataease.plugins.datasource.provider.ExtendedJdbcClassLoader;
+import io.dataease.provider.ProviderFactory;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,10 +27,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Modifier;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
@@ -78,6 +75,15 @@ public class DriverService {
     }
 
     public DeDriver save(DeDriver deDriver) {
+        if(StringUtils.isEmpty(deDriver.getName()) || StringUtils.isEmpty(deDriver.getType())){
+            throw new RuntimeException("Name or Type cannot be empty.");
+        }
+        DeDriverExample example = new DeDriverExample();
+        example.createCriteria().andNameEqualTo(deDriver.getName());
+        if(CollectionUtil.isNotEmpty(deDriverMapper.selectByExample(example))){
+            throw new RuntimeException(Translator.get("I18N_DRIVER_REPEAT_NAME"));
+        }
+
         deDriver.setCreateTime(System.currentTimeMillis());
         deDriver.setId(UUID.randomUUID().toString());
         deDriverMapper.insert(deDriver);
@@ -96,12 +102,15 @@ public class DriverService {
         return deDriverDetailsMapper.selectByExampleWithBLOBs(example);
     }
 
-    public void deleteDriverFile(String driverFileId) {
+    public void deleteDriverFile(String driverFileId) throws Exception{
         DeDriverDetails deDriverDetails = deDriverDetailsMapper.selectByPrimaryKey(driverFileId);
+        DeDriver deDriver = deDriverMapper.selectByPrimaryKey(deDriverDetails.getDeDriverId());
         DeFileUtils.deleteFile(DRIVER_PATH + deDriverDetails.getDeDriverId() + "/" + deDriverDetails.getFileName());
         SysLogDTO sysLogDTO = DeLogUtils.buildLog(SysLogConstants.OPERATE_TYPE.DELETE, SysLogConstants.SOURCE_TYPE.DRIVER_FILE, deDriverDetails.getId(), deDriverDetails.getDeDriverId(), null, null);
         DeLogUtils.save(sysLogDTO);
         deDriverDetailsMapper.deleteByPrimaryKey(driverFileId);
+        DefaultJdbcProvider defaultJdbcProvider = (DefaultJdbcProvider)ProviderFactory.getProvider(deDriver.getType());
+        defaultJdbcProvider.reloadCustomJdbcClassLoader(deDriver);
     }
 
     public DeDriverDetails saveJar(MultipartFile file, String driverId) throws Exception {
@@ -129,6 +138,9 @@ public class DriverService {
         deDriverDetailsMapper.insert(deDriverDetails);
         SysLogDTO sysLogDTO = DeLogUtils.buildLog(SysLogConstants.OPERATE_TYPE.UPLOADFILE, SysLogConstants.SOURCE_TYPE.DRIVER_FILE, deDriverDetails.getId(), driverId, null, null);
         DeLogUtils.save(sysLogDTO);
+        DeDriver deDriver = deDriverMapper.selectByPrimaryKey(driverId);
+        DefaultJdbcProvider defaultJdbcProvider = (DefaultJdbcProvider)ProviderFactory.getProvider(deDriver.getType());
+        defaultJdbcProvider.reloadCustomJdbcClassLoader(deDriver);
         return deDriverDetails;
     }
 
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index 91c15e3406..7c5fa0cfc6 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -154,4 +154,5 @@ SOURCE_TYPE_DRIVER=DRIVER
 SOURCE_TYPE_DRIVER_FILE=DRIVER FILE
 SOURCE_TYPE_MENU=MENU
 
-I18N_DRIVER_NOT_DELETE=Drivers in use cannot be deleted
\ No newline at end of file
+I18N_DRIVER_NOT_DELETE=Drivers in use cannot be deleted
+I18N_DRIVER_REPEAT_NAME=Driver name cannot be same.
\ No newline at end of file
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index b0f7600640..ab615dae2a 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -158,3 +158,4 @@ I18N_USER=操作人
 I18N_TIME=操作时间
 
 I18N_DRIVER_NOT_DELETE=使用中的驱动不允许删除
+I18N_DRIVER_REPEAT_NAME=名称重复
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index f69b3e047b..33343c94ec 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -153,4 +153,5 @@ SOURCE_TYPE_DRIVER=驅動
 SOURCE_TYPE_DRIVER_FILE=驅動文件
 SOURCE_TYPE_MENU=菜單
 
-I18N_DRIVER_NOT_DELETE=使用中的驅動不允許删除
\ No newline at end of file
+I18N_DRIVER_NOT_DELETE=使用中的驅動不允許删除
+I18N_DRIVER_REPEAT_NAME=名稱重複
\ No newline at end of file

From c9bbc2ef2c0d25a97b708094038f4d4d1de40658 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 30 May 2022 23:30:40 +0800
Subject: [PATCH 10/13] =?UTF-8?q?fix:=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=A9=B1=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/provider/datasource/JdbcProvider.java   | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
index 851bdfc197..ea85812798 100644
--- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
+++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
@@ -79,19 +79,11 @@ public class JdbcProvider extends DefaultJdbcProvider {
         List<TableField> list = new LinkedList<>();
         try (Connection connection = getConnectionFromPool(datasourceRequest)) {
             if (datasourceRequest.getDatasource().getType().equalsIgnoreCase("oracle")) {
-                ExtendedJdbcClassLoader classLoader;
-                String driverClass;
                 OracleConfiguration oracleConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfiguration.class);
                 if (isDefaultClassLoader(oracleConfiguration.getCustomDriver())) {
-                    classLoader = extendedJdbcClassLoader;
-                    driverClass = oracleConfiguration.getDriver();
-                } else {
-                    DeDriver deDriver = deDriverMapper.selectByPrimaryKey(oracleConfiguration.getCustomDriver());
-                    classLoader = getCustomJdbcClassLoader(deDriver);
-                    driverClass = deDriver.getDriverClass();
+                    Method setRemarksReporting = extendedJdbcClassLoader.loadClass("oracle.jdbc.driver.OracleConnection").getMethod("setRemarksReporting", boolean.class);
+                    setRemarksReporting.invoke(((DruidPooledConnection) connection).getConnection(), true);
                 }
-                Method setRemarksReporting = classLoader.loadClass(driverClass).getMethod("setRemarksReporting", boolean.class);
-                setRemarksReporting.invoke(((DruidPooledConnection) connection).getConnection(), true);
             }
             DatabaseMetaData databaseMetaData = connection.getMetaData();
             ResultSet resultSet = databaseMetaData.getColumns(null, "%", datasourceRequest.getTable(), "%");

From 31ba1baa3146d170cd939952aff6f599e3100be3 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 31 May 2022 12:04:43 +0800
Subject: [PATCH 11/13] =?UTF-8?q?refactor:=20=E7=BC=93=E5=AD=98=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=E6=B3=A8=E8=A7=A3=E6=94=B9=E4=B8=BA=E5=BC=82=E6=AD=A5?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E5=8A=A0=E5=BF=AB=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/aop/DeCleanerAnnotationHandler.java  | 91 ++---------------
 .../service/decatch/DeCatchProcess.java       | 97 +++++++++++++++++++
 2 files changed, 105 insertions(+), 83 deletions(-)
 create mode 100644 backend/src/main/java/io/dataease/service/decatch/DeCatchProcess.java

diff --git a/backend/src/main/java/io/dataease/auth/aop/DeCleanerAnnotationHandler.java b/backend/src/main/java/io/dataease/auth/aop/DeCleanerAnnotationHandler.java
index 3584de725a..0132c5559e 100644
--- a/backend/src/main/java/io/dataease/auth/aop/DeCleanerAnnotationHandler.java
+++ b/backend/src/main/java/io/dataease/auth/aop/DeCleanerAnnotationHandler.java
@@ -1,18 +1,13 @@
 package io.dataease.auth.aop;
 
 import io.dataease.auth.annotation.DeCleaner;
-import io.dataease.auth.api.dto.CurrentUserDto;
-import io.dataease.commons.constants.AuthConstants;
 import io.dataease.commons.constants.DePermissionType;
-import io.dataease.commons.model.AuthURD;
 import io.dataease.commons.utils.AopUtils;
-import io.dataease.commons.utils.AuthUtils;
+import io.dataease.commons.utils.CommonBeanFactory;
 import io.dataease.commons.utils.LogUtil;
-import io.dataease.listener.util.CacheUtils;
-import org.apache.commons.collections4.CollectionUtils;
+import io.dataease.service.decatch.DeCatchProcess;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -20,9 +15,6 @@ import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Optional;
-
 @Aspect
 @Component
 public class DeCleanerAnnotationHandler {
@@ -43,15 +35,16 @@ public class DeCleanerAnnotationHandler {
                 paramValue = AopUtils.getParamValue(arg, key, 0);
             }
 
+
             switch (type.name()) {
                 case "DATASOURCE":
-                    cleanDataSource(paramValue);
+                    catchProcess().cleanDataSource(paramValue);
                     break;
                 case "DATASET":
-                    cleanDataSet(paramValue);
+                    catchProcess().cleanDataSet(paramValue);
                     break;
                 default:
-                    cleanPanel(paramValue);
+                    catchProcess().cleanPanel(paramValue);
                     break;
             }
         } catch (Throwable e) {
@@ -60,78 +53,10 @@ public class DeCleanerAnnotationHandler {
         }
     }
 
-
-
-    private void cleanCacheParent(String pid, String type) {
-        if (StringUtils.isBlank(pid) || StringUtils.isBlank(type)) {
-            return;
-        }
-        CurrentUserDto user = AuthUtils.getUser();
-        List<String> resourceIds = AuthUtils.parentResources(pid.toString(), type);
-        if (CollectionUtils.isEmpty(resourceIds))return;
-        resourceIds.forEach(resourceId -> {
-            AuthURD authURD = AuthUtils.authURDR(resourceId);
-            Optional.ofNullable(authURD.getUserIds()).ifPresent(ids -> {
-                ids.forEach(id -> {
-                    CacheUtils.remove("user_"+type, "user" + id);
-                });
-            });
-            Optional.ofNullable(authURD.getRoleIds()).ifPresent(ids -> {
-                ids.forEach(id -> {
-                    CacheUtils.remove("role_"+type, "role" + id);
-                });
-            });
-            Optional.ofNullable(authURD.getDeptIds()).ifPresent(ids -> {
-                ids.forEach(id -> {
-                    List<String> depts = AuthUtils.getAuthModels(id.toString(), "dept", user.getUserId(), user.getIsAdmin());
-                    depts.forEach(deptId -> {
-                        CacheUtils.remove("dept_"+type, "dept" + deptId);
-                    });
-                });
-            });
-        });
+    public DeCatchProcess catchProcess() {
+        return CommonBeanFactory.getBean(DeCatchProcess.class);
     }
 
-    public void cleanPanel(Object pid) {
-        CurrentUserDto user = AuthUtils.getUser();
-        CacheUtils.remove(AuthConstants.USER_PANEL_NAME, "user" + user.getUserId());
-        CacheUtils.remove(AuthConstants.DEPT_PANEL_NAME, "dept" + user.getDeptId());
-        user.getRoles().forEach(role -> {
-            CacheUtils.remove(AuthConstants.ROLE_PANEL_NAME, "role" + role.getId());
-        });
-
-        Optional.ofNullable(pid).ifPresent(resourceId -> {
-            cleanCacheParent(resourceId.toString(), "panel");
-        });
-
-
-    }
-
-    public void cleanDataSet(Object pid) {
-        CurrentUserDto user = AuthUtils.getUser();
-        CacheUtils.remove(AuthConstants.USER_DATASET_NAME, "user" + user.getUserId());
-        CacheUtils.remove(AuthConstants.DEPT_DATASET_NAME, "dept" + user.getDeptId());
-        user.getRoles().forEach(role -> {
-            CacheUtils.remove(AuthConstants.ROLE_DATASET_NAME, "role" + role.getId());
-        });
-
-        Optional.ofNullable(pid).ifPresent(resourceId -> {
-            cleanCacheParent(resourceId.toString(), "dataset");
-        });
-    }
-
-    public void cleanDataSource(Object pid) {
-        CurrentUserDto user = AuthUtils.getUser();
-        CacheUtils.remove(AuthConstants.USER_LINK_NAME, "user" + user.getUserId());
-        CacheUtils.remove(AuthConstants.DEPT_LINK_NAME, "dept" + user.getDeptId());
-        user.getRoles().forEach(role -> {
-            CacheUtils.remove(AuthConstants.ROLE_LINK_NAME, "role" + role.getId());
-        });
-
-        Optional.ofNullable(pid).ifPresent(resourceId -> {
-            cleanCacheParent(resourceId.toString(), "link");
-        });
-    }
 
 
 }
diff --git a/backend/src/main/java/io/dataease/service/decatch/DeCatchProcess.java b/backend/src/main/java/io/dataease/service/decatch/DeCatchProcess.java
new file mode 100644
index 0000000000..23010d6039
--- /dev/null
+++ b/backend/src/main/java/io/dataease/service/decatch/DeCatchProcess.java
@@ -0,0 +1,97 @@
+package io.dataease.service.decatch;
+
+import io.dataease.auth.api.dto.CurrentUserDto;
+import io.dataease.commons.constants.AuthConstants;
+import io.dataease.commons.model.AuthURD;
+import io.dataease.commons.utils.AuthUtils;
+import io.dataease.listener.util.CacheUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Author: wangjiahao
+ * Date: 2022/5/31
+ * Description:
+ */
+@Service
+public class DeCatchProcess {
+
+    @Async("taskExecutor")
+    public void cleanPanel(Object pid) {
+        CurrentUserDto user = AuthUtils.getUser();
+        CacheUtils.remove(AuthConstants.USER_PANEL_NAME, "user" + user.getUserId());
+        CacheUtils.remove(AuthConstants.DEPT_PANEL_NAME, "dept" + user.getDeptId());
+        user.getRoles().forEach(role -> {
+            CacheUtils.remove(AuthConstants.ROLE_PANEL_NAME, "role" + role.getId());
+        });
+
+        Optional.ofNullable(pid).ifPresent(resourceId -> {
+            cleanCacheParent(resourceId.toString(), "panel");
+        });
+
+
+    }
+
+    @Async("taskExecutor")
+    public void cleanDataSet(Object pid) {
+        CurrentUserDto user = AuthUtils.getUser();
+        CacheUtils.remove(AuthConstants.USER_DATASET_NAME, "user" + user.getUserId());
+        CacheUtils.remove(AuthConstants.DEPT_DATASET_NAME, "dept" + user.getDeptId());
+        user.getRoles().forEach(role -> {
+            CacheUtils.remove(AuthConstants.ROLE_DATASET_NAME, "role" + role.getId());
+        });
+
+        Optional.ofNullable(pid).ifPresent(resourceId -> {
+            cleanCacheParent(resourceId.toString(), "dataset");
+        });
+    }
+
+    @Async("taskExecutor")
+    public void cleanDataSource(Object pid) {
+        CurrentUserDto user = AuthUtils.getUser();
+        CacheUtils.remove(AuthConstants.USER_LINK_NAME, "user" + user.getUserId());
+        CacheUtils.remove(AuthConstants.DEPT_LINK_NAME, "dept" + user.getDeptId());
+        user.getRoles().forEach(role -> {
+            CacheUtils.remove(AuthConstants.ROLE_LINK_NAME, "role" + role.getId());
+        });
+
+        Optional.ofNullable(pid).ifPresent(resourceId -> {
+            cleanCacheParent(resourceId.toString(), "link");
+        });
+    }
+
+    private void cleanCacheParent(String pid, String type) {
+        if (StringUtils.isBlank(pid) || StringUtils.isBlank(type)) {
+            return;
+        }
+        CurrentUserDto user = AuthUtils.getUser();
+        List<String> resourceIds = AuthUtils.parentResources(pid.toString(), type);
+        if (CollectionUtils.isEmpty(resourceIds))return;
+        resourceIds.forEach(resourceId -> {
+            AuthURD authURD = AuthUtils.authURDR(resourceId);
+            Optional.ofNullable(authURD.getUserIds()).ifPresent(ids -> {
+                ids.forEach(id -> {
+                    CacheUtils.remove("user_"+type, "user" + id);
+                });
+            });
+            Optional.ofNullable(authURD.getRoleIds()).ifPresent(ids -> {
+                ids.forEach(id -> {
+                    CacheUtils.remove("role_"+type, "role" + id);
+                });
+            });
+            Optional.ofNullable(authURD.getDeptIds()).ifPresent(ids -> {
+                ids.forEach(id -> {
+                    List<String> depts = AuthUtils.getAuthModels(id.toString(), "dept", user.getUserId(), user.getIsAdmin());
+                    depts.forEach(deptId -> {
+                        CacheUtils.remove("dept_"+type, "dept" + deptId);
+                    });
+                });
+            });
+        });
+    }
+}

From 38ad5a192246b71aa57e5a815eaaa9de248577ca Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 31 May 2022 12:13:35 +0800
Subject: [PATCH 12/13] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E4=BF=9D=E5=AD=98=E8=BF=94=E5=9B=9E=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/PanelGroupController.java           | 22 ++++++++++++++-----
 .../service/panel/PanelGroupService.java      | 14 ++----------
 frontend/src/api/panel/panel.js               |  8 +++++++
 .../src/views/panel/list/EditPanel/index.vue  |  6 ++---
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
index c1ca4e8678..4150871e9b 100644
--- a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
+++ b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
@@ -62,10 +62,22 @@ public class PanelGroupController {
             @DePermission(type = DePermissionType.PANEL, value = "pid", level = ResourceAuthLevel.PANNEL_LEVEL_MANAGE)
     }, logical = Logical.AND)
     @I18n
-    public PanelGroup saveOrUpdate(@RequestBody PanelGroupRequest request) {
+    public String saveOrUpdate(@RequestBody PanelGroupRequest request) {
         return panelGroupService.saveOrUpdate(request);
     }
 
+    @ApiOperation("保存并返回数据")
+    @PostMapping("/saveWithData")
+    @DePermissions(value = {
+            @DePermission(type = DePermissionType.PANEL, value = "id"),
+            @DePermission(type = DePermissionType.PANEL, value = "pid", level = ResourceAuthLevel.PANNEL_LEVEL_MANAGE)
+    }, logical = Logical.AND)
+    @I18n
+    public PanelGroup saveOrUpdateWithData(@RequestBody PanelGroupRequest request) throws Exception {
+        String panelId = panelGroupService.saveOrUpdate(request);
+        return findOne(panelId);
+    }
+
     @ApiOperation("删除")
     @DePermission(type = DePermissionType.PANEL, level = ResourceAuthLevel.PANNEL_LEVEL_MANAGE)
     @PostMapping("/deleteCircle/{id}")
@@ -107,7 +119,7 @@ public class PanelGroupController {
     @ApiOperation("仪表板组件信息")
     @GetMapping("/queryPanelComponents/{id}")
     @I18n
-    public Map queryPanelComponents(@PathVariable String id){
+    public Map queryPanelComponents(@PathVariable String id) {
         return panelGroupService.queryPanelComponents(id);
     }
 
@@ -115,15 +127,15 @@ public class PanelGroupController {
     @PostMapping("/exportDetails")
     @I18n
     public void exportDetails(@RequestBody PanelViewDetailsRequest request, HttpServletResponse response) throws IOException {
-        panelGroupService.exportPanelViewDetails(request,response);
+        panelGroupService.exportPanelViewDetails(request, response);
     }
 
     @ApiOperation("更新仪表板状态")
     @PostMapping("/updatePanelStatus/{panelId}")
     @I18n
     @DePermission(type = DePermissionType.PANEL, level = ResourceAuthLevel.PANNEL_LEVEL_MANAGE)
-    public void updatePanelStatus(@PathVariable String panelId,@RequestBody PanelGroupBaseInfoRequest request){
-        panelGroupService.updatePanelStatus(panelId,request);
+    public void updatePanelStatus(@PathVariable String panelId, @RequestBody PanelGroupBaseInfoRequest request) {
+        panelGroupService.updatePanelStatus(panelId, request);
     }
 
 }
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index 6280bd45e5..e02c3cc764 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -121,7 +121,7 @@ public class PanelGroupService {
     }
 
     @DeCleaner(value = DePermissionType.PANEL, key = "pid")
-    public PanelGroup saveOrUpdate(PanelGroupRequest request) {
+    public String saveOrUpdate(PanelGroupRequest request) {
         String panelId = request.getId();
         if (StringUtils.isNotEmpty(panelId)) {
             panelViewService.syncPanelViews(request);
@@ -191,19 +191,9 @@ public class PanelGroupService {
                     request.setPid(panel.getPid());
                 }
             }
-
             DeLogUtils.save(SysLogConstants.OPERATE_TYPE.MODIFY, sourceType, request.getId(), request.getPid(), null, sourceType);
         }
-
-        //带有权限的返回
-        PanelGroupRequest authRequest = new PanelGroupRequest();
-        authRequest.setId(panelId);
-        authRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
-        List<PanelGroupDTO> panelGroupDTOList = extPanelGroupMapper.panelGroupList(authRequest);
-        if (!CollectionUtils.isNotEmpty(panelGroupDTOList)) {
-            DataEaseException.throwException("未查询到用户对应的资源权限，请尝试刷新重新保存");
-        }
-        return panelGroupDTOList.get(0);
+        return panelId;
     }
 
 
diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js
index 83849f1dd9..71c3c47d0b 100644
--- a/frontend/src/api/panel/panel.js
+++ b/frontend/src/api/panel/panel.js
@@ -72,6 +72,14 @@ export function panelSave(data) {
     data
   })
 }
+export function panelSaveWithData(data) {
+  return request({
+    url: 'panel/group/saveWithData',
+    method: 'post',
+    loading: true,
+    data
+  })
+}
 export function findOne(id) {
   return request({
     url: 'panel/group/findOne/' + id,
diff --git a/frontend/src/views/panel/list/EditPanel/index.vue b/frontend/src/views/panel/list/EditPanel/index.vue
index 1188f742e8..531d43511d 100644
--- a/frontend/src/views/panel/list/EditPanel/index.vue
+++ b/frontend/src/views/panel/list/EditPanel/index.vue
@@ -23,7 +23,7 @@
       </el-col>
       <el-col :span="16" :style="classBackground" class="preview-show" />
     </el-row>
-        <el-row v-if="inputType==='new_outer_template'" class="preview" :style="classBackground" />
+    <el-row v-if="inputType==='new_outer_template'" class="preview" :style="classBackground" />
     <el-row class="root-class">
       <el-button size="mini" @click="cancel()">{{ $t('commons.cancel') }}</el-button>
       <el-button type="primary" size="mini" @click="save()">{{ $t('commons.confirm') }}</el-button>
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import { panelSave } from '@/api/panel/panel'
+import { panelSaveWithData } from '@/api/panel/panel'
 import { showTemplateList } from '@/api/system/template'
 import TemplateAllList from './TemplateAllList'
 import { deepCopy } from '@/components/canvas/utils/utils'
@@ -147,7 +147,7 @@ export default {
       }
       this.editPanel.panelInfo['newFrom'] = this.inputType
       this.loading = true
-      panelSave(this.editPanel.panelInfo).then(response => {
+      panelSaveWithData(this.editPanel.panelInfo).then(response => {
         this.$message({
           message: this.$t('commons.save_success'),
           type: 'success',

From edc98783687665317c78642cdaf56c8b9578732d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 31 May 2022 13:31:01 +0800
Subject: [PATCH 13/13] =?UTF-8?q?refactor:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/PanelGroupController.java           | 14 ++++----
 .../service/panel/PanelGroupService.java      | 28 ++++++++-------
 frontend/src/api/panel/panel.js               |  6 ++--
 .../components/canvas/components/Toolbar.vue  |  4 +--
 .../src/views/panel/list/EditPanel/index.vue  | 36 +++++++++++++------
 frontend/src/views/panel/list/PanelList.vue   |  4 +--
 6 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
index 4150871e9b..241d0fd29f 100644
--- a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
+++ b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
@@ -62,20 +62,20 @@ public class PanelGroupController {
             @DePermission(type = DePermissionType.PANEL, value = "pid", level = ResourceAuthLevel.PANNEL_LEVEL_MANAGE)
     }, logical = Logical.AND)
     @I18n
-    public String saveOrUpdate(@RequestBody PanelGroupRequest request) {
-        return panelGroupService.saveOrUpdate(request);
+    public PanelGroup save(@RequestBody PanelGroupRequest request) throws Exception{
+        String panelId = panelGroupService.save(request);
+        return findOne(panelId);
     }
 
-    @ApiOperation("保存并返回数据")
-    @PostMapping("/saveWithData")
+    @ApiOperation("更新")
+    @PostMapping("/update")
     @DePermissions(value = {
             @DePermission(type = DePermissionType.PANEL, value = "id"),
             @DePermission(type = DePermissionType.PANEL, value = "pid", level = ResourceAuthLevel.PANNEL_LEVEL_MANAGE)
     }, logical = Logical.AND)
     @I18n
-    public PanelGroup saveOrUpdateWithData(@RequestBody PanelGroupRequest request) throws Exception {
-        String panelId = panelGroupService.saveOrUpdate(request);
-        return findOne(panelId);
+    public String update(@RequestBody PanelGroupRequest request) {
+        return panelGroupService.update(request);
     }
 
     @ApiOperation("删除")
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index e02c3cc764..0e08e58ba6 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -121,20 +121,22 @@ public class PanelGroupService {
     }
 
     @DeCleaner(value = DePermissionType.PANEL, key = "pid")
-    public String saveOrUpdate(PanelGroupRequest request) {
+    public String save(PanelGroupRequest request) {
+        checkPanelName(request.getName(), request.getPid(), PanelConstants.OPT_TYPE_INSERT, null, request.getNodeType());
+        String panelId = newPanel(request);
+        panelGroupMapper.insertSelective(request);
+        // 清理权限缓存
+        clearPermissionCache();
+        sysAuthService.copyAuth(panelId, SysAuthConstants.AUTH_SOURCE_TYPE_PANEL);
+        DeLogUtils.save(SysLogConstants.OPERATE_TYPE.CREATE, sourceType, panelId, request.getPid(), null, null);
+        return panelId;
+    }
+
+
+    public String update(PanelGroupRequest request) {
         String panelId = request.getId();
-        if (StringUtils.isNotEmpty(panelId)) {
-            panelViewService.syncPanelViews(request);
-        }
-        if (StringUtils.isEmpty(panelId)) { // 新建
-            checkPanelName(request.getName(), request.getPid(), PanelConstants.OPT_TYPE_INSERT, null, request.getNodeType());
-            panelId = newPanel(request);
-            panelGroupMapper.insertSelective(request);
-            // 清理权限缓存
-            clearPermissionCache();
-            sysAuthService.copyAuth(panelId, SysAuthConstants.AUTH_SOURCE_TYPE_PANEL);
-            DeLogUtils.save(SysLogConstants.OPERATE_TYPE.CREATE, sourceType, panelId, request.getPid(), null, null);
-        } else if ("toDefaultPanel".equals(request.getOptType())) { // 转存为默认仪表板
+        panelViewService.syncPanelViews(request);
+        if ("toDefaultPanel".equals(request.getOptType())) { // 转存为默认仪表板
             panelId = UUID.randomUUID().toString();
             PanelGroupWithBLOBs newDefaultPanel = panelGroupMapper.selectByPrimaryKey(request.getId());
             newDefaultPanel.setPanelType(PanelConstants.PANEL_TYPE.SYSTEM);
diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js
index 71c3c47d0b..d97c41b615 100644
--- a/frontend/src/api/panel/panel.js
+++ b/frontend/src/api/panel/panel.js
@@ -72,14 +72,16 @@ export function panelSave(data) {
     data
   })
 }
-export function panelSaveWithData(data) {
+
+export function panelUpdate(data) {
   return request({
-    url: 'panel/group/saveWithData',
+    url: 'panel/group/update',
     method: 'post',
     loading: true,
     data
   })
 }
+
 export function findOne(id) {
   return request({
     url: 'panel/group/findOne/' + id,
diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue
index 66f8a630f9..7f092800f4 100644
--- a/frontend/src/components/canvas/components/Toolbar.vue
+++ b/frontend/src/components/canvas/components/Toolbar.vue
@@ -87,7 +87,7 @@ import { mapState } from 'vuex'
 import { commonStyle, commonAttr } from '@/components/canvas/custom-component/component-list'
 import eventBus from '@/components/canvas/utils/eventBus'
 import { deepCopy, mobile2MainCanvas } from '@/components/canvas/utils/utils'
-import { panelSave } from '@/api/panel/panel'
+import { panelUpdate } from '@/api/panel/panel'
 import { saveLinkage, getPanelAllLinkageInfo } from '@/api/panel/linkage'
 import bus from '@/utils/bus'
 import {
@@ -295,7 +295,7 @@ export default {
       })
       // 无需保存条件
       requestInfo.panelData = JSON.stringify(components)
-      panelSave(requestInfo).then(response => {
+      panelUpdate(requestInfo).then(response => {
         this.$store.commit('refreshSaveStatus')
         this.$message({
           message: this.$t('commons.save_success'),
diff --git a/frontend/src/views/panel/list/EditPanel/index.vue b/frontend/src/views/panel/list/EditPanel/index.vue
index 531d43511d..a78ef75ff1 100644
--- a/frontend/src/views/panel/list/EditPanel/index.vue
+++ b/frontend/src/views/panel/list/EditPanel/index.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import { panelSaveWithData } from '@/api/panel/panel'
+import { panelSave, panelUpdate } from '@/api/panel/panel'
 import { showTemplateList } from '@/api/system/template'
 import TemplateAllList from './TemplateAllList'
 import { deepCopy } from '@/components/canvas/utils/utils'
@@ -147,17 +147,31 @@ export default {
       }
       this.editPanel.panelInfo['newFrom'] = this.inputType
       this.loading = true
-      panelSaveWithData(this.editPanel.panelInfo).then(response => {
-        this.$message({
-          message: this.$t('commons.save_success'),
-          type: 'success',
-          showClose: true
+      if (this.editPanel.optType === 'new') {
+        panelSave(this.editPanel.panelInfo).then(response => {
+          this.$message({
+            message: this.$t('commons.save_success'),
+            type: 'success',
+            showClose: true
+          })
+          this.loading = false
+          this.$emit('closeEditPanelDialog', response.data)
+        }).catch(() => {
+          this.loading = false
         })
-        this.loading = false
-        this.$emit('closeEditPanelDialog', response.data)
-      }).catch(() => {
-        this.loading = false
-      })
+      } else {
+        panelUpdate(this.editPanel.panelInfo).then(response => {
+          this.$message({
+            message: this.$t('commons.save_success'),
+            type: 'success',
+            showClose: true
+          })
+          this.loading = false
+          this.$emit('closeEditPanelDialog', response.data)
+        }).catch(() => {
+          this.loading = false
+        })
+      }
     },
     handleFileChange(e) {
       const file = e.target.files[0]
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index ebfdd2655f..3920e9abc5 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -228,7 +228,7 @@ import LinkGenerate from '@/views/link/generate'
 import { uuid } from 'vue-uuid'
 import bus from '@/utils/bus'
 import EditPanel from './EditPanel'
-import { addGroup, delGroup, groupTree, defaultTree, panelSave, initPanelData } from '@/api/panel/panel'
+import {addGroup, delGroup, groupTree, defaultTree, panelSave, initPanelData, panelUpdate} from '@/api/panel/panel'
 import { mapState } from 'vuex'
 import {
   DEFAULT_COMMON_CANVAS_STYLE_STRING
@@ -779,7 +779,7 @@ export default {
     saveMoveGroup() {
       this.moveInfo.pid = this.tGroup.id
       this.moveInfo['optType'] = 'move'
-      panelSave(this.moveInfo).then(response => {
+      panelUpdate(this.moveInfo).then(response => {
         this.tree()
         this.closeMoveGroup()
       })