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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Phone.json

@@ -1913,6 +1913,36 @@
       "modelref" : true,
       "id" : "Begin"
     }
+  }, {
+    "codeName" : "test2",
+    "defaultParamName" : "Default",
+    "logicName" : "test2",
+    "mOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Phone/psappdeuilogics/test2",
+    "name" : "test2",
+    "getPSDEUILogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "mOSFilePath" : "psappdeuilogicnodes/Begin",
+      "name" : "开始",
+      "rTMOSFilePath" : "psappdeuilogicnodes/Begin",
+      "topPos" : 200,
+      "parallelOutput" : true
+    } ],
+    "getPSDEUILogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "mOSFilePath" : "psappdeuilogicparams/Default",
+      "name" : "传入变量",
+      "rTMOSFilePath" : "psappdeuilogicparams/Default",
+      "default" : true,
+      "entityParam" : true
+    } ],
+    "rTMOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Phone/psappdeuilogics/test2",
+    "getStartPSDEUILogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    }
   } ],
   "getAllPSAppViews" : [ {
     "modelref" : true,

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"
@@ -6191,6 +6191,36 @@
           "modelref" : true,
           "id" : "Begin"
         }
+      }, {
+        "codeName" : "test2",
+        "defaultParamName" : "Default",
+        "logicName" : "test2",
+        "mOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Phone/psappdeuilogics/test2",
+        "name" : "test2",
+        "getPSDEUILogicNodes" : [ {
+          "codeName" : "Begin",
+          "leftPos" : 200,
+          "logicNodeType" : "BEGIN",
+          "mOSFilePath" : "psappdeuilogicnodes/Begin",
+          "name" : "开始",
+          "rTMOSFilePath" : "psappdeuilogicnodes/Begin",
+          "topPos" : 200,
+          "parallelOutput" : true
+        } ],
+        "getPSDEUILogicParams" : [ {
+          "codeName" : "Default",
+          "logicName" : "传入变量",
+          "mOSFilePath" : "psappdeuilogicparams/Default",
+          "name" : "传入变量",
+          "rTMOSFilePath" : "psappdeuilogicparams/Default",
+          "default" : true,
+          "entityParam" : true
+        } ],
+        "rTMOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Phone/psappdeuilogics/test2",
+        "getStartPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
       } ],
       "getAllPSAppViews" : [ {
         "modelref" : true,

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

@@ -1942,6 +1942,36 @@
       "modelref" : true,
       "id" : "Begin"
     }
+  }, {
+    "codeName" : "test2",
+    "defaultParamName" : "Default",
+    "logicName" : "test2",
+    "mOSFilePath" : "pssysapps/Web/psappdataentities/Phone/psappdeuilogics/test2",
+    "name" : "test2",
+    "getPSDEUILogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "mOSFilePath" : "psappdeuilogicnodes/Begin",
+      "name" : "开始",
+      "rTMOSFilePath" : "psappdeuilogicnodes/Begin",
+      "topPos" : 200,
+      "parallelOutput" : true
+    } ],
+    "getPSDEUILogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "mOSFilePath" : "psappdeuilogicparams/Default",
+      "name" : "传入变量",
+      "rTMOSFilePath" : "psappdeuilogicparams/Default",
+      "default" : true,
+      "entityParam" : true
+    } ],
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Phone/psappdeuilogics/test2",
+    "getStartPSDEUILogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    }
   } ],
   "getAllPSAppViews" : [ {
     "modelref" : true,

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

@@ -141,7 +141,8 @@
     "enableChartDataSet" : true,
     "stack" : false,
     "getUserParam" : {
-      "EC.label" : "{\"position\":\"inside\"}"
+      "EC.label" : "{\"position\":\"inside\"}",
+      "EC.itemStyle" : "{\"borderType\":\"solid\"}"
     }
   } ],
   "getPSDEChartTitle" : {

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

@@ -37,37 +37,6 @@
     }
   } ],
   "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" : {
@@ -200,6 +169,37 @@
     },
     "getPSDEFormItemName" : "field2",
     "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" : "表单项值规则",

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

@@ -420,7 +420,8 @@
       "enableChartDataSet" : true,
       "stack" : false,
       "getUserParam" : {
-        "EC.label" : "{\"position\":\"inside\"}"
+        "EC.label" : "{\"position\":\"inside\"}",
+        "EC.itemStyle" : "{\"borderType\":\"solid\"}"
       }
     } ],
     "getPSDEChartTitle" : {

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

@@ -166,37 +166,6 @@
       "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" : {
@@ -329,6 +298,37 @@
       },
       "getPSDEFormItemName" : "field2",
       "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" : "表单项值规则",

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

@@ -2311,16 +2311,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"
@@ -17150,37 +17150,6 @@
           "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" : {
@@ -17313,6 +17282,37 @@
           },
           "getPSDEFormItemName" : "field2",
           "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" : "表单项值规则",