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" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSSEARCHFORMS/Usr12203720_SearchForm.json

@@ -14,6 +14,9 @@
   }, {
     "id" : "formitem",
     "dataType" : 25
+  }, {
+    "id" : "formitem2",
+    "dataType" : 25
   } ],
   "getPSDEFormPages" : [ {
     "caption" : "常规条件",
@@ -58,6 +61,20 @@
       "name" : "formitem",
       "noPrivDisplayMode" : 1,
       "outputCodeListConfigMode" : 2,
+      "getPSDEFDGroupLogics" : [ {
+        "groupOP" : "AND",
+        "logicCat" : "ITEMENABLE",
+        "logicType" : "GROUP",
+        "name" : "表单成员[formitem][表单项启用]逻辑",
+        "getPSDEFDLogics" : [ {
+          "condOP" : "EQ",
+          "dEFDName" : "formitem1",
+          "logicType" : "SINGLE",
+          "value" : "1"
+        } ],
+        "relatedDetailNames" : [ "formitem1" ],
+        "notMode" : false
+      } ],
       "getPSEditor" : {
         "editorParams" : {
           "isBtnRoundCorner" : "true",
@@ -83,6 +100,46 @@
       },
       "allowEmpty" : true,
       "needCodeListConfig" : true
+    }, {
+      "caption" : "表单项",
+      "codeName" : "formitem2",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "formitem2",
+      "noPrivDisplayMode" : 1,
+      "getPSDEFDGroupLogics" : [ {
+        "groupOP" : "AND",
+        "logicCat" : "ITEMENABLE",
+        "logicType" : "GROUP",
+        "name" : "表单成员[formitem2][表单项启用]逻辑",
+        "getPSDEFDLogics" : [ {
+          "condOP" : "NOTEQ",
+          "dEFDName" : "formitem1",
+          "logicType" : "SINGLE"
+        } ],
+        "relatedDetailNames" : [ "formitem1" ],
+        "notMode" : false
+      } ],
+      "getPSEditor" : {
+        "editorType" : "RADIOBUTTONLIST",
+        "name" : "formitem2",
+        "getPSAppCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/FileShortcutSearchType.json"
+        }
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "allowEmpty" : true,
+      "needCodeListConfig" : true,
+      "showCaption" : true
     } ],
     "getPSLayout" : {
       "childColLG" : -1,

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

@@ -476,6 +476,9 @@
     }, {
       "id" : "formitem",
       "dataType" : 25
+    }, {
+      "id" : "formitem2",
+      "dataType" : 25
     } ],
     "getPSDEFormPages" : [ {
       "caption" : "常规条件",
@@ -520,6 +523,20 @@
         "name" : "formitem",
         "noPrivDisplayMode" : 1,
         "outputCodeListConfigMode" : 2,
+        "getPSDEFDGroupLogics" : [ {
+          "groupOP" : "AND",
+          "logicCat" : "ITEMENABLE",
+          "logicType" : "GROUP",
+          "name" : "表单成员[formitem][表单项启用]逻辑",
+          "getPSDEFDLogics" : [ {
+            "condOP" : "EQ",
+            "dEFDName" : "formitem1",
+            "logicType" : "SINGLE",
+            "value" : "1"
+          } ],
+          "relatedDetailNames" : [ "formitem1" ],
+          "notMode" : false
+        } ],
         "getPSEditor" : {
           "editorParams" : {
             "isBtnRoundCorner" : "true",
@@ -545,6 +562,46 @@
         },
         "allowEmpty" : true,
         "needCodeListConfig" : true
+      }, {
+        "caption" : "表单项",
+        "codeName" : "formitem2",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitem2",
+        "noPrivDisplayMode" : 1,
+        "getPSDEFDGroupLogics" : [ {
+          "groupOP" : "AND",
+          "logicCat" : "ITEMENABLE",
+          "logicType" : "GROUP",
+          "name" : "表单成员[formitem2][表单项启用]逻辑",
+          "getPSDEFDLogics" : [ {
+            "condOP" : "NOTEQ",
+            "dEFDName" : "formitem1",
+            "logicType" : "SINGLE"
+          } ],
+          "relatedDetailNames" : [ "formitem1" ],
+          "notMode" : false
+        } ],
+        "getPSEditor" : {
+          "editorType" : "RADIOBUTTONLIST",
+          "name" : "formitem2",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/FileShortcutSearchType.json"
+          }
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "needCodeListConfig" : true,
+        "showCaption" : true
       } ],
       "getPSLayout" : {
         "childColLG" : -1,

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

@@ -12386,16 +12386,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   }, {
@@ -12424,10 +12424,10 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
       }
     }, {
       "name" : "消息类型-警告信息",
@@ -12436,10 +12436,10 @@
         "id" : "ViewMsg5"
       }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
       }
     } ]
   }, {
@@ -12456,12 +12456,6 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg10"
-      }
-    }, {
       "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -12473,6 +12467,12 @@
         "modelref" : true,
         "id" : "ViewMsg7"
       }
+    }, {
+      "name" : "消息位置-弹出",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg10"
+      }
     }, {
       "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
@@ -12484,18 +12484,12 @@
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
       },
       "position" : "POPUP"
-    }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
     }, {
       "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
@@ -12503,19 +12497,11 @@
         "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg9"
+      }
     }, {
       "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
@@ -12523,10 +12509,10 @@
         "id" : "ViewMsg12"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
       }
     }, {
       "name" : "关闭模式-本次删除-上方-警告",
@@ -12534,6 +12520,20 @@
         "modelref" : true,
         "id" : "ViewMsg13"
       }
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "消息类型-错误信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
     } ]
   }, {
     "codeName" : "VMGroup5",
@@ -12545,32 +12545,32 @@
         "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     } ]
   }, {
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     } ]
   } ],