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

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"
       }
     } ]
   }, {

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

@@ -184,23 +184,18 @@
           "name" : "expensesheetname"
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "showCaption" : true
       } ],
       "getPSLayout" : {
-        "childColLG" : -1,
-        "childColMD" : 24,
-        "childColSM" : -1,
-        "childColXS" : -1,
-        "columnCount" : 24,
-        "layout" : "TABLE_24COL"
+        "layout" : "FLEX"
       },
       "getPSLayoutPos" : {
-        "colMD" : 24,
-        "layout" : "TABLE_24COL"
+        "grow" : -1,
+        "layout" : "FLEX"
       },
       "infoGroupMode" : false,
       "showCaption" : true
@@ -1616,8 +1611,8 @@
         } ] ]
       },
       "getPSLayoutPos" : {
-        "colMD" : 24,
-        "layout" : "TABLE_24COL"
+        "grow" : -1,
+        "layout" : "FLEX"
       },
       "parentDataJO" : {
         "srfparentdefname" : "EXPENSESHEETID",
@@ -1657,20 +1652,17 @@
         "name" : "expensesheetid"
       },
       "getPSLayoutPos" : {
-        "colMD" : 24,
-        "layout" : "TABLE_24COL"
+        "grow" : -1,
+        "layout" : "FLEX"
       },
       "allowEmpty" : true,
       "hidden" : true,
       "showCaption" : true
     } ],
     "getPSLayout" : {
-      "childColLG" : -1,
-      "childColMD" : 24,
-      "childColSM" : -1,
-      "childColXS" : -1,
-      "columnCount" : 24,
-      "layout" : "TABLE_24COL"
+      "align" : "center",
+      "dir" : "column",
+      "layout" : "FLEX"
     },
     "infoGroupMode" : false
   } ],

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

@@ -295,23 +295,18 @@
             "name" : "expensesheetname"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "allowEmpty" : true,
           "showCaption" : true
         } ],
         "getPSLayout" : {
-          "childColLG" : -1,
-          "childColMD" : 24,
-          "childColSM" : -1,
-          "childColXS" : -1,
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
+          "layout" : "FLEX"
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "infoGroupMode" : false,
         "showCaption" : true
@@ -1727,8 +1722,8 @@
           } ] ]
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "parentDataJO" : {
           "srfparentdefname" : "EXPENSESHEETID",
@@ -1768,20 +1763,17 @@
           "name" : "expensesheetid"
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "hidden" : true,
         "showCaption" : true
       } ],
       "getPSLayout" : {
-        "childColLG" : -1,
-        "childColMD" : 24,
-        "childColSM" : -1,
-        "childColXS" : -1,
-        "columnCount" : 24,
-        "layout" : "TABLE_24COL"
+        "align" : "center",
+        "dir" : "column",
+        "layout" : "FLEX"
       },
       "infoGroupMode" : false
     } ],

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

@@ -3581,16 +3581,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"
       }
     } ]
   }, {
@@ -3608,12 +3608,6 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      }
-    }, {
       "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -3625,17 +3619,17 @@
         "modelref" : true,
         "id" : "ViewMsg4"
       }
-    } ]
     }, {
-    "codeName" : "VMGroup4",
-    "name" : "视图消息位置测试",
-    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg5"
       }
+    } ]
   }, {
+    "codeName" : "VMGroup4",
+    "name" : "视图消息位置测试",
+    "getPSAppViewMsgGroupDetails" : [ {
       "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -3653,15 +3647,21 @@
         "modelref" : true,
         "id" : "ViewMsg8"
       }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     }, {
       "name" : "关闭模式-无删除",
@@ -3670,10 +3670,10 @@
         "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
       }
     } ]
   }, {
@@ -8728,23 +8728,18 @@
                 "name" : "expensesheetname"
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "allowEmpty" : true,
               "showCaption" : true
             } ],
             "getPSLayout" : {
-              "childColLG" : -1,
-              "childColMD" : 24,
-              "childColSM" : -1,
-              "childColXS" : -1,
-              "columnCount" : 24,
-              "layout" : "TABLE_24COL"
+              "layout" : "FLEX"
             },
             "getPSLayoutPos" : {
-              "colMD" : 24,
-              "layout" : "TABLE_24COL"
+              "grow" : -1,
+              "layout" : "FLEX"
             },
             "infoGroupMode" : false,
             "showCaption" : true
@@ -10160,8 +10155,8 @@
               } ] ]
             },
             "getPSLayoutPos" : {
-              "colMD" : 24,
-              "layout" : "TABLE_24COL"
+              "grow" : -1,
+              "layout" : "FLEX"
             },
             "parentDataJO" : {
               "srfparentdefname" : "EXPENSESHEETID",
@@ -10201,20 +10196,17 @@
               "name" : "expensesheetid"
             },
             "getPSLayoutPos" : {
-              "colMD" : 24,
-              "layout" : "TABLE_24COL"
+              "grow" : -1,
+              "layout" : "FLEX"
             },
             "allowEmpty" : true,
             "hidden" : true,
             "showCaption" : true
           } ],
           "getPSLayout" : {
-            "childColLG" : -1,
-            "childColMD" : 24,
-            "childColSM" : -1,
-            "childColXS" : -1,
-            "columnCount" : 24,
-            "layout" : "TABLE_24COL"
+            "align" : "center",
+            "dir" : "column",
+            "layout" : "FLEX"
           },
           "infoGroupMode" : false
         } ],