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

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

@@ -2370,6 +2370,27 @@
     "name" : "UPDATE",
     "rTMOSFilePath" : "psmodules/common/psdataentities/PHONE/psdeopprivs/UPDATE"
   } ],
+  "getAllPSDEReports" : [ {
+    "codeName" : "Report",
+    "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEREPORTS/Report.json",
+    "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdereports/Report",
+    "name" : "Report",
+    "getPSDEDataSet" : {
+      "modelref" : true,
+      "id" : "Default"
+    },
+    "rTMOSFilePath" : "psmodules/common/psdataentities/PHONE/psdereports/Report",
+    "reportFile" : "#",
+    "reportModel" : "{\r\n    \"$schema\": \"http://json-schema.org/draft-04/schema\"\r\n}",
+    "reportType" : "LUCKYSHEET"
+  }, {
+    "codeName" : "Report2",
+    "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEREPORTS/Report2.json",
+    "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdereports/Report2",
+    "name" : "Report2",
+    "rTMOSFilePath" : "psmodules/common/psdataentities/PHONE/psdereports/Report2",
+    "reportType" : "JR"
+  } ],
   "getAllPSDEUserRoles" : [ {
     "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEUSERROLES/ALL_R.json",
     "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdeuserroles/ALL_R",
@@ -2542,6 +2563,14 @@
     "rTMOSFilePath" : "psmodeldata$psdataentities/MEditView9",
     "realModelSubType" : "DEMEDITVIEW9",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr0313383732ReportView",
+    "logicName" : "报表测试",
+    "mOSFilePath" : "psmodeldata$psdataentities/Usr0313383732ReportView",
+    "name" : "报表测试",
+    "rTMOSFilePath" : "psmodeldata$psdataentities/Usr0313383732ReportView",
+    "realModelSubType" : "DEREPORTVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "EditView",
     "logicName" : "手机实体编辑视图",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDEREPORTS/Report.json

+{
+  "codeName" : "Report",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEREPORTS/Report.json",
+  "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdereports/Report",
+  "name" : "Report",
+  "getPSDEDataSet" : {
+    "modelref" : true,
+    "id" : "Default"
+  },
+  "rTMOSFilePath" : "psmodules/common/psdataentities/PHONE/psdereports/Report",
+  "reportFile" : "#",
+  "reportModel" : "{\r\n    \"$schema\": \"http://json-schema.org/draft-04/schema\"\r\n}",
+  "reportType" : "LUCKYSHEET"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDEREPORTS/Report2.json

+{
+  "codeName" : "Report2",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEREPORTS/Report2.json",
+  "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdereports/Report2",
+  "name" : "Report2",
+  "rTMOSFilePath" : "psmodules/common/psdataentities/PHONE/psdereports/Report2",
+  "reportType" : "JR"
+}
\ No newline at end of file

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" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ],
     "rTMOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2"

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

@@ -2266,6 +2266,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneTreeExpView.json",
     "viewType" : "DETREEEXPVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0313383732ReportView.json",
+    "viewType" : "DEREPORTVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phonePhoneView.json",

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

+{
+  "codeName" : "Report",
+  "controlType" : "REPORTPANEL",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSREPORTPANELS/Report.json",
+  "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdereportpanels/Report",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+  },
+  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/phoneUsr0313383732ReportView/psappviewctrls/reportpanel"
+}
\ No newline at end of file

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

+{
+  "codeName" : "Usr0313056284",
+  "controlType" : "SEARCHFORM",
+  "defaultLabelWidth" : 130,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSSEARCHFORMS/Usr0313056284.json",
+  "logicName" : "报表测试_搜索表单",
+  "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdeform_searchforms/Usr0313056284",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+  },
+  "getPSDEFormPages" : [ {
+    "caption" : "常规条件",
+    "codeName" : "formpage1",
+    "detailStyle" : "DEFAULT",
+    "detailType" : "FORMPAGE",
+    "mOSFilePath" : "psdeformdetail_formpages/formpage1",
+    "name" : "formpage1",
+    "getPSLayout" : {
+      "childColLG" : -1,
+      "childColMD" : 24,
+      "childColSM" : -1,
+      "childColXS" : -1,
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "rTMOSFilePath" : "psdeformdetail_formpages/formpage1",
+    "infoGroupMode" : false
+  } ],
+  "getPSLayout" : {
+    "childColLG" : -1,
+    "childColMD" : 24,
+    "childColSM" : -1,
+    "childColXS" : -1,
+    "columnCount" : 24,
+    "layout" : "TABLE_24COL"
+  },
+  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/phoneUsr0313383732ReportView/psappviewctrls/searchform",
+  "searchButtonStyle" : "DEFAULT",
+  "tabHeaderPos" : "TOP",
+  "enableAdvanceSearch" : false,
+  "enableAutoSearch" : false,
+  "enableFilterSave" : false,
+  "noTabHeader" : true,
+  "modelid" : "3BA296E4-2B81-41C7-BDA8-8D91A2BD376D",
+  "modeltype" : "PSDEFORM_SEARCHFORM"
+}
\ No newline at end of file

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

@@ -37,78 +37,6 @@
     }
   } ],
   "getPSDEFormItemVRs" : [ {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule4",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
-      "name" : "field3值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condType" : "STRINGLENGTH",
-          "dEFName" : "FIELD3",
-          "maxValue" : 15,
-          "minValue" : 5,
-          "name" : "[字符长度] 大于等于 5 且  小于等于 15",
-          "ruleInfo" : "5<=field3字符长度<=15",
-          "includeMaxValue" : true,
-          "includeMinValue" : true
-        } ],
-        "ruleInfo" : "5<=field3字符长度<=15"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
-      "ruleInfo" : "5<=field3字符长度<=15",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "field3",
-    "valueRuleType" : "DEFVALUERULE"
-  }, {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule6",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-      "name" : "field5值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condType" : "SYSVALUERULE",
-          "dEFName" : "FIELD5",
-          "name" : "[系统值规则]脚本值规则测试",
-          "getPSSysValueRule" : {
-            "codeName" : "ValueRule20",
-            "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
-            "mOSFilePath" : "pssysvaluerules/ValueRule20",
-            "name" : "脚本值规则测试",
-            "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
-            "ruleInfo" : "脚本校验",
-            "ruleType" : "SCRIPT",
-            "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "ruleInfo" : "脚本校验"
-        } ],
-        "ruleInfo" : "脚本校验"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-      "ruleInfo" : "脚本校验",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "field5",
-    "valueRuleType" : "DEFVALUERULE"
-  }, {
     "checkMode" : 3,
     "name" : "表单项值规则",
     "getPSDEFValueRule" : {
@@ -391,6 +319,78 @@
     },
     "getPSDEFormItemName" : "field",
     "valueRuleType" : "DEFVALUERULE"
+  }, {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule4",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
+      "name" : "field3值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "FIELD3",
+          "maxValue" : 15,
+          "minValue" : 5,
+          "name" : "[字符长度] 大于等于 5 且  小于等于 15",
+          "ruleInfo" : "5<=field3字符长度<=15",
+          "includeMaxValue" : true,
+          "includeMinValue" : true
+        } ],
+        "ruleInfo" : "5<=field3字符长度<=15"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
+      "ruleInfo" : "5<=field3字符长度<=15",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "field3",
+    "valueRuleType" : "DEFVALUERULE"
+  }, {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule6",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+      "name" : "field5值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "SYSVALUERULE",
+          "dEFName" : "FIELD5",
+          "name" : "[系统值规则]脚本值规则测试",
+          "getPSSysValueRule" : {
+            "codeName" : "ValueRule20",
+            "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
+            "mOSFilePath" : "pssysvaluerules/ValueRule20",
+            "name" : "脚本值规则测试",
+            "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
+            "ruleInfo" : "脚本校验",
+            "ruleType" : "SCRIPT",
+            "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "ruleInfo" : "脚本校验"
+        } ],
+        "ruleInfo" : "脚本校验"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+      "ruleInfo" : "脚本校验",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "field5",
+    "valueRuleType" : "DEFVALUERULE"
   } ],
   "getPSDEFormItems" : [ {
     "id" : "srfupdatedate",

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

@@ -166,78 +166,6 @@
       "id" : "FORM"
     },
     "getPSDEFormItemVRs" : [ {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFValueRule" : {
-        "codeName" : "ValueRule4",
-        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
-        "name" : "field3值规则",
-        "getPSDEFVRGroupCondition" : {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "默认组",
-          "getPSDEFVRConditions" : [ {
-            "condType" : "STRINGLENGTH",
-            "dEFName" : "FIELD3",
-            "maxValue" : 15,
-            "minValue" : 5,
-            "name" : "[字符长度] 大于等于 5 且  小于等于 15",
-            "ruleInfo" : "5<=field3字符长度<=15",
-            "includeMaxValue" : true,
-            "includeMinValue" : true
-          } ],
-          "ruleInfo" : "5<=field3字符长度<=15"
-        },
-        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
-        "ruleInfo" : "5<=field3字符长度<=15",
-        "checkDefault" : false,
-        "defaultMode" : false,
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "getPSDEFormItemName" : "field3",
-      "valueRuleType" : "DEFVALUERULE"
-    }, {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFValueRule" : {
-        "codeName" : "ValueRule6",
-        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-        "name" : "field5值规则",
-        "getPSDEFVRGroupCondition" : {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "默认组",
-          "getPSDEFVRConditions" : [ {
-            "condType" : "SYSVALUERULE",
-            "dEFName" : "FIELD5",
-            "name" : "[系统值规则]脚本值规则测试",
-            "getPSSysValueRule" : {
-              "codeName" : "ValueRule20",
-              "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
-              "mOSFilePath" : "pssysvaluerules/ValueRule20",
-              "name" : "脚本值规则测试",
-              "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
-              "ruleInfo" : "脚本校验",
-              "ruleType" : "SCRIPT",
-              "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
-              "enableBackend" : true,
-              "enableFront" : true
-            },
-            "ruleInfo" : "脚本校验"
-          } ],
-          "ruleInfo" : "脚本校验"
-        },
-        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-        "ruleInfo" : "脚本校验",
-        "checkDefault" : false,
-        "defaultMode" : false,
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "getPSDEFormItemName" : "field5",
-      "valueRuleType" : "DEFVALUERULE"
-    }, {
       "checkMode" : 3,
       "name" : "表单项值规则",
       "getPSDEFValueRule" : {
@@ -520,6 +448,78 @@
       },
       "getPSDEFormItemName" : "field",
       "valueRuleType" : "DEFVALUERULE"
+    }, {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFValueRule" : {
+        "codeName" : "ValueRule4",
+        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
+        "name" : "field3值规则",
+        "getPSDEFVRGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "默认组",
+          "getPSDEFVRConditions" : [ {
+            "condType" : "STRINGLENGTH",
+            "dEFName" : "FIELD3",
+            "maxValue" : 15,
+            "minValue" : 5,
+            "name" : "[字符长度] 大于等于 5 且  小于等于 15",
+            "ruleInfo" : "5<=field3字符长度<=15",
+            "includeMaxValue" : true,
+            "includeMinValue" : true
+          } ],
+          "ruleInfo" : "5<=field3字符长度<=15"
+        },
+        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
+        "ruleInfo" : "5<=field3字符长度<=15",
+        "checkDefault" : false,
+        "defaultMode" : false,
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "getPSDEFormItemName" : "field3",
+      "valueRuleType" : "DEFVALUERULE"
+    }, {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFValueRule" : {
+        "codeName" : "ValueRule6",
+        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+        "name" : "field5值规则",
+        "getPSDEFVRGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "默认组",
+          "getPSDEFVRConditions" : [ {
+            "condType" : "SYSVALUERULE",
+            "dEFName" : "FIELD5",
+            "name" : "[系统值规则]脚本值规则测试",
+            "getPSSysValueRule" : {
+              "codeName" : "ValueRule20",
+              "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
+              "mOSFilePath" : "pssysvaluerules/ValueRule20",
+              "name" : "脚本值规则测试",
+              "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
+              "ruleInfo" : "脚本校验",
+              "ruleType" : "SCRIPT",
+              "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
+              "enableBackend" : true,
+              "enableFront" : true
+            },
+            "ruleInfo" : "脚本校验"
+          } ],
+          "ruleInfo" : "脚本校验"
+        },
+        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+        "ruleInfo" : "脚本校验",
+        "checkDefault" : false,
+        "defaultMode" : false,
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "getPSDEFormItemName" : "field5",
+      "valueRuleType" : "DEFVALUERULE"
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",

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

+{
+  "accUserMode" : 2,
+  "caption" : "手机",
+  "codeName" : "phoneUsr0313383732ReportView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0313383732ReportView.json",
+  "mOSFilePath" : "pssysapps/Web/psappdeviews/phoneUsr0313383732ReportView",
+  "name" : "phoneUsr0313383732ReportView",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+  },
+  "getPSAppModule" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPMODULES/common.json"
+  },
+  "getPSControls" : [ {
+    "codeName" : "Usr0313056284",
+    "controlType" : "SEARCHFORM",
+    "defaultLabelWidth" : 130,
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSSEARCHFORMS/Usr0313056284.json",
+    "logicName" : "报表测试_搜索表单",
+    "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdeform_searchforms/Usr0313056284",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+    },
+    "getPSControlHandler" : {
+      "getPSHandlerActions" : [ {
+        "actionType" : "FILTERACTION",
+        "name" : "load",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "FilterGet"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+        }
+      }, {
+        "actionType" : "FILTERACTION",
+        "name" : "loaddraft",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "FilterGetDraft"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+        }
+      }, {
+        "actionType" : "FILTERACTION",
+        "name" : "search",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "FilterSearch"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+        }
+      } ],
+      "enableDEFieldPrivilege" : false,
+      "id" : "搜索表单处理器"
+    },
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true,
+      "id" : "SEARCHFORM"
+    },
+    "getPSDEFormPages" : [ {
+      "caption" : "常规条件",
+      "codeName" : "formpage1",
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMPAGE",
+      "mOSFilePath" : "psdeformdetail_formpages/formpage1",
+      "name" : "formpage1",
+      "getPSLayout" : {
+        "childColLG" : -1,
+        "childColMD" : 24,
+        "childColSM" : -1,
+        "childColXS" : -1,
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "rTMOSFilePath" : "psdeformdetail_formpages/formpage1",
+      "infoGroupMode" : false
+    } ],
+    "getPSLayout" : {
+      "childColLG" : -1,
+      "childColMD" : 24,
+      "childColSM" : -1,
+      "childColXS" : -1,
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "rTMOSFilePath" : "pssysapps/Web/psappdeviews/phoneUsr0313383732ReportView/psappviewctrls/searchform",
+    "searchButtonStyle" : "DEFAULT",
+    "tabHeaderPos" : "TOP",
+    "enableAdvanceSearch" : false,
+    "enableAutoSearch" : false,
+    "enableFilterSave" : false,
+    "noTabHeader" : true,
+    "name" : "searchform",
+    "modelid" : "3BA296E4-2B81-41C7-BDA8-8D91A2BD376D",
+    "modeltype" : "PSDEFORM_SEARCHFORM"
+  }, {
+    "codeName" : "Report",
+    "controlType" : "REPORTPANEL",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSREPORTPANELS/Report.json",
+    "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdereportpanels/Report",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+    },
+    "getPSControlParam" : {
+      "id" : "REPORTPANEL"
+    },
+    "rTMOSFilePath" : "pssysapps/Web/psappdeviews/phoneUsr0313383732ReportView/psappviewctrls/reportpanel",
+    "name" : "reportpanel"
+  } ],
+  "getPSDEViewCodeName" : "Usr0313383732ReportView",
+  "getPSDEViewId" : "0C936E55-2336-4041-900D-4A2070307425",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPDEREPORTVIEW",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "mOSFilePath" : "psmodules/common/psdataentities/PHONE/pssysviewlayoutpanels/Layoutpanel",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+    },
+    "getPSControlParam" : { },
+    "rTMOSFilePath" : "pssysapps/Web/psappdeviews/phoneUsr0313383732ReportView/psappviewctrls/layoutpanel",
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
+  },
+  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/phoneUsr0313383732ReportView",
+  "title" : "报表测试",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DEREPORTVIEW",
+  "enableDP" : true,
+  "enableQuickGroup" : false,
+  "enableQuickSearch" : false,
+  "enableSearch" : true,
+  "expandSearchForm" : true,
+  "loadDefault" : true,
+  "modelid" : "928E971B-82F3-4C08-82F4-C5D9B4FEB935",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file

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

