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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSWORKFLOWS/WorkFlowWf.json

@@ -52,6 +52,7 @@
     "modelref" : true,
     "path" : "PSMODULES/Test/PSWORKFLOWS/WorkFlowWf/PSWFVERSIONS/WorkFlowWfv1.json"
   } ],
+  "uniqueTag" : "Test__WorkFlowWf",
   "wFEngineCat" : "ACTIVITI",
   "wFEngineType" : "ACTIVITI",
   "wFProxyMode" : 0,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPUTILVIEWS/AppWFStepTraceView.json

@@ -8,7 +8,7 @@
     "path" : "PSSYSAPPS/Mob/PSAPPMODULES/Ungroup.json"
   },
   "getPSControls" : [ {
-    "codeName" : "nullcaptionbar",
+    "codeName" : "captionbar",
     "controlType" : "CAPTIONBAR",
     "name" : "captionbar",
     "getPSControlParam" : { }

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPUTILVIEWS/AppWFStepTraceViewLayout.json

@@ -10,7 +10,7 @@
   },
   "getPSControls" : [ {
     "caption" : "应用流程跟踪视图布局面板",
-    "codeName" : "nullcaptionbar",
+    "codeName" : "captionbar",
     "controlType" : "CAPTIONBAR",
     "name" : "captionbar",
     "getPSControlParam" : { }

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json

@@ -1482,18 +1482,19 @@
     "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"
       }
-    } ]
+    } ],
+    "uniqueTag" : "VMGroup2"
   }, {
     "codeName" : "VMGroup",
     "name" : "视图消息组test",
@@ -1504,7 +1505,8 @@
         "id" : "ViewMsg"
       },
       "position" : "TOP"
-    } ]
+    } ],
+    "uniqueTag" : "VMGroup"
   } ],
   "getAllPSAppViewMsgs" : [ {
     "codeName" : "ViewMsg",
@@ -1513,6 +1515,7 @@
     "name" : "视图消息test",
     "position" : "TOP",
     "removeMode" : 0,
+    "uniqueTag" : "ViewMsg",
     "enableRemove" : false
   }, {
     "codeName" : "ViewMsg2",
@@ -1521,6 +1524,7 @@
     "name" : "视图消息",
     "position" : "TOP",
     "removeMode" : 0,
+    "uniqueTag" : "ViewMsg2",
     "enableRemove" : false
   }, {
     "cacheTimeout" : -1,
@@ -1538,6 +1542,7 @@
     },
     "position" : "BOTTOM",
     "removeMode" : 0,
+    "uniqueTag" : "ViewMsg3",
     "enableCache" : false,
     "enableRemove" : false
   } ],

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/ActionPluginTestGrid_Grid.json

