From 6ca72d0ba8452d4ced198e05aa42e750ff33c4a4 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 3 Jan 2023 12:46:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=BA=94=E7=94=A8):=20=E5=A4=8D?=
 =?UTF-8?q?=E7=94=A8=E6=95=B0=E6=8D=AE=E6=BA=90=E7=9A=84=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=85=81=E8=AE=B8=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/panel/PanelGroupService.java      |  7 +--
 .../views/system/datasource/DsFormContent.vue | 45 ++++++++++---------
 2 files changed, 29 insertions(+), 23 deletions(-)

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 ae3ce9e76a..d026e84bc5 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -1068,9 +1068,10 @@ public class PanelGroupService {
         datasetGroupHistoryInfo.setName(request.getDatasetGroupName());
         datasetGroupHistoryInfo.setPid(request.getDatasetGroupPid());
         datasetGroupMapper.updateByPrimaryKey(datasetGroupHistoryInfo);
-
-        //数据源变更
-        panelAppTemplateService.editDatasource(request.getDatasourceList());
+        if ("new".equals(request.getDatasourceFrom())) {
+            //数据源变更
+            panelAppTemplateService.editDatasource(request.getDatasourceList());
+        }
     }
 
     public void toTop(String panelId) {
diff --git a/frontend/src/views/system/datasource/DsFormContent.vue b/frontend/src/views/system/datasource/DsFormContent.vue
index a19fda77b5..057deb2716 100644
--- a/frontend/src/views/system/datasource/DsFormContent.vue
+++ b/frontend/src/views/system/datasource/DsFormContent.vue
@@ -71,8 +71,8 @@
           </el-form>
           <div class="de-row-rules">
             <span>{{
-              positionCheck('appMarket') ? $t('app_template.datasource_info') : $t('datasource.basic_info')
-            }}</span>
+                positionCheck('appMarket') ? $t('app_template.datasource_info') : $t('datasource.basic_info')
+              }}</span>
           </div>
           <el-form
             ref="historyDsForm"
@@ -246,7 +246,8 @@
             v-if="
               formType === 'add'
                 ? true
-                : hasDataPermission('manage', params.privileges)
+                : (hasDataPermission('manage', outerParams.panelPrivileges)
+                ||hasDataPermission('manage', outerParams.datasetPrivileges))
             "
             @click="validaDatasource"
           >{{ $t('commons.validate') }}
@@ -270,7 +271,11 @@
           >{{ $t('commons.cancel') }}
           </deBtn>
           <deBtn
-            v-if="formType === 'add'"
+            v-if="
+              formType === 'add'
+                ? true
+                : hasDataPermission('manage', params.privileges)
+            "
             type="primary"
             @click="saveAppMarketHistory"
           >{{ $t('commons.save') }}
@@ -720,7 +725,7 @@ export default {
           res.data.apiConfiguration = JSON.parse(Base64.decode(res.data.apiConfigurationStr))
         }
         this.params = { ...res.data, showModel }
-        if(showModel === 'copy'){
+        if (showModel === 'copy') {
           this.params.id = ''
         }
         this.$emit('setParams', { ...this.params })
@@ -809,16 +814,16 @@ export default {
     },
     saveAppMarketHistory() {
       this.$refs.historyDsForm.validate(valid => {
-        if (!valid) {
-          return false
+          if (!valid) {
+            return false
+          }
+          const appApplyForm = {
+            ...this.attachForm,
+            ...this.historyDsForm
+          }
+          const method = this.formType === 'add' ? appApply : appEdit
+          this.appApplyMethod(method, appApplyForm)
         }
-        const appApplyForm = {
-          ...this.attachForm,
-          ...this.historyDsForm
-        }
-        const method = this.formType === 'add' ? appApply : appEdit
-        this.appApplyMethod(method, appApplyForm)
-      }
       )
     },
     save() {
@@ -964,10 +969,10 @@ export default {
       }
       if (this.positionCheck('appMarket')) {
         this.$refs.attachParamsForm.validate(valid => {
-          if (!valid) {
-            return false
+            if (!valid) {
+              return false
+            }
           }
-        }
         )
       }
       this.$refs.dsForm.validate((valid) => {
@@ -1112,10 +1117,10 @@ export default {
       }
       if (this.positionCheck('appMarket')) {
         this.$refs.attachParamsForm.validate(valid => {
-          if (!valid) {
-            return false
+            if (!valid) {
+              return false
+            }
           }
-        }
         )
       }
       this.$refs.dsForm.validate((valid) => {