feat: 布局插件更新

3b8721e2 · chitanda · 1a4082c4 · 3b8721e2 · 3b8721e2 · 3b8721e2
--- a/plugins/view-layout-panel-dsl/src/view-layout-model-repository/view-layout-model-repository-de-edit-view-layout.ts
+++ b/plugins/view-layout-panel-dsl/src/view-layout-model-repository/view-layout-model-repository-de-edit-view-layout.ts
@@ -6,14 +6,14 @@ export default {
        {
          "panelItems": [
            {
-              "allowEmpty": true,
              "caption": "页面标题",
              "itemStyle": "DEFAULT",
-              "itemType": "FIELD",
+              "itemType": "CTRLPOS",
              "layoutPos": {
                "layout": "FLEX"
              },
-              "id": "view_pagecaption"
+              "showCaption": true,
+              "id": "captionbar"
            }
          ],
          "layout": {

--- a/plugins/view-layout-panel-dsl/src/view-layout-model-repository/view-layout-model-repository-de-grid-view-layout.ts
+++ b/plugins/view-layout-panel-dsl/src/view-layout-model-repository/view-layout-model-repository-de-grid-view-layout.ts
@@ -26,7 +26,7 @@ export default {
          "layoutPos": {
            "layout": "FLEX"
          },
-          "id": "container4"
+          "id": "page_header_left"
        },
        {
          "panelItems": [
@@ -48,7 +48,7 @@ export default {
                "layout": "FLEX"
              },
              "showCaption": true,
-              "id": "toolbar"
+              "id": "2f55253c559115d81b4455458e6145ee"
            }
          ],
          "layout": {
@@ -62,7 +62,7 @@ export default {
          "layoutPos": {
            "layout": "FLEX"
          },
-          "id": "container5"
+          "id": "page_header_right"
        }
      ],
      "layout": {
@@ -81,7 +81,7 @@ export default {
        "heightMode": "PX",
        "layout": "FLEX"
      },
-      "id": "container1"
+      "id": "page_header"
    },
    {
      "panelItems": [
@@ -93,7 +93,7 @@ export default {
            "layout": "FLEX"
          },
          "showCaption": true,
-          "id": "searchform"
+          "id": "7a449f606592cb2e1b7686a677a7318e"
        }
      ],
      "layout": {
@@ -106,7 +106,7 @@ export default {
      "layoutPos": {
        "layout": "FLEX"
      },
-      "id": "container2"
+      "id": "page_search_content"
    },
    {
      "panelItems": [
@@ -119,7 +119,7 @@ export default {
            "layout": "FLEX"
          },
          "showCaption": true,
-          "id": "grid"
+          "id": "960d53b2b72863885fc59e46a0bccf3a"
        }
      ],
      "layout": {
@@ -133,7 +133,7 @@ export default {
        "grow": 1,
        "layout": "FLEX"
      },
-      "id": "container3"
+      "id": "page_content"
    }
  ],
  "layoutPanel": true,

--- a/plugins/view-layout-panel-dsl/src/view-layout-model-repository/view-layout-model-repository-de-list-view-layout.ts
+++ b/plugins/view-layout-panel-dsl/src/view-layout-model-repository/view-layout-model-repository-de-list-view-layout.ts
+export default {
+  "layoutMode": "TABLE_24COL",
+  "rootPanelItems": [
+    {
+      "panelItems": [
+        {
+          "panelItems": [
+            {
+              "rawItem": {
+                "contentType": "INFO",
+                "predefinedType": "CAPTIONBAR",
+                "id": "info1"
+              },
+              "caption": "提示信息",
+              "itemStyle": "DEFAULT",
+              "itemType": "RAWITEM",
+              "layoutPos": {
+                "layout": "FLEX"
+              },
+              "showCaption": true,
+              "id": "info1"
+            }
+          ],
+          "layout": {
+            "layout": "FLEX"
+          },
+          "dataRegionType": "INHERIT",
+          "caption": "容器",
+          "itemStyle": "DEFAULT",
+          "itemType": "CONTAINER",
+          "layoutPos": {
+            "layout": "FLEX"
+          },
+          "id": "page_header_left"
+        },
+        {
+          "panelItems": [
+            {
+              "caption": "搜索栏",
+              "itemStyle": "DEFAULT",
+              "itemType": "CTRLPOS",
+              "layoutPos": {
+                "layout": "FLEX"
+              },
+              "showCaption": true,
+              "id": "12b58ae206c7040e2e0054b3a6eb2410"
+            },
+            {
+              "caption": "工具栏",
+              "itemStyle": "DEFAULT",
+              "itemType": "CTRLPOS",
+              "layoutPos": {
+                "layout": "FLEX"
+              },
+              "showCaption": true,
+              "id": "0ba0c5ca9646f21ece8618cfd008a67c"
+            }
+          ],
+          "layout": {
+            "dir": "row",
+            "layout": "FLEX"
+          },
+          "dataRegionType": "INHERIT",
+          "caption": "容器",
+          "itemStyle": "DEFAULT",
+          "itemType": "CONTAINER",
+          "layoutPos": {
+            "layout": "FLEX"
+          },
+          "id": "page_header_right"
+        }
+      ],
+      "layout": {
+        "align": "space-between",
+        "dir": "row",
+        "layout": "FLEX"
+      },
+      "dataRegionType": "INHERIT",
+      "caption": "容器",
+      "contentHeight": 54,
+      "height": 54,
+      "itemStyle": "DEFAULT",
+      "itemType": "CONTAINER",
+      "layoutPos": {
+        "colMD": 24,
+        "height": 54,
+        "heightMode": "PX",
+        "layout": "TABLE_24COL"
+      },
+      "id": "page_header"
+    },
+    {
+      "panelItems": [
+        {
+          "caption": "搜索表单",
+          "itemStyle": "DEFAULT",
+          "itemType": "CTRLPOS",
+          "layoutPos": {
+            "layout": "FLEX"
+          },
+          "showCaption": true,
+          "id": "7e1a1b718a86031986f000fbe9813fc9"
+        }
+      ],
+      "layout": {
+        "layout": "FLEX"
+      },
+      "dataRegionType": "INHERIT",
+      "caption": "容器",
+      "itemStyle": "DEFAULT",
+      "itemType": "CONTAINER",
+      "layoutPos": {
+        "colMD": 24,
+        "layout": "TABLE_24COL"
+      },
+      "id": "page_search_content"
+    },
+    {
+      "panelItems": [
+        {
+          "caption": "列表",
+          "itemStyle": "DEFAULT",
+          "itemType": "CTRLPOS",
+          "layoutPos": {
+            "layout": "FLEX"
+          },
+          "showCaption": true,
+          "id": "488ffc0ea2cc68d251eafaad7b8827b7"
+        }
+      ],
+      "layout": {
+        "layout": "FLEX"
+      },
+      "dataRegionType": "INHERIT",
+      "caption": "容器",
+      "itemStyle": "DEFAULT",
+      "itemType": "CONTAINER",
+      "layoutPos": {
+        "colMD": 24,
+        "layout": "TABLE_24COL"
+      },
+      "id": "page_content"
+    }
+  ],
+  "layoutPanel": true,
+  "codeName": "ListViewLayout",
+  "controlType": "VIEWLAYOUTPANEL",
+  "logicName": "列表视图布局面板(预置模型)",
+  "appDataEntityId": "web.viewlayoutmodelrepository",
+  "controlParam": {},
+  "name": "layoutpanel",
+  "id": "listviewlayout"
+}
--- a/plugins/view-layout-panel-dsl/template/{{appEntities}}/{{pages@DELISTVIEW}}.ts.hbs
+++ b/plugins/view-layout-panel-dsl/template/{{appEntities}}/{{pages@DELISTVIEW}}.ts.hbs
+{{#eq page.codeName 'ViewLayoutModelRepositoryDEListViewLayout'}}
+export default {{jsonStringify pageDSL.viewLayoutPanel 2}}
+{{/eq}}