From bed5a0bf02318625cbda6dc342aa89329a9b9267 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 18 Mar 2022 20:35:52 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ext/ExtPanelOuterParamsMapper.java | 4 + .../mapper/ext/ExtPanelOuterParamsMapper.xml | 24 +- .../panel/PanelOuterParamsController.java | 2 - .../panel/PanelOuterParamsService.java | 2 + .../components/canvas/components/Toolbar.vue | 6 +- frontend/src/lang/en.js | 8 + frontend/src/lang/tw.js | 8 + frontend/src/lang/zh.js | 8 + .../src/views/panel/OuterParamsSet/index.vue | 435 +++++++++--------- frontend/src/views/panel/edit/index.vue | 4 +- 10 files changed, 280 insertions(+), 221 deletions(-) diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.java index 893d9bb014..c32cc032a9 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.java +++ b/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); } diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml index 3533af620e..7d535fd956 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml @@ -46,8 +46,8 @@ panel_group.id = #{panelId} - - DELETE poptvi,popi,pop + + 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 popi + FROM + panel_outer_params_info popi, + panel_outer_params pop + WHERE + popi.params_id = pop.params_id + AND pop.panel_id = #{panelId} + + + + DELETE pop + FROM + panel_outer_params pop + WHERE + pop.panel_id = #{panelId} + + + + diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelOuterParamsController.java b/backend/src/main/java/io/dataease/controller/panel/PanelOuterParamsController.java index 7d75dbd3e2..e412a65a8b 100644 --- a/backend/src/main/java/io/dataease/controller/panel/PanelOuterParamsController.java +++ b/backend/src/main/java/io/dataease/controller/panel/PanelOuterParamsController.java @@ -1,8 +1,6 @@ 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; diff --git a/backend/src/main/java/io/dataease/service/panel/PanelOuterParamsService.java b/backend/src/main/java/io/dataease/service/panel/PanelOuterParamsService.java index 995377b036..0bbd7d0997 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelOuterParamsService.java +++ b/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(); diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue index e986b83344..f4beea3570 100644 --- a/frontend/src/components/canvas/components/Toolbar.vue +++ b/frontend/src/components/canvas/components/Toolbar.vue @@ -38,9 +38,9 @@ - - - + + + {{ $t('commons.save') }} diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 2bed62509f..5c753f59af 100644 --- a/frontend/src/lang/en.js +++ b/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', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 48d30b56e7..528f265ef5 100644 --- a/frontend/src/lang/tw.js +++ b/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: '未分享角色', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 23dd1e030e..28e9d097dd 100644 --- a/frontend/src/lang/zh.js +++ b/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: '未分享角色', diff --git a/frontend/src/views/panel/OuterParamsSet/index.vue b/frontend/src/views/panel/OuterParamsSet/index.vue index 4a558b9ffa..2b7820906f 100644 --- a/frontend/src/views/panel/OuterParamsSet/index.vue +++ b/frontend/src/views/panel/OuterParamsSet/index.vue @@ -1,83 +1,61 @@