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

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

@@ -4,7 +4,21 @@
   "controlType" : "CALENDAR",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSCALENDARS/Test.json",
   "emptyText" : "功能-无值显示内容",
-  "groupMode" : "NONE",
+  "groupHeight" : 10,
+  "groupLayout" : "ROW",
+  "groupMode" : "AUTO",
+  "getGroupPSAppDEField" : {
+    "name" : "MONEY",
+    "codeName" : "Money"
+  },
+  "getGroupPSCodeList" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129249258.json"
+  },
+  "getGroupPSSysCss" : {
+    "cssName" : "test3"
+  },
+  "groupWidth" : 20,
   "legendPos" : "TOP",
   "logicName" : "test",
   "mOSFilePath" : "psmodules/common/psdataentities/PHONE/pssyscalendars/Test",
@@ -249,7 +263,7 @@
     "id" : "calendarphoneitem"
   } ],
   "rTMOSFilePath" : "pssysapps/Web/psappdeviews/studentCalendarView/psappviewctrls/calendar",
-  "enableGroup" : false,
+  "enableGroup" : true,
   "modelid" : "C10C79E5-8EFD-4A5E-B0C6-E5DC49DA3E89",
   "modeltype" : "PSSYSCALENDAR"
 }
\ No newline at end of file

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

@@ -59,6 +59,10 @@
     "getPSChartDataSetFields" : [ {
       "index" : 0,
       "name" : "NAME",
+      "getPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+      },
       "groupField" : true,
       "id" : "0"
     }, {
@@ -124,6 +128,10 @@
   "getPSDEChartSerieses" : [ {
     "caption" : "学生信息",
     "catalogField" : "NAME",
+    "getCatalogPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+    },
     "eChartsType" : "line",
     "index" : 0,
     "name" : "line_0",

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

@@ -67,9 +67,18 @@
       "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" : "1"
+      "id" : "2"
     } ],
     "id" : "0"
   } ],
