feat: 补充多项选择视图布局面板

e94c621b · chitanda · 1bf134a2 · e94c621b · e94c621b · e94c621b
--- a/plugins/view-layout-panel-dsl/CHANGELOG.md
+++ b/plugins/view-layout-panel-dsl/CHANGELOG.md
@@ -7,6 +7,10 @@

 ## [Unreleased]

+### Added
+
+- 多数据选择视图布局面板
+
 ## [1.0.10] - 2023-05-25

 ### Added

--- a/plugins/view-layout-panel-dsl/src/index.ts
+++ b/plugins/view-layout-panel-dsl/src/index.ts
@@ -7,6 +7,7 @@ import DEListView from './view-layout-model-repository/view-layout-model-reposit
 import DEOptView from './view-layout-model-repository/view-layout-model-repository-de-option-view-layout';
 import DEPickupGirdView from './view-layout-model-repository/view-layout-model-repository-de-pickup-grid-view-layout';
 import DEPickupView from './view-layout-model-repository/view-layout-model-repository-de-pickup-view-layout';
+import DEMPickupView from './view-layout-model-repository/view-layout-model-repository-dem-pickup-view-layout';

 /**
 * 安装视图默认布局
@@ -26,4 +27,5 @@ export function install(callBack: (key: string, model: any) => void): void {
  callBack('DEOPTVIEW_DEFAULT', DEOptView);
  callBack('DEPICKUPGRIDVIEW_DEFAULT', DEPickupGirdView);
  callBack('DEPICKUPVIEW_DEFAULT', DEPickupView);
+  callBack('DEMPICKUPVIEW_DEFAULT', DEMPickupView);
 }
\ No newline at end of file
--- a/plugins/view-layout-panel-dsl/src/view-layout-model-repository/view-layout-model-repository-de-chart-view-layout.ts
+++ b/plugins/view-layout-panel-dsl/src/view-layout-model-repository/view-layout-model-repository-de-chart-view-layout.ts
 export default {
-  "layoutMode": "TABLE_24COL",
+  "layoutMode": "FLEX",
  "rootPanelItems": [
    {
      "panelItems": [
@@ -40,10 +40,9 @@ export default {
      "itemStyle": "DEFAULT",
      "itemType": "CONTAINER",
      "layoutPos": {
-        "colMD": 24,
        "height": 54,
        "heightMode": "PX",
-        "layout": "TABLE_24COL"
+        "layout": "FLEX"
      },
      "id": "page_header"
    },
@@ -68,8 +67,7 @@ export default {
      "itemStyle": "DEFAULT",
      "itemType": "CONTAINER",
      "layoutPos": {
-        "colMD": 24,
-        "layout": "TABLE_24COL"
+        "layout": "FLEX"
      },
      "id": "page_search_content"
    },
@@ -94,8 +92,8 @@ export default {
      "itemStyle": "DEFAULT",
      "itemType": "CONTAINER",
      "layoutPos": {
-        "colMD": 24,
-        "layout": "TABLE_24COL"
+        "grow": 1,
+        "layout": "FLEX"
      },
      "id": "page_content"
    }

--- a/plugins/view-layout-panel-dsl/src/view-layout-model-repository/view-layout-model-repository-dem-pickup-view-layout.ts
+++ b/plugins/view-layout-panel-dsl/src/view-layout-model-repository/view-layout-model-repository-dem-pickup-view-layout.ts
+export default {
+  "layoutMode": "TABLE_24COL",
+  "rootPanelItems": [
+    {
+      "panelItems": [
+        {
+          "panelItems": [
+            {
+              "caption": "控件占位",
+              "itemStyle": "DEFAULT",
+              "itemType": "CTRLPOS",
+              "layoutPos": {
+                "grow": 1,
+                "layout": "FLEX"
+              },
+              "showCaption": true,
+              "id": "pickupviewpanel"
+            }
+          ],
+          "layout": {
+            "layout": "FLEX"
+          },
+          "dataRegionType": "INHERIT",
+          "caption": "容器",
+          "itemStyle": "DEFAULT",
+          "itemType": "CONTAINER",
+          "layoutPos": {
+            "grow": 1,
+            "layout": "FLEX"
+          },
+          "id": "container3"
+        },
+        {
+          "panelItems": [
+            {
+              "actionType": "UIACTION",
+              "uiactionId": "panel_mpickupviewlayout_addselection_click@viewlayoutmodelrepository",
+              "tooltip": "添加选中",
+              "uiactionTarget": "NONE",
+              "caption": "添加选中",
+              "itemStyle": "DEFAULT",
+              "itemType": "BUTTON",
+              "layoutPos": {
+                "layout": "FLEX"
+              },
+              "showCaption": true,
+              "id": "addselection"
+            },
+            {
+              "actionType": "UIACTION",
+              "uiactionId": "panel_mpickupviewlayout_addall_click@viewlayoutmodelrepository",
+              "tooltip": "添加全部",
+              "uiactionTarget": "NONE",
+              "caption": "添加全部",
+              "itemStyle": "DEFAULT",
+              "itemType": "BUTTON",
+              "layoutPos": {
+                "layout": "FLEX"
+              },
+              "showCaption": true,
+              "id": "addall"
+            },
+            {
+              "actionType": "UIACTION",
+              "uiactionId": "panel_mpickupviewlayout_removeall_click@viewlayoutmodelrepository",
+              "tooltip": "移出全部",
+              "uiactionTarget": "NONE",
+              "caption": "移出全部",
+              "itemStyle": "DEFAULT",
+              "itemType": "BUTTON",
+              "layoutPos": {
+                "layout": "FLEX"
+              },
+              "showCaption": true,
+              "id": "removeall"
+            },
+            {
+              "actionType": "UIACTION",
+              "uiactionId": "panel_mpickupviewlayout_removeselection_click@viewlayoutmodelrepository",
+              "tooltip": "移出选中",
+              "uiactionTarget": "NONE",
+              "caption": "移出选中",
+              "itemStyle": "DEFAULT",
+              "itemType": "BUTTON",
+              "layoutPos": {
+                "layout": "FLEX"
+              },
+              "showCaption": true,
+              "id": "removeselection"
+            }
+          ],
+          "layout": {
+            "layout": "FLEX"
+          },
+          "dataRegionType": "INHERIT",
+          "caption": "容器",
+          "contentHeight": 36,
+          "height": 36,
+          "itemStyle": "DEFAULT",
+          "itemType": "CONTAINER",
+          "layoutPos": {
+            "height": 36,
+            "heightMode": "PX",
+            "layout": "FLEX"
+          },
+          "id": "container4"
+        },
+        {
+          "layout": {
+            "layout": "FLEX"
+          },
+          "dataRegionType": "INHERIT",
+          "caption": "容器",
+          "itemStyle": "DEFAULT",
+          "itemType": "CONTAINER",
+          "layoutPos": {
+            "layout": "FLEX"
+          },
+          "id": "container5"
+        }
+      ],
+      "layout": {
+        "dir": "row",
+        "layout": "FLEX"
+      },
+      "dataRegionType": "INHERIT",
+      "caption": "容器",
+      "itemStyle": "DEFAULT",
+      "itemType": "CONTAINER",
+      "layoutPos": {
+        "colMD": 24,
+        "layout": "TABLE_24COL"
+      },
+      "id": "container1"
+    },
+    {
+      "panelItems": [
+        {
+          "actionType": "UIACTION",
+          "uiactionId": "panel_mpickupviewlayout_ok_click@viewlayoutmodelrepository",
+          "tooltip": "确认",
+          "uiactionTarget": "NONE",
+          "caption": "确认",
+          "itemStyle": "DEFAULT",
+          "itemType": "BUTTON",
+          "layoutPos": {
+            "layout": "FLEX"
+          },
+          "showCaption": true,
+          "id": "ok"
+        },
+        {
+          "actionType": "UIACTION",
+          "uiactionId": "panel_mpickupviewlayout_cancel_click@viewlayoutmodelrepository",
+          "tooltip": "取消",
+          "uiactionTarget": "NONE",
+          "caption": "取消",
+          "itemStyle": "DEFAULT",
+          "itemType": "BUTTON",
+          "layoutPos": {
+            "layout": "FLEX"
+          },
+          "showCaption": true,
+          "id": "cancel"
+        }
+      ],
+      "layout": {
+        "dir": "row-reverse",
+        "layout": "FLEX"
+      },
+      "dataRegionType": "INHERIT",
+      "caption": "容器",
+      "contentHeight": 54,
+      "height": 54,
+      "itemStyle": "DEFAULT",
+      "itemType": "CONTAINER",
+      "layoutPos": {
+        "colMD": 24,
+        "height": 54,
+        "heightMode": "PX",
+        "layout": "TABLE_24COL"
+      },
+      "id": "container2"
+    }
+  ],
+  "layoutPanel": true,
+  "codeName": "MPickupViewLayout",
+  "controlType": "VIEWLAYOUTPANEL",
+  "logicName": "多项选择视图布局面板",
+  "appDataEntityId": "web.viewlayoutmodelrepository",
+  "controlParam": {},
+  "name": "layoutpanel",
+  "id": "mpickupviewlayout"
+}
--- a/plugins/view-layout-panel-dsl/template/index.ts.hbs
+++ b/plugins/view-layout-panel-dsl/template/index.ts.hbs
@@ -7,6 +7,7 @@ import DEListView from './view-layout-model-repository/view-layout-model-reposit
 import DEOptView from './view-layout-model-repository/view-layout-model-repository-de-option-view-layout';
 import DEPickupGirdView from './view-layout-model-repository/view-layout-model-repository-de-pickup-grid-view-layout';
 import DEPickupView from './view-layout-model-repository/view-layout-model-repository-de-pickup-view-layout';
+import DEMPickupView from './view-layout-model-repository/view-layout-model-repository-dem-pickup-view-layout';

 /**
 * 安装视图默认布局
@@ -26,4 +27,5 @@ export function install(callBack: (key: string, model: any) => void): void {
  callBack('DEOPTVIEW_DEFAULT', DEOptView);
  callBack('DEPICKUPGRIDVIEW_DEFAULT', DEPickupGirdView);
  callBack('DEPICKUPVIEW_DEFAULT', DEPickupView);
+  callBack('DEMPICKUPVIEW_DEFAULT', DEMPickupView);
 }
\ No newline at end of file
--- a/plugins/view-layout-panel-dsl/template/{{appEntities}}/{{pages@DEMPICKUPVIEW}}.ts.hbs
+++ b/plugins/view-layout-panel-dsl/template/{{appEntities}}/{{pages@DEMPICKUPVIEW}}.ts.hbs
+{{#eq page.codeName 'ViewLayoutModelRepositoryDEMPickupViewLayout'}}
+export default {{jsonStringify pageDSL.viewLayoutPanel 2}}
+{{/eq}}