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

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

@@ -1133,16 +1133,16 @@
     "mOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ],
     "rTMOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2"

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

@@ -15,15 +15,21 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
   },
   "getPSChartCoordinateSystems" : [ {
-    "eChartsType" : "cartesian2d",
+    "eChartsType" : "none",
     "index" : 0,
-    "name" : "[bar_0]直角坐标系[0]",
+    "name" : "[pie_1]无坐标系[0]",
+    "type" : "NONE",
+    "id" : "0"
+  }, {
+    "eChartsType" : "cartesian2d",
+    "index" : 1,
+    "name" : "[bar_0]直角坐标系[1]",
     "getPSChartGrid" : {
       "index" : 0,
-      "name" : "[bar_0]直角坐标系[0]",
+      "name" : "[bar_0]直角坐标系[1]",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
-        "id" : "0"
+        "id" : "1"
       },
       "getPSChartGridXAxis0" : {
         "modelref" : true,
@@ -37,7 +43,7 @@
       "id" : "0"
     },
     "type" : "XY",
-    "id" : "0"
+    "id" : "1"
   } ],
   "getPSChartDataSetGroups" : [ {
     "index" : 0,
@@ -54,6 +60,21 @@
   } ],
   "getPSChartDataSets" : [ {
     "index" : 0,
+    "name" : "pie_1-DEFAULT",
+    "getPSChartDataSetFields" : [ {
+      "index" : 0,
+      "name" : "name",
+      "groupField" : true,
+      "id" : "0"
+    }, {
+      "index" : 1,
+      "name" : "age",
+      "groupField" : false,
+      "id" : "1"
+    } ],
+    "id" : "0"
+  }, {
+    "index" : 1,
     "name" : "bar_0-DEFAULT",
     "getPSChartDataSetFields" : [ {
       "groupMode" : "YEAR",
@@ -85,14 +106,14 @@
       "groupField" : false,
       "id" : "3"
     } ],
-    "id" : "0"
+    "id" : "1"
   } ],
   "getPSChartGrids" : [ {
     "index" : 0,
-    "name" : "[bar_0]直角坐标系[0]",
+    "name" : "[bar_0]直角坐标系[1]",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
-      "id" : "0"
+      "id" : "1"
     },
     "getPSChartGridXAxis0" : {
       "modelref" : true,
@@ -141,6 +162,31 @@
     "id" : "0"
   },
   "getPSDEChartSerieses" : [ {
+    "catalogField" : "name",
+    "eChartsType" : "pie",
+    "index" : 0,
+    "name" : "pie_1",
+    "getPSChartCoordinateSystem" : {
+      "modelref" : true,
+      "id" : "0"
+    },
+    "getPSChartDataSet" : {
+      "modelref" : true,
+      "id" : "0"
+    },
+    "getPSChartSeriesEncode" : {
+      "category" : "name",
+      "index" : 0,
+      "name" : "坐标系编码",
+      "type" : "NONE",
+      "value" : "age",
+      "id" : "0"
+    },
+    "seriesLayoutBy" : "column",
+    "seriesType" : "pie",
+    "valueField" : "age",
+    "enableChartDataSet" : true
+  }, {
     "caption" : "学生年龄信息",
     "catalogField" : "name",
     "getCatalogPSCodeList" : {
@@ -150,15 +196,15 @@
     "eChartsType" : "bar",
     "groupMode" : "YEAR",
     "idField" : "address",
-    "index" : 0,
+    "index" : 1,
     "name" : "bar_0",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
-      "id" : "0"
+      "id" : "1"
     },
     "getPSChartDataSet" : {
       "modelref" : true,
-      "id" : "0"
+      "id" : "1"
     },
     "getPSChartSeriesEncode" : {
       "index" : 0,

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

@@ -69,6 +69,23 @@
     }
   } ],
   "getPSDEFormItemVRs" : [ {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFormItemName" : "Name",
+    "getPSSysValueRule" : {
+      "codeName" : "ValueRule14",
+      "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
+      "mOSFilePath" : "pssysvaluerules/ValueRule14",
+      "name" : "由26个英文字母组成的字符串",
+      "rTMOSFilePath" : "pssysvaluerules/ValueRule14",
+      "regExCode" : "[A-Za-z]+",
+      "ruleInfo" : "内容必须为26个英文字母组成的字符串",
+      "ruleType" : "REG",
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "valueRuleType" : "SYSVALUERULE"
+  }, {
     "checkMode" : 3,
     "name" : "表单项值规则",
     "getPSDEFValueRule" : {
@@ -100,23 +117,6 @@
     },
     "getPSDEFormItemName" : "StuNo",
     "valueRuleType" : "DEFVALUERULE"
-  }, {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFormItemName" : "Name",
-    "getPSSysValueRule" : {
-      "codeName" : "ValueRule14",
-      "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
-      "mOSFilePath" : "pssysvaluerules/ValueRule14",
-      "name" : "由26个英文字母组成的字符串",
-      "rTMOSFilePath" : "pssysvaluerules/ValueRule14",
-      "regExCode" : "[A-Za-z]+",
-      "ruleInfo" : "内容必须为26个英文字母组成的字符串",
-      "ruleType" : "REG",
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "valueRuleType" : "SYSVALUERULE"
   } ],
   "getPSDEFormItems" : [ {
     "id" : "srfupdatedate",

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

@@ -220,15 +220,21 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
     },
     "getPSChartCoordinateSystems" : [ {
-      "eChartsType" : "cartesian2d",
+      "eChartsType" : "none",
       "index" : 0,
-      "name" : "[bar_0]直角坐标系[0]",
+      "name" : "[pie_1]无坐标系[0]",
+      "type" : "NONE",
+      "id" : "0"
+    }, {
+      "eChartsType" : "cartesian2d",
+      "index" : 1,
+      "name" : "[bar_0]直角坐标系[1]",
       "getPSChartGrid" : {
         "index" : 0,
-        "name" : "[bar_0]直角坐标系[0]",
+        "name" : "[bar_0]直角坐标系[1]",
         "getPSChartCoordinateSystem" : {
           "modelref" : true,
-          "id" : "0"
+          "id" : "1"
         },
         "getPSChartGridXAxis0" : {
           "modelref" : true,
@@ -242,7 +248,7 @@
         "id" : "0"
       },
       "type" : "XY",
-      "id" : "0"
+      "id" : "1"
     } ],
     "getPSChartDataSetGroups" : [ {
       "index" : 0,
@@ -259,6 +265,21 @@
     } ],
     "getPSChartDataSets" : [ {
       "index" : 0,
+      "name" : "pie_1-DEFAULT",
+      "getPSChartDataSetFields" : [ {
+        "index" : 0,
+        "name" : "name",
+        "groupField" : true,
+        "id" : "0"
+      }, {
+        "index" : 1,
+        "name" : "age",
+        "groupField" : false,
+        "id" : "1"
+      } ],
+      "id" : "0"
+    }, {
+      "index" : 1,
       "name" : "bar_0-DEFAULT",
       "getPSChartDataSetFields" : [ {
         "groupMode" : "YEAR",
@@ -290,14 +311,14 @@
         "groupField" : false,
         "id" : "3"
       } ],
-      "id" : "0"
+      "id" : "1"
     } ],
     "getPSChartGrids" : [ {
       "index" : 0,
-      "name" : "[bar_0]直角坐标系[0]",
+      "name" : "[bar_0]直角坐标系[1]",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
-        "id" : "0"
+        "id" : "1"
       },
       "getPSChartGridXAxis0" : {
         "modelref" : true,
@@ -420,6 +441,31 @@
       "id" : "0"
     },
     "getPSDEChartSerieses" : [ {
+      "catalogField" : "name",
+      "eChartsType" : "pie",
+      "index" : 0,
+      "name" : "pie_1",
+      "getPSChartCoordinateSystem" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "getPSChartDataSet" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "getPSChartSeriesEncode" : {
+        "category" : "name",
+        "index" : 0,
+        "name" : "坐标系编码",
+        "type" : "NONE",
+        "value" : "age",
+        "id" : "0"
+      },
+      "seriesLayoutBy" : "column",
+      "seriesType" : "pie",
+      "valueField" : "age",
+      "enableChartDataSet" : true
+    }, {
       "caption" : "学生年龄信息",
       "catalogField" : "name",
       "getCatalogPSCodeList" : {
@@ -429,15 +475,15 @@
       "eChartsType" : "bar",
       "groupMode" : "YEAR",
       "idField" : "address",
-      "index" : 0,
+      "index" : 1,
       "name" : "bar_0",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
-        "id" : "0"
+        "id" : "1"
       },
       "getPSChartDataSet" : {
         "modelref" : true,
-        "id" : "0"
+        "id" : "1"
       },
       "getPSChartSeriesEncode" : {
         "index" : 0,

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

@@ -1253,6 +1253,23 @@
       "id" : "FORM"
     },
     "getPSDEFormItemVRs" : [ {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFormItemName" : "Name",
+      "getPSSysValueRule" : {
+        "codeName" : "ValueRule14",
+        "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
+        "mOSFilePath" : "pssysvaluerules/ValueRule14",
+        "name" : "由26个英文字母组成的字符串",
+        "rTMOSFilePath" : "pssysvaluerules/ValueRule14",
+        "regExCode" : "[A-Za-z]+",
+        "ruleInfo" : "内容必须为26个英文字母组成的字符串",
+        "ruleType" : "REG",
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "valueRuleType" : "SYSVALUERULE"
+    }, {
       "checkMode" : 3,
       "name" : "表单项值规则",
       "getPSDEFValueRule" : {
@@ -1284,23 +1301,6 @@
       },
       "getPSDEFormItemName" : "StuNo",
       "valueRuleType" : "DEFVALUERULE"
-    }, {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFormItemName" : "Name",
-      "getPSSysValueRule" : {
-        "codeName" : "ValueRule14",
-        "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
-        "mOSFilePath" : "pssysvaluerules/ValueRule14",
-        "name" : "由26个英文字母组成的字符串",
-        "rTMOSFilePath" : "pssysvaluerules/ValueRule14",
-        "regExCode" : "[A-Za-z]+",
-        "ruleInfo" : "内容必须为26个英文字母组成的字符串",
-        "ruleType" : "REG",
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "valueRuleType" : "SYSVALUERULE"
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",

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

@@ -2103,16 +2103,16 @@
     "mOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ],
     "rTMOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2"