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

ee5ba376 · ibizdev · cdedf4c6 · ee5ba376 · ee5ba376 · ee5ba376
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo.json
@@ -3071,6 +3071,18 @@
    "name" : "学院登记信息编辑视图",
    "realModelSubType" : "DEEDITVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "UsrCandlestickDeChartView",
+    "logicName" : "测试k线图实体图表视图",
+    "name" : "测试k线图实体图表视图",
+    "realModelSubType" : "DECHARTVIEW",
+    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "UsrCandlestickNavChartView",
+    "logicName" : "k线图图表导航视图",
+    "name" : "k线图图表导航视图",
+    "realModelSubType" : "DECHARTEXPVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "EditView",
    "logicName" : "学员登记信息实体编辑视图",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json
@@ -2358,6 +2358,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
    "viewType" : "DEEDITVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsrCandlestickDeChartView.json",
+    "viewType" : "DECHARTVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr10096831GridView.json",
@@ -2398,6 +2402,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr2DataView.json",
    "viewType" : "DEDATAVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsrCandlestickNavChartView.json",
+    "viewType" : "DECHARTEXPVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr10090445EditView.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/UsrCandlestickDeChartView_Chart.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/UsrCandlestickDeChartView_Chart.json
+{
+  "codeName" : "UsrCandlestickDeChartView_Chart",
+  "controlType" : "CHART",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/UsrCandlestickDeChartView_Chart.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch",
+    "actionType" : "DEDATASET",
+    "name" : "fetch",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    }
+  },
+  "logicName" : "Chart2",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+  },
+  "getPSChartCoordinateSystems" : [ {
+    "eChartsType" : "cartesian2d",
+    "index" : 0,
+    "name" : "[candlestick_0]直角坐标系[0]",
+    "getPSChartGrid" : {
+      "index" : 0,
+      "name" : "[candlestick_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" : [ {
+    "index" : 0,
+    "name" : "DEFAULT",
+    "getPSAppDEDataSet" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    },
+    "id" : "0"
+  } ],
+  "getPSChartDataSets" : [ {
+    "index" : 0,
+    "name" : "candlestick_0-DEFAULT",
+    "getPSChartDataSetFields" : [ {
+      "index" : 0,
+      "name" : "CREATEDATE",
+      "groupField" : true,
+      "id" : "0"
+    } ],
+    "id" : "0"
+  }, {
+    "index" : 1,
+    "name" : "line_1-DEFAULT",
+    "getPSChartDataSetFields" : [ {
+      "index" : 0,
+      "name" : "CREATEDATE",
+      "groupField" : true,
+      "id" : "0"
+    }, {
+      "index" : 1,
+      "name" : "AGE",
+      "groupField" : false,
+      "id" : "1"
+    } ],
+    "id" : "1"
+  }, {
+    "index" : 2,
+    "name" : "line_2-DEFAULT",
+    "getPSChartDataSetFields" : [ {
+      "index" : 0,
+      "name" : "CREATEDATE",
+      "groupField" : true,
+      "id" : "0"
+    }, {
+      "index" : 1,
+      "name" : "SCORES",
+      "groupField" : false,
+      "id" : "1"
+    } ],
+    "id" : "2"
+  } ],
+  "getPSChartGrids" : [ {
+    "index" : 0,
+    "name" : "[candlestick_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_1",
+    "position" : "left",
+    "type" : "numeric",
+    "id" : "0"
+  } ],
+  "getPSDEChartDataGrid" : {
+    "index" : 0,
+    "id" : "0"
+  },
+  "getPSDEChartLegend" : {
+    "index" : 0,
+    "showLegend" : true,
+    "id" : "0"
+  },
+  "getPSDEChartSerieses" : [ {
+    "caption" : "k线图",
+    "catalogField" : "CREATEDATE",
+    "eChartsType" : "candlestick",
+    "index" : 0,
+    "name" : "candlestick_0",
+    "getNavPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
+      "viewType" : "DEEDITVIEW"
+    },
+    "navViewParamJO" : {
+      "testval" : "%age%",
+      "lowestfield" : "age",
+      "closefield" : "age",
+      "openfield" : "age",
+      "highestfield" : "age"
+    },
+    "getPSChartCoordinateSystem" : {
+      "modelref" : true,
+      "id" : "0"
+    },
+    "getPSChartDataSet" : {
+      "modelref" : true,
+      "id" : "0"
+    },
+    "getPSChartSeriesEncode" : {
+      "index" : 0,
+      "name" : "坐标系编码",
+      "getPSChartXAxis" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "getPSChartYAxis" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "type" : "XY",
+      "x" : [ "CREATEDATE" ],
+      "id" : "0"
+    },
+    "getPSNavigateParams" : [ {
+      "key" : "highestfield",
+      "name" : "highestfield",
+      "value" : "age",
+      "rawValue" : true
+    }, {
+      "key" : "closefield",
+      "name" : "closefield",
+      "value" : "age",
+      "rawValue" : true
+    }, {
+      "key" : "lowestfield",
+      "name" : "lowestfield",
+      "value" : "age",
+      "rawValue" : true
+    }, {
+      "key" : "testval",
+      "name" : "testval",
+      "value" : "age",
+      "rawValue" : false
+    }, {
+      "key" : "openfield",
+      "name" : "openfield",
+      "value" : "age",
+      "rawValue" : true
+    } ],
+    "seriesLayoutBy" : "column",
+    "seriesType" : "candlestick",
+    "enableChartDataSet" : true
+  }, {
+    "catalogField" : "CREATEDATE",
+    "eChartsType" : "line",
+    "index" : 1,
+    "name" : "line_1",
+    "getNavPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
+      "viewType" : "DEEDITVIEW"
+    },
+    "getPSChartCoordinateSystem" : {
+      "modelref" : true,
+      "id" : "0"
+    },
+    "getPSChartDataSet" : {
+      "modelref" : true,
+      "id" : "1"
+    },
+    "getPSChartSeriesEncode" : {
+      "index" : 0,
+      "name" : "坐标系编码",
+      "getPSChartXAxis" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "getPSChartYAxis" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "type" : "XY",
+      "x" : [ "CREATEDATE" ],
+      "y" : [ "AGE" ],
+      "id" : "0"
+    },
+    "getPSNavigateContexts" : [ {
+      "key" : "TEST",
+      "name" : "TEST",
+      "value" : "srforgname",
+      "rawValue" : false
+    } ],
+    "getPSNavigateParams" : [ {
+      "key" : "name",
+      "name" : "name",
+      "value" : "name",
+      "rawValue" : false
+    } ],
+    "seriesLayoutBy" : "column",
+    "seriesType" : "line",
+    "valueField" : "AGE",
+    "enableChartDataSet" : true,
+    "stack" : false
+  }, {
+    "catalogField" : "CREATEDATE",
+    "eChartsType" : "line",
+    "index" : 2,
+    "name" : "line_2",
+    "getNavPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",
+      "viewType" : "DEEDITVIEW"
+    },
+    "navViewParamJO" : {
+      "testval" : "%age%"
+    },
+    "getPSChartCoordinateSystem" : {
+      "modelref" : true,
+      "id" : "0"
+    },
+    "getPSChartDataSet" : {
+      "modelref" : true,
+      "id" : "2"
+    },
+    "getPSChartSeriesEncode" : {
+      "index" : 0,
+      "name" : "坐标系编码",
+      "getPSChartXAxis" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "getPSChartYAxis" : {
+        "modelref" : true,
+        "id" : "0"
+      },
+      "type" : "XY",
+      "x" : [ "CREATEDATE" ],
+      "y" : [ "SCORES" ],
+      "id" : "0"
+    },
+    "getPSNavigateParams" : [ {
+      "key" : "testval",
+      "name" : "testval",
+      "value" : "age",
+      "rawValue" : false
+    } ],
+    "seriesLayoutBy" : "column",
+    "seriesType" : "line",
+    "valueField" : "SCORES",
+    "enableChartDataSet" : true,
+    "stack" : false
+  } ],
+  "getPSDEChartTitle" : {
+    "index" : 0,
+    "title" : "测试k线图实体图表视图_图表",
+    "showTitle" : true,
+    "id" : "0"
+  },
+  "readOnly" : true,
+  "modelid" : "6CF1559D-221C-4539-BB44-724A8635AA71",
+  "modeltype" : "PSDECHART",
+  "getUserParam" : {
+    "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
+  }
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSSEARCHFORMS/Usr12317781_SearchForm.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSSEARCHFORMS/Usr12317781_SearchForm.json
+{
+  "codeName" : "Usr12317781_SearchForm",
+  "controlType" : "SEARCHFORM",
+  "defaultLabelWidth" : 130,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSSEARCHFORMS/Usr12317781_SearchForm.json",
+  "logicName" : "测试k线图实体图表视图_搜索表单",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+  },
+  "getPSDEFormPages" : [ {
+    "caption" : "常规条件",
+    "codeName" : "formpage1",
+    "detailStyle" : "DEFAULT",
+    "detailType" : "FORMPAGE",
+    "name" : "formpage1",
+    "getPSLayout" : {
+      "childColMD" : 24,
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "infoGroupMode" : false
+  } ],
+  "getPSLayout" : {
+    "childColMD" : 24,
+    "columnCount" : 24,
+    "layout" : "TABLE_24COL"
+  },
+  "searchButtonStyle" : "DEFAULT",
+  "tabHeaderPos" : "TOP",
+  "enableAdvanceSearch" : false,
+  "enableAutoSearch" : false,
+  "enableFilterSave" : false,
+  "noTabHeader" : true,
+  "modelid" : "2010D4E5-B052-44CE-91EB-76548B8A753C",
+  "modeltype" : "PSDEFORM_SEARCHFORM"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsrCandlestickDeChartView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsrCandlestickDeChartView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsrCandlestickNavChartView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsrCandlestickNavChartView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndex.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndex.json
@@ -4747,6 +4747,44 @@
            "layout" : "TABLE_24COL"
          },
          "tooltip" : "测试编辑器模型视图"
