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

94afc6fa · ibizdev · 8ea88d2d · 94afc6fa · 94afc6fa · 94afc6fa
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2.json
@@ -396,9 +396,8 @@
      "getPSDEFFormItem" : {
        "codeName" : "Default",
        "editorType" : "TEXTBOX",
-        "minStringLength" : 15,
        "name" : "[MXCOUNT][属性]",
-        "stringLength" : 18,
+        "stringLength" : 100,
        "uIMode" : "DEFAULT"
      },
      "type" : "DEFAULT"
@@ -408,9 +407,8 @@
      "getPSDEFFormItem" : {
        "codeName" : "MobileDefault",
        "editorType" : "MOBTEXT",
-        "minStringLength" : 15,
        "name" : "[MXCOUNT][属性]移动端默认",
-        "stringLength" : 18,
+        "stringLength" : 100,
        "uIMode" : "MOBILEDEFAULT",
        "mobileMode" : true
      },
@@ -427,24 +425,16 @@
        "getPSDEFVRConditions" : [ {
          "condType" : "STRINGLENGTH",
          "dEFName" : "MXCOUNT",
-          "maxValue" : 18,
-          "minValue" : 15,
+          "maxValue" : 100,
          "name" : "默认字符串长度",
-          "ruleInfo" : "内容长度必须大于等于[15]且小于等于[18]",
+          "ruleInfo" : "内容长度必须小于等于[100]",
          "includeMaxValue" : true,
-          "includeMinValue" : true,
-          "keyCond" : true
-        }, {
-          "condType" : "REGEX",
-          "dEFName" : "MXCOUNT",
-          "name" : "身份证号验证",
-          "regExCode" : "^(\\d{15}$|^\\d{18}$|^\\d{17}(\\d|X|x))$",
-          "ruleInfo" : "请输入15位或18位身份证号!",
+          "includeMinValue" : false,
          "keyCond" : true
        } ],
-        "ruleInfo" : "(内容长度必须大于等于[15]且小于等于[18] 并且 请输入15位或18位身份证号!)"
+        "ruleInfo" : "内容长度必须小于等于[100]"
      },
-      "ruleInfo" : "(内容长度必须大于等于[15]且小于等于[18] 并且 请输入15位或18位身份证号!)",
+      "ruleInfo" : "内容长度必须小于等于[100]",
      "checkDefault" : true,
      "defaultMode" : true,
      "enableBackend" : true,
@@ -454,9 +444,8 @@
    "dEFType" : 1,
    "dataType" : "TEXT",
    "importOrder" : 1000,
-    "length" : 18,
+    "length" : 100,
    "logicName" : "属性",
-    "minStringLength" : 15,
    "name" : "MXCOUNT",
    "getPSDEDBTable" : {
      "modelref" : true,
@@ -468,7 +457,7 @@
    },
    "serviceCodeName" : "MXcount",
    "stdDataType" : 25,
