zhujiamin 发布系统代码 [TrainSys，网页端]

26ea9497 · ibizdev · c717e6f8 · 26ea9497 · 26ea9497 · 26ea9497
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
@@ -4179,6 +4179,23 @@
    "uIActionType" : "DEUIACTION",
    "enableConfirm" : true,
    "id" : "testMutiKey@Book"
+  }, {
+    "actionTarget" : "NONE",
+    "caption" : "测试界面行为脚本",
+    "codeName" : "testscriptt",
+    "frontProcessType" : "OTHER",
+    "fullCodeName" : "Book_testscriptt",
+    "name" : "测试界面行为脚本",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "scriptCode" : "console.log('测试是否传了view', view);",
+    "timeout" : 60000,
+    "uIActionMode" : "FRONT",
+    "uIActionTag" : "testscriptt",
+    "uIActionType" : "DEUIACTION",
+    "id" : "testscriptt@Book"
  }, {
    "actionTarget" : "SINGLEDATA",
    "caption" : "界面逻辑",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/X6DesingTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/X6DesingTest.json
@@ -1133,6 +1133,31 @@
    "requestPath" : "/select",
    "builtinMethod" : false
  } ],
+  "getAllPSAppDEUILogics" : [ {
+    "codeName" : "Test01",
+    "defaultParamName" : "Default",
+    "logicName" : "Test01",
+    "name" : "Test01",
+    "getPSDEUILogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "name" : "开始",
+      "topPos" : 200,
+      "parallelOutput" : true
+    } ],
+    "getPSDEUILogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "name" : "传入变量",
+      "default" : true,
+      "entityParam" : true
+    } ],
+    "getStartPSDEUILogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    }
+  } ],
  "getAllPSAppViews" : [ {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/X6DesingTestX6DesignEditView.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMXUsr10257483CustomView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMXUsr10257483CustomView.json
@@ -26,6 +26,7 @@
    } ],
    "codeName" : "Usr1025400753",
    "controlType" : "VIEWLAYOUTPANEL",
+    "hookEventNames" : [ "ONCLICK" ],
    "layoutMode" : "FLEX",
    "logicName" : "自定义视图布局面板",
    "name" : "layoutpanel",
@@ -33,6 +34,14 @@
      "modelref" : true,
      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
    },
+    "getPSControlLogics" : [ {
+      "eventNames" : "onClick",
+      "itemName" : "BUTTON_CALLUILOGIC",
+      "logicTag" : "layoutpanel",
+      "logicType" : "SCRIPT",
+      "name" : "logic",
+      "scriptCode" : "console.log('点击了无处理！')"
+    } ],
    "getPSControlParam" : { },
    "getPSLayout" : {
      "layout" : "FLEX"
@@ -223,6 +232,56 @@
          },
          "hidden" : false,
          "showCaption" : false
+        }, {
+          "actionType" : "NONE",
+          "buttonStyle" : "DEFAULT",
+          "caption" : "无处理",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "BUTTON",
+          "name" : "button_calluilogic",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "tooltip" : "无处理",
+          "uIActionTarget" : "NONE",
+          "showCaption" : true
+        }, {
+          "actionType" : "UIACTION",
+          "buttonStyle" : "DEFAULT",
+          "caption" : "测试传view",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "BUTTON",
+          "name" : "button_calluilogic1",
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "layoutpanel_button_calluilogic1"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSUIAction" : {
+            "actionTarget" : "NONE",
+            "caption" : "测试界面行为脚本",
+            "codeName" : "testscriptt",
+            "frontProcessType" : "OTHER",
+            "fullCodeName" : "Book_testscriptt",
+            "name" : "测试界面行为脚本",
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+            },
+            "scriptCode" : "console.log('测试是否传了view', view);",
+            "timeout" : 60000,
+            "uIActionMode" : "FRONT",
+            "uIActionTag" : "testscriptt",
+            "uIActionType" : "DEUIACTION",
+            "id" : "testscriptt@Book"
+          },
+          "tooltip" : "测试传view",
+          "uIActionTarget" : "NONE",
+          "showCaption" : true
        } ]
      }, {
        "caption" : "搜索表单",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/Index2.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/Index2.json
 {
  "accUserMode" : 0,
  "appSwitchMode" : 0,
+  "caption" : "首页",
  "codeName" : "Index2",
  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPINDEXVIEWS/Index2.json",
  "name" : "Index2",
@@ -49,6 +50,7 @@
    "modelid" : "2818DC93-E2F6-4E39-B20F-342774E3A7EF",
    "modeltype" : "PSAPPMENU"
  }, {
+    "caption" : "首页",
    "codeName" : "captionbar",
    "controlType" : "CAPTIONBAR",
    "name" : "captionbar",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -11781,16 +11781,16 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      }
    }, {
      "name" : "消息类型-常规信息",
@@ -11813,12 +11813,6 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg10"
-      }
-    }, {
      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -11836,30 +11830,17 @@
        "modelref" : true,
        "id" : "ViewMsg8"
      }
