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

f2461f98 · ibizdev · 58c599e0 · f2461f98 · f2461f98 · f2461f98
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json
@@ -977,6 +977,44 @@
    "stdDataType" : 6,
    "valueFormat" : "%1$,.2f"
  } ],
+  "getAllPSDELogics" : [ {
+    "codeName" : "logic1",
+    "defaultParamName" : "Default",
+    "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDELOGICS/logic1.json",
+    "logicName" : "处理逻辑测试",
+    "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1",
+    "name" : "处理逻辑测试",
+    "getPSDELogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicnodes/Begin",
+      "name" : "开始",
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicnodes/Begin",
+      "topPos" : 200,
+      "parallelOutput" : true
+    } ],
+    "getPSDELogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicparams/Default",
+      "name" : "传入变量",
+      "getParamPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/TEST.json"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicparams/Default",
+      "default" : true,
+      "entityParam" : true
+    } ],
+    "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1",
+    "getStartPSDELogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    },
+    "enableBackend" : false,
+    "enableFront" : true
+  } ],
  "getAllPSDEMethodDTOs" : [ {
    "name" : "TESTDTO",
    "getPSDEMethodDTOFields" : [ {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDELOGICS/logic1.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDELOGICS/logic1.json
+{
+  "codeName" : "logic1",
+  "defaultParamName" : "Default",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDELOGICS/logic1.json",
+  "logicName" : "处理逻辑测试",
+  "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1",
+  "name" : "处理逻辑测试",
+  "getPSDELogicNodes" : [ {
+    "codeName" : "Begin",
+    "leftPos" : 200,
+    "logicNodeType" : "BEGIN",
+    "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicnodes/Begin",
+    "name" : "开始",
+    "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicnodes/Begin",
+    "topPos" : 200,
+    "parallelOutput" : true
+  } ],
+  "getPSDELogicParams" : [ {
+    "codeName" : "Default",
+    "logicName" : "传入变量",
+    "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicparams/Default",
+    "name" : "传入变量",
+    "getParamPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/TEST.json"
+    },
+    "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicparams/Default",
+    "default" : true,
+    "entityParam" : true
+  } ],
+  "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1",
+  "getStartPSDELogicNode" : {
+    "modelref" : true,
+    "id" : "Begin"
+  },
+  "enableBackend" : false,
+  "enableFront" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json
 {
  "codeName" : "Chart",
  "controlType" : "CHART",
-  "coordinateSystem" : "POLAR",
+  "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]",
+    "name" : "[bar_0]直角坐标系[0]",
-    "type" : "NONE",
+    "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,22 +55,46 @@
  } ],
  "getPSChartDataSets" : [ {
    "index" : 0,
-    "name" : "funnel_0-DATAQUERY2",
+    "name" : "bar_0-DATAQUERY2",
-    "getPSChartDataSetFields" : [ {
+    "id" : "0"
-      "index" : 0,
+  } ],
-      "name" : "NAME",
+  "getPSChartGrids" : [ {
-      "getPSCodeList" : {
+    "index" : 0,
-        "modelref" : true,
+    "name" : "[bar_0]直角坐标系[0]",
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+    "getPSChartCoordinateSystem" : {
-      },
+      "modelref" : true,
-      "groupField" : true,
      "id" : "0"
-    }, {
+    },
-      "index" : 1,
+    "getPSChartGridXAxis0" : {
-      "name" : "AGE",
+      "modelref" : true,
-      "groupField" : false,
+      "id" : "0"
-      "id" : "1"
+    },
-    } ],
+    "getPSChartGridYAxis0" : {
+      "modelref" : true,
+      "id" : "0"
+    },
+    "type" : "grid",
+    "id" : "0"
+  } ],
+  "getPSChartXAxises" : [ {
+    "eChartsPos" : "xAxis",
+    "eChartsType" : "category",
+    "index" : 0,
+    "name" : "axis_xAxis_0",
+    "position" : "bottom",
+    "type" : "category",
+    "getUserParam" : {
+      "EC.interval" : "10"
+    },
+    "id" : "0"
+  } ],
+  "getPSChartYAxises" : [ {
+    "eChartsPos" : "yAxis",
+    "eChartsType" : "value",
+    "index" : 0,
+    "name" : "axis_yAxis_0",
+    "position" : "left",
+    "type" : "numeric",
    "id" : "0"
  } ],
  "getPSControlLogics" : [ {
@@ -72,16 +114,9 @@
    "id" : "0"
  },
  "getPSDEChartSerieses" : [ {
-    "caption" : "漏斗图",
+    "eChartsType" : "bar",
-    "catalogField" : "NAME",
-    "getCatalogPSCodeList" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-    },
-    "eChartsType" : "funnel",
-    "funnelAlign" : "center",
    "index" : 0,
-    "name" : "funnel_0",
+    "name" : "bar_0",
    "getPSChartCoordinateSystem" : {
      "modelref" : true,
      "id" : "0"
@@ -91,17 +126,23 @@
      "id" : "0"
    },
    "getPSChartSeriesEncode" : {
-      "category" : "NAME",
      "index" : 0,
      "name" : "坐标系编码",
-      "type" : "NONE",
+      "getPSChartXAxis" : {
-      "value" : "AGE",
+        "modelref" : true,
+        "id" : "0"
+      },
+      "getPSChartYAxis" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "type" : "XY",
      "id" : "0"
    },
    "seriesLayoutBy" : "column",
-    "seriesType" : "funnel",
+    "seriesType" : "bar",
-    "valueField" : "AGE",
+    "enableChartDataSet" : true,
-    "enableChartDataSet" : true
+    "stack" : false
  } ],
  "getPSDEChartTitle" : {
    "index" : 0,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
@@ -628,6 +628,47 @@
    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/TEST/psappdefields/Amount",
    "stdDataType" : 6
  } ],
+  "getAllPSAppDELogics" : [ {
+    "codeName" : "logic1",
+    "defaultParamName" : "Default",
+    "logicName" : "处理逻辑测试",
+    "mOSFilePath" : "pssysapps/Web/psappdataentities/TEST/psappdelogics/logic1",
+    "name" : "处理逻辑测试",
+    "getPSDELogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "mOSFilePath" : "pssysapps/Web/psappdataentities/TEST/psappdelogics/logic1/psappdelogicnodes/Begin",
+      "name" : "开始",
+      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/TEST/psappdelogics/logic1/psappdelogicnodes/Begin",
+      "topPos" : 200,
+      "parallelOutput" : true
+    } ],
+    "getPSDELogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "mOSFilePath" : "pssysapps/Web/psappdataentities/TEST/psappdelogics/logic1/psappdelogicparams/Default",
+      "name" : "传入变量",
+      "getParamPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getParamPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/TEST.json"
+      },
+      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/TEST/psappdelogics/logic1/psappdelogicparams/Default",
+      "default" : true,
+      "entityParam" : true
+    } ],
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/TEST/psappdelogics/logic1",
+    "getStartPSDELogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    },
+    "enableBackend" : false,
+    "enableFront" : true
+  } ],
  "getAllPSAppDEMethodDTOs" : [ {
    "codeName" : "TESTDTO",
    "name" : "TESTDTO",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoChartView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoChartView.json
@@ -206,7 +206,7 @@
  }, {
    "codeName" : "Chart",
    "controlType" : "CHART",
-    "coordinateSystem" : "POLAR",
+    "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]",
+      "name" : "[bar_0]直角坐标系[0]",
-      "type" : "NONE",
+      "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,22 +260,46 @@
    } ],
    "getPSChartDataSets" : [ {
      "index" : 0,
-      "name" : "funnel_0-DATAQUERY2",
+      "name" : "bar_0-DATAQUERY2",
-      "getPSChartDataSetFields" : [ {
+      "id" : "0"
-        "index" : 0,
+    } ],
-        "name" : "NAME",
+    "getPSChartGrids" : [ {
-        "getPSCodeList" : {
+      "index" : 0,
-          "modelref" : true,
+      "name" : "[bar_0]直角坐标系[0]",
-          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+      "getPSChartCoordinateSystem" : {
-        },
+        "modelref" : true,
-        "groupField" : true,
        "id" : "0"
-      }, {
+      },
-        "index" : 1,
+      "getPSChartGridXAxis0" : {
-        "name" : "AGE",
+        "modelref" : true,
-        "groupField" : false,
+        "id" : "0"
-        "id" : "1"
+      },
-      } ],
+      "getPSChartGridYAxis0" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "type" : "grid",
+      "id" : "0"
+    } ],
+    "getPSChartXAxises" : [ {
+      "eChartsPos" : "xAxis",
+      "eChartsType" : "category",
+      "index" : 0,
+      "name" : "axis_xAxis_0",
+      "position" : "bottom",
+      "type" : "category",
+      "getUserParam" : {
+        "EC.interval" : "10"
+      },
+      "id" : "0"
+    } ],
+    "getPSChartYAxises" : [ {
+      "eChartsPos" : "yAxis",
+      "eChartsType" : "value",
+      "index" : 0,
+      "name" : "axis_yAxis_0",
+      "position" : "left",
+      "type" : "numeric",
      "id" : "0"
    } ],
    "getPSControlHandler" : {
@@ -351,16 +393,9 @@
      "id" : "0"
    },
    "getPSDEChartSerieses" : [ {
-      "caption" : "漏斗图",
+      "eChartsType" : "bar",
-      "catalogField" : "NAME",
-      "getCatalogPSCodeList" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-      },
-      "eChartsType" : "funnel",
-      "funnelAlign" : "center",
      "index" : 0,
-      "name" : "funnel_0",
+      "name" : "bar_0",
      "getPSChartCoordinateSystem" : {
        "modelref" : true,
        "id" : "0"
@@ -370,17 +405,23 @@
        "id" : "0"
      },
      "getPSChartSeriesEncode" : {
-        "category" : "NAME",
        "index" : 0,
        "name" : "坐标系编码",
-        "type" : "NONE",
+        "getPSChartXAxis" : {
-        "value" : "AGE",
+          "modelref" : true,
+          "id" : "0"
+        },
+        "getPSChartYAxis" : {
+          "modelref" : true,
+          "id" : "0"
+        },
+        "type" : "XY",
        "id" : "0"
      },
      "seriesLayoutBy" : "column",
-      "seriesType" : "funnel",
+      "seriesType" : "bar",
-      "valueField" : "AGE",
+      "enableChartDataSet" : true,
-      "enableChartDataSet" : true
+      "stack" : false
    } ],
    "getPSDEChartTitle" : {
      "index" : 0,