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

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

@@ -1214,16 +1214,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/Usr0301846645.json

@@ -7,7 +7,6 @@
     "modelref" : true,
     "id" : "fetch"
   },
-  "hookEventNames" : [ "LOAD", "BEFORELOAD" ],
   "logicName" : "Chart5",
   "mOSFilePath" : "psmodules/common/psdataentities/REGINFO/psdecharts/Usr0301846645",
   "getPSAppDataEntity" : {
@@ -117,16 +116,6 @@
     "type" : "numeric",
     "id" : "0"
   } ],
-  "getPSControlLogics" : [ {
-    "eventNames" : "LOAD;BEFORELOAD",
-    "logicTag" : "chart",
-    "logicType" : "APPVIEWENGINE",
-    "name" : "engine_chart",
-    "getPSAppViewEngine" : {
-      "modelref" : true,
-      "id" : "engine"
-    }
-  } ],
   "getPSDEChartLegend" : {
     "index" : 0,
     "legendPos" : "BOTTOM",
@@ -186,7 +175,7 @@
     "showTitle" : true,
     "id" : "0"
   },
-  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/ReginfoUsr0301474927ChartView/psappviewctrls/chart",
+  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/ReginfoUsr0301140652ChartView/psappviewctrls/chart2",
   "readOnly" : true,
   "modelid" : "AF51908C-6D6F-4055-9E30-C6A599FB191C",
   "modeltype" : "PSDECHART",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/TestRules.json

