Bladeren bron

1)数据集保存 添加trigger属性

2)bug:分库查询的表名错误
master
FLYPHT 2 jaren geleden
bovenliggende
commit
d4f0f0a685
3 gewijzigde bestanden met toevoegingen van 4 en 1 verwijderingen
  1. +1
    -0
      smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
  2. +2
    -0
      smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java
  3. +1
    -1
      smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java

+ 1
- 0
smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java Bestand weergeven

@@ -230,6 +230,7 @@ public class ModelFormHelper {
field.put("linkDb", filter.linkDb);
field.put("linkField", filter.linkField);
field.put("value", filter.value);
field.put("trigger",filter.trigger);
}
}
}


+ 2
- 0
smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java Bestand weergeven

@@ -14,5 +14,7 @@ public class PageDatasetFilter extends PageDatasetField {
public String linkField;
//type为const时,常量值
public String value;
// 触发类型 click按钮触发;change监听触发
public String trigger;
public boolean required = false;
}

+ 1
- 1
smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java Bestand weergeven

@@ -105,7 +105,7 @@ public class DynPageHelper {
sql.append(",");
}
sql.setCharAt(sql.length() - 1, ' ');
sql.append(" from ").append(masterTable.getName());
sql.append(" from ").append(masterTable.getSchemaTableName());
return sql.toString();
} else {
return dataSet.sql;


Laden…
Annuleren
Opslaan