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

6fa32322 · ibizdev · c3d1fdb6 · 6fa32322 · 6fa32322 · 6fa32322
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json
@@ -3841,6 +3841,12 @@
    "name" : "空自定义视图",
    "realModelSubType" : "DECUSTOMVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr19EditView_8467_131",
+    "logicName" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-实体界面逻辑)",
+    "name" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-实体界面逻辑)",
+    "realModelSubType" : "DEEDITVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "Usr12EditView_1918",
    "logicName" : "测试实体实体编辑视图(功能确认-基本功能-气泡卡片)",
@@ -4001,8 +4007,8 @@
    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "Usr14EditView_7532",
-    "logicName" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-视图事件触发)",
-    "name" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-视图事件触发)",
+    "logicName" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-视图事件触发)",
+    "name" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-视图事件触发)",
    "realModelSubType" : "DEEDITVIEW",
    "realModelType" : "PSDEVIEWBASE"
  }, {
@@ -4017,6 +4023,12 @@
    "name" : "模拟表格视图",
    "realModelSubType" : "DECUSTOMVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr19EditView",
+    "logicName" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-脚本代码)",
+    "name" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-脚本代码)",
+    "realModelSubType" : "DEEDITVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "Usr8EditView",
    "logicName" : "测试实体实体编辑视图(功能确认编辑表单)",
@@ -4149,6 +4161,12 @@
    "name" : "工作流发起",
    "realModelSubType" : "DEEDITVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr19EditView_8467_7132",
+    "logicName" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-系统预置界面逻辑)",
+    "name" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-系统预置界面逻辑)",
+    "realModelSubType" : "DEEDITVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "Usr2KanbanView",
    "logicName" : "测试实体实体看板视图(分组代码表)",
@@ -4197,10 +4215,16 @@
    "name" : "测试实体实体看板视图（项布局面板）",
    "realModelSubType" : "DEKANBANVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr19EditView_8467",
+    "logicName" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-界面行为)",
+    "name" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-界面行为)",
+    "realModelSubType" : "DEEDITVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "Usr14EditView_542",
-    "logicName" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-部件事件触发)",
-    "name" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-部件事件触发)",
+    "logicName" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-部件事件触发)",
+    "name" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-部件事件触发)",
    "realModelSubType" : "DEEDITVIEW",
    "realModelType" : "PSDEVIEWBASE"
  }, {
@@ -4313,8 +4337,8 @@
    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "Usr14EditView",
-    "logicName" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-定时器)",
-    "name" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-定时器)",
+    "logicName" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-定时器)",
+    "name" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-定时器)",
    "realModelSubType" : "DEEDITVIEW",
    "realModelType" : "PSDEVIEWBASE"
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json
@@ -3798,6 +3798,53 @@
      "modelref" : true,
      "id" : "Begin"
    }
