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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json

@@ -3190,6 +3190,12 @@
     "name" : "测试实体实体移动端编辑视图（测试表单）",
     "realModelSubType" : "DEMOBEDITVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "DEMobEditViewLayoutPart",
+    "logicName" : "布局引用测试",
+    "name" : "布局引用测试",
+    "realModelSubType" : "DEMOBEDITVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "DEMobWFDynaEditView",
     "logicName" : "实体移动端工作流动态编辑视图",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json

@@ -2908,6 +2908,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobWFDynaEditView3.json",
     "viewType" : "DEMOBWFDYNAEDITVIEW3"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobEditViewLayoutPart.json",
+    "viewType" : "DEMOBEDITVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobMDView9.json",

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

@@ -1009,6 +1009,12 @@
     "viewType" : "DEMOBMDVIEW",
     "resource" : "Reginfo",
     "view" : "MobMDView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobEditViewLayoutPart.json",
+    "viewType" : "DEMOBEDITVIEW",
+    "resource" : "TEST",
+    "view" : "DEMobEditViewLayoutPart"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobMDView9.json",
@@ -8402,6 +8408,10 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobWFDynaEditView3.json",
         "viewType" : "DEMOBWFDYNAEDITVIEW3"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobEditViewLayoutPart.json",
+        "viewType" : "DEMOBEDITVIEW"
       }, {
         "modelref" : true,
         "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobMDView9.json",

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

@@ -1240,16 +1240,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   }, {

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

@@ -557,17 +557,10 @@
   "getPSDEViewCodeName" : "GridViewPanel",
   "getPSDEViewId" : "FFA5856A-7E6E-42E6-A3EA-939FCDB78EDF",
   "getPSViewLayoutPanel" : {
-    "getAllPSPanelFields" : [ {
-      "id" : "visible",
-      "hidden" : true,
-      "viewFieldName" : "visible"
-    }, {
-      "id" : "field1"
-    } ],
     "codeName" : "Usr0605003933",
     "controlType" : "VIEWLAYOUTPANEL",
     "layoutMode" : "FLEX",
-    "logicName" : "测试视图面板11",
+    "logicName" : "基础表格视图面板",
     "name" : "layoutpanel",
     "getPSAppDataEntity" : {
       "modelref" : true,
@@ -578,11 +571,11 @@
       "layout" : "FLEX"
     },
     "getRootPSPanelItems" : [ {
+      "caption" : "引用布局面板",
       "itemStyle" : "DEFAULT",
       "itemType" : "CONTAINER",
-      "name" : "page_container",
+      "name" : "panelpart",
       "getPSLayout" : {
-        "dir" : "column",
         "layout" : "FLEX"
       },
       "getPSLayoutPos" : {
@@ -590,65 +583,171 @@
         "layout" : "FLEX"
       },
       "getPSPanelItems" : [ {
-        "caption" : "搜索表单",
+        "caption" : "容器",
+        "contentHeight" : 54.0,
+        "height" : 54.0,
         "itemStyle" : "DEFAULT",
-        "itemType" : "CTRLPOS",
-        "name" : "searchform",
+        "itemType" : "CONTAINER",
+        "name" : "view_header",
+        "getPSLayout" : {
+          "align" : "space-between",
+          "dir" : "row",
+          "layout" : "FLEX"
+        },
         "getPSLayoutPos" : {
           "grow" : -1,
+          "height" : 54,
+          "heightMode" : "PX",
           "layout" : "FLEX"
         },
-        "getPSPanelItemGroupLogics" : [ {
-          "groupOP" : "AND",
-          "logicCat" : "PANELVISIBLE",
-          "logicType" : "GROUP",
-          "name" : "面板成员[searchform][面板显示]逻辑",
-          "getPSPanelItemLogics" : [ {
-            "condOp" : "ISNOTNULL",
-            "dstModelField" : "visible",
-            "logicType" : "SINGLE",
-            "name" : "逻辑项"
-          } ],
-          "relatedItemNames" : [ "visible" ],
-          "notMode" : false
-        } ],
-        "showCaption" : true
-      } ]
+        "getPSPanelItems" : [ {
+          "caption" : "容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "view_header_left",
+          "getPSLayout" : {
+            "layout" : "FLEX"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "容器",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CONTAINER",
+            "name" : "view_captionbar",
+            "getPSLayout" : {
+              "layout" : "FLEX"
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "getPSPanelItems" : [ {
+              "caption" : "视图标题",
+              "itemStyle" : "DEFAULT",
+              "itemType" : "CTRLPOS",
+              "name" : "captionbar",
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "layout" : "FLEX"
+              },
+              "showCaption" : true
+            } ]
+          } ]
+        }, {
+          "caption" : "容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "view_header_right",
+          "getPSLayout" : {
+            "dir" : "row",
+            "layout" : "FLEX"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "容器",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CONTAINER",
+            "name" : "view_searchbar",
+            "getPSLayout" : {
+              "layout" : "FLEX"
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "getPSPanelItems" : [ {
+              "caption" : "搜索栏",
+              "itemStyle" : "DEFAULT",
+              "itemType" : "CTRLPOS",
+              "name" : "searchbar",
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "layout" : "FLEX"
+              },
+              "showCaption" : true
+            } ]
+          }, {
+            "caption" : "容器",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CONTAINER",
+            "name" : "view_toolbar",
+            "getPSLayout" : {
+              "layout" : "FLEX"
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "getPSPanelItems" : [ {
+              "caption" : "工具栏",
+              "itemStyle" : "DEFAULT",
+              "itemType" : "CTRLPOS",
+              "name" : "toolbar",
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "layout" : "FLEX"
+              },
+              "showCaption" : true
+            } ]
+          } ]
+        } ]
+      }, {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "view_searchform",
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX",
+          "shrink" : 0
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "搜索表单",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CTRLPOS",
+          "name" : "searchform",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "showCaption" : true
+        } ]
+      } ],
+      "predefinedType" : "PANELPART",
+      "showCaption" : true
     }, {
-      "caption" : "文本(动态)",
+      "caption" : "容器",
       "itemStyle" : "DEFAULT",
-      "itemType" : "FIELD",
-      "name" : "visible",
-      "getPSEditor" : {
-        "editorType" : "HIDDEN",
-        "name" : "visible",
-        "predefinedType" : "FIELD_TEXT_DYNAMIC"
-      },
-      "getPSLayoutPos" : {
-        "grow" : -1,
+      "itemType" : "CONTAINER",
+      "name" : "view_grid",
+      "getPSLayout" : {
         "layout" : "FLEX"
       },
-      "viewFieldName" : "visible",
-      "hidden" : true,
-      "showCaption" : false
-    }, {
-      "caption" : "文本(动态)",
-      "itemStyle" : "DEFAULT",
-      "itemType" : "FIELD",
-      "name" : "field1",
-      "getPSEditor" : {
-        "editorType" : "SPAN",
-        "name" : "field1",
-        "predefinedType" : "FIELD_TEXT_DYNAMIC",
-        "renderMode" : "TEXT_DYNAMIC",
-        "enableLinkView" : false
-      },
       "getPSLayoutPos" : {
         "grow" : -1,
-        "layout" : "FLEX"
+        "layout" : "FLEX",
+        "shrink" : 0
       },
-      "hidden" : false,
-      "showCaption" : false
+      "getPSPanelItems" : [ {
+        "caption" : "表格",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CTRLPOS",
+        "name" : "grid",
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "showCaption" : true
+      } ]
     } ],
     "layoutBodyOnly" : false,
     "layoutPanel" : true,

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

@@ -2552,16 +2552,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   } ],