From 7dc5822fde806ffcd111a38c01f47af7f31969df Mon Sep 17 00:00:00 2001
From: zhenggm <zhenggm@jujiatech.com>
Date: Fri, 24 Jun 2022 17:48:18 +0800
Subject: [PATCH] =?UTF-8?q?js=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java |  1 +
 .../cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java  | 10 +++++++++-
 .../src/main/resources/static/template/js_event.ftl            |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java
index 2649a2f..1382049 100644
--- a/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java
+++ b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java
@@ -190,6 +190,7 @@ public class CodeBuildHandler extends AbstractHandler {
         model.put("packageName", packageName);
         model.put("formTitle", form.getTitle());
         model.put("service", sName);
+        model.put("eventPath", ModelFormHelper.getEventPath(form));
 
         CodeGenerator.getInstance().generateService(model, codeJavaPath + "/" + sName + "Service.java");
     }
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 a94151f..a8f8e0f 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
@@ -357,13 +357,21 @@ public class ModelFormHelper {
      * @param opts
      */
     public static void buildOptsEx(ModelForm bean, SwMap opts) {
+        String eventPath = getEventPath(bean);
+        if (StringUtils.isNotEmpty(eventPath)) {
+            opts.put(KEY_EVENT_PATH, eventPath);
+        }
+    }
+
+    public static String getEventPath(ModelForm bean) {
         String moduleName = ModelProjectCache.getInstance().getModule(bean.getPrjId());
         if (StringUtils.isNotEmpty(moduleName)) {
             String ep = moduleName;
             String cn = ModelCatalogCache.getInstance().getFullName(bean.getMcId());
             if (StringUtils.isNotEmpty(cn)) ep = ep + "." + cn;
-            opts.put(KEY_EVENT_PATH, ep + "." + bean.getName());
+            return ep + "." + bean.getName();
         }
+        return "";
     }
 
     /**
diff --git a/smtweb-framework/sw-system-bpm/src/main/resources/static/template/js_event.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/js_event.ftl
index 3ea7c4e..d74d428 100644
--- a/smtweb-framework/sw-system-bpm/src/main/resources/static/template/js_event.ftl
+++ b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/js_event.ftl
@@ -2,7 +2,7 @@
  * Created by ${user} at ${sysTime}
  * 注册事件类【${title}】，参看event.defaultEvent.js
 */
-window.$swEvent.setup("defaultEvent", {
+window.$swEvent.setup("${eventPath}", {
   setup(page){
     const { $params,$refs, $widgets, $model, $utils, $tabRouter, $api } = page;
     const { $$message, $$http } = $utils;