@@ -143,6 +152,8 @@
     },
     "getPSChartSeriesEncode" : {
       "index" : 0,
+      "itemId" : "ADDRESS",
+      "itemName" : "ADDRESS",
       "name" : "坐标系编码",
       "getPSChartXAxis" : {
         "modelref" : true,
@@ -157,6 +168,7 @@
       "y" : [ "AGE" ],
       "id" : "0"
     },
+    "seriesField" : "ADDRESS",
     "seriesLayoutBy" : "column",
     "getSeriesPSCodeList" : {
       "modelref" : true,

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

@@ -37,6 +37,78 @@
     }
   } ],
   "getPSDEFormItemVRs" : [ {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule4",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
+      "name" : "field3值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "FIELD3",
+          "maxValue" : 15,
+          "minValue" : 5,
+          "name" : "[字符长度] 大于等于 5 且  小于等于 15",
+          "ruleInfo" : "5<=field3字符长度<=15",
+          "includeMaxValue" : true,
+          "includeMinValue" : true
+        } ],
+        "ruleInfo" : "5<=field3字符长度<=15"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
+      "ruleInfo" : "5<=field3字符长度<=15",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "field3",
+    "valueRuleType" : "DEFVALUERULE"
+  }, {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule6",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+      "name" : "field5值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "SYSVALUERULE",
+          "dEFName" : "FIELD5",
+          "name" : "[系统值规则]脚本值规则测试",
+          "getPSSysValueRule" : {
+            "codeName" : "ValueRule20",
+            "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
+            "mOSFilePath" : "pssysvaluerules/ValueRule20",
+            "name" : "脚本值规则测试",
+            "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
+            "ruleInfo" : "脚本校验",
+            "ruleType" : "SCRIPT",
+            "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "ruleInfo" : "脚本校验"
+        } ],
+        "ruleInfo" : "脚本校验"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+      "ruleInfo" : "脚本校验",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "field5",
+    "valueRuleType" : "DEFVALUERULE"
+  }, {
     "checkMode" : 3,
     "name" : "表单项值规则",
     "getPSDEFValueRule" : {
@@ -319,78 +391,6 @@
     },
     "getPSDEFormItemName" : "field4",
     "valueRuleType" : "DEFVALUERULE"
-  }, {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule4",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
-      "name" : "field3值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condType" : "STRINGLENGTH",
-          "dEFName" : "FIELD3",
-          "maxValue" : 15,
-          "minValue" : 5,
-          "name" : "[字符长度] 大于等于 5 且  小于等于 15",
-          "ruleInfo" : "5<=field3字符长度<=15",
-          "includeMaxValue" : true,
-          "includeMinValue" : true
-        } ],
-        "ruleInfo" : "5<=field3字符长度<=15"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
-      "ruleInfo" : "5<=field3字符长度<=15",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "field3",
-    "valueRuleType" : "DEFVALUERULE"
-  }, {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule6",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-      "name" : "field5值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condType" : "SYSVALUERULE",
-          "dEFName" : "FIELD5",
-          "name" : "[系统值规则]脚本值规则测试",
-          "getPSSysValueRule" : {
-            "codeName" : "ValueRule20",
-            "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
-            "mOSFilePath" : "pssysvaluerules/ValueRule20",
-            "name" : "脚本值规则测试",
-            "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
-            "ruleInfo" : "脚本校验",
-            "ruleType" : "SCRIPT",
-            "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "ruleInfo" : "脚本校验"
-        } ],
-        "ruleInfo" : "脚本校验"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-      "ruleInfo" : "脚本校验",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "field5",
-    "valueRuleType" : "DEFVALUERULE"
   } ],
   "getPSDEFormItems" : [ {
     "id" : "srfupdatedate",

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

@@ -264,6 +264,10 @@
       "getPSChartDataSetFields" : [ {
         "index" : 0,
         "name" : "NAME",
+        "getPSCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+        },
         "groupField" : true,
         "id" : "0"
       }, {
@@ -403,6 +407,10 @@
     "getPSDEChartSerieses" : [ {
       "caption" : "学生信息",
       "catalogField" : "NAME",
+      "getCatalogPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+      },
       "eChartsType" : "line",
       "index" : 0,
       "name" : "line_0",

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

@@ -198,9 +198,18 @@
         "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" : "1"
+        "id" : "2"
       } ],
       "id" : "0"
     } ],
@@ -350,6 +359,8 @@
       },
       "getPSChartSeriesEncode" : {
         "index" : 0,
+        "itemId" : "ADDRESS",
+        "itemName" : "ADDRESS",
         "name" : "坐标系编码",
         "getPSChartXAxis" : {
           "modelref" : true,
@@ -364,6 +375,7 @@
         "y" : [ "AGE" ],
         "id" : "0"
       },
+      "seriesField" : "ADDRESS",
       "seriesLayoutBy" : "column",
       "getSeriesPSCodeList" : {
         "modelref" : true,

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

@@ -166,6 +166,78 @@
       "id" : "FORM"
     },
     "getPSDEFormItemVRs" : [ {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFValueRule" : {
+        "codeName" : "ValueRule4",
+        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
+        "name" : "field3值规则",
+        "getPSDEFVRGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "默认组",
+          "getPSDEFVRConditions" : [ {
+            "condType" : "STRINGLENGTH",
+            "dEFName" : "FIELD3",
+            "maxValue" : 15,
+            "minValue" : 5,
+            "name" : "[字符长度] 大于等于 5 且  小于等于 15",
+            "ruleInfo" : "5<=field3字符长度<=15",
+            "includeMaxValue" : true,
+            "includeMinValue" : true
+          } ],
+          "ruleInfo" : "5<=field3字符长度<=15"
+        },
+        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
+        "ruleInfo" : "5<=field3字符长度<=15",
+        "checkDefault" : false,
+        "defaultMode" : false,
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "getPSDEFormItemName" : "field3",
+      "valueRuleType" : "DEFVALUERULE"
+    }, {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFValueRule" : {
+        "codeName" : "ValueRule6",
+        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+        "name" : "field5值规则",
+        "getPSDEFVRGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "默认组",
+          "getPSDEFVRConditions" : [ {
+            "condType" : "SYSVALUERULE",
+            "dEFName" : "FIELD5",
+            "name" : "[系统值规则]脚本值规则测试",
+            "getPSSysValueRule" : {
+              "codeName" : "ValueRule20",
+              "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
+              "mOSFilePath" : "pssysvaluerules/ValueRule20",
+              "name" : "脚本值规则测试",
+              "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
+              "ruleInfo" : "脚本校验",
+              "ruleType" : "SCRIPT",
+              "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
+              "enableBackend" : true,
+              "enableFront" : true
+            },
+            "ruleInfo" : "脚本校验"
+          } ],
+          "ruleInfo" : "脚本校验"
+        },
+        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+        "ruleInfo" : "脚本校验",
+        "checkDefault" : false,
+        "defaultMode" : false,
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "getPSDEFormItemName" : "field5",
+      "valueRuleType" : "DEFVALUERULE"
+    }, {
       "checkMode" : 3,
       "name" : "表单项值规则",
       "getPSDEFValueRule" : {
@@ -448,78 +520,6 @@
       },
       "getPSDEFormItemName" : "field4",
       "valueRuleType" : "DEFVALUERULE"
-    }, {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFValueRule" : {
-        "codeName" : "ValueRule4",
-        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
-        "name" : "field3值规则",
-        "getPSDEFVRGroupCondition" : {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "默认组",
-          "getPSDEFVRConditions" : [ {
-            "condType" : "STRINGLENGTH",
-            "dEFName" : "FIELD3",
-            "maxValue" : 15,
-            "minValue" : 5,
-            "name" : "[字符长度] 大于等于 5 且  小于等于 15",
-            "ruleInfo" : "5<=field3字符长度<=15",
-            "includeMaxValue" : true,
-            "includeMinValue" : true
-          } ],
-          "ruleInfo" : "5<=field3字符长度<=15"
-        },
-        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
-        "ruleInfo" : "5<=field3字符长度<=15",
-        "checkDefault" : false,
-        "defaultMode" : false,
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "getPSDEFormItemName" : "field3",
-      "valueRuleType" : "DEFVALUERULE"
-    }, {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFValueRule" : {
-        "codeName" : "ValueRule6",
-        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-        "name" : "field5值规则",
-        "getPSDEFVRGroupCondition" : {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "默认组",
-          "getPSDEFVRConditions" : [ {
-            "condType" : "SYSVALUERULE",
-            "dEFName" : "FIELD5",
-            "name" : "[系统值规则]脚本值规则测试",
-            "getPSSysValueRule" : {
-              "codeName" : "ValueRule20",
-              "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
-              "mOSFilePath" : "pssysvaluerules/ValueRule20",
-              "name" : "脚本值规则测试",
-              "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
-              "ruleInfo" : "脚本校验",
-              "ruleType" : "SCRIPT",
-              "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
-              "enableBackend" : true,
-              "enableFront" : true
-            },
-            "ruleInfo" : "脚本校验"
-          } ],
-          "ruleInfo" : "脚本校验"
-        },
-        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-        "ruleInfo" : "脚本校验",
-        "checkDefault" : false,
-        "defaultMode" : false,
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "getPSDEFormItemName" : "field5",
-      "valueRuleType" : "DEFVALUERULE"
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",

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

@@ -44,7 +44,21 @@
     "controlType" : "CALENDAR",
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSCALENDARS/Test.json",
     "emptyText" : "功能-无值显示内容",
-    "groupMode" : "NONE",
+    "groupHeight" : 10,
+    "groupLayout" : "ROW",
+    "groupMode" : "AUTO",
+    "getGroupPSAppDEField" : {
+      "name" : "MONEY",
+      "codeName" : "Money"
+    },
+    "getGroupPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129249258.json"
+    },
+    "getGroupPSSysCss" : {
+      "cssName" : "test3"
+    },
+    "groupWidth" : 20,
     "legendPos" : "TOP",
     "logicName" : "test",
     "mOSFilePath" : "psmodules/common/psdataentities/PHONE/pssyscalendars/Test",
@@ -298,7 +312,7 @@
       "id" : "calendarphoneitem"
     } ],
     "rTMOSFilePath" : "pssysapps/Web/psappdeviews/phoneCalendarView/psappviewctrls/calendar",
