coder-xiaomo/epp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity GitHub Gitee

bugfix 修复若干商品管理Bug；小程序商品列表不展示下架商品

Browse Source
This commit is contained in:
小墨
2023-04-25 04:33:38 +08:00
parent 0bcef8d497
commit 2038d76b1e
8 changed files with 90 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/microservice-common/src/main/java/com/cxyxiaomo/epp/PageTable/enums/AddType.java
View File

@@ -3,6 +3,7 @@ package com.cxyxiaomo.epp.PageTable.enums;
public enum AddType {
CAN_NOT_ADD("plainText"),
INPUT("input"),
INPUT_NUMBER("input-number"),
TEXTAREA("textarea"),
SELECT("select"),
IMAGE("image");

1
backend/microservice-common/src/main/java/com/cxyxiaomo/epp/PageTable/enums/EditType.java
View File

@@ -3,6 +3,7 @@ package com.cxyxiaomo.epp.PageTable.enums;
public enum EditType {
CAN_NOT_EDIT("plainText"),
INPUT("input"),
INPUT_NUMBER("input-number"),
TEXTAREA("textarea"),
SELECT("select"),
IMAGE("image");

34
backend/microservice-common/src/main/java/com/cxyxiaomo/epp/PageTable/utils/FieldRuleBuilder.java
View File

@@ -43,11 +43,12 @@ public class FieldRuleBuilder {
return this;
}
public FieldRuleBuilder number() {
rules.put("type", "number");
rules.put("message", fieldDisplayName + "必须为数字");
return this;
}
// public FieldRuleBuilder number() {
// // rules.put("type", "number"); // 字符串类型的数字匹配不上
// rules.put("regexp", "^\\d+?$");
// rules.put("message", fieldDisplayName + "必须为数字");
// return this;
// }
public FieldRuleBuilder min(Integer min) {
rules.put("min", min);
@@ -61,6 +62,7 @@ public class FieldRuleBuilder {
return this;
}
// 字符串类型长度范围
public FieldRuleBuilder minMax(Integer min, Integer max) {
rules.put("min", min);
rules.put("max", max);
@@ -68,6 +70,28 @@ public class FieldRuleBuilder {
return this;
}
// 数字类型数值范围
// public FieldRuleBuilder range(Integer min, Integer max) {
// // rules.put("min", min);
// // rules.put("max", max);
// rules.put("message", fieldDisplayName + "应大于 " + min + " 且小于 " + max);
// return this;
// }
// // 数字类型数字个数
// public FieldRuleBuilder price(Integer minLen, Integer maxLen) {
// rules.put("regexp", "^\\d{" + minLen + "," + maxLen + "}(\\.\\d{1,2})?$");
// rules.put("message", fieldDisplayName + "应大于等于 " + Math.pow(10, minLen - 1) + " ，小于等于 " + (Math.pow(10, maxLen) - 1) + " 且小数位数不超过 2 位");
// return this;
// }
// public FieldRuleBuilder regexp(String regexp) {
// // rules.put("type", "regexp");
// rules.put("pattern", regexp);
// rules.put("message", fieldDisplayName + "输入不符合要求，请检查");
// return this;
// }
public FieldRuleBuilder length(Integer len) {
rules.put("min", len);
rules.put("max", len);