@@ -149,13 +149,13 @@
   } ],
   "pagingSize" : 20,
   "getRemovePSControlAction" : {
-    "actionName" : "Remove",
+    "actionName" : "PluginDelete",
     "actionType" : "DEACTION",
     "dataAccessAction" : "DELETE",
     "name" : "remove",
     "getPSAppDEMethod" : {
       "modelref" : true,
-      "id" : "Remove"
+      "id" : "PluginDelete"
     },
     "getPSAppDataEntity" : {
       "modelref" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTActionPluginTestGrid.json

@@ -169,52 +169,52 @@
     },
     "getPSControlHandler" : {
       "getPSHandlerActions" : [ {
-        "actionName" : "Get",
+        "actionName" : "PluginDelete",
         "actionType" : "DEACTION",
         "dataAccessAction" : "READ",
         "name" : "load",
         "getPSAppDEMethod" : {
           "modelref" : true,
-          "id" : "Get"
+          "id" : "PluginDelete"
         },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
         }
       }, {
-        "actionName" : "Create",
+        "actionName" : "PluginDelete",
         "actionType" : "DEACTION",
         "dataAccessAction" : "CREATE",
         "name" : "create",
         "getPSAppDEMethod" : {
           "modelref" : true,
-          "id" : "Create"
+          "id" : "PluginDelete"
         },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
         }
       }, {
-        "actionName" : "Update",
+        "actionName" : "PluginDelete",
         "actionType" : "DEACTION",
         "dataAccessAction" : "UPDATE",
         "name" : "update",
         "getPSAppDEMethod" : {
           "modelref" : true,
-          "id" : "Update"
+          "id" : "PluginDelete"
         },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
         }
       }, {
-        "actionName" : "Remove",
+        "actionName" : "PluginDelete",
         "actionType" : "DEACTION",
         "dataAccessAction" : "DELETE",
         "name" : "remove",
         "getPSAppDEMethod" : {
           "modelref" : true,
-          "id" : "Remove"
+          "id" : "PluginDelete"
         },
         "getPSAppDataEntity" : {
           "modelref" : true,
@@ -378,13 +378,13 @@
     } ],
     "pagingSize" : 20,
     "getRemovePSControlAction" : {
-      "actionName" : "Remove",
+      "actionName" : "PluginDelete",
       "actionType" : "DEACTION",
       "dataAccessAction" : "DELETE",
       "name" : "remove",
       "getPSAppDEMethod" : {
         "modelref" : true,
-        "id" : "Remove"
+        "id" : "PluginDelete"
       },
       "getPSAppDataEntity" : {
         "modelref" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json

@@ -4,6 +4,7 @@
   "codeName" : "bookBookEditViewEditorTest",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json",
   "name" : "bookBookEditViewEditorTest",
+  "openMode" : "INDEXVIEWTAB_POPUPMODAL",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -13233,18 +13233,19 @@
     "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"
       }
-    } ]
+    } ],
+    "uniqueTag" : "VMGroup2"
   }, {
     "codeName" : "VMGroup",
     "name" : "视图消息组test",
@@ -13255,7 +13256,8 @@
         "id" : "ViewMsg"
       },
       "position" : "TOP"
-    } ]
+    } ],
+    "uniqueTag" : "VMGroup"
   }, {
     "codeName" : "VMGroup10",
     "name" : "测试弹出",
@@ -13266,7 +13268,8 @@
         "id" : "ViewMsg10"
       },
       "position" : "POPUP"
-    } ]
+    } ],
+    "uniqueTag" : "VMGroup10"
   }, {
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
@@ -13277,18 +13280,19 @@
         "id" : "ViewMsg4"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       }
-    } ]
+    } ],
+    "uniqueTag" : "VMGroup3"
   }, {
     "codeName" : "VMGroup7",
     "name" : "【动态测试】",
@@ -13298,15 +13302,16 @@
         "modelref" : true,
         "id" : "ViewMsg16"
       }
-    } ]
+    } ],
+    "uniqueTag" : "VMGroup7"
   }, {
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
       }
     }, {
       "name" : "消息位置-视图内容区",
@@ -13321,22 +13326,29 @@
         "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
       }
-    } ]
+    } ],
+    "uniqueTag" : "VMGroup4"
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
       },
       "position" : "POPUP"
+    }, {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
+      }
     }, {
       "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
@@ -13344,11 +13356,19 @@
         "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
@@ -13356,10 +13376,10 @@
         "id" : "ViewMsg12"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
       }
     }, {
       "name" : "关闭模式-本次删除-上方-警告",
@@ -13367,35 +13387,22 @@
         "modelref" : true,
         "id" : "ViewMsg13"
       }
-    }, {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-错误信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
-    } ]
+    } ],
+    "uniqueTag" : "VMGroup8"
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
       }
     }, {
       "name" : "关闭模式-本次删除",
@@ -13403,23 +13410,25 @@
         "modelref" : true,
         "id" : "ViewMsg13"
       }