+  }, {
+    "codeName" : "testviewlogic",
+    "defaultParamName" : "Default",
+    "logicName" : "测试视图逻辑",
+    "name" : "测试视图逻辑",
+    "getPSDEUILogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "name" : "开始",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "Msgbox1"
+        },
+        "linkMode" : 0,
+        "name" : "连接4678",
+        "getSrcPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
+      } ],
+      "topPos" : 200,
+      "parallelOutput" : true
+    }, {
+      "buttonsType" : "YESNO",
+      "codeName" : "Msgbox1",
+      "leftPos" : 579,
+      "logicNodeType" : "MSGBOX",
+      "message" : "实体逻辑测试",
+      "msgBoxType" : "INFO",
+      "name" : "实体逻辑测试",
+      "showMode" : "CENTER",
+      "title" : "实体逻辑测试",
+      "topPos" : 204
+    } ],
+    "getPSDEUILogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "name" : "传入变量",
+      "default" : true,
+      "entityParam" : true
+    } ],
+    "getStartPSDEUILogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    }
  } ],
  "getAllPSAppViews" : [ {
    "modelref" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.json
@@ -20091,6 +20091,53 @@
          "modelref" : true,
          "id" : "Begin"
        }
+      }, {
+        "codeName" : "testviewlogic",
+        "defaultParamName" : "Default",
+        "logicName" : "测试视图逻辑",
+        "name" : "测试视图逻辑",
+        "getPSDEUILogicNodes" : [ {
+          "codeName" : "Begin",
+          "leftPos" : 200,
+          "logicNodeType" : "BEGIN",
+          "name" : "开始",
+          "getPSDEUILogicLinks" : [ {
+            "getDstPSDEUILogicNode" : {
+              "modelref" : true,
+              "id" : "Msgbox1"
+            },
+            "linkMode" : 0,
+            "name" : "连接4678",
+            "getSrcPSDEUILogicNode" : {
+              "modelref" : true,
+              "id" : "Begin"
+            }
+          } ],
+          "topPos" : 200,
+          "parallelOutput" : true
+        }, {
+          "buttonsType" : "YESNO",
+          "codeName" : "Msgbox1",
+          "leftPos" : 579,
+          "logicNodeType" : "MSGBOX",
+          "message" : "实体逻辑测试",
+          "msgBoxType" : "INFO",
+          "name" : "实体逻辑测试",
+          "showMode" : "CENTER",
+          "title" : "实体逻辑测试",
+          "topPos" : 204
+        } ],
+        "getPSDEUILogicParams" : [ {
+          "codeName" : "Default",
+          "logicName" : "传入变量",
+          "name" : "传入变量",
+          "default" : true,
+          "entityParam" : true
+        } ],
+        "getStartPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
      } ],
      "getAllPSAppViews" : [ {
        "modelref" : true,
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json
@@ -3783,6 +3783,53 @@
      "modelref" : true,
      "id" : "Begin"
    }
+  }, {
+    "codeName" : "testviewlogic",
+    "defaultParamName" : "Default",
+    "logicName" : "测试视图逻辑",
+    "name" : "测试视图逻辑",
+    "getPSDEUILogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "name" : "开始",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "Msgbox1"
+        },
+        "linkMode" : 0,
+        "name" : "连接4678",
+        "getSrcPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
+      } ],
+      "topPos" : 200,
+      "parallelOutput" : true
+    }, {
+      "buttonsType" : "YESNO",
+      "codeName" : "Msgbox1",
+      "leftPos" : 579,
+      "logicNodeType" : "MSGBOX",
+      "message" : "实体逻辑测试",
+      "msgBoxType" : "INFO",
+      "name" : "实体逻辑测试",
+      "showMode" : "CENTER",
+      "title" : "实体逻辑测试",
+      "topPos" : 204
+    } ],
+    "getPSDEUILogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "name" : "传入变量",
+      "default" : true,
+      "entityParam" : true
+    } ],
+    "getStartPSDEUILogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    }
  } ],
  "getAllPSAppViews" : [ {
    "modelref" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1398,16 +1398,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    } ]
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
@@ -4186,11 +4186,62 @@
      "modelref" : true,
      "id" : "Begin"
    }
+  }, {
+    "codeName" : "testviewlogic",
+    "defaultParamName" : "Default",
+    "logicName" : "测试视图逻辑",
+    "name" : "测试视图逻辑",
+    "getPSDEUILogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "name" : "开始",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "Msgbox1"
+        },
+        "linkMode" : 0,
+        "name" : "连接4678",
+        "getSrcPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
+      } ],
+      "topPos" : 200,
+      "parallelOutput" : true
+    }, {
+      "buttonsType" : "YESNO",
+      "codeName" : "Msgbox1",
+      "leftPos" : 579,
+      "logicNodeType" : "MSGBOX",
+      "message" : "实体逻辑测试",
+      "msgBoxType" : "INFO",
+      "name" : "实体逻辑测试",
+      "showMode" : "CENTER",
+      "title" : "实体逻辑测试",
+      "topPos" : 204
+    } ],
+    "getPSDEUILogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "name" : "传入变量",
+      "default" : true,
+      "entityParam" : true
+    } ],
+    "getStartPSDEUILogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    }
  } ],
  "getAllPSAppViews" : [ {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPluginEditView.json",
    "viewType" : "DEEDITVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467_131.json",
+    "viewType" : "DEEDITVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestControlEditView.json",
@@ -4283,6 +4334,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestMobMDView.json",
    "viewType" : "DEMOBMDVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView.json",
+    "viewType" : "DEEDITVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView.json",
@@ -4319,6 +4374,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTLogicEditView.json",
    "viewType" : "DEEDITVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467.json",
+    "viewType" : "DEEDITVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRowEditGridView.json",
@@ -4411,6 +4470,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestTreeView.json",
    "viewType" : "DETREEVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467_7132.json",
+    "viewType" : "DEEDITVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTWizardView.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr14EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr14EditView.json
 {
  "accUserMode" : 2,
-  "caption" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-定时器)",
+  "caption" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-定时器)",
  "codeName" : "TESTUsr14EditView",
  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr14EditView.json",
  "name" : "TESTUsr14EditView",
@@ -451,7 +451,7 @@
      "id" : "datainfobar"
    }
  }, {
-    "caption" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-定时器)",
+    "caption" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-定时器)",
    "codeName" : "Usr14EditViewcaptionbar",
    "controlType" : "CAPTIONBAR",
    "name" : "captionbar",
