Merge pull request #1936 from dataease/pr@dev@refactor_outer-params

backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.java

@@ -8,6 +8,10 @@ public interface ExtPanelOuterParamsMapper {
 
     PanelOuterParamsDTO queryWithPanelId(@Param("panelId") String panelId);
 
+    void deleteOuterParamsTargetWithPanelId(@Param("panelId") String panelId);
+
+    void deleteOuterParamsInfoWithPanelId(@Param("panelId") String panelId);
+
     void deleteOuterParamsWithPanelId(@Param("panelId") String panelId);
 
 }

backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml

@@ -46,8 +46,8 @@
         panel_group.id = #{panelId}
   </select>
 
-    <delete id="deleteOuterParamsWithPanelId" >
-        DELETE poptvi,popi,pop
+    <delete id="deleteOuterParamsTargetWithPanelId" >
+        DELETE poptvi
         FROM
             panel_outer_params_target_view_info poptvi,
             panel_outer_params_info popi,
@@ -58,4 +58,24 @@
             AND pop.panel_id = #{panelId}
 	</delete>
 
+    <delete id="deleteOuterParamsInfoWithPanelId" >
+        DELETE popi
+        FROM
+            panel_outer_params_info popi,
+            panel_outer_params pop
+        WHERE
+             popi.params_id = pop.params_id
+            AND pop.panel_id = #{panelId}
+	</delete>
+
+    <delete id="deleteOuterParamsWithPanelId" >
+        DELETE pop
+        FROM
+            panel_outer_params pop
+        WHERE
+            pop.panel_id = #{panelId}
+	</delete>
+
+
+
 </mapper>

backend/src/main/java/io/dataease/controller/panel/PanelOuterParamsController.java

 package io.dataease.controller.panel;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import io.dataease.base.domain.PanelOuterParams;
-import io.dataease.dto.panel.linkJump.PanelLinkJumpDTO;
 import io.dataease.dto.panel.outerParams.PanelOuterParamsDTO;
 import io.dataease.service.panel.PanelOuterParamsService;
 import io.swagger.annotations.Api;

backend/src/main/java/io/dataease/service/panel/PanelOuterParamsService.java

@@ -46,6 +46,8 @@ public class PanelOuterParamsService {
         String panelId = outerParamsDTO.getPanelId();
         Assert.notNull(panelId, "panelId cannot be null");
         //清理原有数据
+        extPanelOuterParamsMapper.deleteOuterParamsTargetWithPanelId(panelId);
+        extPanelOuterParamsMapper.deleteOuterParamsInfoWithPanelId(panelId);
         extPanelOuterParamsMapper.deleteOuterParamsWithPanelId(panelId);
         // 插入新的数据
         String paramsId = UUID.randomUUID().toString();

frontend/src/components/canvas/components/Toolbar.vue

@@ -38,9 +38,9 @@
       <el-tooltip :content="$t('panel.fullscreen_preview')">
         <el-button class="el-icon-view" size="mini" circle @click="clickPreview" />
       </el-tooltip>
-<!--      <el-tooltip :content="$t('panel.params_setting')">-->
-<!--        <el-button class="icon iconfont-tb icon-canshu" size="mini" circle @click="openOuterParamsSet" />-->
-<!--      </el-tooltip>-->
+      <el-tooltip :content="$t('panel.params_setting')">
+        <el-button class="icon iconfont-tb icon-canshu" size="mini" circle @click="openOuterParamsSet" />
+      </el-tooltip>
       <span style="float: right;margin-left: 10px">
         <el-button size="mini" :disabled="saveButtonDisabled" @click="save(false)">
           {{ $t('commons.save') }}

frontend/src/lang/en.js

@@ -1381,6 +1381,14 @@ export default {
     sure_bt: 'Confirm'
   },
   panel: {
+    enable_outer_param_set: 'Enable Outer Param Set',
+    select_param: 'Please Select Param...',
+    add_param_link_field: "Add Params' Linked Field",
+    add_param: 'Add Param',
+    enable_param: 'Enable Param',
+    param_name: 'Param Name',
+    outer_param_set: 'Outer Param Set',
+    input_param_name: "Please Input Param's Name",
     params_setting: 'Outer Params Setting',
     template_view_tips: "Template's Views. Please Change",
     no_auth_role: 'Unshared roles',

frontend/src/lang/tw.js

@@ -1382,6 +1382,14 @@ export default {
     sure_bt: '確定'
   },
   panel: {
+    enable_outer_param_set: '启用外部参数设置',
+    select_param: '请选择参数...',
+    add_param_link_field: '添加参数联动字段',
+    add_param: '添加参数',
+    enable_param: '启用参数',
+    param_name: '参数名称',
+    outer_param_set: '外部参数设置',
+    input_param_name: '请输入参数名称',
     params_setting: '外部参数设置',
     template_view_tips: '当前是模板视图,请点击更换数据集',
     no_auth_role: '未分享角色',

frontend/src/lang/zh.js

@@ -1390,6 +1390,14 @@ export default {
     sure_bt: '确定'
   },
   panel: {
+    enable_outer_param_set: '启用外部参数设置',
+    select_param: '请选择参数...',
+    add_param_link_field: '添加参数联动字段',
+    add_param: '添加参数',
+    enable_param: '启用参数',
+    param_name: '参数名称',
+    outer_param_set: '外部参数设置',
+    input_param_name: '请输入参数名称',
     params_setting: '外部参数设置',
     template_view_tips: '当前是模板视图,请点击更换数据集',
     no_auth_role: '未分享角色',

frontend/src/views/panel/edit/index.vue

@@ -322,7 +322,7 @@
       :destroy-on-close="true"
       :append-to-body="true"
     >
-      <OuterParamsSet v-if="outerParamsSetVisible" @closeOuterParamsSetDialog="closeOuterParamsSetDialog" />
+      <OuterParamsSet v-if="outerParamsSetVisible" @outerParamsSetVisibleChange="outerParamsSetVisibleChange" />
     </el-dialog>
 
   </el-row>
@@ -612,7 +612,7 @@ export default {
     elx && elx.remove()
   },
   methods: {
-    closeOuterParamsSetDialog(){
+    closeOuterParamsSetDialog() {
       this.outerParamsSetVisible = false
     },
     changeRightDrawOpen(param) {