-    "enableGroup" : false,
+    "enableGroup" : true,
     "name" : "calendar",
     "modelid" : "C10C79E5-8EFD-4A5E-B0C6-E5DC49DA3E89",
     "modeltype" : "PSSYSCALENDAR"

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

@@ -44,7 +44,21 @@
     "controlType" : "CALENDAR",
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSCALENDARS/Test.json",
     "emptyText" : "功能-无值显示内容",
-    "groupMode" : "NONE",
+    "groupHeight" : 10,
+    "groupLayout" : "ROW",
+    "groupMode" : "AUTO",
+    "getGroupPSAppDEField" : {
+      "name" : "MONEY",
+      "codeName" : "Money"
+    },
+    "getGroupPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129249258.json"
+    },
+    "getGroupPSSysCss" : {
+      "cssName" : "test3"
+    },
+    "groupWidth" : 20,
     "legendPos" : "TOP",
     "logicName" : "test",
     "mOSFilePath" : "psmodules/common/psdataentities/PHONE/pssyscalendars/Test",
@@ -298,7 +312,7 @@
       "id" : "calendarphoneitem"
     } ],
     "rTMOSFilePath" : "pssysapps/Web/psappdeviews/studentCalendarView/psappviewctrls/calendar",
-    "enableGroup" : false,
+    "enableGroup" : true,
     "name" : "calendar",
     "modelid" : "C10C79E5-8EFD-4A5E-B0C6-E5DC49DA3E89",
     "modeltype" : "PSSYSCALENDAR"

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

