diff --git a/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java index a8f8e0f..2c2e063 100644 --- a/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java +++ b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java @@ -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); } } } diff --git a/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java index f24e4d8..4eb2538 100644 --- a/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java +++ b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java @@ -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; } diff --git a/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java index f6118bf..18f934e 100644 --- a/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java +++ b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java @@ -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;