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

01850ed2 · ibizdev · eef03a48 · 01850ed2 · 01850ed2 · 01850ed2
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSCODELISTS/CodeList.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSCODELISTS/CodeList.json
 {
-  "cacheTimeout" : 10000,
  "codeListTag" : "common__CodeList",
  "codeListType" : "DYNAMIC",
  "codeName" : "CodeList",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/CodeList.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/CodeList.json
 {
-  "cacheTimeout" : 10000,
  "codeListTag" : "common__CodeList",
  "codeListType" : "DYNAMIC",
  "codeName" : "CodeList",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
@@ -185,7 +185,6 @@
  }, {
    "id" : "field3",
    "dataType" : 25,
-    "createDV" : "4,5",
    "getPSAppDEField" : {
      "name" : "FIELD3",
      "codeName" : "Field3"
@@ -765,7 +764,6 @@
      }, {
        "caption" : "选项框列表",
        "codeName" : "field3",
-        "createDV" : "4,5",
        "dataType" : 25,
        "detailStyle" : "DEFAULT",
        "detailType" : "FORMITEM",
@@ -780,16 +778,12 @@
          "name" : "FIELD3",
          "codeName" : "Field3"
        },
-        "getPSDEFormItemUpdate" : {
-          "modelref" : true,
-          "id" : "updateA"
-        },
        "getPSEditor" : {
          "editorType" : "CHECKBOXLIST",
          "name" : "field3",
          "getPSAppCodeList" : {
            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList46.json"
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList.json"
          }
        },
        "getPSLayoutPos" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/TestRules.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/TestRules.json
@@ -37,6 +37,37 @@
    }
  } ],
  "getPSDEFormItemVRs" : [ {
+    "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" : "表单项值规则",
    "getPSDEFValueRule" : {
@@ -284,37 +315,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" : "表单项值规则",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestRulesEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestRulesEditView.json
@@ -166,6 +166,37 @@
      "id" : "FORM"
    },
    "getPSDEFormItemVRs" : [ {
+      "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" : "表单项值规则",
      "getPSDEFValueRule" : {
@@ -413,37 +444,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" : "表单项值规则",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
@@ -1521,7 +1521,6 @@
    }, {
      "id" : "field3",
      "dataType" : 25,
-      "createDV" : "4,5",
      "getPSAppDEField" : {
        "name" : "FIELD3",
        "codeName" : "Field3"
@@ -2101,7 +2100,6 @@
        }, {
          "caption" : "选项框列表",
          "codeName" : "field3",
-          "createDV" : "4,5",
          "dataType" : 25,
          "detailStyle" : "DEFAULT",
          "detailType" : "FORMITEM",
@@ -2116,16 +2114,12 @@
            "name" : "FIELD3",
            "codeName" : "Field3"
          },
-          "getPSDEFormItemUpdate" : {
-            "modelref" : true,
-            "id" : "updateA"
-          },
          "getPSEditor" : {
            "editorType" : "CHECKBOXLIST",
            "name" : "field3",
            "getPSAppCodeList" : {
              "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList46.json"
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList.json"
            }
          },
          "getPSLayoutPos" : {

--- 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
 {
  "getAllPSAppCodeLists" : [ {
-    "cacheTimeout" : 10000,
    "codeListTag" : "common__CodeList",
    "codeListType" : "DYNAMIC",
    "codeName" : "CodeList",
@@ -17194,6 +17193,37 @@
          "id" : "FORM"
        },
        "getPSDEFormItemVRs" : [ {
+          "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" : "表单项值规则",
          "getPSDEFValueRule" : {
@@ -17441,37 +17471,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" : "表单项值规则",