@@ -477,7 +477,7 @@
    "layoutPanel" : true,
    "useDefaultLayout" : true
  },
-  "title" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-定时器)",
+  "title" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-定时器)",
  "viewStyle" : "DEFAULT",
  "viewType" : "DEEDITVIEW",
  "xDataControlName" : "form",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr14EditView_542.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr14EditView_542.json
 {
  "accUserMode" : 2,
-  "caption" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-部件事件触发)",
+  "caption" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-部件事件触发)",
  "codeName" : "TESTUsr14EditView_542",
  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr14EditView_542.json",
  "name" : "TESTUsr14EditView_542",
@@ -452,7 +452,7 @@
      "id" : "datainfobar"
    }
  }, {
-    "caption" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-部件事件触发)",
+    "caption" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-部件事件触发)",
    "codeName" : "Usr14EditView_542captionbar",
    "controlType" : "CAPTIONBAR",
    "name" : "captionbar",
@@ -478,7 +478,7 @@
    "layoutPanel" : true,
    "useDefaultLayout" : true
  },
-  "title" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-部件事件触发)",
+  "title" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-部件事件触发)",
  "viewStyle" : "DEFAULT",
  "viewType" : "DEEDITVIEW",
  "xDataControlName" : "form",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr14EditView_7532.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr14EditView_7532.json
 {
  "accUserMode" : 2,
-  "caption" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-视图事件触发)",
+  "caption" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-视图事件触发)",
  "codeName" : "TESTUsr14EditView_7532",
  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr14EditView_7532.json",
  "name" : "TESTUsr14EditView_7532",
@@ -451,7 +451,7 @@
      "id" : "datainfobar"
    }
  }, {
-    "caption" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-视图事件触发)",
+    "caption" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-视图事件触发)",
    "codeName" : "Usr14EditView_7532captionbar",
    "controlType" : "CAPTIONBAR",
    "name" : "captionbar",
@@ -477,7 +477,7 @@
    "layoutPanel" : true,
    "useDefaultLayout" : true
  },
-  "title" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-视图事件触发)",
+  "title" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-视图事件触发)",
  "viewStyle" : "DEFAULT",
  "viewType" : "DEEDITVIEW",
  "xDataControlName" : "form",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467_131.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467_131.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467_7132.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467_7132.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr2TreeExpView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr2TreeExpView.json
@@ -132,7 +132,7 @@
      }
    }, {
      "name" : "EXPITEM:stljbjsj",
-      "realTitle" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-部件事件触发)",
+      "realTitle" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-部件事件触发)",
      "getRefPSAppView" : {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr14EditView_542.json",
@@ -140,7 +140,7 @@
      }
    }, {
      "name" : "EXPITEM:stljdsq",
-      "realTitle" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-定时器)",
+      "realTitle" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-定时器)",
      "getRefPSAppView" : {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr14EditView.json",
@@ -148,7 +148,7 @@
      }
    }, {
      "name" : "EXPITEM:stsj",
-      "realTitle" : "测试实体实体编辑视图(功能确认-视图逻辑-触发逻辑类型-视图事件触发)",
+      "realTitle" : "测试实体实体编辑视图(功能确认-视图逻辑-事件逻辑触发类型-视图事件触发)",
      "getRefPSAppView" : {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr14EditView_7532.json",

--- 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
@@ -3571,16 +3571,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    } ]
  }, {
@@ -3598,12 +3598,6 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      }
-    }, {
      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -3615,17 +3609,17 @@
        "modelref" : true,
        "id" : "ViewMsg4"
      }
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      }
    } ]
  }, {
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
-    }, {
      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -3643,17 +3637,17 @@
        "modelref" : true,
        "id" : "ViewMsg10"
      }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
