From d4f0f0a685c0b1d5bbb763905af55b63796caf2d Mon Sep 17 00:00:00 2001
From: FLYPHT <1035748121@qq.com>
Date: Tue, 28 Jun 2022 12:59:45 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=89=E6=95=B0=E6=8D=AE=E9=9B=86=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=20=E6=B7=BB=E5=8A=A0trigger=E5=B1=9E=E6=80=A7=202)bug?=
 =?UTF-8?q?=EF=BC=9A=E5=88=86=E5=BA=93=E6=9F=A5=E8=AF=A2=E7=9A=84=E8=A1=A8?=
 =?UTF-8?q?=E5=90=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java | 1 +
 .../cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java  | 2 ++
 .../java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java     | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

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;