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

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

@@ -1432,16 +1432,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/Book/PSFORMS/Main_4.json

@@ -211,6 +211,14 @@
   }, {
     "id" : "formitem9",
     "dataType" : 25
+  }, {
+    "id" : "formitem10",
+    "dataType" : 25,
+    "updateDV" : "efee7d4595f8d6aa83f77c3321f53ff1",
+    "getPSAppDEField" : {
+      "name" : "FIELD5",
+      "codeName" : "Field5"
+    }
   }, {
     "id" : "bookid",
     "hidden" : true,
@@ -1075,6 +1083,38 @@
       },
       "allowEmpty" : true,
       "showCaption" : true
+    }, {
+      "caption" : "单选项",
+      "codeName" : "formitem10",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 0,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "formitem10",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "FIELD5",
+        "codeName" : "Field5"
+      },
+      "getPSEditor" : {
+        "editorType" : "RADIOBUTTONLIST",
+        "name" : "formitem10",
+        "getPSAppCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList.json"
+        }
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "updateDV" : "efee7d4595f8d6aa83f77c3321f53ff1",
+      "allowEmpty" : true,
+      "needCodeListConfig" : true,
+      "showCaption" : true
     } ],
     "getPSLayout" : {
       "childColLG" : -1,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json

@@ -66,14 +66,19 @@
     "name" : "bar_0-DEFAULT",
     "getPSChartDataSetFields" : [ {
       "index" : 0,
-      "name" : "DEPARTMENT",
+      "name" : "address",
       "groupField" : true,
       "id" : "0"
     }, {
       "index" : 1,
+      "name" : "DEPARTMENT",
+      "groupField" : true,
+      "id" : "1"
+    }, {
+      "index" : 2,
       "name" : "AGE",
       "groupField" : false,
-      "id" : "1"
+      "id" : "2"
     } ],
     "id" : "0"
   } ],
@@ -124,6 +129,7 @@
   },
   "getPSDEChartSerieses" : [ {
     "caption" : "正常人数",
+    "catalogField" : "address",
     "eChartsType" : "bar",
     "index" : 0,
     "name" : "bar_0",
@@ -154,6 +160,7 @@
         "id" : "0"
       },
       "type" : "XY",
+      "x" : [ "address" ],
       "y" : [ "AGE" ],
       "id" : "0"
     },

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

@@ -130,14 +130,19 @@
         "name" : "bar_0-DEFAULT",
         "getPSChartDataSetFields" : [ {
           "index" : 0,
-          "name" : "DEPARTMENT",
+          "name" : "address",
           "groupField" : true,
           "id" : "0"
         }, {
           "index" : 1,
+          "name" : "DEPARTMENT",
+          "groupField" : true,
+          "id" : "1"
+        }, {
+          "index" : 2,
           "name" : "AGE",
           "groupField" : false,
-          "id" : "1"
+          "id" : "2"
         } ],
         "id" : "0"
       } ],
@@ -273,6 +278,7 @@
       },
       "getPSDEChartSerieses" : [ {
         "caption" : "正常人数",
+        "catalogField" : "address",
         "eChartsType" : "bar",
         "index" : 0,
         "name" : "bar_0",
@@ -303,6 +309,7 @@
             "id" : "0"
           },
           "type" : "XY",
+          "x" : [ "address" ],
           "y" : [ "AGE" ],
           "id" : "0"
         },

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

@@ -349,14 +349,19 @@
       "name" : "bar_0-DEFAULT",
       "getPSChartDataSetFields" : [ {
         "index" : 0,
-        "name" : "DEPARTMENT",
+        "name" : "address",
         "groupField" : true,
         "id" : "0"
       }, {
         "index" : 1,
+        "name" : "DEPARTMENT",
+        "groupField" : true,
+        "id" : "1"
+      }, {
+        "index" : 2,
         "name" : "AGE",
         "groupField" : false,
-        "id" : "1"
+        "id" : "2"
       } ],
       "id" : "0"
     } ],
@@ -483,6 +488,7 @@
     },
     "getPSDEChartSerieses" : [ {
       "caption" : "正常人数",
+      "catalogField" : "address",
       "eChartsType" : "bar",
       "index" : 0,
       "name" : "bar_0",
@@ -513,6 +519,7 @@
           "id" : "0"
         },
         "type" : "XY",
+        "x" : [ "address" ],
         "y" : [ "AGE" ],
         "id" : "0"
       },

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

@@ -328,6 +328,14 @@
     }, {
       "id" : "formitem9",
       "dataType" : 25
+    }, {
+      "id" : "formitem10",
+      "dataType" : 25,
+      "updateDV" : "efee7d4595f8d6aa83f77c3321f53ff1",
+      "getPSAppDEField" : {
+        "name" : "FIELD5",
+        "codeName" : "Field5"
+      }
     }, {
       "id" : "bookid",
       "hidden" : true,
@@ -1192,6 +1200,38 @@
         },
         "allowEmpty" : true,
         "showCaption" : true
+      }, {
+        "caption" : "单选项",
+        "codeName" : "formitem10",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 0,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitem10",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "FIELD5",
+          "codeName" : "Field5"
+        },
+        "getPSEditor" : {
+          "editorType" : "RADIOBUTTONLIST",
+          "name" : "formitem10",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList.json"
+          }
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "updateDV" : "efee7d4595f8d6aa83f77c3321f53ff1",
+        "allowEmpty" : true,
+        "needCodeListConfig" : true,
+        "showCaption" : true
       } ],
       "getPSLayout" : {
         "childColLG" : -1,

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

@@ -9725,16 +9725,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"
       }
     } ]
   }, {
@@ -9763,12 +9763,6 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      }
-    }, {
       "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -9780,6 +9774,12 @@
         "modelref" : true,
         "id" : "ViewMsg6"
       }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      }
     } ]
   }, {
     "codeName" : "VMGroup7",
@@ -9801,16 +9801,16 @@
         "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
       }
     }, {
       "name" : "消息位置-视图内容区",
@@ -9823,28 +9823,16 @@
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除-上方-错误",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
       "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
         "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
-    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     }, {
       "name" : "消息类型-警告信息",
@@ -9853,6 +9841,12 @@
         "id" : "ViewMsg5"
       },
       "position" : "POPUP"
+    }, {
+      "name" : "关闭模式-本次删除-上方-警告",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
     }, {
       "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
@@ -9861,10 +9855,10 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg8"
       }
     }, {
       "name" : "消息类型-常规信息",
@@ -9873,21 +9867,27 @@
         "id" : "ViewMsg4"
       },
       "position" : "POPUP"
+    }, {
+      "name" : "关闭模式-无删除-上方-常规",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg11"
+      }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
       }
     }, {
       "name" : "关闭模式-默认删除",