Browse Source

优化:依赖表达式expr字段 改为dependExpr

master
FLYPHT 2 years ago
parent
commit
58b6edb6af
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
  2. +1
    -1
      smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/BaseDatasetField.java

+ 1
- 1
smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java View File

@@ -230,7 +230,7 @@ public class ModelFormHelper {
field.put("linkDb", pdf.linkDb); field.put("linkDb", pdf.linkDb);
field.put("linkField", pdf.linkField); field.put("linkField", pdf.linkField);
field.put("value", pdf.value); field.put("value", pdf.value);
field.put("expr", pdf.expr);
field.put("dependExpr", pdf.dependExpr);
field.put("defValue", pdf.defValue); field.put("defValue", pdf.defValue);
if (!isField) { if (!isField) {
PageDatasetFilter filter = (PageDatasetFilter) pdf; PageDatasetFilter filter = (PageDatasetFilter) pdf;


+ 1
- 1
smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/BaseDatasetField.java View File

@@ -41,7 +41,7 @@ public class BaseDatasetField {
// 默认值 // 默认值
public String defValue; public String defValue;
// type为depend时, 表达式 // type为depend时, 表达式
public String expr;
public String dependExpr;
@JsonIgnore @JsonIgnore
public boolean isFieldNotNull() { public boolean isFieldNotNull() {
return notNull == 1; return notNull == 1;


Loading…
Cancel
Save