Merge branch 'dev' of github.com:dataease/dataease into dev

backend/src/main/java/io/dataease/base/domain/PanelGroupExtend.java

+package io.dataease.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class PanelGroupExtend implements Serializable {
+    private String id;
+
+    private String panelId;
+
+    private String templateId;
+
+    private String templateVersion;
+
+    private String templateDynamicData;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

backend/src/main/java/io/dataease/base/domain/PanelGroupExtendData.java

+package io.dataease.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class PanelGroupExtendData implements Serializable {
+    private String id;
+
+    private String panelId;
+
+    private String viewId;
+
+    private String viewDetails;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

backend/src/main/java/io/dataease/base/domain/PanelGroupExtendDataExample.java

+package io.dataease.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PanelGroupExtendDataExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public PanelGroupExtendDataExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    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<Criteria> 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<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> 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 andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            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<String> values) {
+            addCriterion("panel_id in", values, "panelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPanelIdNotIn(List<String> 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 andViewIdIsNull() {
+            addCriterion("view_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewIdIsNotNull() {
+            addCriterion("view_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewIdEqualTo(String value) {
+            addCriterion("view_id =", value, "viewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewIdNotEqualTo(String value) {
+            addCriterion("view_id <>", value, "viewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewIdGreaterThan(String value) {
+            addCriterion("view_id >", value, "viewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewIdGreaterThanOrEqualTo(String value) {
+            addCriterion("view_id >=", value, "viewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewIdLessThan(String value) {
+            addCriterion("view_id <", value, "viewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewIdLessThanOrEqualTo(String value) {
+            addCriterion("view_id <=", value, "viewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewIdLike(String value) {
+            addCriterion("view_id like", value, "viewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewIdNotLike(String value) {
+            addCriterion("view_id not like", value, "viewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewIdIn(List<String> values) {
+            addCriterion("view_id in", values, "viewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewIdNotIn(List<String> values) {
+            addCriterion("view_id not in", values, "viewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewIdBetween(String value1, String value2) {
+            addCriterion("view_id between", value1, value2, "viewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewIdNotBetween(String value1, String value2) {
+            addCriterion("view_id not between", value1, value2, "viewId");
+            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

backend/src/main/java/io/dataease/base/domain/PanelGroupExtendExample.java

+package io.dataease.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PanelGroupExtendExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public PanelGroupExtendExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    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<Criteria> 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<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> 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 andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            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<String> values) {
+            addCriterion("panel_id in", values, "panelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPanelIdNotIn(List<String> 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 andTemplateIdIsNull() {
+            addCriterion("template_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdIsNotNull() {
+            addCriterion("template_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdEqualTo(String value) {
+            addCriterion("template_id =", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdNotEqualTo(String value) {
+            addCriterion("template_id <>", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdGreaterThan(String value) {
+            addCriterion("template_id >", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdGreaterThanOrEqualTo(String value) {
+            addCriterion("template_id >=", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdLessThan(String value) {
+            addCriterion("template_id <", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdLessThanOrEqualTo(String value) {
+            addCriterion("template_id <=", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdLike(String value) {
+            addCriterion("template_id like", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdNotLike(String value) {
+            addCriterion("template_id not like", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdIn(List<String> values) {
+            addCriterion("template_id in", values, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdNotIn(List<String> values) {
+            addCriterion("template_id not in", values, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdBetween(String value1, String value2) {
+            addCriterion("template_id between", value1, value2, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdNotBetween(String value1, String value2) {
+            addCriterion("template_id not between", value1, value2, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateVersionIsNull() {
+            addCriterion("template_version is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateVersionIsNotNull() {
+            addCriterion("template_version is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateVersionEqualTo(String value) {
+            addCriterion("template_version =", value, "templateVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateVersionNotEqualTo(String value) {
+            addCriterion("template_version <>", value, "templateVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateVersionGreaterThan(String value) {
+            addCriterion("template_version >", value, "templateVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateVersionGreaterThanOrEqualTo(String value) {
+            addCriterion("template_version >=", value, "templateVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateVersionLessThan(String value) {
+            addCriterion("template_version <", value, "templateVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateVersionLessThanOrEqualTo(String value) {
+            addCriterion("template_version <=", value, "templateVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateVersionLike(String value) {
+            addCriterion("template_version like", value, "templateVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateVersionNotLike(String value) {
+            addCriterion("template_version not like", value, "templateVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateVersionIn(List<String> values) {
+            addCriterion("template_version in", values, "templateVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateVersionNotIn(List<String> values) {
+            addCriterion("template_version not in", values, "templateVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateVersionBetween(String value1, String value2) {
+            addCriterion("template_version between", value1, value2, "templateVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateVersionNotBetween(String value1, String value2) {
+            addCriterion("template_version not between", value1, value2, "templateVersion");
+            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

backend/src/main/java/io/dataease/base/domain/PanelView.java

@@ -29,6 +29,8 @@ public class PanelView implements Serializable {
 
     private String copyId;
 
+    private String dataFrom;
+
     private byte[] content;
 
     private static final long serialVersionUID = 1L;

backend/src/main/java/io/dataease/base/domain/PanelViewExample.java

@@ -923,6 +923,76 @@ public class PanelViewExample {
             addCriterion("copy_id not between", value1, value2, "copyId");
             return (Criteria) this;
         }
+
+        public Criteria andDataFromIsNull() {
+            addCriterion("data_from is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromIsNotNull() {
+            addCriterion("data_from is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromEqualTo(String value) {
+            addCriterion("data_from =", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromNotEqualTo(String value) {
+            addCriterion("data_from <>", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromGreaterThan(String value) {
+            addCriterion("data_from >", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromGreaterThanOrEqualTo(String value) {
+            addCriterion("data_from >=", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromLessThan(String value) {
+            addCriterion("data_from <", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromLessThanOrEqualTo(String value) {
+            addCriterion("data_from <=", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromLike(String value) {
+            addCriterion("data_from like", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromNotLike(String value) {
+            addCriterion("data_from not like", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromIn(List<String> values) {
+            addCriterion("data_from in", values, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromNotIn(List<String> values) {
+            addCriterion("data_from not in", values, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromBetween(String value1, String value2) {
+            addCriterion("data_from between", value1, value2, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromNotBetween(String value1, String value2) {
+            addCriterion("data_from not between", value1, value2, "dataFrom");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

backend/src/main/java/io/dataease/base/mapper/PanelGroupExtendDataMapper.java

+package io.dataease.base.mapper;
+
+import io.dataease.base.domain.PanelGroupExtendData;
+import io.dataease.base.domain.PanelGroupExtendDataExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PanelGroupExtendDataMapper {
+    long countByExample(PanelGroupExtendDataExample example);
+
+    int deleteByExample(PanelGroupExtendDataExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(PanelGroupExtendData record);
+
+    int insertSelective(PanelGroupExtendData record);
+
+    List<PanelGroupExtendData> selectByExampleWithBLOBs(PanelGroupExtendDataExample example);
+
+    List<PanelGroupExtendData> selectByExample(PanelGroupExtendDataExample example);
+
+    PanelGroupExtendData selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") PanelGroupExtendData record, @Param("example") PanelGroupExtendDataExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") PanelGroupExtendData record, @Param("example") PanelGroupExtendDataExample example);
+
+    int updateByExample(@Param("record") PanelGroupExtendData record, @Param("example") PanelGroupExtendDataExample example);
+
+    int updateByPrimaryKeySelective(PanelGroupExtendData record);
+
+    int updateByPrimaryKeyWithBLOBs(PanelGroupExtendData record);
+
+    int updateByPrimaryKey(PanelGroupExtendData record);
+}
\ No newline at end of file

backend/src/main/java/io/dataease/base/mapper/PanelGroupExtendDataMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.base.mapper.PanelGroupExtendDataMapper">
+  <resultMap id="BaseResultMap" type="io.dataease.base.domain.PanelGroupExtendData">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="panel_id" jdbcType="VARCHAR" property="panelId" />
+    <result column="view_id" jdbcType="VARCHAR" property="viewId" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.base.domain.PanelGroupExtendData">
+    <result column="view_details" jdbcType="LONGVARCHAR" property="viewDetails" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, panel_id, view_id
+  </sql>
+  <sql id="Blob_Column_List">
+    view_details
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="io.dataease.base.domain.PanelGroupExtendDataExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from panel_group_extend_data
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="io.dataease.base.domain.PanelGroupExtendDataExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from panel_group_extend_data
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from panel_group_extend_data
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from panel_group_extend_data
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.dataease.base.domain.PanelGroupExtendDataExample">
+    delete from panel_group_extend_data
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.dataease.base.domain.PanelGroupExtendData">
+    insert into panel_group_extend_data (id, panel_id, view_id, 
+      view_details)
+    values (#{id,jdbcType=VARCHAR}, #{panelId,jdbcType=VARCHAR}, #{viewId,jdbcType=VARCHAR}, 
+      #{viewDetails,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="io.dataease.base.domain.PanelGroupExtendData">
+    insert into panel_group_extend_data
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="panelId != null">
+        panel_id,
+      </if>
+      <if test="viewId != null">
+        view_id,
+      </if>
+      <if test="viewDetails != null">
+        view_details,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="panelId != null">
+        #{panelId,jdbcType=VARCHAR},
+      </if>
+      <if test="viewId != null">
+        #{viewId,jdbcType=VARCHAR},
+      </if>
+      <if test="viewDetails != null">
+        #{viewDetails,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.dataease.base.domain.PanelGroupExtendDataExample" resultType="java.lang.Long">
+    select count(*) from panel_group_extend_data
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update panel_group_extend_data
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.panelId != null">
+        panel_id = #{record.panelId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.viewId != null">
+        view_id = #{record.viewId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.viewDetails != null">
+        view_details = #{record.viewDetails,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update panel_group_extend_data
+    set id = #{record.id,jdbcType=VARCHAR},
+      panel_id = #{record.panelId,jdbcType=VARCHAR},
+      view_id = #{record.viewId,jdbcType=VARCHAR},
+      view_details = #{record.viewDetails,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update panel_group_extend_data
+    set id = #{record.id,jdbcType=VARCHAR},
+      panel_id = #{record.panelId,jdbcType=VARCHAR},
+      view_id = #{record.viewId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.base.domain.PanelGroupExtendData">
+    update panel_group_extend_data
+    <set>
+      <if test="panelId != null">
+        panel_id = #{panelId,jdbcType=VARCHAR},
+      </if>
+      <if test="viewId != null">
+        view_id = #{viewId,jdbcType=VARCHAR},
+      </if>
+      <if test="viewDetails != null">
+        view_details = #{viewDetails,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.dataease.base.domain.PanelGroupExtendData">
+    update panel_group_extend_data
+    set panel_id = #{panelId,jdbcType=VARCHAR},
+      view_id = #{viewId,jdbcType=VARCHAR},
+      view_details = #{viewDetails,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.PanelGroupExtendData">
+    update panel_group_extend_data
+    set panel_id = #{panelId,jdbcType=VARCHAR},
+      view_id = #{viewId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file

backend/src/main/java/io/dataease/base/mapper/PanelGroupExtendMapper.java

+package io.dataease.base.mapper;
+
+import io.dataease.base.domain.PanelGroupExtend;
+import io.dataease.base.domain.PanelGroupExtendExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PanelGroupExtendMapper {
+    long countByExample(PanelGroupExtendExample example);
+
+    int deleteByExample(PanelGroupExtendExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(PanelGroupExtend record);
+
+    int insertSelective(PanelGroupExtend record);
+
+    List<PanelGroupExtend> selectByExampleWithBLOBs(PanelGroupExtendExample example);
+
+    List<PanelGroupExtend> selectByExample(PanelGroupExtendExample example);
+
+    PanelGroupExtend selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") PanelGroupExtend record, @Param("example") PanelGroupExtendExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") PanelGroupExtend record, @Param("example") PanelGroupExtendExample example);
+
+    int updateByExample(@Param("record") PanelGroupExtend record, @Param("example") PanelGroupExtendExample example);
+
+    int updateByPrimaryKeySelective(PanelGroupExtend record);
+
+    int updateByPrimaryKeyWithBLOBs(PanelGroupExtend record);
+
+    int updateByPrimaryKey(PanelGroupExtend record);
+}
\ No newline at end of file

backend/src/main/java/io/dataease/base/mapper/PanelGroupExtendMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.base.mapper.PanelGroupExtendMapper">
+  <resultMap id="BaseResultMap" type="io.dataease.base.domain.PanelGroupExtend">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="panel_id" jdbcType="VARCHAR" property="panelId" />
+    <result column="template_id" jdbcType="VARCHAR" property="templateId" />
+    <result column="template_version" jdbcType="VARCHAR" property="templateVersion" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.base.domain.PanelGroupExtend">
+    <result column="template_dynamic_data" jdbcType="LONGVARCHAR" property="templateDynamicData" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, panel_id, template_id, template_version
+  </sql>
+  <sql id="Blob_Column_List">
+    template_dynamic_data
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="io.dataease.base.domain.PanelGroupExtendExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from panel_group_extend
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="io.dataease.base.domain.PanelGroupExtendExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from panel_group_extend
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from panel_group_extend
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from panel_group_extend
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.dataease.base.domain.PanelGroupExtendExample">
+    delete from panel_group_extend
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.dataease.base.domain.PanelGroupExtend">
+    insert into panel_group_extend (id, panel_id, template_id, 
+      template_version, template_dynamic_data
+      )
+    values (#{id,jdbcType=VARCHAR}, #{panelId,jdbcType=VARCHAR}, #{templateId,jdbcType=VARCHAR}, 
+      #{templateVersion,jdbcType=VARCHAR}, #{templateDynamicData,jdbcType=LONGVARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="io.dataease.base.domain.PanelGroupExtend">
+    insert into panel_group_extend
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="panelId != null">
+        panel_id,
+      </if>
+      <if test="templateId != null">
+        template_id,
+      </if>
+      <if test="templateVersion != null">
+        template_version,
+      </if>
+      <if test="templateDynamicData != null">
+        template_dynamic_data,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="panelId != null">
+        #{panelId,jdbcType=VARCHAR},
+      </if>
+      <if test="templateId != null">
+        #{templateId,jdbcType=VARCHAR},
+      </if>
+      <if test="templateVersion != null">
+        #{templateVersion,jdbcType=VARCHAR},
+      </if>
+      <if test="templateDynamicData != null">
+        #{templateDynamicData,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.dataease.base.domain.PanelGroupExtendExample" resultType="java.lang.Long">
+    select count(*) from panel_group_extend
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update panel_group_extend
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.panelId != null">
+        panel_id = #{record.panelId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.templateId != null">
+        template_id = #{record.templateId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.templateVersion != null">
+        template_version = #{record.templateVersion,jdbcType=VARCHAR},
+      </if>
+      <if test="record.templateDynamicData != null">
+        template_dynamic_data = #{record.templateDynamicData,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update panel_group_extend
+    set id = #{record.id,jdbcType=VARCHAR},
+      panel_id = #{record.panelId,jdbcType=VARCHAR},
+      template_id = #{record.templateId,jdbcType=VARCHAR},
+      template_version = #{record.templateVersion,jdbcType=VARCHAR},
+      template_dynamic_data = #{record.templateDynamicData,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update panel_group_extend
+    set id = #{record.id,jdbcType=VARCHAR},
+      panel_id = #{record.panelId,jdbcType=VARCHAR},
+      template_id = #{record.templateId,jdbcType=VARCHAR},
+      template_version = #{record.templateVersion,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.base.domain.PanelGroupExtend">
+    update panel_group_extend
+    <set>
+      <if test="panelId != null">
+        panel_id = #{panelId,jdbcType=VARCHAR},
+      </if>
+      <if test="templateId != null">
+        template_id = #{templateId,jdbcType=VARCHAR},
+      </if>
+      <if test="templateVersion != null">
+        template_version = #{templateVersion,jdbcType=VARCHAR},
+      </if>
+      <if test="templateDynamicData != null">
+        template_dynamic_data = #{templateDynamicData,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.dataease.base.domain.PanelGroupExtend">
+    update panel_group_extend
+    set panel_id = #{panelId,jdbcType=VARCHAR},
+      template_id = #{templateId,jdbcType=VARCHAR},
+      template_version = #{templateVersion,jdbcType=VARCHAR},
+      template_dynamic_data = #{templateDynamicData,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.PanelGroupExtend">
+    update panel_group_extend
+    set panel_id = #{panelId,jdbcType=VARCHAR},
+      template_id = #{templateId,jdbcType=VARCHAR},
+      template_version = #{templateVersion,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file

backend/src/main/java/io/dataease/base/mapper/PanelViewMapper.xml

@@ -14,6 +14,7 @@
     <result column="copy_from_view" jdbcType="VARCHAR" property="copyFromView" />
     <result column="copy_from" jdbcType="VARCHAR" property="copyFrom" />
     <result column="copy_id" jdbcType="VARCHAR" property="copyId" />
+    <result column="data_from" jdbcType="VARCHAR" property="dataFrom" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.base.domain.PanelView">
     <result column="content" jdbcType="LONGVARBINARY" property="content" />
@@ -78,7 +79,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, panel_id, chart_view_id, create_by, create_time, update_by, update_time, `position`, 
-    copy_from_panel, copy_from_view, copy_from, copy_id
+    copy_from_panel, copy_from_view, copy_from, copy_id, data_from
   </sql>
   <sql id="Blob_Column_List">
     content
@@ -136,12 +137,12 @@
       create_by, create_time, update_by, 
       update_time, `position`, copy_from_panel, 
       copy_from_view, copy_from, copy_id, 
-      content)
+      data_from, content)
     values (#{id,jdbcType=VARCHAR}, #{panelId,jdbcType=VARCHAR}, #{chartViewId,jdbcType=VARCHAR}, 
       #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateBy,jdbcType=VARCHAR}, 
       #{updateTime,jdbcType=BIGINT}, #{position,jdbcType=VARCHAR}, #{copyFromPanel,jdbcType=VARCHAR}, 
       #{copyFromView,jdbcType=VARCHAR}, #{copyFrom,jdbcType=VARCHAR}, #{copyId,jdbcType=VARCHAR}, 
-      #{content,jdbcType=LONGVARBINARY})
+      #{dataFrom,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARBINARY})
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.base.domain.PanelView">
     insert into panel_view
@@ -182,6 +183,9 @@
       <if test="copyId != null">
         copy_id,
       </if>
+      <if test="dataFrom != null">
+        data_from,
+      </if>
       <if test="content != null">
         content,
       </if>
@@ -223,6 +227,9 @@
       <if test="copyId != null">
         #{copyId,jdbcType=VARCHAR},
       </if>
+      <if test="dataFrom != null">
+        #{dataFrom,jdbcType=VARCHAR},
+      </if>
       <if test="content != null">
         #{content,jdbcType=LONGVARBINARY},
       </if>
@@ -273,6 +280,9 @@
       <if test="record.copyId != null">
         copy_id = #{record.copyId,jdbcType=VARCHAR},
       </if>
+      <if test="record.dataFrom != null">
+        data_from = #{record.dataFrom,jdbcType=VARCHAR},
+      </if>
       <if test="record.content != null">
         content = #{record.content,jdbcType=LONGVARBINARY},
       </if>
@@ -295,6 +305,7 @@
       copy_from_view = #{record.copyFromView,jdbcType=VARCHAR},
       copy_from = #{record.copyFrom,jdbcType=VARCHAR},
       copy_id = #{record.copyId,jdbcType=VARCHAR},
+      data_from = #{record.dataFrom,jdbcType=VARCHAR},
       content = #{record.content,jdbcType=LONGVARBINARY}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -313,7 +324,8 @@
       copy_from_panel = #{record.copyFromPanel,jdbcType=VARCHAR},
       copy_from_view = #{record.copyFromView,jdbcType=VARCHAR},
       copy_from = #{record.copyFrom,jdbcType=VARCHAR},
-      copy_id = #{record.copyId,jdbcType=VARCHAR}
+      copy_id = #{record.copyId,jdbcType=VARCHAR},
+      data_from = #{record.dataFrom,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -354,6 +366,9 @@
       <if test="copyId != null">
         copy_id = #{copyId,jdbcType=VARCHAR},
       </if>
+      <if test="dataFrom != null">
+        data_from = #{dataFrom,jdbcType=VARCHAR},
+      </if>
       <if test="content != null">
         content = #{content,jdbcType=LONGVARBINARY},
       </if>
@@ -373,6 +388,7 @@
       copy_from_view = #{copyFromView,jdbcType=VARCHAR},
       copy_from = #{copyFrom,jdbcType=VARCHAR},
       copy_id = #{copyId,jdbcType=VARCHAR},
+      data_from = #{dataFrom,jdbcType=VARCHAR},
       content = #{content,jdbcType=LONGVARBINARY}
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -388,7 +404,8 @@
       copy_from_panel = #{copyFromPanel,jdbcType=VARCHAR},
       copy_from_view = #{copyFromView,jdbcType=VARCHAR},
       copy_from = #{copyFrom,jdbcType=VARCHAR},
-      copy_id = #{copyId,jdbcType=VARCHAR}
+      copy_id = #{copyId,jdbcType=VARCHAR},
+      data_from = #{dataFrom,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file

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

+package io.dataease.base.mapper.ext;
+
+import io.dataease.dto.PanelGroupExtendDataDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ExtPanelGroupExtendDataMapper {
+    void savePanelExtendData(@Param("records") List<PanelGroupExtendDataDTO> records);
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.base.mapper.ext.ExtPanelGroupExtendDataMapper">
+
+  <insert id ="savePanelExtendData">
+    INSERT INTO `panel_group_extend_data` (id, panel_id,view_id,view_details) VALUES
+    <foreach collection="records" item="item" index="index" separator=",">
+      (uuid(),#{item.panelId},#{item.viewId},#{item.viewDetails})
+    </foreach>
+  </insert>
+
+</mapper>

backend/src/main/java/io/dataease/commons/constants/PanelConstants.java

@@ -33,5 +33,18 @@ public class PanelConstants {
     public final static String PANEL_GATHER_PANEL_LIST = "panel_list";
 
 
+    //新建仪表板来源
+    public static final class NEW_PANEL_FROM {
+
+        // 直接新建
+        public static final String NEW = "new";
+
+        // 内部模板新建
+        public static final String NEW_INNER_TEMPLATE = "new_inner_template";
+
+        // 外部模板新建
+        public static final String NEW_OUTER_TEMPLATE = "new_outer_template";
+
+    }
 
 }

backend/src/main/java/io/dataease/controller/request/panel/PanelGroupRequest.java

@@ -17,6 +17,13 @@ public class PanelGroupRequest extends PanelGroupDTO {
     private String userId;
     @ApiModelProperty("操作类型")
     private String optType;
+    @ApiModelProperty("新建来源")
+    private String newFrom;
+    @ApiModelProperty("模板动态数据")
+    private String dynamicData;
+    @ApiModelProperty("内部模板ID")
+    private String templateId;
+
 
     public PanelGroupRequest() {
     }

backend/src/main/java/io/dataease/dto/PanelGroupExtendDataDTO.java

+package io.dataease.dto;
+
+import io.dataease.base.domain.PanelGroupExtendData;
+import lombok.Data;
+import org.pentaho.di.core.util.UUIDUtil;
+
+/**
+ * Author: wangjiahao
+ * Date: 2022/3/14
+ * Description:
+ */
+@Data
+public class PanelGroupExtendDataDTO extends PanelGroupExtendData {
+    public PanelGroupExtendDataDTO(String panelId,String viewId,String viewDetails) {
+        super();
+        super.setId(UUIDUtil.getUUIDAsString());
+        super.setPanelId(panelId);
+        super.setViewId(viewId);
+        super.setViewDetails(viewDetails);
+    }
+
+    public PanelGroupExtendDataDTO() {
+        super();
+    }
+}

backend/src/main/java/io/dataease/dto/panel/po/PanelViewInsertDTO.java

@@ -24,5 +24,12 @@ public class PanelViewInsertDTO extends PanelView {
         super.setPanelId(panelGroupId);
         super.setPosition(position);
     }
+    public PanelViewInsertDTO(String chartViewId,String panelGroupId,String position,String dataFrom) {
+        super();
+        super.setChartViewId(chartViewId);
+        super.setPanelId(panelGroupId);
+        super.setPosition(position);
+        super.setDataFrom(dataFrom);
+    }
 
 }

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

@@ -3,10 +3,7 @@ package io.dataease.service.panel;
 import com.alibaba.fastjson.JSON;
 import io.dataease.auth.annotation.DeCleaner;
 import io.dataease.base.domain.*;
-import io.dataease.base.mapper.ChartViewMapper;
-import io.dataease.base.mapper.PanelGroupMapper;
-import io.dataease.base.mapper.PanelViewMapper;
-import io.dataease.base.mapper.VAuthModelMapper;
+import io.dataease.base.mapper.*;
 import io.dataease.base.mapper.ext.*;
 import io.dataease.commons.constants.DePermissionType;
 import io.dataease.commons.constants.PanelConstants;
@@ -16,16 +13,19 @@ import io.dataease.commons.utils.TreeUtils;
 import io.dataease.controller.request.authModel.VAuthModelRequest;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.controller.request.panel.PanelGroupRequest;
+import io.dataease.dto.PanelGroupExtendDataDTO;
 import io.dataease.dto.authModel.VAuthModelDTO;
 import io.dataease.dto.chart.ChartViewDTO;
 import io.dataease.dto.dataset.DataSetTableDTO;
 import io.dataease.dto.panel.PanelGroupDTO;
 import io.dataease.dto.panel.linkJump.PanelLinkJumpBaseRequest;
+import io.dataease.dto.panel.po.PanelViewInsertDTO;
 import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
 import io.dataease.service.chart.ChartViewService;
 import io.dataease.service.dataset.DataSetTableService;
 import io.dataease.service.sys.SysAuthService;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.pentaho.di.core.util.UUIDUtil;
@@ -85,6 +85,10 @@ public class PanelGroupService {
     private ExtDataSetTableMapper extDataSetTableMapper;
     @Resource
     private DataSetTableService dataSetTableService;
+    @Resource
+    private PanelTemplateMapper templateMapper;
+    @Resource
+    private ExtPanelGroupExtendDataMapper extPanelGroupExtendDataMapper;
 
 
     public List<PanelGroupDTO> tree(PanelGroupRequest panelGroupRequest) {
@@ -105,17 +109,13 @@ public class PanelGroupService {
 //    @Transactional
     public PanelGroup saveOrUpdate(PanelGroupRequest request) {
         String panelId = request.getId();
-        List<String> viewIds = null;
         if(StringUtils.isNotEmpty(panelId)){
-            viewIds = panelViewService.syncPanelViews(request);
+            panelViewService.syncPanelViews(request);
         }
         if (StringUtils.isEmpty(panelId)) {
             // 新建
             checkPanelName(request.getName(), request.getPid(), PanelConstants.OPT_TYPE_INSERT, null, request.getNodeType());
-            panelId = UUID.randomUUID().toString();
-            request.setId(panelId);
-            request.setCreateTime(System.currentTimeMillis());
-            request.setCreateBy(AuthUtils.getUser().getUsername());
+            panelId = newPanel(request);
             panelGroupMapper.insert(request);
         } else if ("toDefaultPanel".equals(request.getOptType())) {
             panelId = UUID.randomUUID().toString();
@@ -164,9 +164,6 @@ public class PanelGroupService {
         if (!CollectionUtils.isNotEmpty(panelGroupDTOList)) {
             DataEaseException.throwException("未查询到用户对应的资源权限，请尝试刷新重新保存");
         }
-
-        //移除没有用到的仪表板私有视图
-        extPanelGroupMapper.removeUselessViews(panelId,viewIds);
         return panelGroupDTOList.get(0);
     }
 
@@ -303,6 +300,53 @@ public class PanelGroupService {
         return newPanelId;
     }
 
+    public String newPanel(PanelGroupRequest request){
+        String newPanelId = UUIDUtil.getUUIDAsString();
+        String newFrom = request.getNewFrom();
+        String templateStyle = null;
+        String templateData = null;
+        String dynamicData = null;
+        if(PanelConstants.NEW_PANEL_FROM.NEW.equals(newFrom)){
+
+        }else{
+            //内部模板新建
+            if(PanelConstants.NEW_PANEL_FROM.NEW_INNER_TEMPLATE.equals(newFrom)){
+                PanelTemplateWithBLOBs panelTemplate = templateMapper.selectByPrimaryKey(request.getTemplateId());
+                templateStyle = panelTemplate.getTemplateStyle();
+                templateData = panelTemplate.getTemplateData();
+                dynamicData = panelTemplate.getDynamicData();
+            }else if(PanelConstants.NEW_PANEL_FROM.NEW_OUTER_TEMPLATE.equals(newFrom)){
+                templateStyle = request.getPanelStyle();
+                templateData = request.getPanelData();
+                dynamicData = request.getDynamicData();
+            }
+            Map<String,String> dynamicDataMap = JSON.parseObject(dynamicData,Map.class);
+            List<PanelViewInsertDTO> panelViews = new ArrayList<>();
+            List<PanelGroupExtendDataDTO> viewsData = new ArrayList<>();
+            for(Map.Entry<String, String> entry : dynamicDataMap.entrySet()){
+                String originViewId = entry.getKey();
+                String originViewData = entry.getValue();
+                String position = JSON.parseObject(originViewData).getString("position");
+                String newViewId = UUIDUtil.getUUIDAsString();
+                //TODO 数据处理 1.替换viewId 2.加入panelView 数据(数据来源为template) 3.加入模板view data数据
+                templateData = templateData.replaceAll(originViewId,newViewId);
+                panelViews.add(new PanelViewInsertDTO(newViewId,newPanelId,position,"template"));
+                viewsData.add(new PanelGroupExtendDataDTO(newPanelId,newViewId,originViewData));
+            }
+            if(CollectionUtils.isNotEmpty(panelViews)){
+                extPanelViewMapper.savePanelView(panelViews);
+            }
+            if(CollectionUtils.isNotEmpty(viewsData)){
+                extPanelGroupExtendDataMapper.savePanelExtendData(viewsData);
+            }
+            request.setPanelData(templateData);
+            request.setPanelStyle(templateStyle);
+        }
+        request.setId(newPanelId);
+        request.setCreateTime(System.currentTimeMillis());
+        request.setCreateBy(AuthUtils.getUser().getUsername());
+        return newPanelId;
+    }
 
     public void sysInit1HistoryPanel() {
         LogUtil.info("=====v1.8版本 仪表板私有化【开始】=====");

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

@@ -8,6 +8,7 @@ import io.dataease.base.domain.PanelView;
 import io.dataease.base.domain.PanelViewExample;
 import io.dataease.base.mapper.PanelViewMapper;
 import io.dataease.base.mapper.ext.ExtChartViewMapper;
+import io.dataease.base.mapper.ext.ExtPanelGroupMapper;
 import io.dataease.base.mapper.ext.ExtPanelViewMapper;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.BeanUtils;
@@ -43,6 +44,8 @@ public class PanelViewService {
     @Resource
     private ExtChartViewMapper extChartViewMapper;
 
+    private ExtPanelGroupMapper extPanelGroupMapper;
+
     private final static String SCENE_TYPE = "scene";
 
     public List<PanelViewDto> groups() {
@@ -127,6 +130,8 @@ public class PanelViewService {
             }
         }
         panelGroup.setMobileLayout(mobileLayout);
+        //移除没有用到的仪表板私有视图
+        extPanelGroupMapper.removeUselessViews(panelId,viewIds);
         return viewIds;
     }
 

backend/src/main/resources/db/migration/V33__1.9.sql

@@ -34,6 +34,41 @@ CREATE TABLE `chart_view_cache` (
 
 SET FOREIGN_KEY_CHECKS = 1;
 
+ALTER TABLE `panel_view`
+ADD COLUMN `data_from` varchar(255) NULL  DEFAULT 'chart'  COMMENT '当前数据来源 chart 视图 template 模板' AFTER `copy_id`;
+
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for panel_group_extend
+-- ----------------------------
+DROP TABLE IF EXISTS `panel_group_extend`;
+CREATE TABLE `panel_group_extend` (
+  `id` varchar(50) NOT NULL,
+  `panel_id` varchar(50) DEFAULT NULL,
+  `template_id` varchar(50) DEFAULT NULL COMMENT '模板来源id',
+  `template_dynamic_data` longtext COMMENT '模板动态数据',
+  `template_version` varchar(255) DEFAULT NULL COMMENT '模板版本号(预留)',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for panel_group_extend_data
+-- ----------------------------
+DROP TABLE IF EXISTS `panel_group_extend_data`;
+CREATE TABLE `panel_group_extend_data` (
+  `id` varchar(50) NOT NULL,
+  `panel_id` varchar(50) DEFAULT NULL,
+  `view_id` varchar(50) DEFAULT NULL,
+  `view_details` longtext,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
 CREATE TABLE `de_engine` (
  `id` varchar(50) NOT NULL DEFAULT '' COMMENT 'ID',
  `name` varchar(50) DEFAULT NULL COMMENT '名称',
@@ -45,4 +80,4 @@ CREATE TABLE `de_engine` (
  `create_by` varchar(50) DEFAULT NULL COMMENT '创建人ID',
  `status` varchar(45) DEFAULT NULL COMMENT '状态',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

frontend/src/components/canvas/custom-component/UserView.vue

@@ -269,7 +269,8 @@ export default {
       'publicLinkStatus',
       'previewCanvasScale',
       'mobileLayoutStatus',
-      'componentData'
+      'componentData',
+      'panelViewDetailsInfo'
     ])
   },
 
@@ -450,6 +451,9 @@ export default {
           // 将视图传入echart组件
           if (response.success) {
             this.chart = response.data
+            this.chart['position'] = this.inTab ? 'tab' : 'panel'
+            // 记录当前数据
+            this.panelViewDetailsInfo[id] = JSON.stringify(this.chart)
             this.sourceCustomAttrStr = this.chart.customAttr
             this.sourceCustomStyleStr = this.chart.customStyle
             this.chart.drillFields = this.chart.drillFields ? JSON.parse(this.chart.drillFields) : []

frontend/src/store/index.js

@@ -101,7 +101,9 @@ const data = {
     },
     scrollAutoMove: 0,
     // 视图是否编辑记录
-    panelViewEditInfo: {}
+    panelViewEditInfo: {},
+    // 仪表板视图明细
+    panelViewDetailsInfo: {}
   },
   mutations: {
     ...animation.mutations,

frontend/src/views/panel/list/EditPanel/index.vue

@@ -2,13 +2,13 @@
   <el-row v-loading="loading">
     <el-row v-if="editPanel.optType==='new' && editPanel.panelInfo.nodeType==='panel'">
       <el-col :span="18" style="height: 40px">
-        <el-radio v-model="inputType" label="self"> {{ $t('panel.custom') }}</el-radio>
-        <!--        <el-radio v-model="inputType" label="import">{{ $t('panel.import_template') }}  </el-radio>-->
-        <el-radio v-model="inputType" label="copy" @click.native="getTree">{{ $t('panel.copy_template') }}  </el-radio>
+        <el-radio v-model="inputType" label="new"> {{ $t('panel.custom') }}</el-radio>
+        <!--        <el-radio v-model="inputType" label="new_outer_template">{{ $t('panel.import_template') }}  </el-radio>-->
+        <el-radio v-model="inputType" label="new_inner_template" @click.native="getTree">{{ $t('panel.copy_template') }}  </el-radio>
       </el-col>
-      <el-col v-if="inputType==='import'" :span="6">
+      <el-col v-if="inputType==='new_outer_template'" :span="6">
         <el-button class="el-icon-upload" size="small" type="primary" @click="goFile">{{ $t('panel.upload_template') }}</el-button>
-        <input id="input" ref="files" type="file" accept=".DE" hidden @change="handleFileChange">
+        <input id="input" ref="files" type="file" accept=".DET" hidden @change="handleFileChange">
       </el-col>
     </el-row>
     <el-row style="margin-top: 5px">
@@ -17,7 +17,7 @@
         <el-input v-model="editPanel.panelInfo.name" clearable size="mini" />
       </el-col>
     </el-row>
-    <el-row v-if="inputType==='copy'" class="preview">
+    <el-row v-if="inputType==='new_inner_template'" class="preview">
       <el-col :span="8" style="height:100%;overflow-y: auto">
         <template-all-list :template-list="templateList" @showCurrentTemplateInfo="showCurrentTemplateInfo" />
       </el-col>
@@ -48,7 +48,7 @@ export default {
   data() {
     return {
       loading: false,
-      inputType: 'self',
+      inputType: 'new',
       fieldName: 'name',
       tableRadio: null,
       keyWordSearch: '',
@@ -73,13 +73,14 @@ export default {
   },
   watch: {
     inputType(newVal) {
-      if (newVal === 'self') {
+      if (newVal === 'new') {
         this.editPanel = deepCopy(this.editPanelOut)
       } else {
         this.editPanel.panelInfo.name = null
         this.editPanel.panelInfo.panelStyle = null
         this.editPanel.panelInfo.panelData = null
         this.importTemplateInfo.snapshot = null
+        this.editPanel.panelInfo.templateId = null
       }
     }
   },
@@ -107,9 +108,10 @@ export default {
       document.removeEventListener('keypress', this.entryKey)
     },
     showCurrentTemplateInfo(data) {
+      this.editPanel.panelInfo.templateId = data.id
       this.editPanel.panelInfo.name = data.name
-      this.editPanel.panelInfo.panelStyle = data.templateStyle
-      this.editPanel.panelInfo.panelData = data.templateData
+      // this.editPanel.panelInfo.panelStyle = data.templateStyle
+      // this.editPanel.panelInfo.panelData = data.templateData
       this.importTemplateInfo.snapshot = data.snapshot
     },
     getTree() {
@@ -139,10 +141,11 @@ export default {
         return false
       }
 
-      if (!this.editPanel.panelInfo.panelData && this.editPanel.optType === 'new' && this.inputType === 'copy') {
+      if (!this.editPanel.panelInfo.templateId && this.editPanel.optType === 'new' && this.inputType === 'new_inner_template') {
         this.$warning(this.$t('chart.template_can_not_empty'))
         return false
       }
+      this.editPanel.panelInfo['newFrom'] = this.inputType
       panelSave(this.editPanel.panelInfo).then(response => {
         this.$message({
           message: this.$t('commons.save_success'),

frontend/src/views/panel/list/PanelViewShow.vue

@@ -187,7 +187,8 @@ export default {
     },
     ...mapState([
       'componentData',
-      'canvasStyleData'
+      'canvasStyleData',
+      'panelViewDetailsInfo'
     ])
   },
   watch: {
@@ -246,7 +247,7 @@ export default {
               nodeType: 'template',
               level: 1,
               pid: null,
-              dynamicData: ''
+              dynamicData: JSON.stringify(this.panelViewDetailsInfo)
             }
           }
         })
@@ -265,10 +266,10 @@ export default {
               snapshot: snapshot,
               panelStyle: JSON.stringify(this.canvasStyleData),
               panelData: JSON.stringify(this.componentData),
-              dynamicData: ''
+              dynamicData: JSON.stringify(this.panelViewDetailsInfo)
             }
             const blob = new Blob([JSON.stringify(this.templateInfo)], { type: '' })
-            FileSaver.saveAs(blob, this.$store.state.panel.panelInfo.name + '-TEMPLATE.DE')
+            FileSaver.saveAs(blob, this.$store.state.panel.panelInfo.name + '-TEMPLATE.DET')
           }
         })
       }, 50)

frontend/src/views/panel/template/component/TemplateImport.vue

@@ -7,7 +7,7 @@
       </el-col>
       <el-col :span="4">
         <el-button style="margin-left: 10px" class="el-icon-upload" size="small" type="primary" @click="goFile">{{ $t('panel.upload_template') }}</el-button>
-        <input id="input" ref="files" type="file" accept=".DE" hidden @change="handleFileChange">
+        <input id="input" ref="files" type="file" accept=".DET" hidden @change="handleFileChange">
       </el-col>
     </el-row>
     <el-row class="preview" :style="classBackground" />