+        }, {
+          "accUserMode" : 2,
+          "caption" : "k线图",
+          "itemType" : "MENUITEM",
+          "name" : "menuitem361",
+          "getPSAppFunc" : {
+            "modelref" : true,
+            "id" : "UsrAppFunc1231004058"
+          },
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "tooltip" : "k线图"
+        }, {
+          "accUserMode" : 2,
+          "caption" : "k线图导航视图",
+          "itemType" : "MENUITEM",
+          "name" : "menuitem362",
+          "getPSAppFunc" : {
+            "modelref" : true,
+            "id" : "UsrAppFunc1231753639"
+          },
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "tooltip" : "k线图导航视图"
        } ],
        "getPSLayout" : {
          "childColMD" : 24,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppIndex.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppIndex.json
@@ -2224,6 +2224,26 @@
        "id" : "UsrAppFunc0812494048"
      },
      "tooltip" : "测试编辑器模型视图"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "k线图",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem361",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc1231004058"
+      },
+      "tooltip" : "k线图"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "k线图导航视图",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem362",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc1231753639"
+      },
+      "tooltip" : "k线图导航视图"
    } ],
    "tooltip" : "测试视图"
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -4074,6 +4074,16 @@
      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr03223638TreeExpView.json",
      "viewType" : "DETREEEXPVIEW"
    }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "UsrAppFunc1231753639",
