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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSCODELISTS/UsrCodeList0129249258.json

@@ -37,7 +37,7 @@
     "path" : "PSMODULES/common.json"
   },
   "rTMOSFilePath" : "psmodules/common/pscodelists/UsrCodeList0129249258",
-  "refFlag" : false,
+  "refFlag" : true,
   "systemTag" : "TrainSys",
   "codeItemValueNumber" : false,
   "enableCache" : true,

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

 {
   "codeName" : "Chart",
   "controlType" : "CHART",
-  "coordinateSystem" : "NONE",
+  "coordinateSystem" : "XY",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json",
   "emptyText" : "hello",
   "getFetchPSControlAction" : {
@@ -16,10 +16,28 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
   },
   "getPSChartCoordinateSystems" : [ {
-    "eChartsType" : "none",
+    "eChartsType" : "cartesian2d",
     "index" : 0,
-    "name" : "[funnel_0]无坐标系[0]",
-    "type" : "NONE",
+    "name" : "[bar_0]直角坐标系[0]",
+    "getPSChartGrid" : {
+      "index" : 0,
+      "name" : "[bar_0]直角坐标系[0]",
+      "getPSChartCoordinateSystem" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "getPSChartGridXAxis0" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "getPSChartGridYAxis0" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "type" : "grid",
+      "id" : "0"
+    },
+    "type" : "XY",
     "id" : "0"
   } ],
   "getPSChartDataSetGroups" : [ {
@@ -37,20 +55,69 @@
   } ],
   "getPSChartDataSets" : [ {
     "index" : 0,
-    "name" : "funnel_0-DEFAULT",
+    "name" : "bar_0-DEFAULT",
     "getPSChartDataSetFields" : [ {
       "index" : 0,
       "name" : "name",
+      "getPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+      },
       "groupField" : true,
       "id" : "0"
     }, {
       "index" : 1,
+      "name" : "department",
+      "getPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129249258.json"
+      },
+      "groupField" : true,
+      "id" : "1"
+    }, {
+      "index" : 2,
       "name" : "age",
       "groupField" : false,
-      "id" : "1"
+      "id" : "2"
     } ],
     "id" : "0"
   } ],
+  "getPSChartGrids" : [ {
+    "index" : 0,
+    "name" : "[bar_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",
+    "id" : "0"
+  } ],
   "getPSControlLogics" : [ {
     "eventNames" : "LOAD;BEFORELOAD",
     "logicTag" : "chart",
@@ -68,11 +135,15 @@
     "id" : "0"
   },
   "getPSDEChartSerieses" : [ {
-    "caption" : "漏斗图",
+    "caption" : "学生信息柱状图",
     "catalogField" : "name",
-    "eChartsType" : "funnel",
+    "getCatalogPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+    },
+    "eChartsType" : "bar",
     "index" : 0,
-    "name" : "funnel_0",
+    "name" : "bar_0",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
       "id" : "0"
@@ -82,17 +153,33 @@
       "id" : "0"
     },
     "getPSChartSeriesEncode" : {
-      "category" : "name",
       "index" : 0,
+      "itemId" : "department",
+      "itemName" : "department",
       "name" : "坐标系编码",
-      "type" : "NONE",
-      "value" : "age",
+      "getPSChartXAxis" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "getPSChartYAxis" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "type" : "XY",
+      "x" : [ "name" ],
+      "y" : [ "age" ],
       "id" : "0"
     },
+    "seriesField" : "department",
     "seriesLayoutBy" : "column",
-    "seriesType" : "funnel",
+    "getSeriesPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129249258.json"
+    },
+    "seriesType" : "bar",
     "valueField" : "age",
-    "enableChartDataSet" : true
+    "enableChartDataSet" : true,
+    "stack" : false
   } ],
   "getPSDEChartTitle" : {
     "index" : 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

@@ -206,7 +206,7 @@
   }, {
     "codeName" : "Chart",
     "controlType" : "CHART",
-    "coordinateSystem" : "NONE",
+    "coordinateSystem" : "XY",
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json",
     "emptyText" : "hello",
     "getFetchPSControlAction" : {
@@ -221,10 +221,28 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
     },
     "getPSChartCoordinateSystems" : [ {
-      "eChartsType" : "none",
+      "eChartsType" : "cartesian2d",
       "index" : 0,
-      "name" : "[funnel_0]无坐标系[0]",
-      "type" : "NONE",
+      "name" : "[bar_0]直角坐标系[0]",
+      "getPSChartGrid" : {
+        "index" : 0,
+        "name" : "[bar_0]直角坐标系[0]",
+        "getPSChartCoordinateSystem" : {
+          "modelref" : true,
+          "id" : "0"
+        },
+        "getPSChartGridXAxis0" : {
+          "modelref" : true,
+          "id" : "0"
+        },
+        "getPSChartGridYAxis0" : {
+          "modelref" : true,
+          "id" : "0"
+        },
+        "type" : "grid",
+        "id" : "0"
+      },
+      "type" : "XY",
       "id" : "0"
     } ],
     "getPSChartDataSetGroups" : [ {
@@ -242,20 +260,69 @@
     } ],
     "getPSChartDataSets" : [ {
       "index" : 0,
-      "name" : "funnel_0-DEFAULT",
+      "name" : "bar_0-DEFAULT",
       "getPSChartDataSetFields" : [ {
         "index" : 0,
         "name" : "name",
+        "getPSCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+        },
         "groupField" : true,
         "id" : "0"
       }, {
         "index" : 1,
+        "name" : "department",
+        "getPSCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129249258.json"
+        },
+        "groupField" : true,
+        "id" : "1"
+      }, {
+        "index" : 2,
         "name" : "age",
         "groupField" : false,
-        "id" : "1"
+        "id" : "2"
       } ],
       "id" : "0"
     } ],