@@ -37,110 +37,6 @@
     }
   } ],
   "getPSDEFormItemVRs" : [ {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule9",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
-      "name" : "field8值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "[条件组]AND",
-          "getPSDEFVRConditions" : [ {
-            "condOp" : "AND",
-            "condType" : "GROUP",
-            "name" : "[条件组]AND",
-            "getPSDEFVRConditions" : [ {
-              "condOp" : "GT",
-              "condType" : "SIMPLE",
-              "dEFName" : "FIELD8",
-              "name" : "[常规条件] 大于(>) (20)",
-              "paramValue" : "20"
-            }, {
-              "condOp" : "NOTEQ",
-              "condType" : "SIMPLE",
-              "dEFName" : "FIELD8",
-              "name" : "[常规条件] 不等于(<>) (30)",
-              "paramValue" : "30"
-            } ]
-          }, {
-            "condOp" : "OR",
-            "condType" : "GROUP",
-            "name" : "[条件组]OR",
-            "getPSDEFVRConditions" : [ {
-              "condOp" : "GT",
-              "condType" : "SIMPLE",
-              "dEFName" : "FIELD8",
-              "name" : "[常规条件] 大于(>) (35)",
-              "paramValue" : "35"
-            }, {
-              "condOp" : "LIKE",
-              "condType" : "SIMPLE",
-              "dEFName" : "FIELD8",
-              "name" : "[常规条件] 文本包含(%) (2)",
-              "paramValue" : "2"
-            } ]
-          } ],
-          "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
-        } ],
-        "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
-      "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "field8",
-    "valueRuleType" : "DEFVALUERULE"
-  }, {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule7",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
-      "name" : "field6值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "[条件组]AND",
-          "getPSDEFVRConditions" : [ {
-            "condOp" : "NOTEQ",
-            "condType" : "SIMPLE",
-            "dEFName" : "FIELD6",
-            "name" : "[常规条件] 不等于(<>) (20)",
-            "paramValue" : "20"
-          }, {
-            "condOp" : "GT",
-            "condType" : "SIMPLE",
-            "dEFName" : "FIELD6",
-            "name" : "[常规条件] 大于(>) (5)",
-            "paramValue" : "5"
-          } ],
-          "ruleInfo" : ">5并且不等于20"
-        } ],
-        "ruleInfo" : ">5并且不等于20"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
-      "ruleInfo" : ">5并且不等于20",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "field6",
-    "valueRuleType" : "DEFVALUERULE"
-  }, {
     "checkMode" : 3,
     "name" : "表单项值规则",
     "getPSDEFValueRule" : {
@@ -187,6 +83,37 @@
     },
     "getPSDEFormItemName" : "field7",
     "valueRuleType" : "DEFVALUERULE"
+  }, {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+      "name" : "amount值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condOp" : "EQ",
+          "condType" : "SIMPLE",
+          "dEFName" : "AMOUNT",
+          "name" : "[常规条件] 等于(=) (100)",
+          "paramType" : "SRCENTITYFIELD",
+          "paramValue" : "100",
+          "ruleInfo" : "amount等于100"
+        } ],
+        "ruleInfo" : "amount等于100"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+      "ruleInfo" : "amount等于100",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "amount",
+    "valueRuleType" : "DEFVALUERULE"
   }, {
     "checkMode" : 3,
     "name" : "表单项值规则",
@@ -364,32 +291,105 @@
     "checkMode" : 3,
     "name" : "表单项值规则",
     "getPSDEFValueRule" : {
-      "codeName" : "ValueRule",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-      "name" : "amount值规则",
+      "codeName" : "ValueRule9",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
+      "name" : "field8值规则",
       "getPSDEFVRGroupCondition" : {
         "condOp" : "AND",
         "condType" : "GROUP",
         "name" : "默认组",
         "getPSDEFVRConditions" : [ {
-          "condOp" : "EQ",
-          "condType" : "SIMPLE",
-          "dEFName" : "AMOUNT",
-          "name" : "[常规条件] 等于(=) (100)",
-          "paramType" : "SRCENTITYFIELD",
-          "paramValue" : "100",
-          "ruleInfo" : "amount等于100"
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "[条件组]AND",
+          "getPSDEFVRConditions" : [ {
+            "condOp" : "AND",
+            "condType" : "GROUP",
+            "name" : "[条件组]AND",
+            "getPSDEFVRConditions" : [ {
+              "condOp" : "GT",
+              "condType" : "SIMPLE",
+              "dEFName" : "FIELD8",
+              "name" : "[常规条件] 大于(>) (20)",
+              "paramValue" : "20"
+            }, {
+              "condOp" : "NOTEQ",
+              "condType" : "SIMPLE",
+              "dEFName" : "FIELD8",
+              "name" : "[常规条件] 不等于(<>) (30)",
+              "paramValue" : "30"
+            } ]
+          }, {
+            "condOp" : "OR",
+            "condType" : "GROUP",
+            "name" : "[条件组]OR",
+            "getPSDEFVRConditions" : [ {
+              "condOp" : "GT",
+              "condType" : "SIMPLE",
+              "dEFName" : "FIELD8",
+              "name" : "[常规条件] 大于(>) (35)",
+              "paramValue" : "35"
+            }, {
+              "condOp" : "LIKE",
+              "condType" : "SIMPLE",
+              "dEFName" : "FIELD8",
+              "name" : "[常规条件] 文本包含(%) (2)",
+              "paramValue" : "2"
+            } ]
+          } ],
+          "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
         } ],
-        "ruleInfo" : "amount等于100"
+        "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
       },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-      "ruleInfo" : "amount等于100",
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
+      "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2",
       "checkDefault" : false,
       "defaultMode" : false,
       "enableBackend" : true,
       "enableFront" : true
     },
-    "getPSDEFormItemName" : "amount",
+    "getPSDEFormItemName" : "field8",
+    "valueRuleType" : "DEFVALUERULE"
+  }, {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule7",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+      "name" : "field6值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "[条件组]AND",
+          "getPSDEFVRConditions" : [ {
+            "condOp" : "NOTEQ",
+            "condType" : "SIMPLE",
+            "dEFName" : "FIELD6",
+            "name" : "[常规条件] 不等于(<>) (20)",
+            "paramValue" : "20"
+          }, {
+            "condOp" : "GT",
+            "condType" : "SIMPLE",
+            "dEFName" : "FIELD6",
+            "name" : "[常规条件] 大于(>) (5)",
+            "paramValue" : "5"
+          } ],
+          "ruleInfo" : ">5并且不等于20"
+        } ],
+        "ruleInfo" : ">5并且不等于20"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+      "ruleInfo" : ">5并且不等于20",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "field6",
     "valueRuleType" : "DEFVALUERULE"
   } ],
   "getPSDEFormItems" : [ {

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

@@ -184,6 +184,16 @@
           "layout" : "FLEX"
         },
         "showCaption" : true
+      }, {
+        "caption" : "图表",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CTRLPOS",
+        "name" : "chart2",
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "showCaption" : true
       } ]
     } ],
     "layoutBodyOnly" : false,