-    "stringLength" : 18,
+    "stringLength" : 100,
    "valueFormat" : "%1$s"
  }, {
    "getAllPSDEFDTColumns" : [ {
@@ -1086,7 +1075,6 @@
    "name" : "BXD2DTO",
    "getPSDEMethodDTOFields" : [ {
      "logicName" : "属性",
-      "minStringLength" : 15,
      "name" : "MXcount",
      "getPSDEField" : {
        "name" : "MXCOUNT",
@@ -1094,7 +1082,7 @@
      },
      "sourceType" : "DEFIELD",
      "stdDataType" : 25,
-      "stringLength" : 18,
+      "stringLength" : 100,
      "type" : "SIMPLE"
    }, {
      "logicName" : "报销单2标识",

--- 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
@@ -1495,16 +1495,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ]
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json
@@ -425,9 +425,8 @@
      "getPSDEFFormItem" : {
        "codeName" : "Default",
        "editorType" : "TEXTBOX",
-        "minStringLength" : 15,
        "name" : "[MXCOUNT][属性]",
-        "stringLength" : 18,
+        "stringLength" : 100,
        "uIMode" : "DEFAULT"
      },
      "type" : "DEFAULT"
@@ -437,9 +436,8 @@
      "getPSDEFFormItem" : {
        "codeName" : "MobileDefault",
        "editorType" : "MOBTEXT",
-        "minStringLength" : 15,
        "name" : "[MXCOUNT][属性]移动端默认",
-        "stringLength" : 18,
+        "stringLength" : 100,
        "uIMode" : "MOBILEDEFAULT",
        "mobileMode" : true
      },
@@ -448,10 +446,9 @@
    } ],
    "codeName" : "MXcount",
    "logicName" : "属性",
-    "minStringLength" : 15,
    "name" : "MXCOUNT",
    "stdDataType" : 25,
-    "stringLength" : 18
+    "stringLength" : 100
  }, {
    "getAllPSAppDEFUIModes" : [ {
      "codeName" : "Default",

--- 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
@@ -11269,6 +11269,60 @@
    "pluginCode" : "viewPlugin",
    "typeCode" : "viewStyle",
    "viewType" : "DEEDITVIEW"
+  }, {
+    "name" : "替换默认编辑视图布局面板",
+    "getPSViewLayoutPanel" : {
+      "codeName" : "Usr1128928261",
+      "controlType" : "VIEWLAYOUTPANEL",
+      "layoutMode" : "FLEX",
+      "logicName" : "替换默认编辑视图布局面板(测试)",
+      "name" : "layoutpanel",
+      "getPSControlParam" : { },
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getRootPSPanelItems" : [ {
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "page_container",
+        "getPSLayout" : {
+          "dir" : "column",
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "文本",
+          "contentType" : "RAW",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "RAWITEM",
+          "name" : "static_text",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSRawItem" : {
+            "caption" : "测试替换默认编辑视图布局",
+            "contentType" : "RAW",
+            "name" : "static_text",
+            "predefinedType" : "STATIC_TEXT",
+            "renderMode" : "TEXT"
+          },
+          "rawContent" : "测试替换默认编辑视图布局",
+          "showCaption" : true
+        } ]
+      } ],
+      "layoutBodyOnly" : false,
+      "layoutPanel" : true,
+      "useDefaultLayout" : false,
+      "modelid" : "B75263BA-392A-4E3D-AE20-2BA34648E924",
+      "modeltype" : "PSSYSVIEWLAYOUTPANEL"
+    },
+    "typeCode" : "editrepeat",
+    "viewType" : "DEEDITVIEW",
+    "replaceDefault" : true
  } ],
  "getAllPSAppUIThemes" : [ {
    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPUITHEMES/null.json",
@@ -11646,16 +11700,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ]
  }, {
@@ -11684,10 +11738,10 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      }
    }, {
      "name" : "消息类型-警告信息",
@@ -11696,10 +11750,10 @@
        "id" : "ViewMsg5"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
      }
    } ]
  }, {
@@ -11722,16 +11776,16 @@
        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg9"
      }
    }, {
      "name" : "消息位置-视图下方",
@@ -11744,10 +11798,10 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg8"
      }
    }, {
      "name" : "消息类型-错误信息",
@@ -11757,11 +11811,12 @@
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
@@ -11775,13 +11830,6 @@
        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
    }, {
      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
@@ -11794,17 +11842,17 @@
        "modelref" : true,
        "id" : "ViewMsg9"
      }
+    }, {
+      "name" : "关闭模式-本次删除-上方-警告",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
-    }, {
      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -11816,6 +11864,12 @@
        "modelref" : true,
        "id" : "ViewMsg13"
      }
+    }, {
+      "name" : "关闭模式-无删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg11"
+      }
    } ]
  }, {
    "codeName" : "VMGroup6",
@@ -57000,9 +57054,8 @@
          "getPSDEFFormItem" : {
            "codeName" : "Default",
            "editorType" : "TEXTBOX",
-            "minStringLength" : 15,
            "name" : "[MXCOUNT][属性]",
-            "stringLength" : 18,
+            "stringLength" : 100,
            "uIMode" : "DEFAULT"
          },
          "type" : "DEFAULT"
@@ -57012,9 +57065,8 @@
          "getPSDEFFormItem" : {
            "codeName" : "MobileDefault",
            "editorType" : "MOBTEXT",
-            "minStringLength" : 15,
            "name" : "[MXCOUNT][属性]移动端默认",
-            "stringLength" : 18,
+            "stringLength" : 100,
            "uIMode" : "MOBILEDEFAULT",
            "mobileMode" : true
          },
@@ -57023,10 +57075,9 @@
        } ],
        "codeName" : "MXcount",
        "logicName" : "属性",
-        "minStringLength" : 15,
        "name" : "MXCOUNT",
        "stdDataType" : 25,
-        "stringLength" : 18
+        "stringLength" : 100
      }, {
        "getAllPSAppDEFUIModes" : [ {
          "codeName" : "Default",
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
@@ -15644,11 +15644,10 @@
      "codeName" : "MXcount",
      "codeName2" : "MXcount",
      "logicName" : "属性",
-      "minStringLength" : 15,
      "name" : "MXCOUNT",
      "orderValue" : 160,
      "stdDataType" : 25,
-      "stringLength" : 18,
+      "stringLength" : 100,
      "allowEmpty" : true,
      "enableCreate" : true,
      "enableModify" : true,