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

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

@@ -1169,16 +1169,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

 {
   "codeName" : "Chart",
   "controlType" : "CHART",
-  "coordinateSystem" : "XY",
+  "coordinateSystem" : "RADAR",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json",
   "emptyText" : "hello",
   "getFetchPSControlAction" : {
@@ -16,28 +16,20 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
   },
   "getPSChartCoordinateSystems" : [ {
-    "eChartsType" : "cartesian2d",
+    "eChartsType" : "radar",
     "index" : 0,
-    "name" : "[candlestick_0]直角坐标系[0]",
-    "getPSChartGrid" : {
+    "name" : "[radar_0]雷达坐标系[0]",
+    "getPSChartRadar" : {
       "index" : 0,
-      "name" : "[candlestick_0]直角坐标系[0]",
+      "name" : "[radar_0]雷达坐标系[0]",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
       },
-      "getPSChartGridXAxis0" : {
-        "modelref" : true,
-        "id" : "0"
-      },
-      "getPSChartGridYAxis0" : {
-        "modelref" : true,
+      "type" : "radar",
       "id" : "0"
     },
-      "type" : "grid",
-      "id" : "0"
-    },
-    "type" : "XY",
+    "type" : "RADAR",
     "id" : "0"
   } ],
   "getPSChartDataSetGroups" : [ {
@@ -55,7 +47,7 @@
   } ],
   "getPSChartDataSets" : [ {
     "index" : 0,
-    "name" : "candlestick_0-DEFAULT",
+    "name" : "radar_0-DEFAULT",
     "getPSChartDataSetFields" : [ {
       "index" : 0,
       "name" : "NAME",
@@ -69,40 +61,14 @@
     } ],
     "id" : "0"
   } ],
-  "getPSChartGrids" : [ {
+  "getPSChartRadars" : [ {
     "index" : 0,
-    "name" : "[candlestick_0]直角坐标系[0]",
+    "name" : "[radar_0]雷达坐标系[0]",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
       "id" : "0"
     },
-    "getPSChartGridXAxis0" : {
-      "modelref" : true,
-      "id" : "0"
-    },
-    "getPSChartGridYAxis0" : {
-      "modelref" : true,
-      "id" : "0"
-    },
-    "type" : "grid",
-    "id" : "0"
-  } ],
-  "getPSChartXAxises" : [ {
-    "eChartsPos" : "xAxis",
-    "eChartsType" : "category",
-    "index" : 0,
-    "name" : "axis_xAxis_0",
-    "position" : "bottom",
-    "type" : "category",
-    "id" : "0"
-  } ],
-  "getPSChartYAxises" : [ {
-    "eChartsPos" : "yAxis",
-    "eChartsType" : "value",
-    "index" : 0,
-    "name" : "axis_yAxis_0",
-    "position" : "left",
-    "type" : "numeric",
+    "type" : "radar",
     "id" : "0"
   } ],
   "getPSControlLogics" : [ {
@@ -122,10 +88,11 @@
     "id" : "0"
   },
   "getPSDEChartSerieses" : [ {
+    "caption" : "数据1",
     "catalogField" : "NAME",
-    "eChartsType" : "candlestick",
+    "eChartsType" : "radar",
     "index" : 0,
-    "name" : "candlestick_0",
+    "name" : "radar_0",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
       "id" : "0"
@@ -134,24 +101,8 @@
       "modelref" : true,
       "id" : "0"
     },
-    "getPSChartSeriesEncode" : {
-      "index" : 0,
-      "name" : "坐标系编码",
-      "getPSChartXAxis" : {
-        "modelref" : true,
-        "id" : "0"
-      },
-      "getPSChartYAxis" : {
-        "modelref" : true,
-        "id" : "0"
-      },
-      "type" : "XY",
-      "x" : [ "NAME" ],
-      "y" : [ "AGE" ],
-      "id" : "0"
-    },
     "seriesLayoutBy" : "column",
-    "seriesType" : "candlestick",
+    "seriesType" : "radar",
     "valueField" : "AGE",
     "enableChartDataSet" : true
   } ],

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

@@ -206,7 +206,7 @@
   }, {
     "codeName" : "Chart",
     "controlType" : "CHART",
-    "coordinateSystem" : "XY",
+    "coordinateSystem" : "RADAR",
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json",
     "emptyText" : "hello",
     "getFetchPSControlAction" : {
@@ -221,28 +221,20 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
     },
     "getPSChartCoordinateSystems" : [ {
-      "eChartsType" : "cartesian2d",
+      "eChartsType" : "radar",
       "index" : 0,
-      "name" : "[candlestick_0]直角坐标系[0]",
-      "getPSChartGrid" : {
+      "name" : "[radar_0]雷达坐标系[0]",
+      "getPSChartRadar" : {
         "index" : 0,
-        "name" : "[candlestick_0]直角坐标系[0]",
+        "name" : "[radar_0]雷达坐标系[0]",
         "getPSChartCoordinateSystem" : {
           "modelref" : true,
           "id" : "0"
         },
-        "getPSChartGridXAxis0" : {
-          "modelref" : true,
-          "id" : "0"
-        },
-        "getPSChartGridYAxis0" : {
-          "modelref" : true,
+        "type" : "radar",
         "id" : "0"
       },
-        "type" : "grid",
-        "id" : "0"
-      },
-      "type" : "XY",
+      "type" : "RADAR",
       "id" : "0"
     } ],
     "getPSChartDataSetGroups" : [ {
@@ -260,7 +252,7 @@
     } ],
     "getPSChartDataSets" : [ {
       "index" : 0,
-      "name" : "candlestick_0-DEFAULT",
+      "name" : "radar_0-DEFAULT",
       "getPSChartDataSetFields" : [ {
         "index" : 0,
         "name" : "NAME",
@@ -274,40 +266,14 @@
       } ],
       "id" : "0"
     } ],
-    "getPSChartGrids" : [ {
+    "getPSChartRadars" : [ {
       "index" : 0,
-      "name" : "[candlestick_0]直角坐标系[0]",
+      "name" : "[radar_0]雷达坐标系[0]",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
       },
-      "getPSChartGridXAxis0" : {
-        "modelref" : true,
-        "id" : "0"
-      },
-      "getPSChartGridYAxis0" : {
-        "modelref" : true,
-        "id" : "0"
-      },
-      "type" : "grid",
-      "id" : "0"
-    } ],
-    "getPSChartXAxises" : [ {
-      "eChartsPos" : "xAxis",
-      "eChartsType" : "category",
-      "index" : 0,
-      "name" : "axis_xAxis_0",
-      "position" : "bottom",
-      "type" : "category",
-      "id" : "0"
-    } ],
-    "getPSChartYAxises" : [ {
-      "eChartsPos" : "yAxis",
-      "eChartsType" : "value",
-      "index" : 0,
-      "name" : "axis_yAxis_0",
-      "position" : "left",
-      "type" : "numeric",
+      "type" : "radar",
       "id" : "0"
     } ],
     "getPSControlHandler" : {
@@ -401,10 +367,11 @@
       "id" : "0"
     },
     "getPSDEChartSerieses" : [ {
+      "caption" : "数据1",
       "catalogField" : "NAME",
-      "eChartsType" : "candlestick",
+      "eChartsType" : "radar",
       "index" : 0,
-      "name" : "candlestick_0",
+      "name" : "radar_0",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
@@ -413,24 +380,8 @@
         "modelref" : true,
         "id" : "0"
       },
-      "getPSChartSeriesEncode" : {
-        "index" : 0,
-        "name" : "坐标系编码",
-        "getPSChartXAxis" : {
-          "modelref" : true,
-          "id" : "0"
-        },
-        "getPSChartYAxis" : {
-          "modelref" : true,
-          "id" : "0"
-        },
-        "type" : "XY",
-        "x" : [ "NAME" ],
-        "y" : [ "AGE" ],
-        "id" : "0"
-      },
       "seriesLayoutBy" : "column",
-      "seriesType" : "candlestick",
+      "seriesType" : "radar",
       "valueField" : "AGE",
       "enableChartDataSet" : true
     } ],

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"