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

66359fbd · ibizdev · cd417938 · 66359fbd · 66359fbd · 66359fbd
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone.json
@@ -1783,6 +1783,18 @@
      "rTMOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelogics/PhoneNumber/psdelogicnodes/Begin",
      "topPos" : 200,
      "parallelOutput" : true
+    }, {
+      "codeName" : "RESETPARAM1",
+      "getDstPSDELogicParam" : {
+        "modelref" : true,
+        "id" : "Default"
+      },
+      "leftPos" : 504,
+      "logicNodeType" : "RESETPARAM",
+      "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelogics/PhoneNumber/psdelogicnodes/RESETPARAM1",
+      "name" : "重置参数",
+      "rTMOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelogics/PhoneNumber/psdelogicnodes/RESETPARAM1",
+      "topPos" : 47
    }, {
      "codeName" : "DEDATASET1",
      "getDstPSDEDataSet" : {
@@ -1887,6 +1899,21 @@
          "id" : "END1"
        },
        "name" : "连接名称",
+        "getPSDELogicLinkGroupCond" : {
+          "groupOP" : "AND",
+          "logicType" : "GROUP",
+          "name" : "连接条件组",
+          "getPSDELogicLinkConds" : [ {
+            "condOP" : "ISNOTNULL",
+            "dstFieldName" : "PHONEID",
+            "getDstLogicParam" : {
+              "modelref" : true,
+              "id" : "Default"
+            },
+            "logicType" : "SINGLE",
+            "name" : "Default[PHONEID] 值不为空(NotNil)"
+          } ]
+        },
        "getSrcPSDELogicNode" : {
          "modelref" : true,
          "id" : "DEACTION1"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/PhoneNumber.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/PhoneNumber.json
@@ -25,6 +25,18 @@
    "rTMOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelogics/PhoneNumber/psdelogicnodes/Begin",
    "topPos" : 200,
    "parallelOutput" : true
+  }, {
+    "codeName" : "RESETPARAM1",
+    "getDstPSDELogicParam" : {
+      "modelref" : true,
+      "id" : "Default"
+    },
+    "leftPos" : 504,
+    "logicNodeType" : "RESETPARAM",
+    "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelogics/PhoneNumber/psdelogicnodes/RESETPARAM1",
+    "name" : "重置参数",
+    "rTMOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelogics/PhoneNumber/psdelogicnodes/RESETPARAM1",
+    "topPos" : 47
  }, {
    "codeName" : "DEDATASET1",
    "getDstPSDEDataSet" : {
@@ -129,6 +141,21 @@
        "id" : "END1"
      },
      "name" : "连接名称",
+      "getPSDELogicLinkGroupCond" : {
+        "groupOP" : "AND",
+        "logicType" : "GROUP",
+        "name" : "连接条件组",
+        "getPSDELogicLinkConds" : [ {
+          "condOP" : "ISNOTNULL",
+          "dstFieldName" : "PHONEID",
+          "getDstLogicParam" : {
+            "modelref" : true,
+            "id" : "Default"
+          },
+          "logicType" : "SINGLE",
+          "name" : "Default[PHONEID] 值不为空(NotNil)"
+        } ]
+      },
      "getSrcPSDELogicNode" : {
        "modelref" : true,
        "id" : "DEACTION1"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Phone.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Phone.json
@@ -969,6 +969,18 @@
      "rTMOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Phone/psappdelogics/PhoneNumber/psappdelogicnodes/Begin",
      "topPos" : 200,
      "parallelOutput" : true
+    }, {
+      "codeName" : "RESETPARAM1",
+      "getDstPSDELogicParam" : {
+        "modelref" : true,
+        "id" : "Default"
+      },
+      "leftPos" : 504,
+      "logicNodeType" : "RESETPARAM",
+      "mOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Phone/psappdelogics/PhoneNumber/psappdelogicnodes/RESETPARAM1",
+      "name" : "重置参数",
+      "rTMOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Phone/psappdelogics/PhoneNumber/psappdelogicnodes/RESETPARAM1",
+      "topPos" : 47
    }, {
      "codeName" : "DEDATASET1",
      "getDstPSAppDEDataSet" : {
@@ -1089,6 +1101,21 @@
          "id" : "END1"
        },
        "name" : "连接名称",
+        "getPSDELogicLinkGroupCond" : {
+          "groupOP" : "AND",
+          "logicType" : "GROUP",
+          "name" : "连接条件组",
+          "getPSDELogicLinkConds" : [ {
+            "condOP" : "ISNOTNULL",
+            "dstFieldName" : "PHONEID",
+            "getDstLogicParam" : {
+              "modelref" : true,
+              "id" : "Default"
+            },
+            "logicType" : "SINGLE",
+            "name" : "Default[PHONEID] 值不为空(NotNil)"
+          } ]
+        },
        "getSrcPSDELogicNode" : {
          "modelref" : true,
          "id" : "DEACTION1"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1209,16 +1209,16 @@
    "mOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ],
    "rTMOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2"
@@ -5321,6 +5321,18 @@
          "rTMOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Phone/psappdelogics/PhoneNumber/psappdelogicnodes/Begin",
          "topPos" : 200,
          "parallelOutput" : true
+        }, {
+          "codeName" : "RESETPARAM1",
+          "getDstPSDELogicParam" : {
+            "modelref" : true,
+            "id" : "Default"
+          },
+          "leftPos" : 504,
+          "logicNodeType" : "RESETPARAM",
+          "mOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Phone/psappdelogics/PhoneNumber/psappdelogicnodes/RESETPARAM1",
+          "name" : "重置参数",
+          "rTMOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Phone/psappdelogics/PhoneNumber/psappdelogicnodes/RESETPARAM1",
+          "topPos" : 47
        }, {
          "codeName" : "DEDATASET1",
          "getDstPSAppDEDataSet" : {
@@ -5441,6 +5453,21 @@
              "id" : "END1"
            },
            "name" : "连接名称",
+            "getPSDELogicLinkGroupCond" : {
+              "groupOP" : "AND",
+              "logicType" : "GROUP",
+              "name" : "连接条件组",
+              "getPSDELogicLinkConds" : [ {
+                "condOP" : "ISNOTNULL",
+                "dstFieldName" : "PHONEID",
+                "getDstLogicParam" : {
+                  "modelref" : true,
+                  "id" : "Default"
+                },
+                "logicType" : "SINGLE",
+                "name" : "Default[PHONEID] 值不为空(NotNil)"
+              } ]
+            },
            "getSrcPSDELogicNode" : {
              "modelref" : true,
              "id" : "DEACTION1"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json
@@ -969,6 +969,18 @@
      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Phone/psappdelogics/PhoneNumber/psappdelogicnodes/Begin",
      "topPos" : 200,
      "parallelOutput" : true
+    }, {
+      "codeName" : "RESETPARAM1",
+      "getDstPSDELogicParam" : {
+        "modelref" : true,
+        "id" : "Default"
+      },
+      "leftPos" : 504,
+      "logicNodeType" : "RESETPARAM",
+      "mOSFilePath" : "pssysapps/Web/psappdataentities/Phone/psappdelogics/PhoneNumber/psappdelogicnodes/RESETPARAM1",
+      "name" : "重置参数",
+      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Phone/psappdelogics/PhoneNumber/psappdelogicnodes/RESETPARAM1",
+      "topPos" : 47
    }, {
      "codeName" : "DEDATASET1",
      "getDstPSAppDEDataSet" : {
@@ -1089,6 +1101,21 @@
          "id" : "END1"
        },
        "name" : "连接名称",
+        "getPSDELogicLinkGroupCond" : {
+          "groupOP" : "AND",
+          "logicType" : "GROUP",
+          "name" : "连接条件组",
+          "getPSDELogicLinkConds" : [ {
+            "condOP" : "ISNOTNULL",
+            "dstFieldName" : "PHONEID",
+            "getDstLogicParam" : {
+              "modelref" : true,
+              "id" : "Default"
+            },
+            "logicType" : "SINGLE",
+            "name" : "Default[PHONEID] 值不为空(NotNil)"
+          } ]
+        },
        "getSrcPSDELogicNode" : {
          "modelref" : true,
          "id" : "DEACTION1"

--- 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
@@ -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" : "表单项值规则",
@@ -391,6 +360,37 @@
    },
    "getPSDEFormItemName" : "field",
    "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"
  } ],
  "getPSDEFormItems" : [ {
    "id" : "srfupdatedate",

--- 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
@@ -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" : "表单项值规则",
@@ -520,6 +489,37 @@
      },
      "getPSDEFormItemName" : "field",
      "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"
    } ],
    "getPSDEFormItems" : [ {
      "id" : "srfupdatedate",

--- 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
@@ -2310,16 +2310,16 @@
    "mOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ],
    "rTMOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2"
@@ -17264,37 +17264,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" : "表单项值规则",
@@ -17547,6 +17516,37 @@
          },
          "getPSDEFormItemName" : "field",
          "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"
        } ],
        "getPSDEFormItems" : [ {
          "id" : "srfupdatedate",