@@ -17949,6 +17949,78 @@
           "id" : "FORM"
         },
         "getPSDEFormItemVRs" : [ {
+          "checkMode" : 3,
+          "name" : "表单项值规则",
+          "getPSDEFValueRule" : {
+            "codeName" : "ValueRule4",
+            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
+            "name" : "field3值规则",
+            "getPSDEFVRGroupCondition" : {
+              "condOp" : "AND",
+              "condType" : "GROUP",
+              "name" : "默认组",
+              "getPSDEFVRConditions" : [ {
+                "condType" : "STRINGLENGTH",
+                "dEFName" : "FIELD3",
+                "maxValue" : 15,
+                "minValue" : 5,
+                "name" : "[字符长度] 大于等于 5 且  小于等于 15",
+                "ruleInfo" : "5<=field3字符长度<=15",
+                "includeMaxValue" : true,
+                "includeMinValue" : true
+              } ],
+              "ruleInfo" : "5<=field3字符长度<=15"
+            },
+            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
+            "ruleInfo" : "5<=field3字符长度<=15",
+            "checkDefault" : false,
+            "defaultMode" : false,
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "getPSDEFormItemName" : "field3",
+          "valueRuleType" : "DEFVALUERULE"
+        }, {
+          "checkMode" : 3,
+          "name" : "表单项值规则",
+          "getPSDEFValueRule" : {
+            "codeName" : "ValueRule6",
+            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+            "name" : "field5值规则",
+            "getPSDEFVRGroupCondition" : {
+              "condOp" : "AND",
+              "condType" : "GROUP",
+              "name" : "默认组",
+              "getPSDEFVRConditions" : [ {
+                "condType" : "SYSVALUERULE",
+                "dEFName" : "FIELD5",
+                "name" : "[系统值规则]脚本值规则测试",
+                "getPSSysValueRule" : {
+                  "codeName" : "ValueRule20",
+                  "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
+                  "mOSFilePath" : "pssysvaluerules/ValueRule20",
+                  "name" : "脚本值规则测试",
+                  "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
+                  "ruleInfo" : "脚本校验",
+                  "ruleType" : "SCRIPT",
+                  "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
+                  "enableBackend" : true,
+                  "enableFront" : true
+                },
+                "ruleInfo" : "脚本校验"
+              } ],
+              "ruleInfo" : "脚本校验"
+            },
+            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+            "ruleInfo" : "脚本校验",
+            "checkDefault" : false,
+            "defaultMode" : false,
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "getPSDEFormItemName" : "field5",
+          "valueRuleType" : "DEFVALUERULE"
+        }, {
           "checkMode" : 3,
           "name" : "表单项值规则",
           "getPSDEFValueRule" : {
@@ -18231,78 +18303,6 @@
           },
           "getPSDEFormItemName" : "field4",
           "valueRuleType" : "DEFVALUERULE"
-        }, {
-          "checkMode" : 3,
-          "name" : "表单项值规则",
-          "getPSDEFValueRule" : {
-            "codeName" : "ValueRule4",
-            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
-            "name" : "field3值规则",
-            "getPSDEFVRGroupCondition" : {
-              "condOp" : "AND",
-              "condType" : "GROUP",
-              "name" : "默认组",
-              "getPSDEFVRConditions" : [ {
-                "condType" : "STRINGLENGTH",
-                "dEFName" : "FIELD3",
-                "maxValue" : 15,
-                "minValue" : 5,
-                "name" : "[字符长度] 大于等于 5 且  小于等于 15",
-                "ruleInfo" : "5<=field3字符长度<=15",
-                "includeMaxValue" : true,
-                "includeMinValue" : true
-              } ],
-              "ruleInfo" : "5<=field3字符长度<=15"
-            },
-            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
-            "ruleInfo" : "5<=field3字符长度<=15",
-            "checkDefault" : false,
-            "defaultMode" : false,
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "getPSDEFormItemName" : "field3",
-          "valueRuleType" : "DEFVALUERULE"
-        }, {
-          "checkMode" : 3,
-          "name" : "表单项值规则",
-          "getPSDEFValueRule" : {
-            "codeName" : "ValueRule6",
-            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-            "name" : "field5值规则",
-            "getPSDEFVRGroupCondition" : {
-              "condOp" : "AND",
-              "condType" : "GROUP",
-              "name" : "默认组",
-              "getPSDEFVRConditions" : [ {
-                "condType" : "SYSVALUERULE",
-                "dEFName" : "FIELD5",
-                "name" : "[系统值规则]脚本值规则测试",
-                "getPSSysValueRule" : {
-                  "codeName" : "ValueRule20",
-                  "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
-                  "mOSFilePath" : "pssysvaluerules/ValueRule20",
-                  "name" : "脚本值规则测试",
-                  "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
-                  "ruleInfo" : "脚本校验",
-                  "ruleType" : "SCRIPT",
-                  "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
-                  "enableBackend" : true,
-                  "enableFront" : true
-                },
-                "ruleInfo" : "脚本校验"
-              } ],
-              "ruleInfo" : "脚本校验"
-            },
-            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-            "ruleInfo" : "脚本校验",
-            "checkDefault" : false,
-            "defaultMode" : false,
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "getPSDEFormItemName" : "field5",
-          "valueRuleType" : "DEFVALUERULE"
         } ],
         "getPSDEFormItems" : [ {
           "id" : "srfupdatedate",