From 15a83c882ccc891b44f6cbb1e0966d5ea1253f1c Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 8 Mar 2024 17:00:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E5=8F=AF?= =?UTF-8?q?=E8=A7=86=E5=8C=96=E8=B5=84=E6=BA=90=E6=94=AF=E6=8C=81=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E5=8F=82=E6=95=B0=E5=8A=9F=E8=83=BD=20#8257?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/MybatisPlusGenerator.java | 4 +- .../auto/entity/VisualizationOuterParams.java | 108 ++++ .../entity/VisualizationOuterParamsInfo.java | 108 ++++ ...isualizationOuterParamsTargetViewInfo.java | 108 ++++ .../VisualizationOuterParamsInfoMapper.java | 18 + .../VisualizationOuterParamsMapper.java | 18 + ...zationOuterParamsTargetViewInfoMapper.java | 18 + .../api/visualization/dataVisualization.ts | 15 + .../src/api/visualization/outerParams.ts | 11 +- .../visualization/outer-params-set/index.vue | 567 ++++++++++++++++++ core/core-frontend/src/utils/check.ts | 10 + .../VisualizationOuterParamsApi.java | 20 + .../dto/VisualizationOuterParamsDTO.java | 9 + .../dto/VisualizationOuterParamsInfoDTO.java | 8 + ...alizationOuterParamsTargetViewInfoDTO.java | 9 + .../VisualizationOuterParamsBaseResponse.java | 24 + .../vo/VisualizationOuterParamsInfoVO.java | 108 ++++ ...ualizationOuterParamsTargetViewInfoVO.java | 108 ++++ .../vo/VisualizationOuterParamsVO.java | 108 ++++ 19 files changed, 1372 insertions(+), 7 deletions(-) create mode 100644 core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParams.java create mode 100644 core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java create mode 100644 core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java create mode 100644 core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java create mode 100644 core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsMapper.java create mode 100644 core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java create mode 100644 core/core-frontend/src/components/visualization/outer-params-set/index.vue create mode 100644 core/core-frontend/src/utils/check.ts create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationOuterParamsApi.java create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsDTO.java create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsInfoDTO.java create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsTargetViewInfoDTO.java create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/response/VisualizationOuterParamsBaseResponse.java create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsInfoVO.java create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java 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 12bd3304f8..0f1a1971a2 100644 --- a/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java +++ b/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java @@ -21,11 +21,11 @@ public class MybatisPlusGenerator { /** * 业务模块例如datasource,dataset,panel等 */ - private static final String busi = "template"; + private static final String busi = "visualization"; /** * 这是要生成代码的表名称 */ - private static final String TABLE_NAME = "visualization_template"; + 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/VisualizationOuterParams.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParams.java new file mode 100644 index 0000000000..79f61e6c1e --- /dev/null +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParams.java @@ -0,0 +1,108 @@ +package io.dataease.visualization.dao.auto.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; + +/** + *
+ * 外部参数关联关系表 + *
+ * + * @author fit2cloud + * @since 2024-03-08 + */ +@TableName("visualization_outer_params") +public class VisualizationOuterParams implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String paramsId; + + /** + * 可视化资源ID + */ + private String visualizationId; + + /** + * 是否启用外部参数标识(1-是,0-否) + */ + private Boolean checked; + + /** + * 备注 + */ + private String remark; + + /** + * 复制来源 + */ + private String copyFrom; + + /** + * 复制来源ID + */ + private String copyId; + + public String getParamsId() { + return paramsId; + } + + public void setParamsId(String paramsId) { + this.paramsId = paramsId; + } + + public String getVisualizationId() { + return visualizationId; + } + + public void setVisualizationId(String visualizationId) { + this.visualizationId = visualizationId; + } + + public Boolean getChecked() { + return checked; + } + + public void setChecked(Boolean checked) { + this.checked = checked; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + 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 "VisualizationOuterParams{" + + "paramsId = " + paramsId + + ", visualizationId = " + visualizationId + + ", checked = " + checked + + ", remark = " + remark + + ", copyFrom = " + copyFrom + + ", copyId = " + copyId + + "}"; + } +} diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java new file mode 100644 index 0000000000..f6ea29e0d9 --- /dev/null +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java @@ -0,0 +1,108 @@ +package io.dataease.visualization.dao.auto.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; + +/** + *+ * 外部参数配置表 + *
+ * + * @author fit2cloud + * @since 2024-03-08 + */ +@TableName("visualization_outer_params_info") +public class VisualizationOuterParamsInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String paramsInfoId; + + /** + * visualization_outer_params 表的 ID + */ + private String paramsId; + + /** + * 参数名 + */ + private String paramName; + + /** + * 是否启用 + */ + private Boolean checked; + + /** + * 复制来源 + */ + private String copyFrom; + + /** + * 复制来源ID + */ + private String copyId; + + public String getParamsInfoId() { + return paramsInfoId; + } + + public void setParamsInfoId(String paramsInfoId) { + this.paramsInfoId = paramsInfoId; + } + + public String getParamsId() { + return paramsId; + } + + public void setParamsId(String paramsId) { + this.paramsId = paramsId; + } + + public String getParamName() { + return paramName; + } + + public void setParamName(String paramName) { + this.paramName = paramName; + } + + public Boolean getChecked() { + return checked; + } + + public void setChecked(Boolean checked) { + this.checked = checked; + } + + 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 "VisualizationOuterParamsInfo{" + + "paramsInfoId = " + paramsInfoId + + ", paramsId = " + paramsId + + ", paramName = " + paramName + + ", checked = " + checked + + ", copyFrom = " + copyFrom + + ", copyId = " + copyId + + "}"; + } +} 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 new file mode 100644 index 0000000000..393127f6f2 --- /dev/null +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java @@ -0,0 +1,108 @@ +package io.dataease.visualization.dao.auto.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; + +/** + *+ * 外部参数联动视图字段信息表 + *
+ * + * @author fit2cloud + * @since 2024-03-08 + */ +@TableName("visualization_outer_params_target_view_info") +public class VisualizationOuterParamsTargetViewInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String targetId; + + /** + * visualization_outer_params_info 表的 ID + */ + private String paramsInfoId; + + /** + * 联动视图ID + */ + private String targetViewId; + + /** + * 联动字段ID + */ + private String targetFieldId; + + /** + * 复制来源 + */ + private String copyFrom; + + /** + * 复制来源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 + + "}"; + } +} diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java new file mode 100644 index 0000000000..5553c7325b --- /dev/null +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java @@ -0,0 +1,18 @@ +package io.dataease.visualization.dao.auto.mapper; + +import io.dataease.visualization.dao.auto.entity.VisualizationOuterParamsInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + *+ * 外部参数配置表 Mapper 接口 + *
+ * + * @author fit2cloud + * @since 2024-03-08 + */ +@Mapper +public interface VisualizationOuterParamsInfoMapper extends BaseMapper+ * 外部参数关联关系表 Mapper 接口 + *
+ * + * @author fit2cloud + * @since 2024-03-08 + */ +@Mapper +public interface VisualizationOuterParamsMapper extends BaseMapper+ * 外部参数联动视图字段信息表 Mapper 接口 + *
+ * + * @author fit2cloud + * @since 2024-03-08 + */ +@Mapper +public interface VisualizationOuterParamsTargetViewInfoMapper extends BaseMapper+ * 外部参数配置表 + *
+ * + * @author fit2cloud + * @since 2024-03-08 + */ +public class VisualizationOuterParamsInfoVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String paramsInfoId; + + /** + * visualization_outer_params 表的 ID + */ + private String paramsId; + + /** + * 参数名 + */ + private String paramName; + + /** + * 是否启用 + */ + private Boolean checked; + + /** + * 复制来源 + */ + private String copyFrom; + + /** + * 复制来源ID + */ + private String copyId; + + public String getParamsInfoId() { + return paramsInfoId; + } + + public void setParamsInfoId(String paramsInfoId) { + this.paramsInfoId = paramsInfoId; + } + + public String getParamsId() { + return paramsId; + } + + public void setParamsId(String paramsId) { + this.paramsId = paramsId; + } + + public String getParamName() { + return paramName; + } + + public void setParamName(String paramName) { + this.paramName = paramName; + } + + public Boolean getChecked() { + return checked; + } + + public void setChecked(Boolean checked) { + this.checked = checked; + } + + 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 "VisualizationOuterParamsInfo{" + + "paramsInfoId = " + paramsInfoId + + ", paramsId = " + paramsId + + ", paramName = " + paramName + + ", checked = " + checked + + ", copyFrom = " + copyFrom + + ", copyId = " + copyId + + "}"; + } +} 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 new file mode 100644 index 0000000000..29555c08a4 --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java @@ -0,0 +1,108 @@ +package io.dataease.api.visualization.vo; + +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; + +/** + *+ * 外部参数联动视图字段信息表 + *
+ * + * @author fit2cloud + * @since 2024-03-08 + */ +public class VisualizationOuterParamsTargetViewInfoVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String targetId; + + /** + * visualization_outer_params_info 表的 ID + */ + private String paramsInfoId; + + /** + * 联动视图ID + */ + private String targetViewId; + + /** + * 联动字段ID + */ + private String targetFieldId; + + /** + * 复制来源 + */ + private String copyFrom; + + /** + * 复制来源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 + + "}"; + } +} diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java new file mode 100644 index 0000000000..f2fa1b7f5a --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java @@ -0,0 +1,108 @@ +package io.dataease.api.visualization.vo; + +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; + +/** + *+ * 外部参数关联关系表 + *
+ * + * @author fit2cloud + * @since 2024-03-08 + */ +public class VisualizationOuterParamsVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String paramsId; + + /** + * 可视化资源ID + */ + private String visualizationId; + + /** + * 是否启用外部参数标识(1-是,0-否) + */ + private Boolean checked; + + /** + * 备注 + */ + private String remark; + + /** + * 复制来源 + */ + private String copyFrom; + + /** + * 复制来源ID + */ + private String copyId; + + public String getParamsId() { + return paramsId; + } + + public void setParamsId(String paramsId) { + this.paramsId = paramsId; + } + + public String getVisualizationId() { + return visualizationId; + } + + public void setVisualizationId(String visualizationId) { + this.visualizationId = visualizationId; + } + + public Boolean getChecked() { + return checked; + } + + public void setChecked(Boolean checked) { + this.checked = checked; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + 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 "VisualizationOuterParams{" + + "paramsId = " + paramsId + + ", visualizationId = " + visualizationId + + ", checked = " + checked + + ", remark = " + remark + + ", copyFrom = " + copyFrom + + ", copyId = " + copyId + + "}"; + } +}