+    "getPSChartGrids" : [ {
+      "index" : 0,
+      "name" : "[bar_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",
+      "id" : "0"
+    } ],
     "getPSControlHandler" : {
       "getPSHandlerActions" : [ {
         "actionName" : "Get",
@@ -347,11 +414,15 @@
       "id" : "0"
     },
     "getPSDEChartSerieses" : [ {
-      "caption" : "漏斗图",
+      "caption" : "学生信息柱状图",
       "catalogField" : "name",
-      "eChartsType" : "funnel",
+      "getCatalogPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+      },
+      "eChartsType" : "bar",
       "index" : 0,
-      "name" : "funnel_0",
+      "name" : "bar_0",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
@@ -361,17 +432,33 @@
         "id" : "0"
       },
       "getPSChartSeriesEncode" : {
-        "category" : "name",
         "index" : 0,
+        "itemId" : "department",
+        "itemName" : "department",
         "name" : "坐标系编码",
-        "type" : "NONE",
-        "value" : "age",
+        "getPSChartXAxis" : {
+          "modelref" : true,
+          "id" : "0"
+        },
+        "getPSChartYAxis" : {
+          "modelref" : true,
+          "id" : "0"
+        },
+        "type" : "XY",
+        "x" : [ "name" ],
+        "y" : [ "age" ],
         "id" : "0"
       },
+      "seriesField" : "department",
       "seriesLayoutBy" : "column",
-      "seriesType" : "funnel",
+      "getSeriesPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129249258.json"
+      },
+      "seriesType" : "bar",
       "valueField" : "age",
-      "enableChartDataSet" : true
+      "enableChartDataSet" : true,
+      "stack" : false
     } ],
     "getPSDEChartTitle" : {
       "index" : 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

@@ -298,6 +298,42 @@
     "predefinedType" : "OPERATOR",
     "rTMOSFilePath" : "pssysapps/Web/psappcodelists/SysOperator",
     "enableCache" : true
+  }, {
+    "codeListTag" : "common__UsrCodeList0129249258",
+    "codeListType" : "STATIC",
+    "codeName" : "UsrCodeList0129249258",
+    "dynaInstMode" : 0,
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129249258.json",
+    "emptyText" : "未定义",
+    "mOSFilePath" : "psmodules/common/pscodelists/UsrCodeList0129249258",
+    "name" : "地区",
+    "getPSCodeItems" : [ {
+      "codeName" : "Item_1",
+      "mOSFilePath" : "psmodules/common/pscodelists/UsrCodeList0129249258/pscodeitems/Item_1",
+      "rTMOSFilePath" : "psmodules/common/pscodelists/UsrCodeList0129249258/pscodeitems/Item_1",
+      "text" : "江南",
+      "value" : "苏州"
+    }, {
+      "codeName" : "Item_2",
+      "mOSFilePath" : "psmodules/common/pscodelists/UsrCodeList0129249258/pscodeitems/Item_2",
+      "rTMOSFilePath" : "psmodules/common/pscodelists/UsrCodeList0129249258/pscodeitems/Item_2",
+      "text" : "粤",
+      "value" : "广州"
+    }, {
+      "codeName" : "Item_3",
+      "mOSFilePath" : "psmodules/common/pscodelists/UsrCodeList0129249258/pscodeitems/Item_3",
+      "rTMOSFilePath" : "psmodules/common/pscodelists/UsrCodeList0129249258/pscodeitems/Item_3",
+      "text" : "首都",
+      "value" : "北京"
+    }, {
+      "codeName" : "Item_4",
+      "mOSFilePath" : "psmodules/common/pscodelists/UsrCodeList0129249258/pscodeitems/Item_4",
+      "rTMOSFilePath" : "psmodules/common/pscodelists/UsrCodeList0129249258/pscodeitems/Item_4",
+      "text" : "魔都",
+      "value" : "上海"
+    } ],
+    "rTMOSFilePath" : "pssysapps/Web/psappcodelists/UsrCodeList0129249258",
+    "enableCache" : true
   }, {
     "codeListTag" : "common__UsrCodeList0129740128",
     "codeListType" : "STATIC",