From 89652ad890de7e138bd386e692fd56191b06007e Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 17 Mar 2022 21:14:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=8E=A5=E6=94=B6=E5=A4=96=E9=83=A8=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/domain/PanelOuterParams.java | 21 + .../base/domain/PanelOuterParamsExample.java | 610 +++++++++++++++++ .../base/domain/PanelOuterParamsInfo.java | 21 + .../domain/PanelOuterParamsInfoExample.java | 610 +++++++++++++++++ .../PanelOuterParamsTargetViewInfo.java | 21 + ...PanelOuterParamsTargetViewInfoExample.java | 620 ++++++++++++++++++ .../mapper/PanelOuterParamsInfoMapper.java | 30 + .../mapper/PanelOuterParamsInfoMapper.xml | 228 +++++++ .../base/mapper/PanelOuterParamsMapper.java | 30 + .../base/mapper/PanelOuterParamsMapper.xml | 228 +++++++ .../PanelOuterParamsTargetViewInfoMapper.java | 30 + .../PanelOuterParamsTargetViewInfoMapper.xml | 228 +++++++ .../mapper/ext/ExtPanelOuterParamsMapper.java | 13 + .../mapper/ext/ExtPanelOuterParamsMapper.xml | 61 ++ .../panel/PanelOuterParamsController.java | 39 ++ .../outerParams/PanelOuterParamsDTO.java | 24 + .../outerParams/PanelOuterParamsInfoDTO.java | 21 + .../panel/PanelOuterParamsService.java | 68 ++ .../src/main/resources/generatorConfig.xml | 6 +- frontend/src/api/panel/outerParams.js | 19 + .../components/canvas/components/Toolbar.vue | 6 + frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + frontend/src/styles/deicon/demo_index.html | 52 +- frontend/src/styles/deicon/iconfont.css | 14 +- frontend/src/styles/deicon/iconfont.js | 2 +- frontend/src/styles/deicon/iconfont.json | 14 + frontend/src/styles/deicon/iconfont.ttf | Bin 21600 -> 21932 bytes frontend/src/styles/deicon/iconfont.woff | Bin 13372 -> 13520 bytes frontend/src/styles/deicon/iconfont.woff2 | Bin 11360 -> 11448 bytes .../src/views/panel/OuterParamsSet/index.vue | 479 ++++++++++++++ frontend/src/views/panel/edit/index.vue | 26 +- 33 files changed, 3512 insertions(+), 12 deletions(-) create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelOuterParams.java create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelOuterParamsExample.java create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelOuterParamsInfo.java create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelOuterParamsInfoExample.java create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelOuterParamsTargetViewInfo.java create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelOuterParamsTargetViewInfoExample.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsInfoMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsInfoMapper.xml create mode 100644 backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsMapper.xml create mode 100644 backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsTargetViewInfoMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsTargetViewInfoMapper.xml create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml create mode 100644 backend/src/main/java/io/dataease/controller/panel/PanelOuterParamsController.java create mode 100644 backend/src/main/java/io/dataease/dto/panel/outerParams/PanelOuterParamsDTO.java create mode 100644 backend/src/main/java/io/dataease/dto/panel/outerParams/PanelOuterParamsInfoDTO.java create mode 100644 backend/src/main/java/io/dataease/service/panel/PanelOuterParamsService.java create mode 100644 frontend/src/api/panel/outerParams.js create mode 100644 frontend/src/views/panel/OuterParamsSet/index.vue diff --git a/backend/src/main/java/io/dataease/base/domain/PanelOuterParams.java b/backend/src/main/java/io/dataease/base/domain/PanelOuterParams.java new file mode 100644 index 0000000000..5030904042 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelOuterParams.java @@ -0,0 +1,21 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class PanelOuterParams implements Serializable { + private String paramsId; + + private String panelId; + + private Boolean checked; + + private String remark; + + private String copyFrom; + + private String copyId; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsExample.java b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsExample.java new file mode 100644 index 0000000000..6fe57dc790 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsExample.java @@ -0,0 +1,610 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class PanelOuterParamsExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public PanelOuterParamsExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andParamsIdIsNull() { + addCriterion("params_id is null"); + return (Criteria) this; + } + + public Criteria andParamsIdIsNotNull() { + addCriterion("params_id is not null"); + return (Criteria) this; + } + + public Criteria andParamsIdEqualTo(String value) { + addCriterion("params_id =", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotEqualTo(String value) { + addCriterion("params_id <>", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdGreaterThan(String value) { + addCriterion("params_id >", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdGreaterThanOrEqualTo(String value) { + addCriterion("params_id >=", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdLessThan(String value) { + addCriterion("params_id <", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdLessThanOrEqualTo(String value) { + addCriterion("params_id <=", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdLike(String value) { + addCriterion("params_id like", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotLike(String value) { + addCriterion("params_id not like", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdIn(List values) { + addCriterion("params_id in", values, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotIn(List values) { + addCriterion("params_id not in", values, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdBetween(String value1, String value2) { + addCriterion("params_id between", value1, value2, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotBetween(String value1, String value2) { + addCriterion("params_id not between", value1, value2, "paramsId"); + return (Criteria) this; + } + + public Criteria andPanelIdIsNull() { + addCriterion("panel_id is null"); + return (Criteria) this; + } + + public Criteria andPanelIdIsNotNull() { + addCriterion("panel_id is not null"); + return (Criteria) this; + } + + public Criteria andPanelIdEqualTo(String value) { + addCriterion("panel_id =", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdNotEqualTo(String value) { + addCriterion("panel_id <>", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdGreaterThan(String value) { + addCriterion("panel_id >", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdGreaterThanOrEqualTo(String value) { + addCriterion("panel_id >=", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdLessThan(String value) { + addCriterion("panel_id <", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdLessThanOrEqualTo(String value) { + addCriterion("panel_id <=", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdLike(String value) { + addCriterion("panel_id like", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdNotLike(String value) { + addCriterion("panel_id not like", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdIn(List values) { + addCriterion("panel_id in", values, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdNotIn(List values) { + addCriterion("panel_id not in", values, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdBetween(String value1, String value2) { + addCriterion("panel_id between", value1, value2, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdNotBetween(String value1, String value2) { + addCriterion("panel_id not between", value1, value2, "panelId"); + return (Criteria) this; + } + + public Criteria andCheckedIsNull() { + addCriterion("`checked` is null"); + return (Criteria) this; + } + + public Criteria andCheckedIsNotNull() { + addCriterion("`checked` is not null"); + return (Criteria) this; + } + + public Criteria andCheckedEqualTo(Boolean value) { + addCriterion("`checked` =", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedNotEqualTo(Boolean value) { + addCriterion("`checked` <>", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedGreaterThan(Boolean value) { + addCriterion("`checked` >", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedGreaterThanOrEqualTo(Boolean value) { + addCriterion("`checked` >=", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedLessThan(Boolean value) { + addCriterion("`checked` <", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedLessThanOrEqualTo(Boolean value) { + addCriterion("`checked` <=", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedIn(List values) { + addCriterion("`checked` in", values, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedNotIn(List values) { + addCriterion("`checked` not in", values, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedBetween(Boolean value1, Boolean value2) { + addCriterion("`checked` between", value1, value2, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedNotBetween(Boolean value1, Boolean value2) { + addCriterion("`checked` not between", value1, value2, "checked"); + return (Criteria) this; + } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andCopyFromIsNull() { + addCriterion("copy_from is null"); + return (Criteria) this; + } + + public Criteria andCopyFromIsNotNull() { + addCriterion("copy_from is not null"); + return (Criteria) this; + } + + public Criteria andCopyFromEqualTo(String value) { + addCriterion("copy_from =", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotEqualTo(String value) { + addCriterion("copy_from <>", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromGreaterThan(String value) { + addCriterion("copy_from >", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromGreaterThanOrEqualTo(String value) { + addCriterion("copy_from >=", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLessThan(String value) { + addCriterion("copy_from <", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLessThanOrEqualTo(String value) { + addCriterion("copy_from <=", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLike(String value) { + addCriterion("copy_from like", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotLike(String value) { + addCriterion("copy_from not like", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromIn(List values) { + addCriterion("copy_from in", values, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotIn(List values) { + addCriterion("copy_from not in", values, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromBetween(String value1, String value2) { + addCriterion("copy_from between", value1, value2, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotBetween(String value1, String value2) { + addCriterion("copy_from not between", value1, value2, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyIdIsNull() { + addCriterion("copy_id is null"); + return (Criteria) this; + } + + public Criteria andCopyIdIsNotNull() { + addCriterion("copy_id is not null"); + return (Criteria) this; + } + + public Criteria andCopyIdEqualTo(String value) { + addCriterion("copy_id =", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotEqualTo(String value) { + addCriterion("copy_id <>", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdGreaterThan(String value) { + addCriterion("copy_id >", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdGreaterThanOrEqualTo(String value) { + addCriterion("copy_id >=", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLessThan(String value) { + addCriterion("copy_id <", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLessThanOrEqualTo(String value) { + addCriterion("copy_id <=", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLike(String value) { + addCriterion("copy_id like", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotLike(String value) { + addCriterion("copy_id not like", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdIn(List values) { + addCriterion("copy_id in", values, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotIn(List values) { + addCriterion("copy_id not in", values, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdBetween(String value1, String value2) { + addCriterion("copy_id between", value1, value2, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotBetween(String value1, String value2) { + addCriterion("copy_id not between", value1, value2, "copyId"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsInfo.java b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsInfo.java new file mode 100644 index 0000000000..4095a769ea --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsInfo.java @@ -0,0 +1,21 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class PanelOuterParamsInfo implements Serializable { + private String paramsInfoId; + + private String paramsId; + + private String paramName; + + private Boolean checked; + + private String copyFrom; + + private String copyId; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsInfoExample.java b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsInfoExample.java new file mode 100644 index 0000000000..9336967019 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsInfoExample.java @@ -0,0 +1,610 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class PanelOuterParamsInfoExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public PanelOuterParamsInfoExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andParamsInfoIdIsNull() { + addCriterion("params_info_id is null"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdIsNotNull() { + addCriterion("params_info_id is not null"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdEqualTo(String value) { + addCriterion("params_info_id =", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotEqualTo(String value) { + addCriterion("params_info_id <>", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdGreaterThan(String value) { + addCriterion("params_info_id >", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdGreaterThanOrEqualTo(String value) { + addCriterion("params_info_id >=", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdLessThan(String value) { + addCriterion("params_info_id <", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdLessThanOrEqualTo(String value) { + addCriterion("params_info_id <=", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdLike(String value) { + addCriterion("params_info_id like", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotLike(String value) { + addCriterion("params_info_id not like", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdIn(List values) { + addCriterion("params_info_id in", values, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotIn(List values) { + addCriterion("params_info_id not in", values, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdBetween(String value1, String value2) { + addCriterion("params_info_id between", value1, value2, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotBetween(String value1, String value2) { + addCriterion("params_info_id not between", value1, value2, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsIdIsNull() { + addCriterion("params_id is null"); + return (Criteria) this; + } + + public Criteria andParamsIdIsNotNull() { + addCriterion("params_id is not null"); + return (Criteria) this; + } + + public Criteria andParamsIdEqualTo(String value) { + addCriterion("params_id =", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotEqualTo(String value) { + addCriterion("params_id <>", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdGreaterThan(String value) { + addCriterion("params_id >", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdGreaterThanOrEqualTo(String value) { + addCriterion("params_id >=", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdLessThan(String value) { + addCriterion("params_id <", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdLessThanOrEqualTo(String value) { + addCriterion("params_id <=", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdLike(String value) { + addCriterion("params_id like", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotLike(String value) { + addCriterion("params_id not like", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdIn(List values) { + addCriterion("params_id in", values, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotIn(List values) { + addCriterion("params_id not in", values, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdBetween(String value1, String value2) { + addCriterion("params_id between", value1, value2, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotBetween(String value1, String value2) { + addCriterion("params_id not between", value1, value2, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamNameIsNull() { + addCriterion("param_name is null"); + return (Criteria) this; + } + + public Criteria andParamNameIsNotNull() { + addCriterion("param_name is not null"); + return (Criteria) this; + } + + public Criteria andParamNameEqualTo(String value) { + addCriterion("param_name =", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameNotEqualTo(String value) { + addCriterion("param_name <>", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameGreaterThan(String value) { + addCriterion("param_name >", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameGreaterThanOrEqualTo(String value) { + addCriterion("param_name >=", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameLessThan(String value) { + addCriterion("param_name <", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameLessThanOrEqualTo(String value) { + addCriterion("param_name <=", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameLike(String value) { + addCriterion("param_name like", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameNotLike(String value) { + addCriterion("param_name not like", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameIn(List values) { + addCriterion("param_name in", values, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameNotIn(List values) { + addCriterion("param_name not in", values, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameBetween(String value1, String value2) { + addCriterion("param_name between", value1, value2, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameNotBetween(String value1, String value2) { + addCriterion("param_name not between", value1, value2, "paramName"); + return (Criteria) this; + } + + public Criteria andCheckedIsNull() { + addCriterion("`checked` is null"); + return (Criteria) this; + } + + public Criteria andCheckedIsNotNull() { + addCriterion("`checked` is not null"); + return (Criteria) this; + } + + public Criteria andCheckedEqualTo(Boolean value) { + addCriterion("`checked` =", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedNotEqualTo(Boolean value) { + addCriterion("`checked` <>", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedGreaterThan(Boolean value) { + addCriterion("`checked` >", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedGreaterThanOrEqualTo(Boolean value) { + addCriterion("`checked` >=", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedLessThan(Boolean value) { + addCriterion("`checked` <", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedLessThanOrEqualTo(Boolean value) { + addCriterion("`checked` <=", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedIn(List values) { + addCriterion("`checked` in", values, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedNotIn(List values) { + addCriterion("`checked` not in", values, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedBetween(Boolean value1, Boolean value2) { + addCriterion("`checked` between", value1, value2, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedNotBetween(Boolean value1, Boolean value2) { + addCriterion("`checked` not between", value1, value2, "checked"); + return (Criteria) this; + } + + public Criteria andCopyFromIsNull() { + addCriterion("copy_from is null"); + return (Criteria) this; + } + + public Criteria andCopyFromIsNotNull() { + addCriterion("copy_from is not null"); + return (Criteria) this; + } + + public Criteria andCopyFromEqualTo(String value) { + addCriterion("copy_from =", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotEqualTo(String value) { + addCriterion("copy_from <>", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromGreaterThan(String value) { + addCriterion("copy_from >", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromGreaterThanOrEqualTo(String value) { + addCriterion("copy_from >=", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLessThan(String value) { + addCriterion("copy_from <", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLessThanOrEqualTo(String value) { + addCriterion("copy_from <=", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLike(String value) { + addCriterion("copy_from like", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotLike(String value) { + addCriterion("copy_from not like", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromIn(List values) { + addCriterion("copy_from in", values, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotIn(List values) { + addCriterion("copy_from not in", values, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromBetween(String value1, String value2) { + addCriterion("copy_from between", value1, value2, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotBetween(String value1, String value2) { + addCriterion("copy_from not between", value1, value2, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyIdIsNull() { + addCriterion("copy_id is null"); + return (Criteria) this; + } + + public Criteria andCopyIdIsNotNull() { + addCriterion("copy_id is not null"); + return (Criteria) this; + } + + public Criteria andCopyIdEqualTo(String value) { + addCriterion("copy_id =", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotEqualTo(String value) { + addCriterion("copy_id <>", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdGreaterThan(String value) { + addCriterion("copy_id >", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdGreaterThanOrEqualTo(String value) { + addCriterion("copy_id >=", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLessThan(String value) { + addCriterion("copy_id <", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLessThanOrEqualTo(String value) { + addCriterion("copy_id <=", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLike(String value) { + addCriterion("copy_id like", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotLike(String value) { + addCriterion("copy_id not like", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdIn(List values) { + addCriterion("copy_id in", values, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotIn(List values) { + addCriterion("copy_id not in", values, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdBetween(String value1, String value2) { + addCriterion("copy_id between", value1, value2, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotBetween(String value1, String value2) { + addCriterion("copy_id not between", value1, value2, "copyId"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsTargetViewInfo.java b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsTargetViewInfo.java new file mode 100644 index 0000000000..ad35bdf7de --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsTargetViewInfo.java @@ -0,0 +1,21 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class PanelOuterParamsTargetViewInfo implements Serializable { + private String targetId; + + private String paramsInfoId; + + private String targetViewId; + + private String targetFieldId; + + private String copyFrom; + + private String copyId; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsTargetViewInfoExample.java b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsTargetViewInfoExample.java new file mode 100644 index 0000000000..feb98341d5 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsTargetViewInfoExample.java @@ -0,0 +1,620 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class PanelOuterParamsTargetViewInfoExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public PanelOuterParamsTargetViewInfoExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andTargetIdIsNull() { + addCriterion("target_id is null"); + return (Criteria) this; + } + + public Criteria andTargetIdIsNotNull() { + addCriterion("target_id is not null"); + return (Criteria) this; + } + + public Criteria andTargetIdEqualTo(String value) { + addCriterion("target_id =", value, "targetId"); + return (Criteria) this; + } + + public Criteria andTargetIdNotEqualTo(String value) { + addCriterion("target_id <>", value, "targetId"); + return (Criteria) this; + } + + public Criteria andTargetIdGreaterThan(String value) { + addCriterion("target_id >", value, "targetId"); + return (Criteria) this; + } + + public Criteria andTargetIdGreaterThanOrEqualTo(String value) { + addCriterion("target_id >=", value, "targetId"); + return (Criteria) this; + } + + public Criteria andTargetIdLessThan(String value) { + addCriterion("target_id <", value, "targetId"); + return (Criteria) this; + } + + public Criteria andTargetIdLessThanOrEqualTo(String value) { + addCriterion("target_id <=", value, "targetId"); + return (Criteria) this; + } + + public Criteria andTargetIdLike(String value) { + addCriterion("target_id like", value, "targetId"); + return (Criteria) this; + } + + public Criteria andTargetIdNotLike(String value) { + addCriterion("target_id not like", value, "targetId"); + return (Criteria) this; + } + + public Criteria andTargetIdIn(List values) { + addCriterion("target_id in", values, "targetId"); + return (Criteria) this; + } + + public Criteria andTargetIdNotIn(List values) { + addCriterion("target_id not in", values, "targetId"); + return (Criteria) this; + } + + public Criteria andTargetIdBetween(String value1, String value2) { + addCriterion("target_id between", value1, value2, "targetId"); + return (Criteria) this; + } + + public Criteria andTargetIdNotBetween(String value1, String value2) { + addCriterion("target_id not between", value1, value2, "targetId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdIsNull() { + addCriterion("params_info_id is null"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdIsNotNull() { + addCriterion("params_info_id is not null"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdEqualTo(String value) { + addCriterion("params_info_id =", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotEqualTo(String value) { + addCriterion("params_info_id <>", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdGreaterThan(String value) { + addCriterion("params_info_id >", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdGreaterThanOrEqualTo(String value) { + addCriterion("params_info_id >=", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdLessThan(String value) { + addCriterion("params_info_id <", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdLessThanOrEqualTo(String value) { + addCriterion("params_info_id <=", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdLike(String value) { + addCriterion("params_info_id like", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotLike(String value) { + addCriterion("params_info_id not like", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdIn(List values) { + addCriterion("params_info_id in", values, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotIn(List values) { + addCriterion("params_info_id not in", values, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdBetween(String value1, String value2) { + addCriterion("params_info_id between", value1, value2, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotBetween(String value1, String value2) { + addCriterion("params_info_id not between", value1, value2, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andTargetViewIdIsNull() { + addCriterion("target_view_id is null"); + return (Criteria) this; + } + + public Criteria andTargetViewIdIsNotNull() { + addCriterion("target_view_id is not null"); + return (Criteria) this; + } + + public Criteria andTargetViewIdEqualTo(String value) { + addCriterion("target_view_id =", value, "targetViewId"); + return (Criteria) this; + } + + public Criteria andTargetViewIdNotEqualTo(String value) { + addCriterion("target_view_id <>", value, "targetViewId"); + return (Criteria) this; + } + + public Criteria andTargetViewIdGreaterThan(String value) { + addCriterion("target_view_id >", value, "targetViewId"); + return (Criteria) this; + } + + public Criteria andTargetViewIdGreaterThanOrEqualTo(String value) { + addCriterion("target_view_id >=", value, "targetViewId"); + return (Criteria) this; + } + + public Criteria andTargetViewIdLessThan(String value) { + addCriterion("target_view_id <", value, "targetViewId"); + return (Criteria) this; + } + + public Criteria andTargetViewIdLessThanOrEqualTo(String value) { + addCriterion("target_view_id <=", value, "targetViewId"); + return (Criteria) this; + } + + public Criteria andTargetViewIdLike(String value) { + addCriterion("target_view_id like", value, "targetViewId"); + return (Criteria) this; + } + + public Criteria andTargetViewIdNotLike(String value) { + addCriterion("target_view_id not like", value, "targetViewId"); + return (Criteria) this; + } + + public Criteria andTargetViewIdIn(List values) { + addCriterion("target_view_id in", values, "targetViewId"); + return (Criteria) this; + } + + public Criteria andTargetViewIdNotIn(List values) { + addCriterion("target_view_id not in", values, "targetViewId"); + return (Criteria) this; + } + + public Criteria andTargetViewIdBetween(String value1, String value2) { + addCriterion("target_view_id between", value1, value2, "targetViewId"); + return (Criteria) this; + } + + public Criteria andTargetViewIdNotBetween(String value1, String value2) { + addCriterion("target_view_id not between", value1, value2, "targetViewId"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdIsNull() { + addCriterion("target_field_id is null"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdIsNotNull() { + addCriterion("target_field_id is not null"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdEqualTo(String value) { + addCriterion("target_field_id =", value, "targetFieldId"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdNotEqualTo(String value) { + addCriterion("target_field_id <>", value, "targetFieldId"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdGreaterThan(String value) { + addCriterion("target_field_id >", value, "targetFieldId"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdGreaterThanOrEqualTo(String value) { + addCriterion("target_field_id >=", value, "targetFieldId"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdLessThan(String value) { + addCriterion("target_field_id <", value, "targetFieldId"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdLessThanOrEqualTo(String value) { + addCriterion("target_field_id <=", value, "targetFieldId"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdLike(String value) { + addCriterion("target_field_id like", value, "targetFieldId"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdNotLike(String value) { + addCriterion("target_field_id not like", value, "targetFieldId"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdIn(List values) { + addCriterion("target_field_id in", values, "targetFieldId"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdNotIn(List values) { + addCriterion("target_field_id not in", values, "targetFieldId"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdBetween(String value1, String value2) { + addCriterion("target_field_id between", value1, value2, "targetFieldId"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdNotBetween(String value1, String value2) { + addCriterion("target_field_id not between", value1, value2, "targetFieldId"); + return (Criteria) this; + } + + public Criteria andCopyFromIsNull() { + addCriterion("copy_from is null"); + return (Criteria) this; + } + + public Criteria andCopyFromIsNotNull() { + addCriterion("copy_from is not null"); + return (Criteria) this; + } + + public Criteria andCopyFromEqualTo(String value) { + addCriterion("copy_from =", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotEqualTo(String value) { + addCriterion("copy_from <>", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromGreaterThan(String value) { + addCriterion("copy_from >", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromGreaterThanOrEqualTo(String value) { + addCriterion("copy_from >=", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLessThan(String value) { + addCriterion("copy_from <", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLessThanOrEqualTo(String value) { + addCriterion("copy_from <=", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLike(String value) { + addCriterion("copy_from like", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotLike(String value) { + addCriterion("copy_from not like", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromIn(List values) { + addCriterion("copy_from in", values, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotIn(List values) { + addCriterion("copy_from not in", values, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromBetween(String value1, String value2) { + addCriterion("copy_from between", value1, value2, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotBetween(String value1, String value2) { + addCriterion("copy_from not between", value1, value2, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyIdIsNull() { + addCriterion("copy_id is null"); + return (Criteria) this; + } + + public Criteria andCopyIdIsNotNull() { + addCriterion("copy_id is not null"); + return (Criteria) this; + } + + public Criteria andCopyIdEqualTo(String value) { + addCriterion("copy_id =", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotEqualTo(String value) { + addCriterion("copy_id <>", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdGreaterThan(String value) { + addCriterion("copy_id >", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdGreaterThanOrEqualTo(String value) { + addCriterion("copy_id >=", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLessThan(String value) { + addCriterion("copy_id <", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLessThanOrEqualTo(String value) { + addCriterion("copy_id <=", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLike(String value) { + addCriterion("copy_id like", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotLike(String value) { + addCriterion("copy_id not like", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdIn(List values) { + addCriterion("copy_id in", values, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotIn(List values) { + addCriterion("copy_id not in", values, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdBetween(String value1, String value2) { + addCriterion("copy_id between", value1, value2, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotBetween(String value1, String value2) { + addCriterion("copy_id not between", value1, value2, "copyId"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsInfoMapper.java b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsInfoMapper.java new file mode 100644 index 0000000000..0da15d6141 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsInfoMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.PanelOuterParamsInfo; +import io.dataease.base.domain.PanelOuterParamsInfoExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface PanelOuterParamsInfoMapper { + long countByExample(PanelOuterParamsInfoExample example); + + int deleteByExample(PanelOuterParamsInfoExample example); + + int deleteByPrimaryKey(String paramsInfoId); + + int insert(PanelOuterParamsInfo record); + + int insertSelective(PanelOuterParamsInfo record); + + List selectByExample(PanelOuterParamsInfoExample example); + + PanelOuterParamsInfo selectByPrimaryKey(String paramsInfoId); + + int updateByExampleSelective(@Param("record") PanelOuterParamsInfo record, @Param("example") PanelOuterParamsInfoExample example); + + int updateByExample(@Param("record") PanelOuterParamsInfo record, @Param("example") PanelOuterParamsInfoExample example); + + int updateByPrimaryKeySelective(PanelOuterParamsInfo record); + + int updateByPrimaryKey(PanelOuterParamsInfo record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsInfoMapper.xml b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsInfoMapper.xml new file mode 100644 index 0000000000..1460d4a4fd --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsInfoMapper.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + params_info_id, params_id, param_name, `checked`, copy_from, copy_id + + + + + delete from panel_outer_params_info + where params_info_id = #{paramsInfoId,jdbcType=VARCHAR} + + + delete from panel_outer_params_info + + + + + + insert into panel_outer_params_info (params_info_id, params_id, param_name, + `checked`, copy_from, copy_id + ) + values (#{paramsInfoId,jdbcType=VARCHAR}, #{paramsId,jdbcType=VARCHAR}, #{paramName,jdbcType=VARCHAR}, + #{checked,jdbcType=BIT}, #{copyFrom,jdbcType=VARCHAR}, #{copyId,jdbcType=VARCHAR} + ) + + + insert into panel_outer_params_info + + + params_info_id, + + + params_id, + + + param_name, + + + `checked`, + + + copy_from, + + + copy_id, + + + + + #{paramsInfoId,jdbcType=VARCHAR}, + + + #{paramsId,jdbcType=VARCHAR}, + + + #{paramName,jdbcType=VARCHAR}, + + + #{checked,jdbcType=BIT}, + + + #{copyFrom,jdbcType=VARCHAR}, + + + #{copyId,jdbcType=VARCHAR}, + + + + + + update panel_outer_params_info + + + params_info_id = #{record.paramsInfoId,jdbcType=VARCHAR}, + + + params_id = #{record.paramsId,jdbcType=VARCHAR}, + + + param_name = #{record.paramName,jdbcType=VARCHAR}, + + + `checked` = #{record.checked,jdbcType=BIT}, + + + copy_from = #{record.copyFrom,jdbcType=VARCHAR}, + + + copy_id = #{record.copyId,jdbcType=VARCHAR}, + + + + + + + + update panel_outer_params_info + set params_info_id = #{record.paramsInfoId,jdbcType=VARCHAR}, + params_id = #{record.paramsId,jdbcType=VARCHAR}, + param_name = #{record.paramName,jdbcType=VARCHAR}, + `checked` = #{record.checked,jdbcType=BIT}, + copy_from = #{record.copyFrom,jdbcType=VARCHAR}, + copy_id = #{record.copyId,jdbcType=VARCHAR} + + + + + + update panel_outer_params_info + + + params_id = #{paramsId,jdbcType=VARCHAR}, + + + param_name = #{paramName,jdbcType=VARCHAR}, + + + `checked` = #{checked,jdbcType=BIT}, + + + copy_from = #{copyFrom,jdbcType=VARCHAR}, + + + copy_id = #{copyId,jdbcType=VARCHAR}, + + + where params_info_id = #{paramsInfoId,jdbcType=VARCHAR} + + + update panel_outer_params_info + set params_id = #{paramsId,jdbcType=VARCHAR}, + param_name = #{paramName,jdbcType=VARCHAR}, + `checked` = #{checked,jdbcType=BIT}, + copy_from = #{copyFrom,jdbcType=VARCHAR}, + copy_id = #{copyId,jdbcType=VARCHAR} + where params_info_id = #{paramsInfoId,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsMapper.java b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsMapper.java new file mode 100644 index 0000000000..2acfaa56a6 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.PanelOuterParams; +import io.dataease.base.domain.PanelOuterParamsExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface PanelOuterParamsMapper { + long countByExample(PanelOuterParamsExample example); + + int deleteByExample(PanelOuterParamsExample example); + + int deleteByPrimaryKey(String paramsId); + + int insert(PanelOuterParams record); + + int insertSelective(PanelOuterParams record); + + List selectByExample(PanelOuterParamsExample example); + + PanelOuterParams selectByPrimaryKey(String paramsId); + + int updateByExampleSelective(@Param("record") PanelOuterParams record, @Param("example") PanelOuterParamsExample example); + + int updateByExample(@Param("record") PanelOuterParams record, @Param("example") PanelOuterParamsExample example); + + int updateByPrimaryKeySelective(PanelOuterParams record); + + int updateByPrimaryKey(PanelOuterParams record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsMapper.xml b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsMapper.xml new file mode 100644 index 0000000000..4e314b16dc --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsMapper.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + params_id, panel_id, `checked`, remark, copy_from, copy_id + + + + + delete from panel_outer_params + where params_id = #{paramsId,jdbcType=VARCHAR} + + + delete from panel_outer_params + + + + + + insert into panel_outer_params (params_id, panel_id, `checked`, + remark, copy_from, copy_id + ) + values (#{paramsId,jdbcType=VARCHAR}, #{panelId,jdbcType=VARCHAR}, #{checked,jdbcType=BIT}, + #{remark,jdbcType=VARCHAR}, #{copyFrom,jdbcType=VARCHAR}, #{copyId,jdbcType=VARCHAR} + ) + + + insert into panel_outer_params + + + params_id, + + + panel_id, + + + `checked`, + + + remark, + + + copy_from, + + + copy_id, + + + + + #{paramsId,jdbcType=VARCHAR}, + + + #{panelId,jdbcType=VARCHAR}, + + + #{checked,jdbcType=BIT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{copyFrom,jdbcType=VARCHAR}, + + + #{copyId,jdbcType=VARCHAR}, + + + + + + update panel_outer_params + + + params_id = #{record.paramsId,jdbcType=VARCHAR}, + + + panel_id = #{record.panelId,jdbcType=VARCHAR}, + + + `checked` = #{record.checked,jdbcType=BIT}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + copy_from = #{record.copyFrom,jdbcType=VARCHAR}, + + + copy_id = #{record.copyId,jdbcType=VARCHAR}, + + + + + + + + update panel_outer_params + set params_id = #{record.paramsId,jdbcType=VARCHAR}, + panel_id = #{record.panelId,jdbcType=VARCHAR}, + `checked` = #{record.checked,jdbcType=BIT}, + remark = #{record.remark,jdbcType=VARCHAR}, + copy_from = #{record.copyFrom,jdbcType=VARCHAR}, + copy_id = #{record.copyId,jdbcType=VARCHAR} + + + + + + update panel_outer_params + + + panel_id = #{panelId,jdbcType=VARCHAR}, + + + `checked` = #{checked,jdbcType=BIT}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + copy_from = #{copyFrom,jdbcType=VARCHAR}, + + + copy_id = #{copyId,jdbcType=VARCHAR}, + + + where params_id = #{paramsId,jdbcType=VARCHAR} + + + update panel_outer_params + set panel_id = #{panelId,jdbcType=VARCHAR}, + `checked` = #{checked,jdbcType=BIT}, + remark = #{remark,jdbcType=VARCHAR}, + copy_from = #{copyFrom,jdbcType=VARCHAR}, + copy_id = #{copyId,jdbcType=VARCHAR} + where params_id = #{paramsId,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsTargetViewInfoMapper.java b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsTargetViewInfoMapper.java new file mode 100644 index 0000000000..5557ac40d9 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsTargetViewInfoMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.PanelOuterParamsTargetViewInfo; +import io.dataease.base.domain.PanelOuterParamsTargetViewInfoExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface PanelOuterParamsTargetViewInfoMapper { + long countByExample(PanelOuterParamsTargetViewInfoExample example); + + int deleteByExample(PanelOuterParamsTargetViewInfoExample example); + + int deleteByPrimaryKey(String targetId); + + int insert(PanelOuterParamsTargetViewInfo record); + + int insertSelective(PanelOuterParamsTargetViewInfo record); + + List selectByExample(PanelOuterParamsTargetViewInfoExample example); + + PanelOuterParamsTargetViewInfo selectByPrimaryKey(String targetId); + + int updateByExampleSelective(@Param("record") PanelOuterParamsTargetViewInfo record, @Param("example") PanelOuterParamsTargetViewInfoExample example); + + int updateByExample(@Param("record") PanelOuterParamsTargetViewInfo record, @Param("example") PanelOuterParamsTargetViewInfoExample example); + + int updateByPrimaryKeySelective(PanelOuterParamsTargetViewInfo record); + + int updateByPrimaryKey(PanelOuterParamsTargetViewInfo record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsTargetViewInfoMapper.xml b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsTargetViewInfoMapper.xml new file mode 100644 index 0000000000..c5d9d8781e --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsTargetViewInfoMapper.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + target_id, params_info_id, target_view_id, target_field_id, copy_from, copy_id + + + + + delete from panel_outer_params_target_view_info + where target_id = #{targetId,jdbcType=VARCHAR} + + + delete from panel_outer_params_target_view_info + + + + + + insert into panel_outer_params_target_view_info (target_id, params_info_id, target_view_id, + target_field_id, copy_from, copy_id + ) + values (#{targetId,jdbcType=VARCHAR}, #{paramsInfoId,jdbcType=VARCHAR}, #{targetViewId,jdbcType=VARCHAR}, + #{targetFieldId,jdbcType=VARCHAR}, #{copyFrom,jdbcType=VARCHAR}, #{copyId,jdbcType=VARCHAR} + ) + + + insert into panel_outer_params_target_view_info + + + target_id, + + + params_info_id, + + + target_view_id, + + + target_field_id, + + + copy_from, + + + copy_id, + + + + + #{targetId,jdbcType=VARCHAR}, + + + #{paramsInfoId,jdbcType=VARCHAR}, + + + #{targetViewId,jdbcType=VARCHAR}, + + + #{targetFieldId,jdbcType=VARCHAR}, + + + #{copyFrom,jdbcType=VARCHAR}, + + + #{copyId,jdbcType=VARCHAR}, + + + + + + update panel_outer_params_target_view_info + + + target_id = #{record.targetId,jdbcType=VARCHAR}, + + + params_info_id = #{record.paramsInfoId,jdbcType=VARCHAR}, + + + target_view_id = #{record.targetViewId,jdbcType=VARCHAR}, + + + target_field_id = #{record.targetFieldId,jdbcType=VARCHAR}, + + + copy_from = #{record.copyFrom,jdbcType=VARCHAR}, + + + copy_id = #{record.copyId,jdbcType=VARCHAR}, + + + + + + + + update panel_outer_params_target_view_info + set target_id = #{record.targetId,jdbcType=VARCHAR}, + params_info_id = #{record.paramsInfoId,jdbcType=VARCHAR}, + target_view_id = #{record.targetViewId,jdbcType=VARCHAR}, + target_field_id = #{record.targetFieldId,jdbcType=VARCHAR}, + copy_from = #{record.copyFrom,jdbcType=VARCHAR}, + copy_id = #{record.copyId,jdbcType=VARCHAR} + + + + + + update panel_outer_params_target_view_info + + + params_info_id = #{paramsInfoId,jdbcType=VARCHAR}, + + + target_view_id = #{targetViewId,jdbcType=VARCHAR}, + + + target_field_id = #{targetFieldId,jdbcType=VARCHAR}, + + + copy_from = #{copyFrom,jdbcType=VARCHAR}, + + + copy_id = #{copyId,jdbcType=VARCHAR}, + + + where target_id = #{targetId,jdbcType=VARCHAR} + + + update panel_outer_params_target_view_info + set params_info_id = #{paramsInfoId,jdbcType=VARCHAR}, + target_view_id = #{targetViewId,jdbcType=VARCHAR}, + target_field_id = #{targetFieldId,jdbcType=VARCHAR}, + copy_from = #{copyFrom,jdbcType=VARCHAR}, + copy_id = #{copyId,jdbcType=VARCHAR} + where target_id = #{targetId,jdbcType=VARCHAR} + + \ No newline at end of file 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 new file mode 100644 index 0000000000..893d9bb014 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.java @@ -0,0 +1,13 @@ +package io.dataease.base.mapper.ext; + + +import io.dataease.dto.panel.outerParams.PanelOuterParamsDTO; +import org.apache.ibatis.annotations.Param; + +public interface ExtPanelOuterParamsMapper { + + PanelOuterParamsDTO queryWithPanelId(@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 new file mode 100644 index 0000000000..3533af620e --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + DELETE poptvi,popi,pop + FROM + panel_outer_params_target_view_info poptvi, + panel_outer_params_info popi, + panel_outer_params pop + WHERE + poptvi.params_info_id = popi.params_info_id + AND popi.params_id = pop.params_id + AND 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 new file mode 100644 index 0000000000..7d75dbd3e2 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/panel/PanelOuterParamsController.java @@ -0,0 +1,39 @@ +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; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * Author: wangjiahao + * Date: 2022/3/17 + * Description: + */ +@Api(tags = "仪表板：外部参数") +@ApiSupport(order = 172) +@RestController +@RequestMapping("outerParams") +public class PanelOuterParamsController { + + @Resource + private PanelOuterParamsService panelOuterParamsService; + + @ApiOperation("根据仪表板ID获取外部参数信息") + @GetMapping("/queryWithPanelId/{panelId}") + public PanelOuterParamsDTO queryWithPanelId(@PathVariable("panelId") String panelId){ + return panelOuterParamsService.queryWithPanelId(panelId) ; + } + + @ApiOperation("更新外部参数信息") + @PostMapping("/updateOuterParamsSet") + public void updateOuterParamsSet(@RequestBody PanelOuterParamsDTO OuterParamsDTO) { + panelOuterParamsService.updateOuterParamsSet(OuterParamsDTO); + } +} diff --git a/backend/src/main/java/io/dataease/dto/panel/outerParams/PanelOuterParamsDTO.java b/backend/src/main/java/io/dataease/dto/panel/outerParams/PanelOuterParamsDTO.java new file mode 100644 index 0000000000..abb96f34d1 --- /dev/null +++ b/backend/src/main/java/io/dataease/dto/panel/outerParams/PanelOuterParamsDTO.java @@ -0,0 +1,24 @@ +package io.dataease.dto.panel.outerParams; + +import io.dataease.base.domain.PanelOuterParams; +import lombok.Data; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Author: wangjiahao + * Date: 2022/3/17 + * Description: + */ +@Data +public class PanelOuterParamsDTO extends PanelOuterParams { + + private List targetInfoList; + + private List outerParamsInfoArray = new ArrayList<>(); + + private Map mapOuterParamsInfoArray = new HashMap<>(); +} diff --git a/backend/src/main/java/io/dataease/dto/panel/outerParams/PanelOuterParamsInfoDTO.java b/backend/src/main/java/io/dataease/dto/panel/outerParams/PanelOuterParamsInfoDTO.java new file mode 100644 index 0000000000..0f79c1bb77 --- /dev/null +++ b/backend/src/main/java/io/dataease/dto/panel/outerParams/PanelOuterParamsInfoDTO.java @@ -0,0 +1,21 @@ +package io.dataease.dto.panel.outerParams; + +import io.dataease.base.domain.PanelOuterParamsInfo; +import io.dataease.base.domain.PanelOuterParamsTargetViewInfo; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Author: wangjiahao + * Date: 2022/3/17 + * Description: + */ +@Data +public class PanelOuterParamsInfoDTO extends PanelOuterParamsInfo { + + private String panelId; + + private List targetViewInfoList=new ArrayList<>(); +} diff --git a/backend/src/main/java/io/dataease/service/panel/PanelOuterParamsService.java b/backend/src/main/java/io/dataease/service/panel/PanelOuterParamsService.java new file mode 100644 index 0000000000..995377b036 --- /dev/null +++ b/backend/src/main/java/io/dataease/service/panel/PanelOuterParamsService.java @@ -0,0 +1,68 @@ +package io.dataease.service.panel; + +import io.dataease.base.mapper.PanelOuterParamsInfoMapper; +import io.dataease.base.mapper.PanelOuterParamsMapper; +import io.dataease.base.mapper.PanelOuterParamsTargetViewInfoMapper; +import io.dataease.base.mapper.ext.ExtPanelOuterParamsMapper; +import io.dataease.dto.panel.linkJump.PanelLinkJumpDTO; +import io.dataease.dto.panel.outerParams.PanelOuterParamsDTO; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.Assert; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Optional; +import java.util.UUID; + +/** + * Author: wangjiahao + * Date: 2022/3/17 + * Description: + */ +@Service +public class PanelOuterParamsService { + + @Resource + private ExtPanelOuterParamsMapper extPanelOuterParamsMapper; + + @Resource + private PanelOuterParamsMapper panelOuterParamsMapper; + + @Resource + private PanelOuterParamsInfoMapper panelOuterParamsInfoMapper; + + @Resource + private PanelOuterParamsTargetViewInfoMapper panelOuterParamsTargetViewInfoMapper; + + + public PanelOuterParamsDTO queryWithPanelId(String panelId){ + PanelOuterParamsDTO panelOuterParamsDTO = extPanelOuterParamsMapper.queryWithPanelId(panelId); + return panelOuterParamsDTO; + } + + @Transactional + public void updateOuterParamsSet(PanelOuterParamsDTO outerParamsDTO) { + String panelId = outerParamsDTO.getPanelId(); + Assert.notNull(panelId, "panelId cannot be null"); + //清理原有数据 + extPanelOuterParamsMapper.deleteOuterParamsWithPanelId(panelId); + // 插入新的数据 + String paramsId = UUID.randomUUID().toString(); + outerParamsDTO.setParamsId(paramsId); + panelOuterParamsMapper.insertSelective(outerParamsDTO); + Optional.ofNullable(outerParamsDTO.getOuterParamsInfoArray()).orElse(new ArrayList<>()).forEach(outerParamsInfo -> { + String paramsInfoId = UUID.randomUUID().toString(); + outerParamsInfo.setParamsInfoId(paramsInfoId); + outerParamsInfo.setParamsId(paramsId); + panelOuterParamsInfoMapper.insertSelective(outerParamsInfo); + Optional.ofNullable(outerParamsInfo.getTargetViewInfoList()).orElse(new ArrayList<>()).forEach(targetViewInfo -> { + String targetViewInfoId = UUID.randomUUID().toString(); + targetViewInfo.setTargetId(targetViewInfoId); + targetViewInfo.setParamsInfoId(paramsInfoId); + panelOuterParamsTargetViewInfoMapper.insertSelective(targetViewInfo); + }); + }); + } + +} diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml index 9a6f59b4d0..ca6e4672c7 100644 --- a/backend/src/main/resources/generatorConfig.xml +++ b/backend/src/main/resources/generatorConfig.xml @@ -63,8 +63,8 @@ - -
-
+
+
+
diff --git a/frontend/src/api/panel/outerParams.js b/frontend/src/api/panel/outerParams.js new file mode 100644 index 0000000000..7f8ecb3c5d --- /dev/null +++ b/frontend/src/api/panel/outerParams.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +export function queryWithPanelId(panelId) { + return request({ + url: '/outerParams/queryWithPanelId/' + panelId, + method: 'get' + }) +} + + + +export function updateOuterParamsSet(requestInfo) { + return request({ + url: '/outerParams/updateOuterParamsSet', + method: 'post', + data: requestInfo, + loading: true + }) +} diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue index a7663d7af6..e986b83344 100644 --- a/frontend/src/components/canvas/components/Toolbar.vue +++ b/frontend/src/components/canvas/components/Toolbar.vue @@ -38,6 +38,9 @@ + + + {{ $t('commons.save') }} @@ -299,6 +302,9 @@ export default { clickPreview() { this.$emit('previewFullScreen') }, + openOuterParamsSet() { + this.$emit('outerParamsSetVisibleChange', true) + }, changeAidedDesign() { this.$emit('changeAidedDesign') }, diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index e13dc44306..2bed62509f 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1381,6 +1381,7 @@ export default { sure_bt: 'Confirm' }, panel: { + params_setting: 'Outer Params Setting', template_view_tips: "Template's Views. Please Change", no_auth_role: 'Unshared roles', auth_role: 'Shared roles', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 8ec39b0355..48d30b56e7 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1382,6 +1382,7 @@ export default { sure_bt: '確定' }, panel: { + params_setting: '外部参数设置', template_view_tips: '当前是模板视图,请点击更换数据集', no_auth_role: '未分享角色', auth_role: '已分享角色', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 67b257077c..23dd1e030e 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1390,6 +1390,7 @@ export default { sure_bt: '确定' }, panel: { + params_setting: '外部参数设置', template_view_tips: '当前是模板视图,请点击更换数据集', no_auth_role: '未分享角色', auth_role: '已分享角色', diff --git a/frontend/src/styles/deicon/demo_index.html b/frontend/src/styles/deicon/demo_index.html index 7b9d1d8a9e..c63d234675 100644 --- a/frontend/src/styles/deicon/demo_index.html +++ b/frontend/src/styles/deicon/demo_index.html @@ -54,6 +54,12 @@
    +
  • + +
    参数
    +
    &#xe6d7;
    +
    • +
  • 更换
    @@ -186,6 +192,12 @@
    &#xe8e6;
    • +
  • + +
    右悬浮-选中
    +
    &#xeb86;
    +
    • +
  • 44.tabs
    @@ -504,9 +516,9 @@ 
    @font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1642061879222') format('woff2'),
-       url('iconfont.woff?t=1642061879222') format('woff'),
-       url('iconfont.ttf?t=1642061879222') format('truetype');
+  src: url('iconfont.woff2?t=1647483965100') format('woff2'),
+       url('iconfont.woff?t=1647483965100') format('woff'),
+       url('iconfont.ttf?t=1647483965100') format('truetype');
 }

    第二步：定义使用 iconfont 的样式

    @@ -532,6 +544,15 @@
      +
    • + +
      + 参数 +
      +
      .icon-canshu +
      +
      • +
    • @@ -730,6 +751,15 @@
      • +
    • + +
      + 右悬浮-选中 +
      +
      .icon-youxuanfu-copy-copy +
      +
      • +
    • @@ -1207,6 +1237,14 @@
        +
      • + +
        参数
        +
        #icon-canshu
        +
        • +
      • #icon-xuanfuanniu
        • +
      • + +
        右悬浮-选中
        +
        #icon-youxuanfu-copy-copy
        +
        • +
      • JSGjVoA5D76fC8hEJLP(-|(83{j!B~v4H6J)R-lcz6c)o8Yzv|NRDmRIe;oJI0 zFHA$T9&sW?_WQJAMYJ8Mf(ju@L3WVTB^EQU#b%WGY82Z=I^FpdyF4QS7QRio)3YeQ zt40I7$lHnBKvu9;o)OpeJidXD0;V1?$t`v|5=qDAAyk<`)Ty709yXD&CrB$ZMWOIP2MgmvW~g58IA9(DCf4$PS-#Y|%yd zZ`MD|?h)8ch`wWL%D<}ct}QxKe`p2Cb&D~Wnwqi_>~_UH{QDOAca}e< zihCz_5BKOotzcd|c#}+b;_szAwP9X;h(?6&FM5CGbb$K*CI5%Q)5bNpjHCEolO9gv zLoP{;q|+lt-0a+A#^dIEwHfdHdbg_U>TcCAUfRPP%USRe%c`uxo%k=S$)~+441O1m53~AVKa7VjFqAE<*Db8WH>bY$UsunaO&-Xzh@(9yM{MM_ zdh&mDL6nMvEX*?%i#ZL}TJ1X1F+DL^nER1helB6<2fK~D-*I`)bbb>I{TskHwW0Tv z#?-%77q1yp-P_q68(gc7tyzpkW2HmDz6pU+ zVWJPac+TqruEj295856i+~~I?&-51x{r!K1a3Wk-w5U*6l&+1}(hnq=-*VCq-KYGT zcCToNJ?(k;)8-*CJZ954On!t?SCMNWJ~Q97t<1~yn8I2Ys>~aE?ze7i4?LfOsyO2R zj;X6&M3`9W{p>AYVa=QczeA(lH1k#{ZhKM-hqWhl)70p>d*aDumma)y*|JNQ^{ju* z?ok}`5Rmw?((uON;f*^t4ktUqB*EZ2KVl93^%q{q3XY}VWHTNP$IUnPWY_jCyL4*m z(wi@xO2+ocX6#lVvE=X>=bbS;e8xy=85}VY=@9fCehc@57z391=lZLtTMW8ruQ=U&$i=P#MnP((fWV#>^}N|*+*#4?BCPrV`*~x)=H~c={(CUW&R8Q z0w=rw{w=KA(D@>snS{9*W%yB;O2C)^F}bvLxI?86^^#H)YwLEyTJ zFD4V9f9u2U29|%M_2CwS{Z^}m&xf(d{Q?H$^DVAx-}xW(>vS)d>vBg%+nEotgBm}X z_w7UhhTUw{!4q_wJ}x2PvDBRK+x@*fyXIn;86j6x+IMFgIWY76PG@DVnPrK4>Se+G zovy;59*sryZCW%Q(f6x*Cq{pMtg9bO_q^JhKBVe&Z@cpGOg-ZcIsJJv+swfcr#~0| zc)3M7Uvqz=>W^ws4WCEnV(ih`h9sspefV&?*HF6W=jhY)yL4ywOJ%uXZh||7S%T}4 zx|uiG-ka=yMmWJcnK^MvxL`-X(_}Ia9`82NyQFEf@^cx_EAqZ?7ugYW^Y!-+$bXwF z3(9!a{T&Q|{Wtgr)jtpqE*v}iT$|*3V9#qi@BpuWek0uc|9}nu2LU4sTX>vfU}Rum z0Aj}0eVOt6HeVnaxLFuL;2!IQZ7}-(pZ|3%vzXg}Tn+{%kSG8@Pz+glbRW1N93YM%03nDX1^@tf zoMT{QU|{fI%wiB@00AZ-<^n|zi5IEhm@jWallb2yI+xQI)*j4QZ`Yq*XZxQSc1 zjXSuDdx&r!5AYB}Ji=oDP<}eOU3baVOcQ#H&%xgmz0cL6>aW8OdZ#GR}ZV`rZAS=DwS1o=&xRZ zXJl=HIgO1iWt*E*vb?2~eQsZERi$lZwO3Gb)VapBP}SByD7BqOFT}|;j21^P pjwP2)B`4xkOjw7ka|C%`r^#7s)@P$6PceCOX=SVR3q~ChEC3#n12zBv diff --git a/frontend/src/styles/deicon/iconfont.woff2 b/frontend/src/styles/deicon/iconfont.woff2 index fa730c9626604a9c9482f9c9ae9d4d210b16adee..98f46b50c80b4240261057d76f790cd9bea0b06f 100644 GIT binary patch literal 11448 zcmV;pEJxFKPew8T0RR9104%rw3jhEB09C9204!(#0RR9100000000000000000000 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 S_0Ht#@JqmnL*c%T44(ig{Y8`j literal 11360 zcmV-mET7YNPew8T0RR9104!ht3jhEB090TA04xvy0RR9100000000000000000000 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 + + + {{ $t('panel.jump_set') }} + {{ $t('panel.enable_jump') }} + + + + + + {{ $t('panel.column_name') }} + {{ $t('panel.enable_column') }} + + + + + + + +
        + + + + +
        + +         +         +         + + 添加参数 + +         + + + + + {{ $t('panel.link_type') }}： + + + + {{ $t('panel.link_outer') }} + {{ $t('panel.link_panel') }} + + + + + + + + + {{ $t('panel.open_model') }}： + + + + {{ $t('panel.now_window') }} + {{ $t('panel.new_window') }} + + + + + + +
        {{ $t('panel.link_view') }}
        +         + +
        {{ $t('panel.link_view_field') }}
        +         +         + + + +
        + + + + + + {{ item.name }} + + +
        +         + +
        + + + + + + + + + {{ viewField.name }} + + +
        +         + +
        + +
        +         +         +         + + + {{ $t('panel.add_jump_field') }} + + + + +         + + + +         + + {{ $t('panel.select_dimension') }} + +         +         +         + + {{ $t('commons.cancel') }} + {{ $t('commons.confirm') }} + +         + + + + + diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 084cf2a8a7..2ed0b4da86 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -18,6 +18,7 @@ @showPanel="showPanel" @previewFullScreen="previewFullScreen" @changeAidedDesign="changeAidedDesign" + @outerParamsSetVisibleChange="outerParamsSetVisibleChange" /> @@ -312,6 +313,18 @@ @newViewInfo="newViewInfo" /> + + + + + @@ -334,14 +347,14 @@ import componentList, { import { mapState } from 'vuex' import { uuid } from 'vue-uuid' import Toolbar from '@/components/canvas/components/Toolbar' -import { initPanelComponentsData, initPanelData, initViewCache } from '@/api/panel/panel' +import { initPanelData, initViewCache } from '@/api/panel/panel' import Preview from '@/components/canvas/components/Editor/Preview' import AttrListExtend from '@/components/canvas/components/AttrListExtend' import elementResizeDetectorMaker from 'element-resize-detector' import AssistComponent from '@/views/panel/AssistComponent' import PanelTextEditor from '@/components/canvas/custom-component/PanelTextEditor' import ChartGroup from '@/views/chart/group/Group' -import { chartCopy, searchAdviceSceneId } from '@/api/chart/chart' +import { chartCopy } from '@/api/chart/chart' // 引入样式 import '@/components/canvas/assets/iconfont/iconfont.css' import '@/components/canvas/styles/animate.css' @@ -354,10 +367,12 @@ import TextAttr from '@/components/canvas/components/TextAttr' import ComponentWait from '@/views/panel/edit/ComponentWait' import { deleteEnshrine, saveEnshrine, starStatus } from '@/api/panel/enshrine' import ChartEdit from '@/views/chart/view/ChartEdit' +import OuterParamsSet from '@/views/panel/OuterParamsSet/index' export default { name: 'PanelEdit', components: { + OuterParamsSet, ComponentWait, DeMainContainer, DeContainer, @@ -378,6 +393,7 @@ export default { }, data() { return { + outerParamsSetVisible: false, autoMoveOffSet: 15, mobileEditorShow: true, hasStar: false, @@ -596,6 +612,9 @@ export default { elx && elx.remove() }, methods: { + closeOuterParamsSetDialog(){ + this.outerParamsSetVisible = false + }, changeRightDrawOpen(param) { this.rightDrawOpen = param if (this.rightDrawOpen) { @@ -860,6 +879,9 @@ export default { changeAidedDesign() { this.aidedButtonActive = !this.aidedButtonActive }, + outerParamsSetVisibleChange(param) { + this.outerParamsSetVisible = param + }, getOriginStyle(value) { const scale = this.canvasStyleData.scale const result = value / (scale / 100)