@ibiz-template/runtime 0.7.41-alpha.145 → 0.7.41-alpha.146

package/out/utils/layout-panel-util/layout-panel-util.d.ts

@@ -1,4 +1,4 @@
-import { IAppView, IViewLayoutPanel, IAppIndexView } from '@ibiz/model-core';
+import { IAppView, IViewLayoutPanel, IAppIndexView, IPanelItem } from '@ibiz/model-core';
 /**
  * 布局面板工具类
  *
@@ -79,5 +79,21 @@ export declare class LayoutPanelUtil {
      * @memberof LayoutPanelUtil
      */
     protected calcDEMedViewLayoutTag(viewModel: IAppView): string;
+    /**
+     * @description 递归查找指定标识的面板项
+     * @protected
+     * @param {IPanelItem[]} items
+     * @param {string} id
+     * @returns {*}  {(IPanelItem | undefined)}
+     * @memberof LayoutPanelUtil
+     */
+    protected findPanelItem(items: IPanelItem[], id: string): IPanelItem | undefined;
+    /**
+     * @description 替换简单列表部件占位
+     * @protected
+     * @param {IAppView} viewModel
+     * @memberof LayoutPanelUtil
+     */
+    protected replaceSimpleList(viewModel: IAppView): void;
 }
 //# sourceMappingURL=layout-panel-util.d.ts.map

package/out/utils/layout-panel-util/layout-panel-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout-panel-util.d.ts","sourceRoot":"","sources":["../../../src/utils/layout-panel-util/layout-panel-util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,aAAa,EAGd,MAAM,kBAAkB,CAAC;AAI1B;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAa;IAE3D;;;;;;;OAOG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAIpD;;;;;;OAMG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAI9C;;;;;;;OAOG;IACH,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,QAAQ;IAgCnC;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,QAAQ,GAAG,MAAM;IAgBpD;;;;;;OAMG;IACH,SAAS,CAAC,uBAAuB,CAAC,SAAS,EAAE,QAAQ,GAAG,MAAM;IAS9D;;;;;;;;OAQG;IACH,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,aAAa,GAAG,MAAM;IA+BlE;;;;;;OAMG;IACH,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,QAAQ,GAAG,MAAM;CAW9D"}
+{"version":3,"file":"layout-panel-util.d.ts","sourceRoot":"","sources":["../../../src/utils/layout-panel-util/layout-panel-util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,aAAa,EAIb,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAI1B;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAa;IAE3D;;;;;;;OAOG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAIpD;;;;;;OAMG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAI9C;;;;;;;OAOG;IACH,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,QAAQ;IAuCnC;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,QAAQ,GAAG,MAAM;IAgBpD;;;;;;OAMG;IACH,SAAS,CAAC,uBAAuB,CAAC,SAAS,EAAE,QAAQ,GAAG,MAAM;IAS9D;;;;;;;;OAQG;IACH,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,aAAa,GAAG,MAAM;IA+BlE;;;;;;OAMG;IACH,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,QAAQ,GAAG,MAAM;IAY7D;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CACrB,KAAK,EAAE,UAAU,EAAE,EACnB,EAAE,EAAE,MAAM,GACT,UAAU,GAAG,SAAS;IAiBzB;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,QAAQ,GAAG,IAAI;CAqBvD"}

package/out/utils/layout-panel-util/layout-panel-util.js

@@ -76,6 +76,9 @@ export class LayoutPanelUtil {
                     layout.controls = viewModel.controls;
                     delete viewModel.controls;
                 }
+                if (['DEMPICKUPVIEW', 'DEMPICKUPVIEW2', 'DEMOBMPICKUPVIEW'].includes(viewModel.viewType)) {
+                    this.replaceSimpleList(viewModel);
+                }
             }
         }
         return viewModel;
@@ -172,4 +175,50 @@ export class LayoutPanelUtil {
         }
         return `${viewType}_${viewStyle}`;
     }
