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

 {
   "codeName" : "Chart",
   "controlType" : "CHART",
-  "coordinateSystem" : "XY",
+  "coordinateSystem" : "NONE",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json",
   "emptyText" : "hello",
   "getFetchPSControlAction" : {
@@ -16,28 +16,10 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
   },
   "getPSChartCoordinateSystems" : [ {
-    "eChartsType" : "cartesian2d",
+    "eChartsType" : "none",
     "index" : 0,
-    "name" : "[line_0]直角坐标系[0]",
-    "getPSChartGrid" : {
-      "index" : 0,
-      "name" : "[line_0]直角坐标系[0]",
-      "getPSChartCoordinateSystem" : {
-        "modelref" : true,
-        "id" : "0"
-      },
-      "getPSChartGridXAxis0" : {
-        "modelref" : true,
-        "id" : "0"
-      },
-      "getPSChartGridYAxis0" : {
-        "modelref" : true,
-        "id" : "0"
-      },
-      "type" : "grid",
-      "id" : "0"
-    },
-    "type" : "XY",
+    "name" : "[funnel_0]无坐标系[0]",
+    "type" : "NONE",
     "id" : "0"
   } ],
   "getPSChartDataSetGroups" : [ {
@@ -55,10 +37,14 @@
   } ],
   "getPSChartDataSets" : [ {
     "index" : 0,
-    "name" : "line_0-DEFAULT",
+    "name" : "funnel_0-DEFAULT",
     "getPSChartDataSetFields" : [ {
       "index" : 0,
-      "name" : "department",
+      "name" : "name",
+      "getPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+      },
       "groupField" : true,
       "id" : "0"
     }, {
@@ -69,42 +55,6 @@
     } ],
     "id" : "0"
   } ],
-  "getPSChartGrids" : [ {
-    "index" : 0,
-    "name" : "[line_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",
@@ -122,11 +72,15 @@
     "id" : "0"
   },
   "getPSDEChartSerieses" : [ {
-    "caption" : "Step Start",
-    "catalogField" : "department",
-    "eChartsType" : "line",
+    "caption" : "漏斗图",
+    "catalogField" : "name",
+    "getCatalogPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+    },
+    "eChartsType" : "funnel",
     "index" : 0,
-    "name" : "line_0",
+    "name" : "funnel_0",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
       "id" : "0"
@@ -136,27 +90,17 @@
       "id" : "0"
     },
     "getPSChartSeriesEncode" : {
+      "category" : "name",
       "index" : 0,
       "name" : "坐标系编码",
-      "getPSChartXAxis" : {
-        "modelref" : true,
-        "id" : "0"
-      },
-      "getPSChartYAxis" : {
-        "modelref" : true,
-        "id" : "0"
-      },
-      "type" : "XY",
-      "x" : [ "department" ],
-      "y" : [ "age" ],
+      "type" : "NONE",
+      "value" : "age",
       "id" : "0"
     },
     "seriesLayoutBy" : "column",
-    "seriesType" : "line",
-    "step" : false,
+    "seriesType" : "funnel",
     "valueField" : "age",
-    "enableChartDataSet" : true,
-    "stack" : false
+    "enableChartDataSet" : true
   } ],
   "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" : "XY",
+    "coordinateSystem" : "NONE",
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json",
     "emptyText" : "hello",
     "getFetchPSControlAction" : {
@@ -221,28 +221,10 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
     },
     "getPSChartCoordinateSystems" : [ {
-      "eChartsType" : "cartesian2d",
+      "eChartsType" : "none",
       "index" : 0,
-      "name" : "[line_0]直角坐标系[0]",
-      "getPSChartGrid" : {
-        "index" : 0,
-        "name" : "[line_0]直角坐标系[0]",
-        "getPSChartCoordinateSystem" : {
-          "modelref" : true,
-          "id" : "0"
-        },
-        "getPSChartGridXAxis0" : {
-          "modelref" : true,
-          "id" : "0"
-        },
-        "getPSChartGridYAxis0" : {
-          "modelref" : true,
-          "id" : "0"
-        },
-        "type" : "grid",
-        "id" : "0"
-      },
-      "type" : "XY",
+      "name" : "[funnel_0]无坐标系[0]",
+      "type" : "NONE",
       "id" : "0"
     } ],
     "getPSChartDataSetGroups" : [ {
@@ -260,10 +242,14 @@
     } ],
     "getPSChartDataSets" : [ {
       "index" : 0,
-      "name" : "line_0-DEFAULT",
+      "name" : "funnel_0-DEFAULT",
       "getPSChartDataSetFields" : [ {
         "index" : 0,
-        "name" : "department",
+        "name" : "name",
+        "getPSCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+        },
         "groupField" : true,
         "id" : "0"
       }, {
@@ -274,42 +260,6 @@
       } ],
       "id" : "0"
     } ],
-    "getPSChartGrids" : [ {
-      "index" : 0,
-      "name" : "[line_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",
@@ -401,11 +351,15 @@
       "id" : "0"
     },
     "getPSDEChartSerieses" : [ {
-      "caption" : "Step Start",
-      "catalogField" : "department",
-      "eChartsType" : "line",
+      "caption" : "漏斗图",
+      "catalogField" : "name",
+      "getCatalogPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+      },
+      "eChartsType" : "funnel",
       "index" : 0,
-      "name" : "line_0",
+      "name" : "funnel_0",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
@@ -415,27 +369,17 @@
         "id" : "0"
       },
       "getPSChartSeriesEncode" : {
+        "category" : "name",
         "index" : 0,
         "name" : "坐标系编码",
-        "getPSChartXAxis" : {
-          "modelref" : true,
-          "id" : "0"
-        },
-        "getPSChartYAxis" : {
-          "modelref" : true,
-          "id" : "0"
-        },
-        "type" : "XY",
-        "x" : [ "department" ],
-        "y" : [ "age" ],
+        "type" : "NONE",
+        "value" : "age",
         "id" : "0"
       },
       "seriesLayoutBy" : "column",
-      "seriesType" : "line",
-      "step" : false,
+      "seriesType" : "funnel",
       "valueField" : "age",
-      "enableChartDataSet" : true,
-      "stack" : false
+      "enableChartDataSet" : true
     } ],
     "getPSDEChartTitle" : {
       "index" : 0,

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

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