From 9c4ebea77e8635120a82bf876a3aa18aa90154e1 Mon Sep 17 00:00:00 2001
From: zhenggm <zhenggm@jujiatech.com>
Date: Mon, 6 Jun 2022 18:46:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cc/smtweb/framework/core/common/SwEnum.java         | 2 +-
 .../src/main/java/cc/smtweb/framework/core/db/impl/DatabaseUtil.java  | 4 ++--
 smtweb-system/sw-system-bpm/doc/版本修改说明.md                 | 2 +-
 .../java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java    | 4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java
index 8f57da0..2a6c9a4 100644
--- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java
+++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java
@@ -216,7 +216,7 @@ public interface SwEnum {
         public static WidgetType instance = new WidgetType();
 
         public static StrEnumBean GRID = instance.addEnum("grid", "表格");
-        public static StrEnumBean TREE = instance.addEnum("tree", "下拉树");
+        public static StrEnumBean TREE = instance.addEnum("tree", "树");
         public static StrEnumBean COMBOGRID = instance.addEnum("combogrid", "下拉表格");
         public static StrEnumBean COMBOTREE = instance.addEnum("combotree", "下拉树");
         public static StrEnumBean CUSTOM = instance.addEnum("custom", "自定义");
diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/DatabaseUtil.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/DatabaseUtil.java
index 8c2ea3b..f73b50d 100644
--- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/DatabaseUtil.java
+++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/DatabaseUtil.java
@@ -491,7 +491,7 @@ public class DatabaseUtil {
         if (SwEnum.IndexType.PK.value.equalsIgnoreCase(modelIndex.getType())) return null;
         SwEnum.IndexTypeBean type = SwEnum.IndexType.instance.getByValue(modelIndex.getType());
         return "CREATE " + (SwEnum.IndexType.U.value.equalsIgnoreCase(modelIndex.getType()) ? SwEnum.IndexType.U.fullName : "") +
-                " INDEX " + entity.getAbbr() + "_" + getDbIndexName(entity, modelIndex) +
+                " INDEX " + getDbIndexName(entity, modelIndex) +
                 " ON " + entity.getSchemaTableName() + " (" + modelIndex.getFields() + ")";
     }
 
@@ -551,6 +551,6 @@ public class DatabaseUtil {
     }
 
     private String getDbIndexName(ModelTable entity, ModelIndex modelIndex) {
-        return entity.getAbbr() + "_" + modelIndex;
+        return entity.getAbbr() + "_" + modelIndex.getName();
     }
 }
\ No newline at end of file
diff --git a/smtweb-system/sw-system-bpm/doc/版本修改说明.md b/smtweb-system/sw-system-bpm/doc/版本修改说明.md
index 290d484..d1c430f 100644
--- a/smtweb-system/sw-system-bpm/doc/版本修改说明.md
+++ b/smtweb-system/sw-system-bpm/doc/版本修改说明.md
@@ -5,4 +5,4 @@
 3. 移除数据集的表类型属性tableType， 添加 initData
 
 
-后台写 event.js 后台 ctrl+shift+f9
+后台写 defaultEvent.js 后台 ctrl+shift+f9
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
index 18b9da4..2272d18 100644
--- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
+++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
@@ -293,7 +293,9 @@ public class ModelFormHelper {
         List widgetIds = (List) option.get("widgetRef");
         for (Object v : widgetIds) {
             long id;
-            if (v instanceof Integer) {
+            if (v instanceof String) {
+                id = Long.parseLong((String)v);
+            } else if (v instanceof Integer) {
                 id = (Integer)v;
             } else if (v instanceof Long) {
                 id = (Long)v;