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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json

@@ -63,9 +63,14 @@
       "id" : "0"
     }, {
       "index" : 1,
+      "name" : "DEPARTMENT",
+      "groupField" : true,
+      "id" : "1"
+    }, {
+      "index" : 2,
       "name" : "AGE",
       "groupField" : false,
-      "id" : "1"
+      "id" : "2"
     } ],
     "id" : "0"
   } ],
@@ -96,7 +101,7 @@
     "type" : "category",
     "getUserParam" : {
       "EC.axisTick" : "{\"inside\":0,\"show\":0}",
-      "EC.axisLine" : "{\"show\":0}"
+      "EC.axisLine" : "{\"show\":0,\"lineStyle\":{\"color\":\"#000000\",\"opacity\":-1}}"
     },
     "id" : "0"
   } ],
@@ -140,6 +145,8 @@
     },
     "getPSChartSeriesEncode" : {
       "index" : 0,
+      "itemId" : "DEPARTMENT",
+      "itemName" : "DEPARTMENT",
       "name" : "坐标系编码",
       "getPSChartXAxis" : {
         "modelref" : true,
@@ -154,6 +161,7 @@
       "y" : [ "AGE" ],
       "id" : "0"
     },
+    "seriesField" : "DEPARTMENT",
     "seriesLayoutBy" : "column",
     "seriesType" : "bar",
     "valueField" : "AGE",

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

@@ -108,37 +108,6 @@
     },
     "getPSDEFormItemName" : "field5",
     "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" : "表单项值规则",
@@ -351,6 +320,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" : "表单项值规则",

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

@@ -392,9 +392,14 @@
         "id" : "0"
       }, {
         "index" : 1,
+        "name" : "DEPARTMENT",
+        "groupField" : true,
+        "id" : "1"
+      }, {
+        "index" : 2,
         "name" : "AGE",
         "groupField" : false,
-        "id" : "1"
+        "id" : "2"
       } ],
       "id" : "0"
     } ],
@@ -425,7 +430,7 @@
       "type" : "category",
       "getUserParam" : {
         "EC.axisTick" : "{\"inside\":0,\"show\":0}",
-        "EC.axisLine" : "{\"show\":0}"
+        "EC.axisLine" : "{\"show\":0,\"lineStyle\":{\"color\":\"#000000\",\"opacity\":-1}}"
       },
       "id" : "0"
     } ],
@@ -545,6 +550,8 @@
       },
       "getPSChartSeriesEncode" : {
         "index" : 0,
+        "itemId" : "DEPARTMENT",
+        "itemName" : "DEPARTMENT",
         "name" : "坐标系编码",
         "getPSChartXAxis" : {
           "modelref" : true,
@@ -559,6 +566,7 @@
         "y" : [ "AGE" ],
         "id" : "0"
       },
+      "seriesField" : "DEPARTMENT",
       "seriesLayoutBy" : "column",
       "seriesType" : "bar",
       "valueField" : "AGE",

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

@@ -237,37 +237,6 @@
       },
       "getPSDEFormItemName" : "field5",
       "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" : "表单项值规则",
@@ -480,6 +449,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" : "表单项值规则",

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

@@ -18129,37 +18129,6 @@
           },
           "getPSDEFormItemName" : "field5",
           "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" : "表单项值规则",
@@ -18372,6 +18341,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" : "表单项值规则",