+    "name" : "k线图导航视图",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsrCandlestickNavChartView.json",
+      "viewType" : "DECHARTEXPVIEW"
+    }
  }, {
    "appFuncType" : "APPVIEW",
    "codeName" : "UsrAppFunc0606948444",
@@ -7085,6 +7095,16 @@
      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr11EditView.json",
      "viewType" : "DEEDITVIEW"
    }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "UsrAppFunc1231004058",
+    "name" : "k线图实体视图",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsrCandlestickDeChartView.json",
+      "viewType" : "DECHARTVIEW"
+    }
  }, {
    "appFuncType" : "APPVIEW",
    "codeName" : "UsrAppFunc0716718928",
@@ -33622,6 +33642,12 @@
    "viewType" : "DEHTMLVIEW",
    "resource" : "Student",
    "view" : "Usr08212734HtmlView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsrCandlestickDeChartView.json",
+    "viewType" : "DECHARTVIEW",
+    "resource" : "Reginfo",
+    "view" : "UsrCandlestickDeChartView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr05103999TabExpView.json",
@@ -34954,6 +34980,12 @@
    "viewType" : "DEGRIDVIEW",
    "resource" : "TESTGRID",
    "view" : "GridTestArrangePView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsrCandlestickNavChartView.json",
+    "viewType" : "DECHARTEXPVIEW",
+    "resource" : "Reginfo",
+    "view" : "UsrCandlestickNavChartView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr2KanbanView.json",
@@ -40878,6 +40910,44 @@
                "layout" : "TABLE_24COL"
              },
              "tooltip" : "测试编辑器模型视图"
+            }, {
+              "accUserMode" : 2,
+              "caption" : "k线图",
+              "itemType" : "MENUITEM",
+              "name" : "menuitem361",
+              "getPSAppFunc" : {
+                "modelref" : true,
+                "id" : "UsrAppFunc1231004058"
+              },
+              "getPSLayout" : {
+                "childColMD" : 24,
+                "columnCount" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "tooltip" : "k线图"
+            }, {
+              "accUserMode" : 2,
+              "caption" : "k线图导航视图",
+              "itemType" : "MENUITEM",
+              "name" : "menuitem362",
+              "getPSAppFunc" : {
+                "modelref" : true,
+                "id" : "UsrAppFunc1231753639"
+              },
+              "getPSLayout" : {
+                "childColMD" : 24,
+                "columnCount" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "tooltip" : "k线图导航视图"
            } ],
            "getPSLayout" : {
              "childColMD" : 24,