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

0893e451 · ibizdev · afd1dd4e · 0893e451 · 0893e451 · 0893e451
--- 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
@@ -2584,6 +2584,14 @@
    "rTMOSFilePath" : "psmodeldata$psdataentities/MEditView9",
    "realModelSubType" : "DEMEDITVIEW9",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr0321702002CustomView",
+    "logicName" : "测试（5）",
+    "mOSFilePath" : "psmodeldata$psdataentities/Usr0321702002CustomView",
+    "name" : "测试（5）",
+    "rTMOSFilePath" : "psmodeldata$psdataentities/Usr0321702002CustomView",
+    "realModelSubType" : "DECUSTOMVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "Usr0313383732ReportView",
    "logicName" : "报表测试",

--- 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
@@ -1214,16 +1214,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"

--- 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
@@ -2244,6 +2244,10 @@
    }
  } ],
  "getAllPSAppViews" : [ {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0321702002CustomView.json",
+    "viewType" : "DECUSTOMVIEW"
+  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneCustomView.json",
    "viewType" : "DECUSTOMVIEW"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json
@@ -59,6 +59,10 @@
    "getPSChartDataSetFields" : [ {
      "index" : 0,
      "name" : "NAME",
+      "getPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+      },
      "groupField" : true,
      "id" : "0"
    }, {
@@ -122,6 +126,10 @@
  },
  "getPSDEChartSerieses" : [ {
    "catalogField" : "NAME",
+    "getCatalogPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+    },
    "eChartsType" : "bar",
    "index" : 0,
    "name" : "bar_0",

--- 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,46 +37,6 @@
    }
  } ],
  "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" : {
@@ -391,6 +351,46 @@
    },
    "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/ReginfoUsr0301727282ChartView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0301727282ChartView.json
@@ -190,6 +190,10 @@
      "getPSChartDataSetFields" : [ {
        "index" : 0,
        "name" : "NAME",
+        "getPSCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+        },
        "groupField" : true,
        "id" : "0"
      }, {
@@ -329,6 +333,10 @@
    },
    "getPSDEChartSerieses" : [ {
      "catalogField" : "NAME",
+      "getCatalogPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
+      },
      "eChartsType" : "bar",
      "index" : 0,
      "name" : "bar_0",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView_VIewPanel.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView_VIewPanel.json
--- 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,46 +166,6 @@
      "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" : {
@@ -520,6 +480,46 @@
      },
      "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/phoneUsr0321702002CustomView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0321702002CustomView.json
+{
+  "accUserMode" : 2,
+  "caption" : "手机",
+  "codeName" : "phoneUsr0321702002CustomView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0321702002CustomView.json",
+  "mOSFilePath" : "pssysapps/Web/psappdeviews/phoneUsr0321702002CustomView",
+  "name" : "phoneUsr0321702002CustomView",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+  },
+  "getPSAppModule" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
+  },
+  "getPSDEViewCodeName" : "Usr0321702002CustomView",
+  "getPSDEViewId" : "0C7860A1-41E6-46CD-9B36-0669188D62B8",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Usr0321209371",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "layoutMode" : "FLEX",
+    "logicName" : "测试（5）布局面板",
+    "mOSFilePath" : "psmodules/common/psdataentities/PHONE/pssysviewlayoutpanels/Usr0321209371",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+    },
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "layout" : "FLEX"
+    },
+    "rTMOSFilePath" : "pssysapps/Web/psappdeviews/phoneUsr0321702002CustomView/psappviewctrls/layoutpanel",
+    "getRootPSPanelItems" : [ {
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "page_container",
+      "getPSLayout" : {
+        "dir" : "column",
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      }
+    } ],
+    "layoutBodyOnly" : false,
+    "layoutPanel" : true,
+    "useDefaultLayout" : false,
+    "viewProxyMode" : true,
+    "modelid" : "CE762190-87D9-4F93-88AA-50EC4BFDAE08",
+    "modeltype" : "PSSYSVIEWLAYOUTPANEL"
+  },
+  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/phoneUsr0321702002CustomView",
+  "refFlag" : false,
+  "title" : "test （5）",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DECUSTOMVIEW",
+  "enableDP" : true,
+  "modelid" : "19284A33-D832-410D-8973-024E91D243E7",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file
--- 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
@@ -2346,16 +2346,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"
@@ -2425,6 +2425,12 @@
    "viewType" : "DEEDITVIEW",
    "resource" : "PRINT",
    "view" : "EditView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0321702002CustomView.json",
+    "viewType" : "DECUSTOMVIEW",
+    "resource" : "Phone",
+    "view" : "Usr0321702002CustomView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoChartView.json",
@@ -17901,46 +17907,6 @@
          "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" : {
@@ -18255,6 +18221,46 @@
          },
          "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",