@@ -686,6 +696,266 @@
         "EC.textStyle" : "{\"color\":\"#F5DF9D\",\"fontSize\":16}",
         "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
       }
+    }, {
+      "codeName" : "Usr0301846645",
+      "controlType" : "CHART",
+      "coordinateSystem" : "XY",
+      "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301846645.json",
+      "getFetchPSControlAction" : {
+        "modelref" : true,
+        "id" : "fetch"
+      },
+      "logicName" : "Chart5",
+      "mOSFilePath" : "psmodules/common/psdataentities/REGINFO/psdecharts/Usr0301846645",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+      },
+      "getPSChartCoordinateSystems" : [ {
+        "eChartsType" : "cartesian2d",
+        "index" : 0,
+        "name" : "[scatter_0]直角坐标系[0]",
+        "getPSChartGrid" : {
+          "index" : 0,
+          "name" : "[scatter_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" : "scatter_0-DEFAULT",
+        "getPSChartDataSetFields" : [ {
+          "index" : 0,
+          "name" : "NAME",
+          "getPSCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+          },
+          "groupField" : true,
+          "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" : "2"
+        } ],
+        "id" : "0"
+      } ],
+      "getPSChartGrids" : [ {
+        "index" : 0,
+        "name" : "[scatter_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",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "READ",
+          "name" : "load",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Get"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+          }
+        }, {
+          "actionName" : "Create",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "CREATE",
+          "name" : "create",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Create"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+          }
+        }, {
+          "actionName" : "Update",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "UPDATE",
+          "name" : "update",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Update"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+          }
+        }, {
+          "actionName" : "Remove",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "DELETE",
+          "name" : "remove",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Remove"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+          }
+        }, {
+          "actionType" : "DEDATASET",
+          "name" : "fetch",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "FetchDefault"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+          }
+        } ],
+        "userDRAction" : "READ",
+        "enableDEFieldPrivilege" : false,
+        "id" : "图形控件处理器"
+      },
+      "getPSControlParam" : {
+        "autoLoad" : true,
+        "showBusyIndicator" : true,
+        "id" : "CHART2"
+      },
+      "getPSDEChartLegend" : {
+        "index" : 0,
+        "legendPos" : "BOTTOM",
+        "showLegend" : true,
+        "id" : "0"
+      },
+      "getPSDEChartSerieses" : [ {
+        "catalogField" : "NAME",
+        "getCatalogPSCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+        },
+        "eChartsType" : "scatter",
+        "index" : 0,
+        "name" : "scatter_0",
+        "getPSChartCoordinateSystem" : {
+          "modelref" : true,
+          "id" : "0"
+        },
+        "getPSChartDataSet" : {
+          "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",
+        "getSeriesPSCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129249258.json"
+        },
+        "seriesType" : "scatter",
+        "valueField" : "AGE",
+        "enableChartDataSet" : true
+      } ],
+      "getPSDEChartTitle" : {
+        "index" : 0,
+        "subTitle" : "学生年龄发布",
+        "title" : "散点图_图表",
+        "titlePos" : "LEFT",
+        "showTitle" : true,
+        "id" : "0"
+      },
+      "rTMOSFilePath" : "pssysapps/Web/psappdeviews/ReginfoUsr0301140652ChartView/psappviewctrls/chart2",
+      "readOnly" : true,
+      "name" : "chart2",
+      "modelid" : "AF51908C-6D6F-4055-9E30-C6A599FB191C",
+      "modeltype" : "PSDECHART",
+      "getUserParam" : {
+        "EC.textStyle" : "{\"fontSize\":16}",
+        "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
+      }
     }, {
       "controlType" : "SEARCHBAR",
       "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSSEARCHBARS/.json",