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

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

@@ -18,10 +18,10 @@
   "getPSChartCoordinateSystems" : [ {
     "eChartsType" : "cartesian2d",
     "index" : 0,
-    "name" : "[bar_0]直角坐标系[0]",
+    "name" : "[candlestick_0]直角坐标系[0]",
     "getPSChartGrid" : {
       "index" : 0,
-      "name" : "[bar_0]直角坐标系[0]",
+      "name" : "[candlestick_0]直角坐标系[0]",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
@@ -55,10 +55,14 @@
   } ],
   "getPSChartDataSets" : [ {
     "index" : 0,
-    "name" : "bar_0-DEFAULT",
+    "name" : "candlestick_0-DEFAULT",
     "getPSChartDataSetFields" : [ {
       "index" : 0,
       "name" : "NAME",
+      "getPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+      },
       "groupField" : true,
       "id" : "0"
     }, {
@@ -80,7 +84,7 @@
   } ],
   "getPSChartGrids" : [ {
     "index" : 0,
-    "name" : "[bar_0]直角坐标系[0]",
+    "name" : "[candlestick_0]直角坐标系[0]",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
       "id" : "0"
@@ -97,7 +101,6 @@
     "id" : "0"
   } ],
   "getPSChartXAxises" : [ {
-    "dataShowMode" : 1,
     "eChartsPos" : "xAxis",
     "eChartsType" : "category",
     "index" : 0,
@@ -133,9 +136,13 @@
   },
   "getPSDEChartSerieses" : [ {
     "catalogField" : "NAME",
-    "eChartsType" : "bar",
+    "getCatalogPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+    },
+    "eChartsType" : "candlestick",
     "index" : 0,
-    "name" : "bar_0",
+    "name" : "candlestick_0",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
       "id" : "0"
@@ -168,16 +175,14 @@
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129249258.json"
     },
-    "seriesType" : "bar",
+    "seriesType" : "candlestick",
     "valueField" : "AGE",
-    "enableChartDataSet" : true,
-    "stack" : false
+    "enableChartDataSet" : true
   } ],
   "getPSDEChartTitle" : {
     "index" : 0,
     "subTitle" : "学生年龄信息5222",
     "title" : "学生信息",
-    "titlePos" : "BOTTOM",
     "showTitle" : true,
     "id" : "0"
   },

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

@@ -69,23 +69,6 @@
     }
   } ],
   "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" : {
@@ -117,6 +100,23 @@
     },
     "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

@@ -223,10 +223,10 @@
     "getPSChartCoordinateSystems" : [ {
       "eChartsType" : "cartesian2d",
       "index" : 0,
-      "name" : "[bar_0]直角坐标系[0]",
+      "name" : "[candlestick_0]直角坐标系[0]",
       "getPSChartGrid" : {
         "index" : 0,
-        "name" : "[bar_0]直角坐标系[0]",
+        "name" : "[candlestick_0]直角坐标系[0]",
         "getPSChartCoordinateSystem" : {
           "modelref" : true,
           "id" : "0"
@@ -260,10 +260,14 @@
     } ],
     "getPSChartDataSets" : [ {
       "index" : 0,
-      "name" : "bar_0-DEFAULT",
+      "name" : "candlestick_0-DEFAULT",
       "getPSChartDataSetFields" : [ {
         "index" : 0,
         "name" : "NAME",
+        "getPSCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+        },
         "groupField" : true,
         "id" : "0"
       }, {
@@ -285,7 +289,7 @@
     } ],
     "getPSChartGrids" : [ {
       "index" : 0,
-      "name" : "[bar_0]直角坐标系[0]",
+      "name" : "[candlestick_0]直角坐标系[0]",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
@@ -302,7 +306,6 @@
       "id" : "0"
     } ],
     "getPSChartXAxises" : [ {
-      "dataShowMode" : 1,
       "eChartsPos" : "xAxis",
       "eChartsType" : "category",
       "index" : 0,
@@ -412,9 +415,13 @@
     },
     "getPSDEChartSerieses" : [ {
       "catalogField" : "NAME",
-      "eChartsType" : "bar",
+      "getCatalogPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+      },
+      "eChartsType" : "candlestick",
       "index" : 0,
-      "name" : "bar_0",
+      "name" : "candlestick_0",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
@@ -447,16 +454,14 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129249258.json"
       },
-      "seriesType" : "bar",
+      "seriesType" : "candlestick",
       "valueField" : "AGE",
-      "enableChartDataSet" : true,
-      "stack" : false
+      "enableChartDataSet" : true
     } ],
     "getPSDEChartTitle" : {
       "index" : 0,
       "subTitle" : "学生年龄信息5222",
       "title" : "学生信息",
-      "titlePos" : "BOTTOM",
       "showTitle" : true,
       "id" : "0"
     },

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

@@ -1253,23 +1253,6 @@
       "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" : {
@@ -1301,6 +1284,23 @@
       },
       "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

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