Date: Mon, 28 Feb 2022 13:01:45 +0800
Subject: [PATCH 19/61] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80?=
=?UTF-8?q?=E8=A6=81=E7=9A=84=E5=B7=A5=E5=85=B7=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/util/jsonschema/BaseColumn.java | 28 ---
.../util/jsonschema/CommonProperty.java | 195 ------------------
.../util/jsonschema/JsonSchemaDescrip.java | 87 --------
.../util/jsonschema/JsonschemaUtil.java | 70 -------
.../jsonschema/validate/DictProperty.java | 82 --------
.../jsonschema/validate/HiddenProperty.java | 38 ----
.../jsonschema/validate/LinkDownProperty.java | 66 ------
.../jsonschema/validate/NumberProperty.java | 153 --------------
.../jsonschema/validate/PopupProperty.java | 76 -------
.../jsonschema/validate/StringProperty.java | 119 -----------
.../jsonschema/validate/SwitchProperty.java | 46 -----
.../validate/TreeSelectProperty.java | 146 -------------
12 files changed, 1106 deletions(-)
delete mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/BaseColumn.java
delete mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/CommonProperty.java
delete mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/JsonSchemaDescrip.java
delete mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/JsonschemaUtil.java
delete mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/DictProperty.java
delete mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/HiddenProperty.java
delete mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/LinkDownProperty.java
delete mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/NumberProperty.java
delete mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/PopupProperty.java
delete mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/StringProperty.java
delete mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/SwitchProperty.java
delete mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/TreeSelectProperty.java
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/BaseColumn.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/BaseColumn.java
deleted file mode 100644
index 5a77ac23..00000000
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/BaseColumn.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.jero.common.util.jsonschema;
-
-import lombok.Data;
-
-/**
- * 列 配置基本信息
- */
-@Data
-public class BaseColumn {
-
- /**
- * 列配置 描述 -对应数据库字段描述
- */
- private String title;
-
- /**
- * 列配置 名称 -对应数据库字段名
- */
- private String field;
-
- public BaseColumn(){}
-
- public BaseColumn(String title,String field){
- this.title = title;
- this.field = field;
- }
-
-}
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/CommonProperty.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/CommonProperty.java
deleted file mode 100644
index 891575df..00000000
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/CommonProperty.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.jero.common.util.jsonschema;
-
-import com.alibaba.fastjson.JSONObject;
-import com.jero.common.system.vo.DictModel;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 验证通用属性
- */
-public abstract class CommonProperty implements Serializable{
-
- private static final long serialVersionUID = -426159949502493187L;
-
-
- protected String key;
-
-
- /**
- * 此关键字的值必须是字符串或数组。如果它是一个数组，那么数组的元素必须是字符串，并且必须是唯一的。
- *
字符串值必须是六种基本类型之一（“null”，“boolean”，“object”，“array”，“number”或“string”），或“integer”，它匹配任何数字，零分数部分。
- *
当且仅当实例位于为此关键字列出的任何集合中时，实例才会验证。
- *
- */
- protected String type;
-
- /**
- * 对应JsonSchema的enum
- *
该关键字的值必须是一个数组。这个数组应该至少有一个元素。数组中的元素应该是唯一的。如果实例的值等于此关键字的数组值中的某个元素，则实例将对此关键字成功验证。
- * 数组中的元素可以是任何值，包括null
- *
- * {
- * "type": "string",
- * "enum": ["1", "2", "3"] 需要的话可以通过这个include转一下
- * }
- */
- protected List include;
-
- /**
- * 对应JsonSchema的const
- * 此关键字的值可以是任何类型，包括null。
- * 如果实例的值等于关键字的值，则实例将针对此关键字成功验证。
- */
- protected Object constant;
-
- //三个自定义 属性
- protected String view;// 展示类型
- protected String title;//数据库字段备注
- protected Integer order;//字段显示排序
-
- protected boolean disabled;//是否禁用
-
- protected String defVal; // 字段默认值
-
- protected String fieldExtendJson;//扩展参数
-
- protected Integer dbPointLength;//小数点
-
- public String getDefVal() {
- return defVal;
- }
-
- public void setDefVal(String defVal) {
- this.defVal = defVal;
- }
-
- public boolean isDisabled() {
- return disabled;
- }
-
- public void setDisabled(boolean disabled) {
- this.disabled = disabled;
- }
-
- public String getView() {
- return view;
- }
-
- public void setView(String view) {
- this.view = view;
- }
-
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public List getInclude() {
- return include;
- }
-
- public void setInclude(List include) {
- this.include = include;
- }
-
- public Object getConstant() {
- return constant;
- }
-
- public void setConstant(Object constant) {
- this.constant = constant;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public Integer getOrder() {
- return order;
- }
-
- public void setOrder(Integer order) {
- this.order = order;
- }
-
- public String getFieldExtendJson() {
- return fieldExtendJson;
- }
-
- public void setFieldExtendJson(String fieldExtendJson) {
- this.fieldExtendJson = fieldExtendJson;
- }
-
- public Integer getDbPointLength() {
- return dbPointLength;
- }
-
- public void setDbPointLength(Integer dbPointLength) {
- this.dbPointLength = dbPointLength;
- }
-
- /**
- * 返回一个map有两个key
- * key ---> Property JSON的key
- *
prop --> JSON object
- * @return
- */
- public abstract Map getPropertyJson();
-
- public JSONObject getCommonJson() {
- JSONObject json = new JSONObject();
- json.put("type", type);
- if(include!=null && include.size()>0) {
- json.put("enum", include);
- }
- if(constant!=null) {
- json.put("const", constant);
- }
- if(title!=null) {
- json.put("title", title);
- }
- if(order!=null) {
- json.put("order", order);
- }
- if(view==null) {
- json.put("view", "input");
- }else {
- json.put("view", view);
- }
- if(disabled) {
- String str = "{\"widgetattrs\":{\"disabled\":true}}";
- JSONObject ui = JSONObject.parseObject(str);
- json.put("ui", ui);
- }
- if (defVal!=null && defVal.length()>0) {
- json.put("defVal", defVal);
- }
- if(fieldExtendJson != null){
- json.put("fieldExtendJson", fieldExtendJson);
- }
- if(dbPointLength !=null ) {
- json.put("dbPointLength", dbPointLength);
- }
- return json;
- }
-
-
-}
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/JsonSchemaDescrip.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/JsonSchemaDescrip.java
deleted file mode 100644
index e75797fb..00000000
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/JsonSchemaDescrip.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.jero.common.util.jsonschema;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * JsonSchema 模式类
- * < http://json-schema.org/draft-07/schema# >
- */
-public class JsonSchemaDescrip implements Serializable{
-
- /**
- *
- */
- private static final long serialVersionUID = 7682073117441544718L;
-
-
- private String $schema = "http://json-schema.org/draft-07/schema#";
-
- /**
- * 用它给我们的模式提供了标题。
- */
- private String title;
-
- /**
- * 关于模式的描述。
- */
- private String description;
-
- /**
- *type 关键字在我们的 JSON 数据上定义了第一个约束：必须是一个 JSON 对象。 可以直接设置成object
- */
- private String type;
-
- private List required;
-
-
- public List getRequired() {
- return required;
- }
-
- public void setRequired(List required) {
- this.required = required;
- }
-
- public String get$schema() {
- return $schema;
- }
-
- public void set$schema(String $schema) {
- this.$schema = $schema;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public JsonSchemaDescrip() {}
-
- public JsonSchemaDescrip(List required) {
- this.description="我是一个jsonschema description";
- this.title="我是一个jsonschema title";
- this.type="object";
- this.required = required;
- }
-
-}
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/JsonschemaUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/JsonschemaUtil.java
deleted file mode 100644
index 91fab531..00000000
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/JsonschemaUtil.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.jero.common.util.jsonschema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class JsonschemaUtil {
-
- /**
- * 生成JsonSchema
- *
- * @param descrip
- * @param propertyList
- * @return
- */
- public static JSONObject getJsonSchema(JsonSchemaDescrip descrip, List propertyList) {
- JSONObject obj = new JSONObject();
- obj.put("$schema", descrip.get$schema());
- obj.put("type", descrip.getType());
- obj.put("title", descrip.getTitle());
-
- List requiredArr = descrip.getRequired();
- obj.put("required", requiredArr);
-
- JSONObject properties = new JSONObject();
- for (CommonProperty commonProperty : propertyList) {
- Map map = commonProperty.getPropertyJson();
- properties.put(map.get("key").toString(), map.get("prop"));
- }
- obj.put("properties", properties);
- //鬼知道这里为什么报错 com.jero.modules.system.model.DictModel cannot be cast to com.jero.modules.system.model.DictModel
- //log.info("---JSONSchema--->"+obj.toJSONString());
- return obj;
- }
-
- /**
- * 生成JsonSchema 用于子对象
- * @param title 子对象描述
- * @param requiredArr 子对象必填属性名集合
- * @param propertyList 子对象属性集合
- * @return
- */
- public static JSONObject getSubJsonSchema(String title,List requiredArr,List propertyList) {
- JSONObject obj = new JSONObject();
- obj.put("type", "object");
- obj.put("view", "tab");
- obj.put("title", title);
-
- if(requiredArr==null) {
- requiredArr = new ArrayList();
- }
- obj.put("required", requiredArr);
-
- JSONObject properties = new JSONObject();
- for (CommonProperty commonProperty : propertyList) {
- Map map = commonProperty.getPropertyJson();
- properties.put(map.get("key").toString(), map.get("prop"));
- }
- obj.put("properties", properties);
- //log.info("---JSONSchema--->"+obj.toString());
- return obj;
- }
-
-}
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/DictProperty.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/DictProperty.java
deleted file mode 100644
index 7a235d9a..00000000
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/DictProperty.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.jero.common.util.jsonschema.validate;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.jero.common.util.jsonschema.CommonProperty;
-
-import com.alibaba.fastjson.JSONObject;
-
-/**
- * 字典属性
- * @author 86729
- *
- */
-public class DictProperty extends CommonProperty {
-
- private static final long serialVersionUID = 3786503639885610767L;
-
- //字典三属性
- private String dictCode;
- private String dictTable;
- private String dictText;
-
- public String getDictCode() {
- return dictCode;
- }
-
- public void setDictCode(String dictCode) {
- this.dictCode = dictCode;
- }
-
- public String getDictTable() {
- return dictTable;
- }
-
- public void setDictTable(String dictTable) {
- this.dictTable = dictTable;
- }
-
- public String getDictText() {
- return dictText;
- }
-
- public void setDictText(String dictText) {
- this.dictText = dictText;
- }
-
- public DictProperty() {}
-
- /**
- * 构造器
- */
- public DictProperty(String key,String title,String dictTable,String dictCode,String dictText) {
- this.type = "string";
- this.view = "sel_search";
- this.key = key;
- this.title = title;
- this.dictCode = dictCode;
- this.dictTable= dictTable;
- this.dictText= dictText;
- }
-
- @Override
- public Map getPropertyJson() {
- Map map = new HashMap<>();
- map.put("key",getKey());
- JSONObject prop = getCommonJson();
- if(dictCode!=null) {
- prop.put("dictCode",dictCode);
- }
- if(dictTable!=null) {
- prop.put("dictTable",dictTable);
- }
- if(dictText!=null) {
- prop.put("dictText",dictText);
- }
- map.put("prop",prop);
- return map;
- }
-
- //TODO 重构问题：数据字典 只是字符串类的还是有存储的数值类型？只有字符串请跳过这个 只改前端
-}
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/HiddenProperty.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/HiddenProperty.java
deleted file mode 100644
index 2cb95058..00000000
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/HiddenProperty.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.jero.common.util.jsonschema.validate;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.jero.common.util.jsonschema.CommonProperty;
-
-import com.alibaba.fastjson.JSONObject;
-
-/**
- * 字典属性
- * @author 86729
- *
- */
-public class HiddenProperty extends CommonProperty {
-
- private static final long serialVersionUID = -8939298551502162479L;
-
- public HiddenProperty() {}
-
- public HiddenProperty(String key,String title) {
- this.type = "string";
- this.view = "hidden";
- this.key = key;
- this.title = title;
- }
-
- @Override
- public Map getPropertyJson() {
- Map map = new HashMap<>();
- map.put("key",getKey());
- JSONObject prop = getCommonJson();
- prop.put("hidden",true);
- map.put("prop",prop);
- return map;
- }
-
-}
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/LinkDownProperty.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/LinkDownProperty.java
deleted file mode 100644
index 3815d477..00000000
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/LinkDownProperty.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.jero.common.util.jsonschema.validate;
-
-import com.alibaba.fastjson.JSONObject;
-import com.jero.common.util.jsonschema.BaseColumn;
-import com.jero.common.util.jsonschema.CommonProperty;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 级联下拉
- */
-public class LinkDownProperty extends CommonProperty {
-
- /**
- * 配置信息
- */
- String dictTable;
-
- /**
- * 级联下拉组件 的其他级联列
- */
- List otherColumns;
-
- public String getDictTable(){
- return this.dictTable;
- }
-
- public void setDictTable(String dictTable){
- this.dictTable = dictTable;
- }
-
- public List getOtherColumns(){
- return this.otherColumns;
- }
-
- public void setOtherColumns(List otherColumns){
- this.otherColumns = otherColumns;
- }
-
- public LinkDownProperty() {}
-
- /**
- * 构造器
- */
- public LinkDownProperty(String key,String title,String dictTable) {
- this.type = "string";
- this.view = "link_down";
- this.key = key;
- this.title = title;
- this.dictTable= dictTable;
- }
-
- @Override
- public Map getPropertyJson() {
- Map map = new HashMap<>();
- map.put("key", getKey());
- JSONObject prop = getCommonJson();
- JSONObject temp = JSONObject.parseObject(this.dictTable);
- prop.put("config", temp);
- prop.put("others", otherColumns);
- map.put("prop", prop);
- return map;
- }
-}
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/NumberProperty.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/NumberProperty.java
deleted file mode 100644
index 174f595d..00000000
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/NumberProperty.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.jero.common.util.jsonschema.validate;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.jero.common.system.vo.DictModel;
-import com.jero.common.util.jsonschema.CommonProperty;
-
-import com.alibaba.fastjson.JSONObject;
-
-public class NumberProperty extends CommonProperty {
-
- private static final long serialVersionUID = -558615331436437200L;
-
- /**
- * 倍数
- * 验证实例是否为此数值的倍数
- * “multipleOf”的值必须是一个数字，严格大于0。
- */
- private Integer multipleOf;
-
- /**
- * 小于等于
- * “maximum”的值必须是一个数字，表示数字实例的包含上限。
- * 如果实例是数字，则仅当实例小于或等于“最大”时，此关键字才会生效。
- */
- private Integer maxinum;
-
- /**
- * 小于
- * “exclusiveMaximum”的值必须是数字，表示数字实例的独占上限。
- * 如果实例是数字，则实例仅在其值严格小于（不等于）“exclusiveMaximum”时才有效。
- */
- private Integer exclusiveMaximum;
-
- /**
- * 大于等于
- */
- private Integer minimum;
-
- /**
- * 大于等于
- */
- private Integer exclusiveMinimum;
-
- private String pattern;
-
- public Integer getMultipleOf() {
- return multipleOf;
- }
-
- public void setMultipleOf(Integer multipleOf) {
- this.multipleOf = multipleOf;
- }
-
- public Integer getMaxinum() {
- return maxinum;
- }
-
- public void setMaxinum(Integer maxinum) {
- this.maxinum = maxinum;
- }
-
- public Integer getExclusiveMaximum() {
- return exclusiveMaximum;
- }
-
- public void setExclusiveMaximum(Integer exclusiveMaximum) {
- this.exclusiveMaximum = exclusiveMaximum;
- }
-
- public Integer getMinimum() {
- return minimum;
- }
-
- public void setMinimum(Integer minimum) {
- this.minimum = minimum;
- }
-
- public Integer getExclusiveMinimum() {
- return exclusiveMinimum;
- }
-
- public void setExclusiveMinimum(Integer exclusiveMinimum) {
- this.exclusiveMinimum = exclusiveMinimum;
- }
-
- public String getPattern() {
- return pattern;
- }
-
- public void setPattern(String pattern) {
- this.pattern = pattern;
- }
-
- public NumberProperty() {}
-
- /**
- * 构造器
- * @param key 字段名
- * @param title 字段备注
- * @param type number和integer
- */
- public NumberProperty(String key,String title,String type) {
- this.key = key;
- this.type = type;
- this.title = title;
- this.view = "number";
- }
-
- /**
- * 列表类型的走这个构造器 字典里存储的都是字符串 没法走这个构造器
- * @param key
- * @param type
- * @param view list-checkbox-radio
- * @param include
- */
- public NumberProperty(String key,String title,String view,List include) {
- this.type = "integer";
- this.key = key;
- this.view = view;
- this.title = title;
- this.include = include;
- }
-
- @Override
- public Map getPropertyJson() {
- Map map = new HashMap<>();
- map.put("key",getKey());
- JSONObject prop = getCommonJson();
- if(multipleOf!=null) {
- prop.put("multipleOf",multipleOf);
- }
- if(maxinum!=null) {
- prop.put("maxinum",maxinum);
- }
- if(exclusiveMaximum!=null) {
- prop.put("exclusiveMaximum",exclusiveMaximum);
- }
- if(minimum!=null) {
- prop.put("minimum",minimum);
- }
- if(exclusiveMinimum!=null) {
- prop.put("exclusiveMinimum",exclusiveMinimum);
- }
- if(pattern!=null) {
- prop.put("pattern",pattern);
- }
- map.put("prop",prop);
- return map;
- }
-}
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/PopupProperty.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/PopupProperty.java
deleted file mode 100644
index b025d49b..00000000
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/PopupProperty.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.jero.common.util.jsonschema.validate;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.jero.common.util.jsonschema.CommonProperty;
-
-import com.alibaba.fastjson.JSONObject;
-
-public class PopupProperty extends CommonProperty {
-
- private static final long serialVersionUID = -3200493311633999539L;
-
- private String code;
-
- private String destFields;
-
- private String orgFields;
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getDestFields() {
- return destFields;
- }
-
- public void setDestFields(String destFields) {
- this.destFields = destFields;
- }
-
- public String getOrgFields() {
- return orgFields;
- }
-
- public void setOrgFields(String orgFields) {
- this.orgFields = orgFields;
- }
-
- public PopupProperty() {}
-
- public PopupProperty(String key,String title,String code,String destFields,String orgFields) {
- this.view = "popup";
- this.type = "string";
- this.key = key;
- this.title = title;
- this.code = code;
- this.destFields=destFields;
- this.orgFields=orgFields;
- }
-
-
- @Override
- public Map getPropertyJson() {
- Map map = new HashMap<>();
- map.put("key",getKey());
- JSONObject prop = getCommonJson();
- if(code!=null) {
- prop.put("code",code);
- }
- if(destFields!=null) {
- prop.put("destFields",destFields);
- }
- if(orgFields!=null) {
- prop.put("orgFields",orgFields);
- }
- map.put("prop",prop);
- return map;
- }
-
-}
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/StringProperty.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/StringProperty.java
deleted file mode 100644
index 124740f7..00000000
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/StringProperty.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.jero.common.util.jsonschema.validate;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.jero.common.system.vo.DictModel;
-import com.jero.common.util.jsonschema.CommonProperty;
-
-import com.alibaba.fastjson.JSONObject;
-
-public class StringProperty extends CommonProperty {
-
- private static final long serialVersionUID = -3200493311633999539L;
-
- private Integer maxLength;
-
- private Integer minLength;
-
- /**
- * 根据ECMA 262正则表达式方言，该字符串应该是有效的正则表达式。
- */
- private String pattern;
-
- /**
- * 错误提示信息
- */
- private String errorInfo;
-
- public Integer getMaxLength() {
- return maxLength;
- }
-
-
- public void setMaxLength(Integer maxLength) {
- this.maxLength = maxLength;
- }
-
- public Integer getMinLength() {
- return minLength;
- }
-
- public void setMinLength(Integer minLength) {
- this.minLength = minLength;
- }
-
- public String getPattern() {
- return pattern;
- }
-
- public void setPattern(String pattern) {
- this.pattern = pattern;
- }
-
- public String getErrorInfo() {
- return errorInfo;
- }
-
-
- public void setErrorInfo(String errorInfo) {
- this.errorInfo = errorInfo;
- }
-
-
- public StringProperty() {}
-
- /**
- * 一般字符串类型走这个构造器
- * @param key 字段名
- * @param title 字段备注
- * @param view 展示控件
- * @param maxLength 数据库字段最大长度
- */
- public StringProperty(String key,String title,String view,Integer maxLength) {
- this.maxLength = maxLength;
- this.key = key;
- this.view = view;
- this.title = title;
- this.type = "string";
- }
-
- /**
- * 列表类型的走这个构造器
- * @param key 字段名
- * @param title 字段备注
- * @param view 展示控件 list-checkbox-radio
- * @param maxLength 数据库字段最大长度
- * @param include 数据字典
- */
- public StringProperty(String key,String title,String view,Integer maxLength,List include) {
- this.maxLength = maxLength;
- this.key = key;
- this.view = view;
- this.title = title;
- this.type = "string";
- this.include = include;
- }
- @Override
- public Map getPropertyJson() {
- Map map = new HashMap<>();
- map.put("key",getKey());
- JSONObject prop = getCommonJson();
- if(maxLength!=null) {
- prop.put("maxLength",maxLength);
- }
- if(minLength!=null) {
- prop.put("minLength",minLength);
- }
- if(pattern!=null) {
- prop.put("pattern",pattern);
- }
- if(errorInfo!=null) {
- prop.put("errorInfo",errorInfo);
- }
- map.put("prop",prop);
- return map;
- }
-
-}
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/SwitchProperty.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/SwitchProperty.java
deleted file mode 100644
index 46ff15b2..00000000
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/SwitchProperty.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.jero.common.util.jsonschema.validate;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.jero.common.util.jsonschema.CommonProperty;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 开关 属性
- */
-public class SwitchProperty extends CommonProperty {
-
- //扩展参数配置信息
- private String extendStr;
-
- public SwitchProperty() {}
-
- /**
- * 构造器
- */
- public SwitchProperty(String key, String title, String extendStr) {
- this.type = "string";
- this.view = "switch";
- this.key = key;
- this.title = title;
- this.extendStr = extendStr;
- }
-
- @Override
- public Map getPropertyJson() {
- Map map = new HashMap<>();
- map.put("key",getKey());
- JSONObject prop = getCommonJson();
- JSONArray array = new JSONArray();
- if(extendStr!=null) {
- array = JSONArray.parseArray(extendStr);
- prop.put("extendOption",array);
- }
- map.put("prop",prop);
- return map;
- }
-
- //TODO 重构问题：数据字典 只是字符串类的还是有存储的数值类型？只有字符串请跳过这个 只改前端
-}
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/TreeSelectProperty.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/TreeSelectProperty.java
deleted file mode 100644
index 96160879..00000000
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/jsonschema/validate/TreeSelectProperty.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.jero.common.util.jsonschema.validate;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.jero.common.util.jsonschema.CommonProperty;
-
-import com.alibaba.fastjson.JSONObject;
-
-/**
- * 字典属性
- * @author 86729
- *
- */
-public class TreeSelectProperty extends CommonProperty {
-
- private static final long serialVersionUID = 3786503639885610767L;
-
- private String dict;//表名,文本,id
- private String pidField;//父级字段 默认pid
- private String pidValue;//父级节点的值 暂时没用到 默认为0
- private String hasChildField;
- private String textField;//树形下拉保存text值的字段名
-
- /**
- * 是不是pid 组件 1是 0否
- */
- private Integer pidComponent = 0;
-
- public String getDict() {
- return dict;
- }
-
- public void setDict(String dict) {
- this.dict = dict;
- }
-
- public String getPidField() {
- return pidField;
- }
-
- public void setPidField(String pidField) {
- this.pidField = pidField;
- }
-
- public String getPidValue() {
- return pidValue;
- }
-
- public void setPidValue(String pidValue) {
- this.pidValue = pidValue;
- }
-
- public String getHasChildField() {
- return hasChildField;
- }
-
- public void setHasChildField(String hasChildField) {
- this.hasChildField = hasChildField;
- }
-
- public TreeSelectProperty() {}
-
- public String getTextField() {
- return textField;
- }
-
- public void setTextField(String textField) {
- this.textField = textField;
- }
-
- public Integer getPidComponent() {
- return pidComponent;
- }
-
- public void setPidComponent(Integer pidComponent) {
- this.pidComponent = pidComponent;
- }
-
- /**
- * 构造器 构造普通树形下拉
- */
- public TreeSelectProperty(String key,String title,String dict,String pidField,String pidValue) {
- this.type = "string";
- this.view = "sel_tree";
- this.key = key;
- this.title = title;
- this.dict = dict;
- this.pidField= pidField;
- this.pidValue= pidValue;
- }
-
- /**
- * 分类字典下拉专用
- * @param key
- * @param title
- * @param pidValue
- */
- public TreeSelectProperty(String key,String title,String pidValue) {
- this.type = "string";
- this.view = "cat_tree";
- this.key = key;
- this.title = title;
- this.pidValue = pidValue;
- }
-
- /**
- * 分类字典 支持存储text 下拉专用
- * @param key
- * @param title
- * @param pidValue
- * @param textField
- */
- public TreeSelectProperty(String key,String title,String pidValue,String textField) {
- this(key,title,pidValue);
- this.textField = textField;
- }
-
- @Override
- public Map getPropertyJson() {
- Map map = new HashMap<>();
- map.put("key",getKey());
- JSONObject prop = getCommonJson();
- if(dict!=null) {
- prop.put("dict",dict);
- }
- if(pidField!=null) {
- prop.put("pidField",pidField);
- }
- if(pidValue!=null) {
- prop.put("pidValue",pidValue);
- }
- if(textField!=null) {
- prop.put("textField",textField);
- }
- if(hasChildField!=null) {
- prop.put("hasChildField",hasChildField);
- }
- if(pidComponent!=null) {
- prop.put("pidComponent",pidComponent);
- }
- map.put("prop",prop);
- return map;
- }
-
-}
From bfea29550dcdd7965c2b08f02b27d5cc939b35d6 Mon Sep 17 00:00:00 2001
From: zer0Black
Date: Mon, 28 Feb 2022 13:08:23 +0800
Subject: [PATCH 20/61] =?UTF-8?q?JEditableTable=E7=BB=84=E4=BB=B6popup?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=AE=BE=E7=BD=AE=E5=BF=85=E5=A1=AB=E6=A0=A1?=
=?UTF-8?q?=E9=AA=8C=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/components/jero/JEditableTable.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jero-web/src/components/jero/JEditableTable.vue b/jero-web/src/components/jero/JEditableTable.vue
index 4e0550b1..09efcb30 100644
--- a/jero-web/src/components/jero/JEditableTable.vue
+++ b/jero-web/src/components/jero/JEditableTable.vue
@@ -2704,7 +2704,7 @@
}
this.setOneValue(this.popupValues, id, popupValue)
// 做单个表单验证
- this.validateOneInput(value, row, column, this.notPassedIds, true, 'change')
+ this.validateOneInput(popupValue, row, column, this.notPassedIds, true, 'change')
// 触发valueChange 事件
this.elemValueChange('input', row, column, value)
},
From 5916a76898b732a32f288a71f237cb863e37f5cc Mon Sep 17 00:00:00 2001
From: zer0Black
Date: Mon, 28 Feb 2022 13:11:34 +0800
Subject: [PATCH 21/61] =?UTF-8?q?JImageUpload=E7=BB=84=E4=BB=B6=E5=8D=95?=
=?UTF-8?q?=E5=BC=A0=E6=97=A0=E6=B3=95=E9=A2=84=E8=A7=88=E5=92=8C=E5=88=A0?=
=?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/components/jero/JImageUpload.vue | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/jero-web/src/components/jero/JImageUpload.vue b/jero-web/src/components/jero/JImageUpload.vue
index e6e66a56..6eb18b5d 100644
--- a/jero-web/src/components/jero/JImageUpload.vue
+++ b/jero-web/src/components/jero/JImageUpload.vue
@@ -11,16 +11,14 @@
:beforeUpload="beforeUpload"
:disabled="disabled"
:isMultiple="isMultiple"
- :showUploadList="isMultiple"
v-bind="$attrs"
v-on="childListeners"
@change="handleChange"
@preview="handlePreview"
- :class="!isMultiple?'imgupload':''">
-
-
![]()
-
-
+ :class="[!isMultiple?'imgupload':'', (!isMultiple && picUrl)?'image-upload-single-over':'' ]">
+
+
+
From 4dd5b749ded58f05c92ea52c1044c328a1e34ceb Mon Sep 17 00:00:00 2001
From: zer0Black
Date: Mon, 28 Feb 2022 13:12:49 +0800
Subject: [PATCH 22/61] =?UTF-8?q?=E5=A4=96=E9=83=A8url=E8=8F=9C=E5=8D=95?=
=?UTF-8?q?=EF=BC=8C=E5=86=85=E9=83=A8=E6=89=93=E5=BC=80=E6=97=B6=EF=BC=8C?=
=?UTF-8?q?=E4=B9=9F=E6=94=AF=E6=8C=81=E9=80=9A=E8=BF=87=20${token}?=
=?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BC=A0=E9=80=92=E5=BD=93=E5=89=8D=E7=99=BB?=
=?UTF-8?q?=E5=BD=95TOKEN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/layouts/IframePageView.vue | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/jero-web/src/components/layouts/IframePageView.vue b/jero-web/src/components/layouts/IframePageView.vue
index 50434423..dee1ddd9 100644
--- a/jero-web/src/components/layouts/IframePageView.vue
+++ b/jero-web/src/components/layouts/IframePageView.vue
@@ -38,16 +38,18 @@
//url = "http://www.baidu.com"
console.log("------url------"+url)
if (url !== null && url !== undefined) {
- this.url = url;
+ //-----------------------------------------------------------------------------------------
+ //url支持通过 ${token}方式传递当前登录TOKEN
+ let tokenStr = "${token}";
+ if(url.indexOf(tokenStr)!=-1) {
+ let token = Vue.ls.get(ACCESS_TOKEN);
+ this.url = url.replace(tokenStr, token);
+ }
+ //-----------------------------------------------------------------------------------------
+
/*update_begin author:wuxianquan date:20190908 for:判断打开方式，新窗口打开时this.$route.meta.internalOrExternal==true */
if(this.$route.meta.internalOrExternal != undefined && this.$route.meta.internalOrExternal==true){
this.closeCurrent();
- //外部url加入token
- let tokenStr = "${token}";
- if(url.indexOf(tokenStr)!=-1){
- let token = Vue.ls.get(ACCESS_TOKEN);
- this.url = url.replace(tokenStr,token);
- }
window.open(this.url);
}
/*update_end author:wuxianquan date:20190908 for:判断打开方式，新窗口打开时this.$route.meta.internalOrExternal==true */
From aafbcd24043979c54dbf461247cd56b1613c7bec Mon Sep 17 00:00:00 2001
From: zer0Black
Date: Mon, 28 Feb 2022 13:13:21 +0800
Subject: [PATCH 23/61] =?UTF-8?q?=E5=A4=96=E9=83=A8URL=E8=8F=9C=E5=8D=95?=
=?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=B8=BA=E7=A9=BA=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/components/layouts/IframePageView.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/jero-web/src/components/layouts/IframePageView.vue b/jero-web/src/components/layouts/IframePageView.vue
index dee1ddd9..1770b07b 100644
--- a/jero-web/src/components/layouts/IframePageView.vue
+++ b/jero-web/src/components/layouts/IframePageView.vue
@@ -44,6 +44,8 @@
if(url.indexOf(tokenStr)!=-1) {
let token = Vue.ls.get(ACCESS_TOKEN);
this.url = url.replace(tokenStr, token);
+ } else {
+ this.url = url
}
//-----------------------------------------------------------------------------------------
From 193d92f968ddbe61b1a0512ff1b20a376d249eaf Mon Sep 17 00:00:00 2001
From: zer0Black
Date: Mon, 28 Feb 2022 13:16:08 +0800
Subject: [PATCH 24/61] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E7=A7=8D=20Cr?=
=?UTF-8?q?on=E8=A1=A8=E8=BE=BE=E5=BC=8F=20=E9=80=89=E6=8B=A9=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/jero/JEasyCron/EasyCron.vue | 281 ++++++++++++++++++
.../components/jero/JEasyCron/InputCron.vue | 99 ++++++
.../components/jero/JEasyCron/format-date.js | 37 +++
.../src/components/jero/JEasyCron/index.js | 6 +
.../components/jero/JEasyCron/tabs/const.js | 21 ++
.../components/jero/JEasyCron/tabs/day.vue | 101 +++++++
.../components/jero/JEasyCron/tabs/hour.vue | 67 +++++
.../components/jero/JEasyCron/tabs/minute.vue | 67 +++++
.../components/jero/JEasyCron/tabs/mixin.js | 162 ++++++++++
.../components/jero/JEasyCron/tabs/mixin.less | 35 +++
.../components/jero/JEasyCron/tabs/month.vue | 67 +++++
.../components/jero/JEasyCron/tabs/second.vue | 68 +++++
.../components/jero/JEasyCron/tabs/week.vue | 118 ++++++++
.../components/jero/JEasyCron/tabs/year.vue | 60 ++++
.../components/jero/JEasyCron/validator.js | 51 ++++
jero-web/src/views/demo/ImgTurnPage.vue | 2 +-
jero-web/src/views/demo/SelectDemo.vue | 2 +-
.../JeroOrderModalForJVexTable.vue | 12 +-
.../views/demo/modules/JeroOrderMainModal.vue | 10 +-
.../demo/tablist/form/JeroOrderDMainModal.vue | 4 +-
20 files changed, 1255 insertions(+), 15 deletions(-)
create mode 100644 jero-web/src/components/jero/JEasyCron/EasyCron.vue
create mode 100644 jero-web/src/components/jero/JEasyCron/InputCron.vue
create mode 100644 jero-web/src/components/jero/JEasyCron/format-date.js
create mode 100644 jero-web/src/components/jero/JEasyCron/index.js
create mode 100644 jero-web/src/components/jero/JEasyCron/tabs/const.js
create mode 100644 jero-web/src/components/jero/JEasyCron/tabs/day.vue
create mode 100644 jero-web/src/components/jero/JEasyCron/tabs/hour.vue
create mode 100644 jero-web/src/components/jero/JEasyCron/tabs/minute.vue
create mode 100644 jero-web/src/components/jero/JEasyCron/tabs/mixin.js
create mode 100644 jero-web/src/components/jero/JEasyCron/tabs/mixin.less
create mode 100644 jero-web/src/components/jero/JEasyCron/tabs/month.vue
create mode 100644 jero-web/src/components/jero/JEasyCron/tabs/second.vue
create mode 100644 jero-web/src/components/jero/JEasyCron/tabs/week.vue
create mode 100644 jero-web/src/components/jero/JEasyCron/tabs/year.vue
create mode 100644 jero-web/src/components/jero/JEasyCron/validator.js
diff --git a/jero-web/src/components/jero/JEasyCron/EasyCron.vue b/jero-web/src/components/jero/JEasyCron/EasyCron.vue
new file mode 100644
index 00000000..73ef4872
--- /dev/null
+++ b/jero-web/src/components/jero/JEasyCron/EasyCron.vue
@@ -0,0 +1,281 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 近十次执行时间（不含年）
+
+
+
+
+
+
+
+
+
+
区间
+ 从
+
+ 日
+ 至
+
+ 日
+
+
循环
+ 从
+
+ 日开始，间隔
+
+ 日
+
+
工作日
+ 本月
+
+ 日，最近的工作日
+
+
+
+
+
+
区间
+ 从
+
+ 时
+ 至
+
+ 时
+
+
循环
+ 从
+
+ 时开始，间隔
+
+ 时
+
+
+
+
+
+
区间
+ 从
+
+ 分
+ 至
+
+ 分
+
+
循环
+ 从
+
+ 分开始，间隔
+
+ 分
+
+
+
+
+
+
区间
+ 从
+
+ 月
+ 至
+
+ 月
+
+
循环
+ 从
+
+ 月开始，间隔
+
+ 月
+
+
+
+
+
+
区间
+ 从
+
+ 秒
+ 至
+
+ 秒
+
+
循环
+ 从
+
+ 秒开始，间隔
+
+ 秒
+
+
+
+
+
+
区间
+ 从
+
+
+ {{k}}
+
+
+ 至
+
+
+ {{k}}
+
+
+
+
循环
+ 从
+
+
+ {{k}}
+
+
+ 开始，间隔
+
+ 天
+
+
+
+
+
+
区间
+ 从
+
+ 年
+ 至
+
+ 年
+
+
循环
+ 从
+
+ 年开始，间隔
+
+ 年
+
+