@@ -2322,16 +2322,16 @@
     "mOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ],
     "rTMOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2"
@@ -2747,6 +2747,12 @@
     "viewType" : "DELISTEXPVIEW",
     "resource" : "TEST",
     "view" : "ListExpView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0313383732ReportView.json",
+    "viewType" : "DEREPORTVIEW",
+    "resource" : "Phone",
+    "view" : "Usr0313383732ReportView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoEditView.json",
@@ -17232,78 +17238,6 @@
           "id" : "FORM"
         },
         "getPSDEFormItemVRs" : [ {
-          "checkMode" : 3,
-          "name" : "表单项值规则",
-          "getPSDEFValueRule" : {
-            "codeName" : "ValueRule4",
-            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
-            "name" : "field3值规则",
-            "getPSDEFVRGroupCondition" : {
-              "condOp" : "AND",
-              "condType" : "GROUP",
-              "name" : "默认组",
-              "getPSDEFVRConditions" : [ {
-                "condType" : "STRINGLENGTH",
-                "dEFName" : "FIELD3",
-                "maxValue" : 15,
-                "minValue" : 5,
-                "name" : "[字符长度] 大于等于 5 且  小于等于 15",
-                "ruleInfo" : "5<=field3字符长度<=15",
-                "includeMaxValue" : true,
-                "includeMinValue" : true
-              } ],
-              "ruleInfo" : "5<=field3字符长度<=15"
-            },
-            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
-            "ruleInfo" : "5<=field3字符长度<=15",
-            "checkDefault" : false,
-            "defaultMode" : false,
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "getPSDEFormItemName" : "field3",
-          "valueRuleType" : "DEFVALUERULE"
-        }, {
-          "checkMode" : 3,
-          "name" : "表单项值规则",
-          "getPSDEFValueRule" : {
-            "codeName" : "ValueRule6",
-            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-            "name" : "field5值规则",
-            "getPSDEFVRGroupCondition" : {
-              "condOp" : "AND",
-              "condType" : "GROUP",
-              "name" : "默认组",
-              "getPSDEFVRConditions" : [ {
-                "condType" : "SYSVALUERULE",
-                "dEFName" : "FIELD5",
-                "name" : "[系统值规则]脚本值规则测试",
-                "getPSSysValueRule" : {
-                  "codeName" : "ValueRule20",
-                  "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
-                  "mOSFilePath" : "pssysvaluerules/ValueRule20",
-                  "name" : "脚本值规则测试",
-                  "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
-                  "ruleInfo" : "脚本校验",
-                  "ruleType" : "SCRIPT",
-                  "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
-                  "enableBackend" : true,
-                  "enableFront" : true
-                },
-                "ruleInfo" : "脚本校验"
-              } ],
-              "ruleInfo" : "脚本校验"
-            },
-            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-            "ruleInfo" : "脚本校验",
-            "checkDefault" : false,
-            "defaultMode" : false,
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "getPSDEFormItemName" : "field5",
-          "valueRuleType" : "DEFVALUERULE"
-        }, {
           "checkMode" : 3,
           "name" : "表单项值规则",
           "getPSDEFValueRule" : {
@@ -17586,6 +17520,78 @@
           },
           "getPSDEFormItemName" : "field",
           "valueRuleType" : "DEFVALUERULE"
+        }, {
+          "checkMode" : 3,
+          "name" : "表单项值规则",
+          "getPSDEFValueRule" : {
+            "codeName" : "ValueRule4",
+            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
+            "name" : "field3值规则",
+            "getPSDEFVRGroupCondition" : {
+              "condOp" : "AND",
+              "condType" : "GROUP",
+              "name" : "默认组",
+              "getPSDEFVRConditions" : [ {
+                "condType" : "STRINGLENGTH",
+                "dEFName" : "FIELD3",
+                "maxValue" : 15,
+                "minValue" : 5,
+                "name" : "[字符长度] 大于等于 5 且  小于等于 15",
+                "ruleInfo" : "5<=field3字符长度<=15",
+                "includeMaxValue" : true,
+                "includeMinValue" : true
+              } ],
+              "ruleInfo" : "5<=field3字符长度<=15"
+            },
+            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
+            "ruleInfo" : "5<=field3字符长度<=15",
+            "checkDefault" : false,
+            "defaultMode" : false,
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "getPSDEFormItemName" : "field3",
+          "valueRuleType" : "DEFVALUERULE"
+        }, {
+          "checkMode" : 3,
+          "name" : "表单项值规则",
+          "getPSDEFValueRule" : {
+            "codeName" : "ValueRule6",
+            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+            "name" : "field5值规则",
+            "getPSDEFVRGroupCondition" : {
+              "condOp" : "AND",
+              "condType" : "GROUP",
+              "name" : "默认组",
+              "getPSDEFVRConditions" : [ {
+                "condType" : "SYSVALUERULE",
+                "dEFName" : "FIELD5",
+                "name" : "[系统值规则]脚本值规则测试",
+                "getPSSysValueRule" : {
+                  "codeName" : "ValueRule20",
+                  "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
+                  "mOSFilePath" : "pssysvaluerules/ValueRule20",
+                  "name" : "脚本值规则测试",
+                  "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
+                  "ruleInfo" : "脚本校验",
+                  "ruleType" : "SCRIPT",
+                  "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
+                  "enableBackend" : true,
+                  "enableFront" : true
+                },
+                "ruleInfo" : "脚本校验"
+              } ],
+              "ruleInfo" : "脚本校验"
+            },
+            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+            "ruleInfo" : "脚本校验",
+            "checkDefault" : false,
+            "defaultMode" : false,
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "getPSDEFormItemName" : "field5",
+          "valueRuleType" : "DEFVALUERULE"
         } ],
         "getPSDEFormItems" : [ {
           "id" : "srfupdatedate",