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

74dcebb3 · ibizdev · 032522e8 · 74dcebb3 · 74dcebb3 · 74dcebb3
--- 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,46 @@
    }
  } ],
  "getPSDEFormItemVRs" : [ {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule5",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD4/psdefvaluerules/ValueRule5",
+      "name" : "field4值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "SYSVALUERULE",
+          "dEFName" : "FIELD4",
+          "name" : "[系统值规则]URL",
+          "getPSSysValueRule" : {
+            "codeName" : "ValueRule17",
+            "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule17.json",
+            "mOSFilePath" : "pssysvaluerules/ValueRule17",
+            "name" : "URL",
+            "rTMOSFilePath" : "pssysvaluerules/ValueRule17",
+            "regExCode" : "[a-zA-z]+://(\\w+(-\\w+)*)(\\.(\\w+(-\\w+)*))*(\\?\\S*)?",
+            "ruleInfo" : "内容必须为有效URL格式",
+            "ruleType" : "REG",
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "ruleInfo" : "内容必须为有效URL格式"
+        } ],
+        "ruleInfo" : "内容必须为有效URL格式"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD4/psdefvaluerules/ValueRule5",
+      "ruleInfo" : "内容必须为有效URL格式",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "field4",
+    "valueRuleType" : "DEFVALUERULE"
+  }, {
    "checkMode" : 3,
    "name" : "表单项值规则",
    "getPSDEFValueRule" : {
@@ -351,46 +391,6 @@
    },
    "getPSDEFormItemName" : "field7",
    "valueRuleType" : "DEFVALUERULE"
-  }, {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule5",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD4/psdefvaluerules/ValueRule5",
-      "name" : "field4值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condType" : "SYSVALUERULE",
-          "dEFName" : "FIELD4",
-          "name" : "[系统值规则]URL",
-          "getPSSysValueRule" : {
-            "codeName" : "ValueRule17",
-            "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule17.json",
-            "mOSFilePath" : "pssysvaluerules/ValueRule17",
-            "name" : "URL",
-            "rTMOSFilePath" : "pssysvaluerules/ValueRule17",
-            "regExCode" : "[a-zA-z]+://(\\w+(-\\w+)*)(\\.(\\w+(-\\w+)*))*(\\?\\S*)?",
-            "ruleInfo" : "内容必须为有效URL格式",
-            "ruleType" : "REG",
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "ruleInfo" : "内容必须为有效URL格式"
-        } ],
-        "ruleInfo" : "内容必须为有效URL格式"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD4/psdefvaluerules/ValueRule5",
-      "ruleInfo" : "内容必须为有效URL格式",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "field4",
-    "valueRuleType" : "DEFVALUERULE"
  } ],
  "getPSDEFormItems" : [ {
    "id" : "srfupdatedate",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSWIZARDPANELS/default.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSWIZARDPANELS/default.json
@@ -7,10 +7,6 @@
    "id" : "finish"
  },
  "hookEventNames" : [ "FINISH" ],
-  "getInitPSControlAction" : {
-    "modelref" : true,
-    "id" : "init"
-  },
  "logicName" : "默认向导",
  "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdewizardpanels/default",
  "getPSAppDataEntity" : {
@@ -2347,12 +2343,14 @@
  "getPSDEWizard" : {
    "codeName" : "default",
    "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEWIZARDS/default.json",
+    "finishCaption" : "结束",
    "getFirstPSDEWizardForm" : {
      "modelref" : true,
      "id" : "第一步"
    },
    "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdewizards/default",
    "name" : "默认向导",
+    "nextCaption" : "前进",
    "getPSDEWizardForms" : [ {
      "formTag" : "third",
      "name" : "第三步",
@@ -2407,6 +2405,7 @@
      "title" : "第二步",
      "enableLink" : false
    } ],
+    "prevCaption" : "后退",
    "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdewizards/default",
    "wizardStyle" : "DEFAULT",
    "stateWizard" : false

--- 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,46 @@
      "id" : "FORM"
    },
    "getPSDEFormItemVRs" : [ {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFValueRule" : {
+        "codeName" : "ValueRule5",
+        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD4/psdefvaluerules/ValueRule5",
+        "name" : "field4值规则",
+        "getPSDEFVRGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "默认组",
+          "getPSDEFVRConditions" : [ {
+            "condType" : "SYSVALUERULE",
+            "dEFName" : "FIELD4",
+            "name" : "[系统值规则]URL",
+            "getPSSysValueRule" : {
+              "codeName" : "ValueRule17",
+              "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule17.json",
+              "mOSFilePath" : "pssysvaluerules/ValueRule17",
+              "name" : "URL",
+              "rTMOSFilePath" : "pssysvaluerules/ValueRule17",
+              "regExCode" : "[a-zA-z]+://(\\w+(-\\w+)*)(\\.(\\w+(-\\w+)*))*(\\?\\S*)?",
+              "ruleInfo" : "内容必须为有效URL格式",
+              "ruleType" : "REG",
+              "enableBackend" : true,
+              "enableFront" : true
+            },
+            "ruleInfo" : "内容必须为有效URL格式"
+          } ],
+          "ruleInfo" : "内容必须为有效URL格式"
+        },
+        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD4/psdefvaluerules/ValueRule5",
+        "ruleInfo" : "内容必须为有效URL格式",
+        "checkDefault" : false,
+        "defaultMode" : false,
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "getPSDEFormItemName" : "field4",
+      "valueRuleType" : "DEFVALUERULE"
+    }, {
      "checkMode" : 3,
      "name" : "表单项值规则",
      "getPSDEFValueRule" : {
@@ -480,46 +520,6 @@
      },
      "getPSDEFormItemName" : "field7",
      "valueRuleType" : "DEFVALUERULE"
-    }, {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFValueRule" : {
-        "codeName" : "ValueRule5",
-        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD4/psdefvaluerules/ValueRule5",
-        "name" : "field4值规则",
-        "getPSDEFVRGroupCondition" : {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "默认组",
-          "getPSDEFVRConditions" : [ {
-            "condType" : "SYSVALUERULE",
-            "dEFName" : "FIELD4",
-            "name" : "[系统值规则]URL",
-            "getPSSysValueRule" : {
-              "codeName" : "ValueRule17",
-              "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule17.json",
-              "mOSFilePath" : "pssysvaluerules/ValueRule17",
-              "name" : "URL",
-              "rTMOSFilePath" : "pssysvaluerules/ValueRule17",
-              "regExCode" : "[a-zA-z]+://(\\w+(-\\w+)*)(\\.(\\w+(-\\w+)*))*(\\?\\S*)?",
-              "ruleInfo" : "内容必须为有效URL格式",
-              "ruleType" : "REG",
-              "enableBackend" : true,
-              "enableFront" : true
-            },
-            "ruleInfo" : "内容必须为有效URL格式"
-          } ],
-          "ruleInfo" : "内容必须为有效URL格式"
-        },
-        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD4/psdefvaluerules/ValueRule5",
-        "ruleInfo" : "内容必须为有效URL格式",
-        "checkDefault" : false,
-        "defaultMode" : false,
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "getPSDEFormItemName" : "field4",
-      "valueRuleType" : "DEFVALUERULE"
    } ],
    "getPSDEFormItems" : [ {
      "id" : "srfupdatedate",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTWizardView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTWizardView.json
@@ -33,10 +33,6 @@
      "id" : "finish"
    },
    "hookEventNames" : [ "FINISH" ],
-    "getInitPSControlAction" : {
-      "modelref" : true,
-      "id" : "init"
-    },
    "logicName" : "默认向导",
    "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdewizardpanels/default",
    "getPSAppDataEntity" : {
@@ -45,18 +41,6 @@
    },
    "getPSControlHandler" : {
      "getPSHandlerActions" : [ {
-        "actionName" : "Create",
-        "actionType" : "DEACTION",
-        "name" : "init",
-        "getPSAppDEMethod" : {
-          "modelref" : true,
-          "id" : "Create"
-        },
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-        }
-      }, {
        "actionName" : "Update",
        "actionType" : "DEACTION",
        "name" : "finish",
@@ -2407,12 +2391,14 @@
    "getPSDEWizard" : {
      "codeName" : "default",
      "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEWIZARDS/default.json",
+      "finishCaption" : "结束",
      "getFirstPSDEWizardForm" : {
        "modelref" : true,
        "id" : "第一步"
      },
      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdewizards/default",
      "name" : "默认向导",
+      "nextCaption" : "前进",
      "getPSDEWizardForms" : [ {
        "formTag" : "third",
        "name" : "第三步",
@@ -2467,6 +2453,7 @@
        "title" : "第二步",
        "enableLink" : false
      } ],
+      "prevCaption" : "后退",
      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdewizards/default",
      "wizardStyle" : "DEFAULT",
      "stateWizard" : false

--- 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
@@ -16388,6 +16388,46 @@
          "id" : "FORM"
        },
        "getPSDEFormItemVRs" : [ {
+          "checkMode" : 3,
+          "name" : "表单项值规则",
+          "getPSDEFValueRule" : {
+            "codeName" : "ValueRule5",
+            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD4/psdefvaluerules/ValueRule5",
+            "name" : "field4值规则",
+            "getPSDEFVRGroupCondition" : {
+              "condOp" : "AND",
+              "condType" : "GROUP",
+              "name" : "默认组",
+              "getPSDEFVRConditions" : [ {
+                "condType" : "SYSVALUERULE",
+                "dEFName" : "FIELD4",
+                "name" : "[系统值规则]URL",
+                "getPSSysValueRule" : {
+                  "codeName" : "ValueRule17",
+                  "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule17.json",
+                  "mOSFilePath" : "pssysvaluerules/ValueRule17",
+                  "name" : "URL",
+                  "rTMOSFilePath" : "pssysvaluerules/ValueRule17",
+                  "regExCode" : "[a-zA-z]+://(\\w+(-\\w+)*)(\\.(\\w+(-\\w+)*))*(\\?\\S*)?",
+                  "ruleInfo" : "内容必须为有效URL格式",
+                  "ruleType" : "REG",
+                  "enableBackend" : true,
+                  "enableFront" : true
+                },
+                "ruleInfo" : "内容必须为有效URL格式"
+              } ],
+              "ruleInfo" : "内容必须为有效URL格式"
+            },
+            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD4/psdefvaluerules/ValueRule5",
+            "ruleInfo" : "内容必须为有效URL格式",
+            "checkDefault" : false,
+            "defaultMode" : false,
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "getPSDEFormItemName" : "field4",
+          "valueRuleType" : "DEFVALUERULE"
+        }, {
          "checkMode" : 3,
          "name" : "表单项值规则",
          "getPSDEFValueRule" : {
@@ -16702,46 +16742,6 @@
          },
          "getPSDEFormItemName" : "field7",
          "valueRuleType" : "DEFVALUERULE"
-        }, {
-          "checkMode" : 3,
-          "name" : "表单项值规则",
-          "getPSDEFValueRule" : {
-            "codeName" : "ValueRule5",
-            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD4/psdefvaluerules/ValueRule5",
-            "name" : "field4值规则",
-            "getPSDEFVRGroupCondition" : {
-              "condOp" : "AND",
-              "condType" : "GROUP",
-              "name" : "默认组",
-              "getPSDEFVRConditions" : [ {
-                "condType" : "SYSVALUERULE",
-                "dEFName" : "FIELD4",
-                "name" : "[系统值规则]URL",
-                "getPSSysValueRule" : {
-                  "codeName" : "ValueRule17",
-                  "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule17.json",
-                  "mOSFilePath" : "pssysvaluerules/ValueRule17",
-                  "name" : "URL",
-                  "rTMOSFilePath" : "pssysvaluerules/ValueRule17",
-                  "regExCode" : "[a-zA-z]+://(\\w+(-\\w+)*)(\\.(\\w+(-\\w+)*))*(\\?\\S*)?",
-                  "ruleInfo" : "内容必须为有效URL格式",
-                  "ruleType" : "REG",
-                  "enableBackend" : true,
-                  "enableFront" : true
-                },
-                "ruleInfo" : "内容必须为有效URL格式"
-              } ],
-              "ruleInfo" : "内容必须为有效URL格式"
-            },
-            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD4/psdefvaluerules/ValueRule5",
-            "ruleInfo" : "内容必须为有效URL格式",
-            "checkDefault" : false,
-            "defaultMode" : false,
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "getPSDEFormItemName" : "field4",
-          "valueRuleType" : "DEFVALUERULE"
        } ],
        "getPSDEFormItems" : [ {
          "id" : "srfupdatedate",