From 00c37f404c9ac4ad51f2279d8ffe63746160aff3 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 21 Aug 2024 14:19:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BC=98=E5=8C=96=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/MybatisPlusGenerator.java | 2 +- ...isualizationOuterParamsTargetViewInfo.java | 20 +- ...zationOuterParamsTargetViewInfoMapper.java | 2 +- .../main/resources/db/desktop/V2.10__ddl.sql | 5 + .../resources/db/migration/V2.10__ddl.sql | 4 + .../ExtVisualizationOuterParamsMapper.xml | 1 + .../visualization/OuterParamsSet.vue | 2 +- .../visualization/OuterParamsSetDS.vue | 647 ++++++++++++++++++ ...ualizationOuterParamsTargetViewInfoVO.java | 68 +- 9 files changed, 685 insertions(+), 66 deletions(-) create mode 100644 core/core-frontend/src/components/visualization/OuterParamsSetDS.vue diff --git a/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java b/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java index 3e5d0ddc25..0f1a1971a2 100644 --- a/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java +++ b/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java @@ -25,7 +25,7 @@ public class MybatisPlusGenerator { /** * 这是要生成代码的表名称 */ - private static final String TABLE_NAME = "visualization_report_filter"; + private static final String TABLE_NAME = "visualization_outer_params_target_view_info"; /** * 下面两个配置基本上不用动 diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java index 393127f6f2..e36f2ea50f 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java @@ -1,5 +1,6 @@ package io.dataease.visualization.dao.auto.entity; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -9,7 +10,7 @@ import java.io.Serializable; *

* * @author fit2cloud - * @since 2024-03-08 + * @since 2024-08-21 */ @TableName("visualization_outer_params_target_view_info") public class VisualizationOuterParamsTargetViewInfo implements Serializable { @@ -19,6 +20,7 @@ public class VisualizationOuterParamsTargetViewInfo implements Serializable { /** * 主键 */ + @TableId("target_id") private String targetId; /** @@ -27,10 +29,15 @@ public class VisualizationOuterParamsTargetViewInfo implements Serializable { private String paramsInfoId; /** - * 联动视图ID + * 联动视图ID/联动过滤项ID */ private String targetViewId; + /** + * 联动数据集id/联动过滤组件id + */ + private String targetDsId; + /** * 联动字段ID */ @@ -70,6 +77,14 @@ public class VisualizationOuterParamsTargetViewInfo implements Serializable { this.targetViewId = targetViewId; } + public String getTargetDsId() { + return targetDsId; + } + + public void setTargetDsId(String targetDsId) { + this.targetDsId = targetDsId; + } + public String getTargetFieldId() { return targetFieldId; } @@ -100,6 +115,7 @@ public class VisualizationOuterParamsTargetViewInfo implements Serializable { "targetId = " + targetId + ", paramsInfoId = " + paramsInfoId + ", targetViewId = " + targetViewId + + ", targetDsId = " + targetDsId + ", targetFieldId = " + targetFieldId + ", copyFrom = " + copyFrom + ", copyId = " + copyId + diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java index 1d4f56197a..0e6a211399 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; *

* * @author fit2cloud - * @since 2024-03-08 + * @since 2024-08-21 */ @Mapper public interface VisualizationOuterParamsTargetViewInfoMapper extends BaseMapper { diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10__ddl.sql index f6a904983a..902dcd020a 100644 --- a/core/core-backend/src/main/resources/db/desktop/V2.10__ddl.sql +++ b/core/core-backend/src/main/resources/db/desktop/V2.10__ddl.sql @@ -6,3 +6,8 @@ alter table `core_dataset_table_field` add params text null comment '计算字 alter table `core_datasource` add `enable_data_fill` tinyint default 0 null comment '启用数据填报功能'; + + +ALTER TABLE `visualization_outer_params_target_view_info` + MODIFY COLUMN `target_view_id` varchar(50) NULL DEFAULT NULL COMMENT '联动视图ID/联动过滤项ID' , + ADD COLUMN `target_ds_id` varchar(50) NULL COMMENT '联动数据集id/联动过滤组件id' ; diff --git a/core/core-backend/src/main/resources/db/migration/V2.10__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10__ddl.sql index 855346aeea..5f2a9c4f8b 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.10__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.10__ddl.sql @@ -57,3 +57,7 @@ CREATE TABLE `xpack_threshold_instance` ); +ALTER TABLE `visualization_outer_params_target_view_info` + MODIFY COLUMN `target_view_id` varchar(50) NULL DEFAULT NULL COMMENT '联动视图ID/联动过滤项ID' , + ADD COLUMN `target_ds_id` varchar(50) NULL COMMENT '联动数据集id/联动过滤组件id' ; + diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml index b4c7d781f5..8f68002f96 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml @@ -49,6 +49,7 @@ popi.param_name, ifnull( popi.checked, 0 ) AS checked, poptvi.target_view_id, + poptvi.target_ds_id, poptvi.target_field_id FROM visualization_outer_params pop diff --git a/core/core-frontend/src/components/visualization/OuterParamsSet.vue b/core/core-frontend/src/components/visualization/OuterParamsSet.vue index 2298b24eb7..08cc0444ba 100644 --- a/core/core-frontend/src/components/visualization/OuterParamsSet.vue +++ b/core/core-frontend/src/components/visualization/OuterParamsSet.vue @@ -13,7 +13,7 @@ - 参数列表 + 参数列表DS diff --git a/core/core-frontend/src/components/visualization/OuterParamsSetDS.vue b/core/core-frontend/src/components/visualization/OuterParamsSetDS.vue new file mode 100644 index 0000000000..2298b24eb7 --- /dev/null +++ b/core/core-frontend/src/components/visualization/OuterParamsSetDS.vue @@ -0,0 +1,647 @@ + + + + + diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java index 29555c08a4..314365a542 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java @@ -1,6 +1,6 @@ package io.dataease.api.visualization.vo; -import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.io.Serializable; @@ -12,6 +12,7 @@ import java.io.Serializable; * @author fit2cloud * @since 2024-03-08 */ +@Data public class VisualizationOuterParamsTargetViewInfoVO implements Serializable { private static final long serialVersionUID = 1L; @@ -31,6 +32,11 @@ public class VisualizationOuterParamsTargetViewInfoVO implements Serializable { */ private String targetViewId; + /** + * 联动数据集id/联动过滤组件id + */ + private String targetDsId; + /** * 联动字段ID */ @@ -45,64 +51,4 @@ public class VisualizationOuterParamsTargetViewInfoVO implements Serializable { * 复制来源ID */ private String copyId; - - public String getTargetId() { - return targetId; - } - - public void setTargetId(String targetId) { - this.targetId = targetId; - } - - public String getParamsInfoId() { - return paramsInfoId; - } - - public void setParamsInfoId(String paramsInfoId) { - this.paramsInfoId = paramsInfoId; - } - - public String getTargetViewId() { - return targetViewId; - } - - public void setTargetViewId(String targetViewId) { - this.targetViewId = targetViewId; - } - - public String getTargetFieldId() { - return targetFieldId; - } - - public void setTargetFieldId(String targetFieldId) { - this.targetFieldId = targetFieldId; - } - - public String getCopyFrom() { - return copyFrom; - } - - public void setCopyFrom(String copyFrom) { - this.copyFrom = copyFrom; - } - - public String getCopyId() { - return copyId; - } - - public void setCopyId(String copyId) { - this.copyId = copyId; - } - - @Override - public String toString() { - return "VisualizationOuterParamsTargetViewInfo{" + - "targetId = " + targetId + - ", paramsInfoId = " + paramsInfoId + - ", targetViewId = " + targetViewId + - ", targetFieldId = " + targetFieldId + - ", copyFrom = " + copyFrom + - ", copyId = " + copyId + - "}"; - } }