+    /**
+     * @description 递归查找指定标识的面板项
+     * @protected
+     * @param {IPanelItem[]} items
+     * @param {string} id
+     * @returns {*}  {(IPanelItem | undefined)}
+     * @memberof LayoutPanelUtil
+     */
+    findPanelItem(items, id) {
+        for (let i = 0; i < items.length; i++) {
+            const item = items[i];
+            if (item.id === id) {
+                return item;
+            }
+            const children = item.panelItems;
+            if (children === null || children === void 0 ? void 0 : children.length) {
+                const result = this.findPanelItem(children, id);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        return undefined;
+    }
+    /**
+     * @description 替换简单列表部件占位
+     * @protected
+     * @param {IAppView} viewModel
+     * @memberof LayoutPanelUtil
+     */
+    replaceSimpleList(viewModel) {
+        const layout = viewModel.viewLayoutPanel;
+        const { controls = [] } = layout;
+        const simpleListControl = controls.find(control => control.name === 'simplelist');
+        // 当simplelist部件不存在时替换为面板项
+        if (!simpleListControl) {
+            const simpleListItem = this.findPanelItem(layout.rootPanelItems, 'simplelist');
+            if (simpleListItem) {
+                simpleListItem.itemType = 'RAWITEM';
+                simpleListItem.rawItem = {
+                    predefinedType: 'SIMPLELIST',
+                    appId: simpleListItem.appId,
+                };
+            }
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.41-alpha.145",
+  "version": "0.7.41-alpha.146",
   "description": "运行时逻辑库",
   "type": "module",
   "main": "out/index.js",
@@ -70,5 +70,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "767d5e7eac1aedd7a318c25ec1c26bf0c76e9a19"
+  "gitHead": "7cc5be2deacb8a66432f97138b3f47ffd9284f34"
 }

package/src/utils/layout-panel-util/layout-panel-util.ts

@@ -4,6 +4,9 @@ import {
   IAppIndexView,
   IAppDETabExplorerView,
   IDEMultiEditViewPanel,
+  IPanelContainer,
+  IPanelItem,
+  IPanelRawItem,
 } from '@ibiz/model-core';
 import { clone } from 'ramda';
 import { getControl } from '../../model';
@@ -85,6 +88,13 @@ export class LayoutPanelUtil {
           layout.controls = viewModel.controls;
           delete viewModel.controls;
         }
+        if (
+          ['DEMPICKUPVIEW', 'DEMPICKUPVIEW2', 'DEMOBMPICKUPVIEW'].includes(
+            viewModel.viewType!,
+          )
+        ) {
+          this.replaceSimpleList(viewModel);
+        }
       }
     }
     return viewModel;
@@ -189,4 +199,60 @@ export class LayoutPanelUtil {
     }
     return `${viewType}_${viewStyle}`;
   }
+
+  /**
+   * @description 递归查找指定标识的面板项
+   * @protected
+   * @param {IPanelItem[]} items
+   * @param {string} id
+   * @returns {*}  {(IPanelItem | undefined)}
+   * @memberof LayoutPanelUtil
+   */
+  protected findPanelItem(
+    items: IPanelItem[],
+    id: string,
+  ): IPanelItem | undefined {
+    for (let i = 0; i < items.length; i++) {
+      const item = items[i];
+      if (item.id === id) {
+        return item;
+      }
+      const children = (item as IPanelContainer).panelItems;
+      if (children?.length) {
+        const result = this.findPanelItem(children, id);
+        if (result) {
+          return result;
+        }
+      }
+    }
+    return undefined;
+  }
+
+  /**
+   * @description 替换简单列表部件占位
+   * @protected
+   * @param {IAppView} viewModel
+   * @memberof LayoutPanelUtil
+   */
+  protected replaceSimpleList(viewModel: IAppView): void {
+    const layout = viewModel.viewLayoutPanel!;
+    const { controls = [] } = layout;
+    const simpleListControl = controls.find(
+      control => control.name === 'simplelist',
+    );
+    // 当simplelist部件不存在时替换为面板项
+    if (!simpleListControl) {
+      const simpleListItem = this.findPanelItem(
+        layout.rootPanelItems!,
+        'simplelist',
+      );
+      if (simpleListItem) {
+        simpleListItem.itemType = 'RAWITEM';
+        (simpleListItem as IPanelRawItem).rawItem = {
+          predefinedType: 'SIMPLELIST',
+          appId: simpleListItem.appId,
+        };
+      }
+    }
+  }
 }