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/TemplatePublish/PSSYSAPP.json

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

 {
   "codeName" : "Chart",
   "controlType" : "CHART",
-  "coordinateSystem" : "RADAR",
+  "coordinateSystem" : "XY",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json",
   "emptyText" : "hello",
   "getFetchPSControlAction" : {
@@ -16,20 +16,28 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
   },
   "getPSChartCoordinateSystems" : [ {
-    "eChartsType" : "radar",
+    "eChartsType" : "cartesian2d",
     "index" : 0,
-    "name" : "[radar_0]雷达坐标系[0]",
-    "getPSChartRadar" : {
+    "name" : "[bar_0]直角坐标系[0]",
+    "getPSChartGrid" : {
       "index" : 0,
-      "name" : "[radar_0]雷达坐标系[0]",
+      "name" : "[bar_0]直角坐标系[0]",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
       },
-      "type" : "radar",
+      "getPSChartGridXAxis0" : {
+        "modelref" : true,
         "id" : "0"
       },
-    "type" : "RADAR",
+      "getPSChartGridYAxis0" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "type" : "grid",
+      "id" : "0"
+    },
+    "type" : "XY",
     "id" : "0"
   } ],
   "getPSChartDataSetGroups" : [ {
@@ -47,7 +55,7 @@
   } ],
   "getPSChartDataSets" : [ {
     "index" : 0,
-    "name" : "radar_0-DEFAULT",
+    "name" : "bar_0-DEFAULT",
     "getPSChartDataSetFields" : [ {
       "index" : 0,
       "name" : "NAME",
@@ -59,20 +67,55 @@
       "id" : "0"
     }, {
       "index" : 1,
+      "name" : "ADDRESS",
+      "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"
   } ],
-  "getPSChartRadars" : [ {
+  "getPSChartGrids" : [ {
     "index" : 0,
-    "name" : "[radar_0]雷达坐标系[0]",
+    "name" : "[bar_0]直角坐标系[0]",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
       "id" : "0"
     },
-    "type" : "radar",
+    "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" : [ {
@@ -92,15 +135,14 @@
     "id" : "0"
   },
   "getPSDEChartSerieses" : [ {
-    "caption" : "数据1",
     "catalogField" : "NAME",
     "getCatalogPSCodeList" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
     },
-    "eChartsType" : "radar",
+    "eChartsType" : "bar",
     "index" : 0,
-    "name" : "radar_0",
+    "name" : "bar_0",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
       "id" : "0"
@@ -109,10 +151,34 @@
       "modelref" : true,
       "id" : "0"
     },
+    "getPSChartSeriesEncode" : {
+      "index" : 0,
+      "itemId" : "ADDRESS",
+      "itemName" : "ADDRESS",
+      "name" : "坐标系编码",
+      "getPSChartXAxis" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "getPSChartYAxis" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "type" : "XY",
+      "x" : [ "NAME" ],
+      "y" : [ "AGE" ],
+      "id" : "0"
+    },
+    "seriesField" : "ADDRESS",
     "seriesLayoutBy" : "column",
-    "seriesType" : "radar",
+    "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/ReginfoChartView.json

@@ -206,7 +206,7 @@
   }, {
     "codeName" : "Chart",
     "controlType" : "CHART",
-    "coordinateSystem" : "RADAR",
+    "coordinateSystem" : "XY",
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json",
     "emptyText" : "hello",
     "getFetchPSControlAction" : {
@@ -221,20 +221,28 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
     },
     "getPSChartCoordinateSystems" : [ {
-      "eChartsType" : "radar",
+      "eChartsType" : "cartesian2d",
       "index" : 0,
-      "name" : "[radar_0]雷达坐标系[0]",
-      "getPSChartRadar" : {
+      "name" : "[bar_0]直角坐标系[0]",
+      "getPSChartGrid" : {
         "index" : 0,
-        "name" : "[radar_0]雷达坐标系[0]",
+        "name" : "[bar_0]直角坐标系[0]",
         "getPSChartCoordinateSystem" : {
           "modelref" : true,
           "id" : "0"
         },
-        "type" : "radar",
+        "getPSChartGridXAxis0" : {
+          "modelref" : true,
           "id" : "0"
         },
-      "type" : "RADAR",
+        "getPSChartGridYAxis0" : {
+          "modelref" : true,
+          "id" : "0"
+        },
+        "type" : "grid",
+        "id" : "0"
+      },
+      "type" : "XY",
       "id" : "0"
     } ],
     "getPSChartDataSetGroups" : [ {
@@ -252,7 +260,7 @@
     } ],
     "getPSChartDataSets" : [ {
       "index" : 0,
-      "name" : "radar_0-DEFAULT",
+      "name" : "bar_0-DEFAULT",
       "getPSChartDataSetFields" : [ {
         "index" : 0,
         "name" : "NAME",
@@ -264,20 +272,55 @@
         "id" : "0"
       }, {
         "index" : 1,
+        "name" : "ADDRESS",
+        "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"
     } ],
-    "getPSChartRadars" : [ {
+    "getPSChartGrids" : [ {
       "index" : 0,
-      "name" : "[radar_0]雷达坐标系[0]",
+      "name" : "[bar_0]直角坐标系[0]",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
       },
-      "type" : "radar",
+      "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" : {
@@ -371,15 +414,14 @@
       "id" : "0"
     },
     "getPSDEChartSerieses" : [ {
-      "caption" : "数据1",
       "catalogField" : "NAME",
       "getCatalogPSCodeList" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
       },
-      "eChartsType" : "radar",
+      "eChartsType" : "bar",
       "index" : 0,
-      "name" : "radar_0",
+      "name" : "bar_0",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
@@ -388,10 +430,34 @@
         "modelref" : true,
         "id" : "0"
       },
+      "getPSChartSeriesEncode" : {
+        "index" : 0,
+        "itemId" : "ADDRESS",
+        "itemName" : "ADDRESS",
+        "name" : "坐标系编码",
+        "getPSChartXAxis" : {
+          "modelref" : true,
+          "id" : "0"
+        },
+        "getPSChartYAxis" : {
+          "modelref" : true,
+          "id" : "0"
+        },
+        "type" : "XY",
+        "x" : [ "NAME" ],
+        "y" : [ "AGE" ],
+        "id" : "0"
+      },
+      "seriesField" : "ADDRESS",
       "seriesLayoutBy" : "column",
-      "seriesType" : "radar",
+      "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/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",
@@ -2131,16 +2167,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"