-    } ]
+    } ],
+    "uniqueTag" : "VMGroup5"
   }, {
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
-    } ]
+    } ],
+    "uniqueTag" : "VMGroup6"
   } ],
   "getAllPSAppViewMsgs" : [ {
     "codeName" : "ViewMsg",
@@ -13428,6 +13437,7 @@
     "name" : "视图消息test",
     "position" : "TOP",
     "removeMode" : 0,
+    "uniqueTag" : "ViewMsg",
     "enableRemove" : false
   }, {
     "codeName" : "ViewMsg10",
@@ -13438,6 +13448,7 @@
     "position" : "POPUP",
     "removeMode" : 2,
     "title" : "标题",
+    "uniqueTag" : "ViewMsg10",
     "userTag" : "user1",
     "userTag2" : "user2",
     "enableRemove" : true
@@ -13449,6 +13460,7 @@
     "position" : "TOP",
     "removeMode" : 0,
     "title" : "关闭模式-无删除-上方-常规",
+    "uniqueTag" : "ViewMsg11",
     "enableRemove" : false
   }, {
     "codeName" : "ViewMsg12",
@@ -13458,6 +13470,7 @@
     "position" : "TOP",
     "removeMode" : 1,
     "title" : "关闭模式-默认删除-上方-错误",
+    "uniqueTag" : "ViewMsg12",
     "enableRemove" : true
   }, {
     "codeName" : "ViewMsg13",
@@ -13467,6 +13480,7 @@
     "position" : "TOP",
     "removeMode" : 2,
     "title" : "关闭模式-本次删除-上方-警告",
+    "uniqueTag" : "ViewMsg13",
     "enableRemove" : true
   }, {
     "cacheTimeout" : -1,
@@ -13485,6 +13499,7 @@
     },
     "position" : "TOP",
     "removeMode" : 0,
+    "uniqueTag" : "ViewMsg14",
     "enableCache" : false,
     "enableRemove" : false
   }, {
@@ -13494,6 +13509,7 @@
     "name" : "动态模式-静态内容",
     "position" : "BOTTOM",
     "removeMode" : 0,
+    "uniqueTag" : "ViewMsg15",
     "enableRemove" : false
   }, {
     "cacheTimeout" : -1,
@@ -13540,6 +13556,7 @@
       "name" : "TITLE",
       "codeName" : "Title"
     },
+    "uniqueTag" : "ViewMsg16",
     "enableCache" : false,
     "enableRemove" : false
   }, {
@@ -13549,6 +13566,7 @@
     "name" : "视图消息",
     "position" : "TOP",
     "removeMode" : 0,
+    "uniqueTag" : "ViewMsg2",
     "enableRemove" : false
   }, {
     "cacheTimeout" : -1,
@@ -13566,6 +13584,7 @@
     },
     "position" : "BOTTOM",
     "removeMode" : 0,
+    "uniqueTag" : "ViewMsg3",
     "enableCache" : false,
     "enableRemove" : false
   }, {
@@ -13576,6 +13595,7 @@
     "position" : "TOP",
     "removeMode" : 0,
     "title" : "消息类型-常规信息",
+    "uniqueTag" : "ViewMsg4",
     "enableRemove" : false
   }, {
     "codeName" : "ViewMsg5",
@@ -13585,6 +13605,7 @@
     "position" : "BOTTOM",
     "removeMode" : 0,
     "title" : "消息类型-警告信息",
+    "uniqueTag" : "ViewMsg5",
     "enableRemove" : false
   }, {
     "codeName" : "ViewMsg6",
@@ -13594,6 +13615,7 @@
     "position" : "BODY",
     "removeMode" : 0,
     "title" : "消息类型-错误信息",
+    "uniqueTag" : "ViewMsg6",
     "enableRemove" : false
   }, {
     "codeName" : "ViewMsg7",
@@ -13602,6 +13624,7 @@
     "name" : "消息位置-视图上方",
     "position" : "TOP",
     "removeMode" : 0,
+    "uniqueTag" : "ViewMsg7",
     "enableRemove" : false
   }, {
     "codeName" : "ViewMsg8",
@@ -13610,6 +13633,7 @@
     "position" : "BOTTOM",
     "removeMode" : 0,
     "title" : "消息位置-视图下方",
+    "uniqueTag" : "ViewMsg8",
     "enableRemove" : false
   }, {
     "codeName" : "ViewMsg9",
@@ -13618,6 +13642,7 @@
     "position" : "BODY",
     "removeMode" : 0,
     "title" : "消息位置-视图内容区",
+    "uniqueTag" : "ViewMsg9",
     "enableRemove" : false
   } ],
   "getAllPSAppViews" : [ {