-    }, {
      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -3665,6 +3659,12 @@
        "modelref" : true,
        "id" : "ViewMsg12"
      }
+    }, {
+      "name" : "关闭模式-本次删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
    } ]
  }, {
    "codeName" : "VMGroup6",
@@ -3832,6 +3832,12 @@
    "viewType" : "DEREDIRECTVIEW",
    "resource" : "SysTodo",
    "view" : "RedirectView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467_131.json",
+    "viewType" : "DEEDITVIEW",
+    "resource" : "TEST",
+    "view" : "Usr19EditView_8467_131"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ViewLayoutModelRepositoryDEListExpViewLayout.json",
@@ -4378,6 +4384,12 @@
    "viewType" : "DEMOBMDVIEW",
    "resource" : "TEST",
    "view" : "TestMobMDView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView.json",
+    "viewType" : "DEEDITVIEW",
+    "resource" : "TEST",
+    "view" : "Usr19EditView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookCalendarExpView.json",
@@ -4587,6 +4599,12 @@
    "viewType" : "DEOPTVIEW",
    "resource" : "ViewLayoutModelRepository",
    "view" : "DEOptionViewLayout"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467.json",
+    "viewType" : "DEEDITVIEW",
+    "resource" : "TEST",
+    "view" : "Usr19EditView_8467"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentEditView3.json",
@@ -5104,6 +5122,12 @@
    "path" : "PSSYSAPPS/Web/PSAPPUTILVIEWS/AppWFStepTraceView.json",
    "viewType" : "APPWFSTEPTRACEVIEW",
    "view" : "AppWFStepTraceView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467_7132.json",
+    "viewType" : "DEEDITVIEW",
+    "resource" : "TEST",
+    "view" : "Usr19EditView_8467_7132"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalView.json",
@@ -34319,11 +34343,62 @@
          "modelref" : true,
          "id" : "Begin"
        }
+      }, {
+        "codeName" : "testviewlogic",
+        "defaultParamName" : "Default",
+        "logicName" : "测试视图逻辑",
+        "name" : "测试视图逻辑",
+        "getPSDEUILogicNodes" : [ {
+          "codeName" : "Begin",
+          "leftPos" : 200,
+          "logicNodeType" : "BEGIN",
+          "name" : "开始",
+          "getPSDEUILogicLinks" : [ {
+            "getDstPSDEUILogicNode" : {
+              "modelref" : true,
+              "id" : "Msgbox1"
+            },
+            "linkMode" : 0,
+            "name" : "连接4678",
+            "getSrcPSDEUILogicNode" : {
+              "modelref" : true,
+              "id" : "Begin"
+            }
+          } ],
+          "topPos" : 200,
+          "parallelOutput" : true
+        }, {
+          "buttonsType" : "YESNO",
+          "codeName" : "Msgbox1",
+          "leftPos" : 579,
+          "logicNodeType" : "MSGBOX",
+          "message" : "实体逻辑测试",
+          "msgBoxType" : "INFO",
+          "name" : "实体逻辑测试",
+          "showMode" : "CENTER",
+          "title" : "实体逻辑测试",
+          "topPos" : 204
+        } ],
+        "getPSDEUILogicParams" : [ {
+          "codeName" : "Default",
+          "logicName" : "传入变量",
+          "name" : "传入变量",
+          "default" : true,
+          "entityParam" : true
+        } ],
+        "getStartPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
      } ],
      "getAllPSAppViews" : [ {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPluginEditView.json",
        "viewType" : "DEEDITVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467_131.json",
+        "viewType" : "DEEDITVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestControlEditView.json",
@@ -34416,6 +34491,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestMobMDView.json",
        "viewType" : "DEMOBMDVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView.json",
+        "viewType" : "DEEDITVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView.json",
@@ -34452,6 +34531,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTLogicEditView.json",
        "viewType" : "DEEDITVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467.json",
+        "viewType" : "DEEDITVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRowEditGridView.json",
@@ -34544,6 +34627,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestTreeView.json",
        "viewType" : "DETREEVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467_7132.json",
+        "viewType" : "DEEDITVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTWizardView.json",