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

trainsys-core/src/main/resources/liquibase/h2_table.xml

@@ -194,7 +194,7 @@
     </changeSet>
 
     <!--输出实体[REGINFO]数据结构 -->
-    <changeSet author="root" id="tab-reginfo-42-8">
+    <changeSet author="root" id="tab-reginfo-46-8">
         <createTable tableName="T_REGINFO">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo.json

@@ -1109,6 +1109,30 @@
       "type" : "DEFAULT"
     } ],
     "getAllPSDEFValueRules" : [ {
+      "codeName" : "ValueRule",
+      "name" : "实体值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "VALUERANGE2",
+          "dEFName" : "STUNO",
+          "maxValue" : 444.0,
+          "minValue" : 1.0,
+          "name" : "[数值范围] 大于 1.0 且  小于 444.0",
+          "ruleInfo" : "数值必须大于[1.0]且小于[444.0]",
+          "includeMaxValue" : false,
+          "includeMinValue" : false
+        } ],
+        "ruleInfo" : "数值必须大于[1.0]且小于[444.0]"
+      },
+      "ruleInfo" : "数值必须大于[1.0]且小于[444.0]",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    }, {
       "codeName" : "Default",
       "name" : "默认规则",
       "getPSDEFVRGroupCondition" : {

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

@@ -67,18 +67,33 @@
   }, {
     "checkMode" : 3,
     "name" : "表单项值规则",
-    "getPSDEFormItemName" : "StuNo",
-    "getPSSysValueRule" : {
-      "codeName" : "ValueRule3",
-      "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule3.json",
-      "name" : "非负整数（正整数 + 0）",
-      "regExCode" : "\\d+",
-      "ruleInfo" : "内容必须为非负整数（正整数 + 0）",
-      "ruleType" : "REG",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule",
+      "name" : "实体值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "VALUERANGE2",
+          "dEFName" : "STUNO",
+          "maxValue" : 444.0,
+          "minValue" : 1.0,
+          "name" : "[数值范围] 大于 1.0 且  小于 444.0",
+          "ruleInfo" : "数值必须大于[1.0]且小于[444.0]",
+          "includeMaxValue" : false,
+          "includeMinValue" : false
+        } ],
+        "ruleInfo" : "数值必须大于[1.0]且小于[444.0]"
+      },
+      "ruleInfo" : "数值必须大于[1.0]且小于[444.0]",
+      "checkDefault" : false,
+      "defaultMode" : false,
       "enableBackend" : true,
       "enableFront" : true
     },
-    "valueRuleType" : "SYSVALUERULE"
+    "getPSDEFormItemName" : "StuNo",
+    "valueRuleType" : "DEFVALUERULE"
   } ],
   "getPSDEFormItems" : [ {
     "id" : "srfupdatedate",

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

@@ -1053,18 +1053,33 @@
     }, {
       "checkMode" : 3,
       "name" : "表单项值规则",
-      "getPSDEFormItemName" : "StuNo",
-      "getPSSysValueRule" : {
-        "codeName" : "ValueRule3",
-        "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule3.json",
-        "name" : "非负整数（正整数 + 0）",
-        "regExCode" : "\\d+",
-        "ruleInfo" : "内容必须为非负整数（正整数 + 0）",
-        "ruleType" : "REG",
+      "getPSDEFValueRule" : {
+        "codeName" : "ValueRule",
+        "name" : "实体值规则",
+        "getPSDEFVRGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "默认组",
+          "getPSDEFVRConditions" : [ {
+            "condType" : "VALUERANGE2",
+            "dEFName" : "STUNO",
+            "maxValue" : 444.0,
+            "minValue" : 1.0,
+            "name" : "[数值范围] 大于 1.0 且  小于 444.0",
+            "ruleInfo" : "数值必须大于[1.0]且小于[444.0]",
+            "includeMaxValue" : false,
+            "includeMinValue" : false
+          } ],
+          "ruleInfo" : "数值必须大于[1.0]且小于[444.0]"
+        },
+        "ruleInfo" : "数值必须大于[1.0]且小于[444.0]",
+        "checkDefault" : false,
+        "defaultMode" : false,
         "enableBackend" : true,
         "enableFront" : true
       },
-      "valueRuleType" : "SYSVALUERULE"
+      "getPSDEFormItemName" : "StuNo",
+      "valueRuleType" : "DEFVALUERULE"
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",