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" : true,
+  "refFlag" : false,
   "systemTag" : "TrainSys",
   "codeItemValueNumber" : false,
   "enableCache" : true,

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

@@ -42,7 +42,7 @@
   } ],
   "getAllPSAppDEUILogics" : [ {
     "codeName" : "test",
-    "defaultParamName" : "paramTest",
+    "defaultParamName" : "Default",
     "logicName" : "test",
     "mOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Phone/psappdeuilogics/test",
     "name" : "test",
@@ -68,6 +68,22 @@
       "rTMOSFilePath" : "psappdeuilogicnodes/Begin",
       "topPos" : 254,
       "parallelOutput" : true
+    }, {
+      "buttonsType" : "YESNO",
+      "codeName" : "MSGBOX1",
+      "leftPos" : 1300,
+      "logicNodeType" : "MSGBOX",
+      "mOSFilePath" : "psappdeuilogicnodes/MSGBOX1",
+      "getMsgBoxParam" : {
+        "modelref" : true,
+        "id" : "Default"
+      },
+      "msgBoxType" : "INFO",
+      "name" : "消息弹窗",
+      "rTMOSFilePath" : "psappdeuilogicnodes/MSGBOX1",
+      "showMode" : "CENTER",
+      "title" : "是否删除",
+      "topPos" : 440
     }, {
       "codeName" : "Deuiaction1",
       "getDstPSAppDEUIAction" : {
@@ -105,22 +121,6 @@
       "rTMOSFilePath" : "psappdeuilogicnodes/Deuiaction1",
       "topPos" : 262,
       "parallelOutput" : true
-    }, {
-      "buttonsType" : "YESNO",
-      "codeName" : "MSGBOX1",
-      "leftPos" : 1300,
-      "logicNodeType" : "MSGBOX",
-      "mOSFilePath" : "psappdeuilogicnodes/MSGBOX1",
-      "getMsgBoxParam" : {
-        "modelref" : true,
-        "id" : "Default"
-      },
-      "msgBoxType" : "INFO",
-      "name" : "消息弹窗",
-      "rTMOSFilePath" : "psappdeuilogicnodes/MSGBOX1",
-      "showMode" : "CENTER",
-      "title" : "是否删除",
-      "topPos" : 440
     }, {
       "codeName" : "BINDPARAM1",
       "getDstPSDEUILogicParam" : {
@@ -169,6 +169,20 @@
       "topPos" : 262
     } ],
     "getPSDEUILogicParams" : [ {
+      "codeName" : "t3",
+      "logicName" : "t3",
+      "mOSFilePath" : "psappdeuilogicparams/t3",
+      "name" : "t3",
+      "rTMOSFilePath" : "psappdeuilogicparams/t3",
+      "entityListParam" : true
+    }, {
+      "codeName" : "t2",
+      "logicName" : "t2",
+      "mOSFilePath" : "psappdeuilogicparams/t2",
+      "name" : "t2",
+      "rTMOSFilePath" : "psappdeuilogicparams/t2",
+      "filterParam" : true
+    }, {
       "codeName" : "Default",
       "logicName" : "传入变量",
       "mOSFilePath" : "psappdeuilogicparams/Default",
@@ -176,13 +190,54 @@
       "rTMOSFilePath" : "psappdeuilogicparams/Default",
       "default" : true,
       "entityParam" : true
+    }, {
+      "codeName" : "t4",
+      "logicName" : "t4",
+      "mOSFilePath" : "psappdeuilogicparams/t4",
+      "name" : "t4",
+      "rTMOSFilePath" : "psappdeuilogicparams/t4",
+      "entityPageParam" : true
+    }, {
+      "codeName" : "t1",
+      "logicName" : "t1",
+      "mOSFilePath" : "psappdeuilogicparams/t1",
+      "name" : "t1",
+      "rTMOSFilePath" : "psappdeuilogicparams/t1",
+      "lastReturnParam" : true
+    }, {
+      "codeName" : "ViewRouteParam",
+      "logicName" : "视图路由参数",
+      "mOSFilePath" : "psappdeuilogicparams/ViewRouteParam",
+      "name" : "视图路由参数",
+      "rTMOSFilePath" : "psappdeuilogicparams/ViewRouteParam",
+      "navViewParamParam" : true
+    }, {
+      "codeName" : "x",
+      "logicName" : "x",
+      "mOSFilePath" : "psappdeuilogicparams/x",
+      "name" : "x",
+      "rTMOSFilePath" : "psappdeuilogicparams/x",
+      "simpleListParam" : true
+    }, {
+      "codeName" : "j1",
+      "logicName" : "j1",
+      "mOSFilePath" : "psappdeuilogicparams/j1",
+      "name" : "j1",
+      "rTMOSFilePath" : "psappdeuilogicparams/j1",
+      "simpleParam" : true
+    }, {
+      "codeName" : "context",
+      "logicName" : "context",
+      "mOSFilePath" : "psappdeuilogicparams/context",
+      "name" : "context",
+      "rTMOSFilePath" : "psappdeuilogicparams/context",
+      "navContextParam" : true
     }, {
       "codeName" : "paramTest",
       "logicName" : "应用上下文",
       "mOSFilePath" : "psappdeuilogicparams/paramTest",
       "name" : "应用上下文",
       "rTMOSFilePath" : "psappdeuilogicparams/paramTest",
-      "default" : true,
       "navContextParam" : true
     } ],
     "rTMOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Phone/psappdeuilogics/test",

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

@@ -4082,7 +4082,7 @@
       } ],
       "getAllPSAppDEUILogics" : [ {
         "codeName" : "test",
-        "defaultParamName" : "paramTest",
+        "defaultParamName" : "Default",
         "logicName" : "test",
         "mOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Phone/psappdeuilogics/test",
         "name" : "test",
@@ -4108,6 +4108,22 @@
           "rTMOSFilePath" : "psappdeuilogicnodes/Begin",
           "topPos" : 254,
           "parallelOutput" : true
+        }, {
+          "buttonsType" : "YESNO",
+          "codeName" : "MSGBOX1",
+          "leftPos" : 1300,
+          "logicNodeType" : "MSGBOX",
+          "mOSFilePath" : "psappdeuilogicnodes/MSGBOX1",
+          "getMsgBoxParam" : {
+            "modelref" : true,
+            "id" : "Default"
+          },
+          "msgBoxType" : "INFO",
+          "name" : "消息弹窗",
+          "rTMOSFilePath" : "psappdeuilogicnodes/MSGBOX1",
+          "showMode" : "CENTER",
+          "title" : "是否删除",
+          "topPos" : 440
         }, {
           "codeName" : "Deuiaction1",
           "getDstPSAppDEUIAction" : {
@@ -4145,22 +4161,6 @@
           "rTMOSFilePath" : "psappdeuilogicnodes/Deuiaction1",
           "topPos" : 262,
           "parallelOutput" : true
-        }, {
-          "buttonsType" : "YESNO",
-          "codeName" : "MSGBOX1",
-          "leftPos" : 1300,
-          "logicNodeType" : "MSGBOX",
-          "mOSFilePath" : "psappdeuilogicnodes/MSGBOX1",
-          "getMsgBoxParam" : {
-            "modelref" : true,
-            "id" : "Default"
-          },
-          "msgBoxType" : "INFO",
-          "name" : "消息弹窗",
-          "rTMOSFilePath" : "psappdeuilogicnodes/MSGBOX1",
-          "showMode" : "CENTER",
-          "title" : "是否删除",
-          "topPos" : 440
         }, {
           "codeName" : "BINDPARAM1",
           "getDstPSDEUILogicParam" : {
@@ -4209,6 +4209,20 @@
           "topPos" : 262
         } ],
         "getPSDEUILogicParams" : [ {
+          "codeName" : "t3",
+          "logicName" : "t3",
+          "mOSFilePath" : "psappdeuilogicparams/t3",
+          "name" : "t3",
+          "rTMOSFilePath" : "psappdeuilogicparams/t3",
+          "entityListParam" : true
+        }, {
+          "codeName" : "t2",
+          "logicName" : "t2",
+          "mOSFilePath" : "psappdeuilogicparams/t2",
+          "name" : "t2",
+          "rTMOSFilePath" : "psappdeuilogicparams/t2",
+          "filterParam" : true
+        }, {
           "codeName" : "Default",
           "logicName" : "传入变量",
           "mOSFilePath" : "psappdeuilogicparams/Default",
@@ -4216,13 +4230,54 @@
           "rTMOSFilePath" : "psappdeuilogicparams/Default",
           "default" : true,
           "entityParam" : true
+        }, {
+          "codeName" : "t4",
+          "logicName" : "t4",
+          "mOSFilePath" : "psappdeuilogicparams/t4",
+          "name" : "t4",
+          "rTMOSFilePath" : "psappdeuilogicparams/t4",
+          "entityPageParam" : true
+        }, {
+          "codeName" : "t1",
+          "logicName" : "t1",
+          "mOSFilePath" : "psappdeuilogicparams/t1",
+          "name" : "t1",
+          "rTMOSFilePath" : "psappdeuilogicparams/t1",
+          "lastReturnParam" : true
+        }, {
+          "codeName" : "ViewRouteParam",
+          "logicName" : "视图路由参数",
+          "mOSFilePath" : "psappdeuilogicparams/ViewRouteParam",
+          "name" : "视图路由参数",
+          "rTMOSFilePath" : "psappdeuilogicparams/ViewRouteParam",
+          "navViewParamParam" : true
+        }, {
+          "codeName" : "x",
+          "logicName" : "x",
+          "mOSFilePath" : "psappdeuilogicparams/x",
+          "name" : "x",
+          "rTMOSFilePath" : "psappdeuilogicparams/x",
+          "simpleListParam" : true
+        }, {
+          "codeName" : "j1",
+          "logicName" : "j1",
+          "mOSFilePath" : "psappdeuilogicparams/j1",
+          "name" : "j1",
+          "rTMOSFilePath" : "psappdeuilogicparams/j1",
+          "simpleParam" : true
+        }, {
+          "codeName" : "context",
+          "logicName" : "context",
+          "mOSFilePath" : "psappdeuilogicparams/context",
+          "name" : "context",
+          "rTMOSFilePath" : "psappdeuilogicparams/context",
+          "navContextParam" : true
         }, {
           "codeName" : "paramTest",
           "logicName" : "应用上下文",
           "mOSFilePath" : "psappdeuilogicparams/paramTest",
           "name" : "应用上下文",
           "rTMOSFilePath" : "psappdeuilogicparams/paramTest",
-          "default" : true,
           "navContextParam" : true
         } ],
         "rTMOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Phone/psappdeuilogics/test",

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

@@ -1514,7 +1514,7 @@
   } ],
   "getAllPSAppDEUILogics" : [ {
     "codeName" : "test",
-    "defaultParamName" : "paramTest",
+    "defaultParamName" : "Default",
     "logicName" : "test",
     "mOSFilePath" : "pssysapps/Web/psappdataentities/Phone/psappdeuilogics/test",
     "name" : "test",
@@ -1540,6 +1540,22 @@
       "rTMOSFilePath" : "psappdeuilogicnodes/Begin",
       "topPos" : 254,
       "parallelOutput" : true
+    }, {
+      "buttonsType" : "YESNO",
+      "codeName" : "MSGBOX1",
+      "leftPos" : 1300,
+      "logicNodeType" : "MSGBOX",
+      "mOSFilePath" : "psappdeuilogicnodes/MSGBOX1",
+      "getMsgBoxParam" : {
+        "modelref" : true,
+        "id" : "Default"
+      },
+      "msgBoxType" : "INFO",
+      "name" : "消息弹窗",
+      "rTMOSFilePath" : "psappdeuilogicnodes/MSGBOX1",
+      "showMode" : "CENTER",
+      "title" : "是否删除",
+      "topPos" : 440
     }, {
       "codeName" : "Deuiaction1",
       "getDstPSAppDEUIAction" : {
@@ -1577,22 +1593,6 @@
       "rTMOSFilePath" : "psappdeuilogicnodes/Deuiaction1",
       "topPos" : 262,
       "parallelOutput" : true
-    }, {
-      "buttonsType" : "YESNO",
-      "codeName" : "MSGBOX1",
-      "leftPos" : 1300,
-      "logicNodeType" : "MSGBOX",
-      "mOSFilePath" : "psappdeuilogicnodes/MSGBOX1",
-      "getMsgBoxParam" : {
-        "modelref" : true,
-        "id" : "Default"
-      },
-      "msgBoxType" : "INFO",
-      "name" : "消息弹窗",
-      "rTMOSFilePath" : "psappdeuilogicnodes/MSGBOX1",
-      "showMode" : "CENTER",
-      "title" : "是否删除",
-      "topPos" : 440
     }, {
       "codeName" : "BINDPARAM1",
       "getDstPSDEUILogicParam" : {
@@ -1641,6 +1641,20 @@
       "topPos" : 262
     } ],
     "getPSDEUILogicParams" : [ {
+      "codeName" : "t3",
+      "logicName" : "t3",
+      "mOSFilePath" : "psappdeuilogicparams/t3",
+      "name" : "t3",
+      "rTMOSFilePath" : "psappdeuilogicparams/t3",
+      "entityListParam" : true
+    }, {
+      "codeName" : "t2",
+      "logicName" : "t2",
+      "mOSFilePath" : "psappdeuilogicparams/t2",
+      "name" : "t2",
+      "rTMOSFilePath" : "psappdeuilogicparams/t2",
+      "filterParam" : true
+    }, {
       "codeName" : "Default",
       "logicName" : "传入变量",
       "mOSFilePath" : "psappdeuilogicparams/Default",
@@ -1648,13 +1662,54 @@
       "rTMOSFilePath" : "psappdeuilogicparams/Default",
       "default" : true,
       "entityParam" : true
+    }, {
+      "codeName" : "t4",
+      "logicName" : "t4",
+      "mOSFilePath" : "psappdeuilogicparams/t4",
+      "name" : "t4",
+      "rTMOSFilePath" : "psappdeuilogicparams/t4",
+      "entityPageParam" : true
+    }, {
+      "codeName" : "t1",
+      "logicName" : "t1",
+      "mOSFilePath" : "psappdeuilogicparams/t1",
+      "name" : "t1",
+      "rTMOSFilePath" : "psappdeuilogicparams/t1",
+      "lastReturnParam" : true
+    }, {
+      "codeName" : "ViewRouteParam",
+      "logicName" : "视图路由参数",
+      "mOSFilePath" : "psappdeuilogicparams/ViewRouteParam",
+      "name" : "视图路由参数",
+      "rTMOSFilePath" : "psappdeuilogicparams/ViewRouteParam",
+      "navViewParamParam" : true
+    }, {
+      "codeName" : "x",
+      "logicName" : "x",
+      "mOSFilePath" : "psappdeuilogicparams/x",
+      "name" : "x",
+      "rTMOSFilePath" : "psappdeuilogicparams/x",
+      "simpleListParam" : true
+    }, {
+      "codeName" : "j1",
+      "logicName" : "j1",
+      "mOSFilePath" : "psappdeuilogicparams/j1",
+      "name" : "j1",
+      "rTMOSFilePath" : "psappdeuilogicparams/j1",
+      "simpleParam" : true
+    }, {
+      "codeName" : "context",
+      "logicName" : "context",
+      "mOSFilePath" : "psappdeuilogicparams/context",
+      "name" : "context",
+      "rTMOSFilePath" : "psappdeuilogicparams/context",
+      "navContextParam" : true
     }, {
       "codeName" : "paramTest",
       "logicName" : "应用上下文",
       "mOSFilePath" : "psappdeuilogicparams/paramTest",
       "name" : "应用上下文",
       "rTMOSFilePath" : "psappdeuilogicparams/paramTest",
-      "default" : true,
       "navContextParam" : true
     } ],
     "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Phone/psappdeuilogics/test",

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,31 +55,45 @@
   } ],
   "getPSChartDataSets" : [ {
     "index" : 0,
-    "name" : "funnel_0-DEFAULT",
-    "getPSChartDataSetFields" : [ {
-      "index" : 0,
-      "name" : "NAME",
-      "getPSCodeList" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-      },
-      "groupField" : true,
+    "name" : "bar_0-DEFAULT",
+    "id" : "0"
+  } ],
+  "getPSChartGrids" : [ {
+    "index" : 0,
+    "name" : "[bar_0]直角坐标系[0]",
+    "getPSChartCoordinateSystem" : {
+      "modelref" : 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" : "2"
-    } ],
+    },
+    "getPSChartGridXAxis0" : {
+      "modelref" : true,
+      "id" : "0"
+    },
+    "getPSChartGridYAxis0" : {
+      "modelref" : true,
+      "id" : "0"
+    },
+    "type" : "grid",
+    "id" : "0"
+  } ],
+  "getPSChartXAxises" : [ {
+    "dataShowMode" : 1,
+    "eChartsPos" : "xAxis",
+    "eChartsType" : "category",
+    "index" : 0,
+    "name" : "axis_xAxis_0",
+    "position" : "bottom",
+    "type" : "category",
+    "id" : "0"
+  } ],
+  "getPSChartYAxises" : [ {
+    "dataShowMode" : 3,
+    "eChartsPos" : "yAxis",
+    "eChartsType" : "value",
+    "index" : 0,
+    "name" : "axis_yAxis_0",
+    "position" : "left",
+    "type" : "numeric",
     "id" : "0"
   } ],
   "getPSControlLogics" : [ {
@@ -81,15 +113,9 @@
     "id" : "0"
   },
   "getPSDEChartSerieses" : [ {
-    "caption" : "漏斗图",
-    "catalogField" : "NAME",
-    "getCatalogPSCodeList" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-    },
-    "eChartsType" : "funnel",
+    "eChartsType" : "bar",
     "index" : 0,
-    "name" : "funnel_0",
+    "name" : "bar_0",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
       "id" : "0"
@@ -99,24 +125,23 @@
       "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",
       "id" : "0"
     },
-    "seriesField" : "DEPARTMENT",
     "seriesLayoutBy" : "column",
-    "getSeriesPSCodeList" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129249258.json"
-    },
-    "seriesType" : "funnel",
-    "valueField" : "AGE",
-    "enableChartDataSet" : true
+    "seriesType" : "bar",
+    "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" : "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,31 +260,45 @@
     } ],
     "getPSChartDataSets" : [ {
       "index" : 0,
-      "name" : "funnel_0-DEFAULT",
-      "getPSChartDataSetFields" : [ {
-        "index" : 0,
-        "name" : "NAME",
-        "getPSCodeList" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-        },
-        "groupField" : true,
+      "name" : "bar_0-DEFAULT",
+      "id" : "0"
+    } ],
+    "getPSChartGrids" : [ {
+      "index" : 0,
+      "name" : "[bar_0]直角坐标系[0]",
+      "getPSChartCoordinateSystem" : {
+        "modelref" : 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" : "2"
-      } ],
+      },
+      "getPSChartGridXAxis0" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "getPSChartGridYAxis0" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "type" : "grid",
+      "id" : "0"
+    } ],
+    "getPSChartXAxises" : [ {
+      "dataShowMode" : 1,
+      "eChartsPos" : "xAxis",
+      "eChartsType" : "category",
+      "index" : 0,
+      "name" : "axis_xAxis_0",
+      "position" : "bottom",
+      "type" : "category",
+      "id" : "0"
+    } ],
+    "getPSChartYAxises" : [ {
+      "dataShowMode" : 3,
+      "eChartsPos" : "yAxis",
+      "eChartsType" : "value",
+      "index" : 0,
+      "name" : "axis_yAxis_0",
+      "position" : "left",
+      "type" : "numeric",
       "id" : "0"
     } ],
     "getPSControlHandler" : {
@@ -360,15 +392,9 @@
       "id" : "0"
     },
     "getPSDEChartSerieses" : [ {
-      "caption" : "漏斗图",
-      "catalogField" : "NAME",
-      "getCatalogPSCodeList" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-      },
-      "eChartsType" : "funnel",
+      "eChartsType" : "bar",
       "index" : 0,
-      "name" : "funnel_0",
+      "name" : "bar_0",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
@@ -378,24 +404,23 @@
         "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",
         "id" : "0"
       },
-      "seriesField" : "DEPARTMENT",
       "seriesLayoutBy" : "column",
-      "getSeriesPSCodeList" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129249258.json"
-      },
-      "seriesType" : "funnel",
-      "valueField" : "AGE",
-      "enableChartDataSet" : true
+      "seriesType" : "bar",
+      "enableChartDataSet" : true,
+      "stack" : false
     } ],
     "getPSDEChartTitle" : {
       "index" : 0,

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

@@ -298,42 +298,6 @@
     "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",