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

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

@@ -1517,16 +1517,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"
       }
     } ]
   }, {

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

@@ -185,6 +185,20 @@
           "name" : "TESTNAME",
           "codeName" : "TESTName"
         },
+        "getPSDEFDGroupLogics" : [ {
+          "groupOP" : "AND",
+          "logicCat" : "PANELVISIBLE",
+          "logicType" : "GROUP",
+          "name" : "表单成员[testname][面板显示]逻辑",
+          "getPSDEFDLogics" : [ {
+            "condOP" : "IN",
+            "dEFDName" : "testname",
+            "logicType" : "SINGLE",
+            "value" : "cccccc"
+          } ],
+          "relatedDetailNames" : [ "testname" ],
+          "notMode" : false
+        } ],
         "getPSEditor" : {
           "editorType" : "TEXTBOX",
           "maxLength" : 50,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSGANTTS/Usr12114819GanttView_Gantt.json

@@ -464,50 +464,50 @@
     "getPSDETreeNodeDataItems" : [ {
       "cLConvertMode" : "NONE",
       "dataType" : 25,
-      "name" : "name",
+      "name" : "end",
       "getPSAppDEField" : {
-        "name" : "WORKITEMNAME",
-        "codeName" : "WORKITEMName"
+        "name" : "END",
+        "codeName" : "END"
       },
       "getPSDETreeColumn" : {
         "modelref" : true,
-        "id" : "name"
+        "id" : "end"
       }
     }, {
       "cLConvertMode" : "NONE",
       "dataType" : 25,
-      "name" : "sn",
+      "name" : "begin",
       "getPSAppDEField" : {
-        "name" : "BH",
-        "codeName" : "BH"
+        "name" : "BEGIN",
+        "codeName" : "BEGIN"
       },
       "getPSDETreeColumn" : {
         "modelref" : true,
-        "id" : "sn"
+        "id" : "begin"
       }
     }, {
       "cLConvertMode" : "NONE",
       "dataType" : 25,
-      "name" : "begin",
+      "name" : "name",
       "getPSAppDEField" : {
-        "name" : "BEGIN",
-        "codeName" : "BEGIN"
+        "name" : "WORKITEMNAME",
+        "codeName" : "WORKITEMName"
       },
       "getPSDETreeColumn" : {
         "modelref" : true,
-        "id" : "begin"
+        "id" : "name"
       }
     }, {
       "cLConvertMode" : "NONE",
       "dataType" : 25,
-      "name" : "end",
+      "name" : "sn",
       "getPSAppDEField" : {
-        "name" : "END",
-        "codeName" : "END"
+        "name" : "BH",
+        "codeName" : "BH"
       },
       "getPSDETreeColumn" : {
         "modelref" : true,
-        "id" : "end"
+        "id" : "sn"
       }
     } ],
     "getTextPSAppDEField" : {
@@ -697,14 +697,14 @@
     "getPSDETreeNodeDataItems" : [ {
       "cLConvertMode" : "NONE",
       "dataType" : 25,
-      "name" : "end",
+      "name" : "begin",
       "getPSAppDEField" : {
-        "name" : "END",
-        "codeName" : "END"
+        "name" : "BEGIN",
+        "codeName" : "BEGIN"
       },
       "getPSDETreeColumn" : {
         "modelref" : true,
-        "id" : "end"
+        "id" : "begin"
       }
     }, {
       "cLConvertMode" : "NONE",
@@ -721,26 +721,26 @@
     }, {
       "cLConvertMode" : "NONE",
       "dataType" : 25,
-      "name" : "sn",
+      "name" : "end",
       "getPSAppDEField" : {
-        "name" : "BH",
-        "codeName" : "BH"
+        "name" : "END",
+        "codeName" : "END"
       },
       "getPSDETreeColumn" : {
         "modelref" : true,
-        "id" : "sn"
+        "id" : "end"
       }
     }, {
       "cLConvertMode" : "NONE",
       "dataType" : 25,
-      "name" : "begin",
+      "name" : "sn",
       "getPSAppDEField" : {
-        "name" : "BEGIN",
-        "codeName" : "BEGIN"
+        "name" : "BH",
+        "codeName" : "BH"
       },
       "getPSDETreeColumn" : {
         "modelref" : true,
-        "id" : "begin"
+        "id" : "sn"
       }
     } ],
     "getTextPSAppDEField" : {

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

@@ -304,6 +304,20 @@
             "name" : "TESTNAME",
             "codeName" : "TESTName"
           },
+          "getPSDEFDGroupLogics" : [ {
+            "groupOP" : "AND",
+            "logicCat" : "PANELVISIBLE",
+            "logicType" : "GROUP",
+            "name" : "表单成员[testname][面板显示]逻辑",
+            "getPSDEFDLogics" : [ {
+              "condOP" : "IN",
+              "dEFDName" : "testname",
+              "logicType" : "SINGLE",
+              "value" : "cccccc"
+            } ],
+            "relatedDetailNames" : [ "testname" ],
+            "notMode" : false
+          } ],
           "getPSEditor" : {
             "editorType" : "TEXTBOX",
             "maxLength" : 50,

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

@@ -495,50 +495,50 @@
       "getPSDETreeNodeDataItems" : [ {
         "cLConvertMode" : "NONE",
         "dataType" : 25,
-        "name" : "name",
+        "name" : "end",
         "getPSAppDEField" : {
-          "name" : "WORKITEMNAME",
-          "codeName" : "WORKITEMName"
+          "name" : "END",
+          "codeName" : "END"
         },
         "getPSDETreeColumn" : {
           "modelref" : true,
-          "id" : "name"
+          "id" : "end"
         }
       }, {
         "cLConvertMode" : "NONE",
         "dataType" : 25,
-        "name" : "sn",
+        "name" : "begin",
         "getPSAppDEField" : {
-          "name" : "BH",
-          "codeName" : "BH"
+          "name" : "BEGIN",
+          "codeName" : "BEGIN"
         },
         "getPSDETreeColumn" : {
           "modelref" : true,
-          "id" : "sn"
+          "id" : "begin"
         }
       }, {
         "cLConvertMode" : "NONE",
         "dataType" : 25,
-        "name" : "begin",
+        "name" : "name",
         "getPSAppDEField" : {
-          "name" : "BEGIN",
-          "codeName" : "BEGIN"
+          "name" : "WORKITEMNAME",
+          "codeName" : "WORKITEMName"
         },
         "getPSDETreeColumn" : {
           "modelref" : true,
-          "id" : "begin"
+          "id" : "name"
         }
       }, {
         "cLConvertMode" : "NONE",
         "dataType" : 25,
-        "name" : "end",
+        "name" : "sn",
         "getPSAppDEField" : {
-          "name" : "END",
-          "codeName" : "END"
+          "name" : "BH",
+          "codeName" : "BH"
         },
         "getPSDETreeColumn" : {
           "modelref" : true,
-          "id" : "end"
+          "id" : "sn"
         }
       } ],
       "getTextPSAppDEField" : {
@@ -728,14 +728,14 @@
       "getPSDETreeNodeDataItems" : [ {
         "cLConvertMode" : "NONE",
         "dataType" : 25,
-        "name" : "end",
+        "name" : "begin",
         "getPSAppDEField" : {
-          "name" : "END",
-          "codeName" : "END"
+          "name" : "BEGIN",
+          "codeName" : "BEGIN"
         },
         "getPSDETreeColumn" : {
           "modelref" : true,
-          "id" : "end"
+          "id" : "begin"
         }
       }, {
         "cLConvertMode" : "NONE",
@@ -752,26 +752,26 @@
       }, {
         "cLConvertMode" : "NONE",
         "dataType" : 25,
-        "name" : "sn",
+        "name" : "end",
         "getPSAppDEField" : {
-          "name" : "BH",
-          "codeName" : "BH"
+          "name" : "END",
+          "codeName" : "END"
         },
         "getPSDETreeColumn" : {
           "modelref" : true,
-          "id" : "sn"
+          "id" : "end"
         }
       }, {
         "cLConvertMode" : "NONE",
         "dataType" : 25,
-        "name" : "begin",
+        "name" : "sn",
         "getPSAppDEField" : {
-          "name" : "BEGIN",
-          "codeName" : "BEGIN"
+          "name" : "BH",
+          "codeName" : "BH"
         },
         "getPSDETreeColumn" : {
           "modelref" : true,
-          "id" : "begin"
+          "id" : "sn"
         }
       } ],
       "getTextPSAppDEField" : {

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

@@ -12428,16 +12428,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"
       }
     } ]
   }, {
@@ -12466,16 +12466,16 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       }
     }, {
       "name" : "消息类型-常规信息",
@@ -12498,6 +12498,12 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
+    }, {
       "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -12515,22 +12521,30 @@
         "modelref" : true,
         "id" : "ViewMsg10"
       }
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg11"
       }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
@@ -12549,13 +12563,6 @@
         "modelref" : true,
         "id" : "ViewMsg13"
       }
-    }, {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
     }, {
       "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
@@ -12564,39 +12571,32 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg8"
       }
-    }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     } ]
   }, {