-    } ]
-  }, {
-    "codeName" : "VMGroup8",
-    "name" : "【静态测试】",
-    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除-上方-警告",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息位置-弹出",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
      }
+    } ]
  }, {
+    "codeName" : "VMGroup8",
+    "name" : "【静态测试】",
+    "getPSAppViewMsgGroupDetails" : [ {
      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -11879,6 +11860,12 @@
        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
+    }, {
+      "name" : "关闭模式-默认删除-上方-错误",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
    }, {
      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
@@ -11886,22 +11873,29 @@
        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
      }
-    } ]
    }, {
-    "codeName" : "VMGroup5",
+      "name" : "消息类型-错误信息",
-    "name" : "视图消息关闭模式",
-    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
      }
+    } ]
  }, {
+    "codeName" : "VMGroup5",
+    "name" : "视图消息关闭模式",
+    "getPSAppViewMsgGroupDetails" : [ {
      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -11913,21 +11907,27 @@
        "modelref" : true,
        "id" : "ViewMsg13"
      }
+    }, {
+      "name" : "关闭模式-无删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg11"
+      }
    } ]
  }, {
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    } ]
  } ],
@@ -38271,6 +38271,7 @@
        } ],
        "codeName" : "Usr1025400753",
        "controlType" : "VIEWLAYOUTPANEL",
+        "hookEventNames" : [ "ONCLICK" ],
        "layoutMode" : "FLEX",
        "logicName" : "自定义视图布局面板",
        "name" : "layoutpanel",
@@ -38278,6 +38279,14 @@
          "modelref" : true,
          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX.json"
        },
+        "getPSControlLogics" : [ {
+          "eventNames" : "onClick",
+          "itemName" : "BUTTON_CALLUILOGIC",
+          "logicTag" : "layoutpanel",
+          "logicType" : "SCRIPT",
+          "name" : "logic",
+          "scriptCode" : "console.log('点击了无处理！')"
+        } ],
        "getPSControlParam" : { },
        "getPSLayout" : {
          "layout" : "FLEX"
@@ -38468,6 +38477,56 @@
              },
              "hidden" : false,
              "showCaption" : false
+            }, {
+              "actionType" : "NONE",
+              "buttonStyle" : "DEFAULT",
+              "caption" : "无处理",
+              "itemStyle" : "DEFAULT",
+              "itemType" : "BUTTON",
+              "name" : "button_calluilogic",
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "layout" : "FLEX"
+              },
+              "tooltip" : "无处理",
+              "uIActionTarget" : "NONE",
+              "showCaption" : true
+            }, {
+              "actionType" : "UIACTION",
+              "buttonStyle" : "DEFAULT",
+              "caption" : "测试传view",
+              "itemStyle" : "DEFAULT",
+              "itemType" : "BUTTON",
+              "name" : "button_calluilogic1",
+              "getPSAppViewUIAction" : {
+                "modelref" : true,
+                "id" : "layoutpanel_button_calluilogic1"
+              },
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "layout" : "FLEX"
+              },
+              "getPSUIAction" : {
+                "actionTarget" : "NONE",
+                "caption" : "测试界面行为脚本",
+                "codeName" : "testscriptt",
+                "frontProcessType" : "OTHER",
+                "fullCodeName" : "Book_testscriptt",
+                "name" : "测试界面行为脚本",
+                "getPSAppDataEntity" : {
+                  "modelref" : true,
+                  "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+                },
+                "scriptCode" : "console.log('测试是否传了view', view);",
+                "timeout" : 60000,
+                "uIActionMode" : "FRONT",
+                "uIActionTag" : "testscriptt",
+                "uIActionType" : "DEUIACTION",
+                "id" : "testscriptt@Book"
+              },
+              "tooltip" : "测试传view",
+              "uIActionTarget" : "NONE",
+              "showCaption" : true
            } ]
          }, {
            "caption" : "搜索表单",
@@ -50284,6 +50343,23 @@
        "uIActionType" : "DEUIACTION",
        "enableConfirm" : true,
        "id" : "testMutiKey@Book"
+      }, {
+        "actionTarget" : "NONE",
+        "caption" : "测试界面行为脚本",
+        "codeName" : "testscriptt",
+        "frontProcessType" : "OTHER",
+        "fullCodeName" : "Book_testscriptt",
+        "name" : "测试界面行为脚本",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        },
+        "scriptCode" : "console.log('测试是否传了view', view);",
+        "timeout" : 60000,
+        "uIActionMode" : "FRONT",
+        "uIActionTag" : "testscriptt",
+        "uIActionType" : "DEUIACTION",
+        "id" : "testscriptt@Book"
      }, {
        "actionTarget" : "SINGLEDATA",
        "caption" : "界面逻辑",