@ibiz-template/runtime 0.7.25 → 0.7.26-alpha.0

package/out/controller/control/report-panel/generator/user-generator.d.ts

@@ -21,6 +21,6 @@ export declare class UserReportPanelGenerator extends ReportPanelBaseGenerator {
      * @return {*}  {Promise<IData>}
      * @memberof UserReportPanelGenerator
      */
-    load(data: IData): Promise<IData>;
+    load(data?: IData): Promise<IData>;
 }
 //# sourceMappingURL=user-generator.d.ts.map

package/out/controller/control/report-panel/generator/user-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/user-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5D;;;;;;GAMG;AACH,qBAAa,wBAAyB,SAAQ,wBAAwB;IACpE;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IA2C3B;;;;;;OAMG;IACI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAMzC"}
+{"version":3,"file":"user-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/user-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5D;;;;;;GAMG;AACH,qBAAa,wBAAyB,SAAQ,wBAAwB;IACpE;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IA2C3B;;;;;;OAMG;IACI,IAAI,CAAC,IAAI,GAAE,KAAU,GAAG,OAAO,CAAC,KAAK,CAAC;CAM9C"}

package/out/controller/control/report-panel/generator/user-generator.js

@@ -58,7 +58,7 @@ export class UserReportPanelGenerator extends ReportPanelBaseGenerator {
      * @return {*}  {Promise<IData>}
      * @memberof UserReportPanelGenerator
      */
-    load(data) {
+    load(data = {}) {
         if (this.protoRef) {
             this.protoRef.setData(data);
         }

package/out/controller/control/report-panel/report-panel.controller.d.ts

@@ -1,5 +1,5 @@
 import { IDEReportPanel, IAppDataEntity } from '@ibiz/model-core';
-import { MDCtrlLoadParams, IReportPanelController, IReportPanelEvent, IReportPanelState } from '../../../interface';
+import { MDCtrlLoadParams, IReportPanelController, IReportPanelEvent, IReportPanelState, IModalData } from '../../../interface';
 import { ControlController } from '../../common';
 import { ReportPanelService } from './report-panel.service';
 import { ControllerEvent } from '../../utils';
@@ -35,6 +35,14 @@ export declare class ReportPanelController extends ControlController<IDEReportPa
      * @memberof ReportPanelController
      */
     protected get _evt(): ControllerEvent<IReportPanelEvent>;
+    /**
+     * 是否为bi报表
+     *
+     * @author tony001
+     * @date 2024-06-19 18:06:02
+     * @readonly
+     */
+    get isBIReport(): boolean;
     /**
      * 初始化状态
      *
@@ -107,8 +115,8 @@ export declare class ReportPanelController extends ControlController<IDEReportPa
      *
      * @author tony001
      * @date 2024-06-18 16:06:46
-     * @return {*}  {Promise<boolean>}
+     * @return {*}  {Promise<IModalData>}
      */
-    openReportDesignPage(): Promise<boolean>;
+    openReportDesignPage(): Promise<IModalData>;
 }
 //# sourceMappingURL=report-panel.controller.d.ts.map

package/out/controller/control/report-panel/report-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"report-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/report-panel/report-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EAElB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAGtE,qBAAa,qBACX,SAAQ,iBAAiB,CACvB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;OAIG;IACH,SAAS,CAAC,OAAO,EAAG,kBAAkB,CAAC;IAEvC;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;OAMG;IACI,SAAS,EAAG,wBAAwB,CAAC;IAE5C;;;;;;;OAOG;IACH,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,iBAAiB,CAAC,CAEvD;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC;;;;;;;OAOG;IACU,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,CAAC;IAwC9D;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAIpE;;;;OAIG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAkB7D;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B;;;;;;OAMG;IACG,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC;CA+B/C"}
+{"version":3,"file":"report-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/report-panel/report-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EACjB,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAGtE,qBAAa,qBACX,SAAQ,iBAAiB,CACvB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;OAIG;IACH,SAAS,CAAC,OAAO,EAAG,kBAAkB,CAAC;IAEvC;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;OAMG;IACI,SAAS,EAAG,wBAAwB,CAAC;IAE5C;;;;;;;OAOG;IACH,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,iBAAiB,CAAC,CAEvD;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,OAAO,CAaxB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC;;;;;;;OAOG;IACU,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,CAAC;IA+B9D;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAIpE;;;;OAIG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAkB7D;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE;IAOlB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAU9B;;;;;;OAMG;IACG,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC;CAsBlD"}

package/out/controller/control/report-panel/report-panel.controller.js

@@ -13,6 +13,25 @@ export class ReportPanelController extends ControlController {
     get _evt() {
         return this.evt;
     }
+    /**
+     * 是否为bi报表
+     *
+     * @author tony001
+     * @date 2024-06-19 18:06:02
+     * @readonly
+     */
+    get isBIReport() {
+        if (this.state.reportType === 'DESYSBIREPORTS' ||
+            this.state.reportType === 'SYSBICUBE' ||
+            this.state.reportType === 'DESYSBICUBES' ||
+            this.state.reportType === 'ALLSYSBICUBES' ||
+            this.state.reportType === 'SYSBIREPORT' ||
+            this.state.reportType === 'SYSBICUBEREPORTS' ||
+            this.state.reportType === 'ALLSYSBIREPORTS') {
+            return true;
+        }
+        return false;
+    }
     /**
      * 初始化状态
      *
@@ -34,7 +53,7 @@ export class ReportPanelController extends ControlController {
      */
     async onCreated() {
         await super.onCreated();
-        this.generator = ReportPanelGeneratorFactory.getInstance(this.model);
+        this.generator = ReportPanelGeneratorFactory.getInstance(this.model, this);
         this.dataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId, this.model.appId);
         this.service = new ReportPanelService(this.model);
         await this.service.init(this.context);
@@ -72,14 +91,7 @@ export class ReportPanelController extends ControlController {
      * @memberof ReportPanelController
      */
     async load(args = {}) {
-        if (this.state.reportType &&
-            (this.state.reportType === 'DESYSBIREPORTS' ||
-                this.state.reportType === 'SYSBICUBE' ||
-                this.state.reportType === 'DESYSBICUBES' ||
-                this.state.reportType === 'ALLSYSBICUBES' ||
-                this.state.reportType === 'SYSBIREPORT' ||
-                this.state.reportType === 'SYSBICUBEREPORTS' ||
-                this.state.reportType === 'ALLSYSBIREPORTS')) {
+        if (this.state.reportType && this.isBIReport) {
             return {};
         }
         await this.startLoading();
@@ -142,6 +154,10 @@ export class ReportPanelController extends ControlController {
      * @memberof ReportPanelController
      */
     getData() {
+        var _a;
+        if (this.isBIReport) {
+            return ((_a = this.generator.protoRef) === null || _a === void 0 ? void 0 : _a.state.items) || [];
+        }
         return [this.state.data];
     }
     /**
@@ -149,28 +165,26 @@ export class ReportPanelController extends ControlController {
      * @date 2023-05-23 03:42:41
      */
     async refresh() {
-        this.doNextActive(() => this.load({ isInitialLoad: false }), {
-            key: 'refresh',
-        });
+        if (this.isBIReport) {
+            this.generator.load();
+        }
+        else {
+            this.doNextActive(() => this.load({ isInitialLoad: false }), {
+                key: 'refresh',
+            });
+        }
     }
     /**
      * 打开设计界面
      *
      * @author tony001
      * @date 2024-06-18 16:06:46
-     * @return {*}  {Promise<boolean>}
+     * @return {*}  {Promise<IModalData>}
      */
     async openReportDesignPage() {
-        if (this.state.reportType &&
-            (this.state.reportType === 'DESYSBIREPORTS' ||
-                this.state.reportType === 'SYSBICUBE' ||
-                this.state.reportType === 'DESYSBICUBES' ||
-                this.state.reportType === 'ALLSYSBICUBES' ||
-                this.state.reportType === 'SYSBIREPORT' ||
-                this.state.reportType === 'SYSBICUBEREPORTS' ||
-                this.state.reportType === 'ALLSYSBIREPORTS')) {
+        if (this.state.reportType && this.isBIReport) {
             const modal = ibiz.overlay.createModal('iBizBIReportDesign', {
-                dismiss: () => modal.dismiss(),
+                dismiss: (_data) => modal.dismiss(_data),
                 context: this.context,
                 viewParams: this.params,
                 config: this.generator.config,
@@ -181,8 +195,8 @@ export class ReportPanelController extends ControlController {
             });
             modal.present();
             const result = await modal.onWillDismiss();
-            return result.ok || false;
+            return result;
         }
-        return true;
+        return { ok: false, data: [] };
     }
 }

package/out/engine/md-view.engine.d.ts

@@ -1,6 +1,6 @@
 import { IAppDEMultiDataView } from '@ibiz/model-core';
 import { ViewController } from '../controller';
-import { IMDViewEvent, IMDViewState, IMDControlController, ISearchFormController, MDCtrlRemoveParams, ISearchBarController, MDCtrlLoadParams, EventBase, IUIActionResult, IToolbarController } from '../interface';
+import { IMDViewEvent, IMDViewState, IMDControlController, MDCtrlRemoveParams, ISearchBarController, MDCtrlLoadParams, EventBase, IUIActionResult, IToolbarController } from '../interface';
 import { ViewEngineBase } from './view-base.engine';
 /**
  * 多数据视图引擎
@@ -20,20 +20,6 @@ export declare class MDViewEngine extends ViewEngineBase {
      * @type {string}
      */
     get xdataControlName(): string;
-    /**
-     * 搜索表单控制器
-     * @author lxm
-     * @date 2023-05-22 01:56:25
-     * @readonly
-     */
-    protected get searchForm(): ISearchFormController;
-    /**
-     * 搜索栏控制器
-     * @author lxm
-     * @date 2023-05-22 01:56:25
-     * @readonly
-     */
-    protected get searchBar(): ISearchBarController;
     /**
      * 获取分页搜索视图上移的工具栏控制器
      * @author lxm
@@ -43,13 +29,6 @@ export declare class MDViewEngine extends ViewEngineBase {
      * @type {(IToolbarController | undefined)}
      */
     protected get tabToolbar(): IToolbarController | undefined;
-    /**
-     * 获取分页搜索视图上移的搜索表单控制器
-     * @author lxm
-     * @date 2023-05-22 01:56:25
-     * @readonly
-     */
-    protected get tabSearchForm(): ISearchFormController;
     /**
      * 获取分页搜索视图上移的搜索栏控制器
      * @author lxm
@@ -198,13 +177,6 @@ export declare class MDViewEngine extends ViewEngineBase {
      * @memberof MDViewEngine
      */
     protected calcViewSearchBarVisible(): boolean;
-    /**
-     * 切换搜索表单的显示与否
-     * @author lxm
-     * @date 2023-06-06 09:20:35
-     * @protected
-     */
-    protected toggleFilter(): void;
     /**
      * 计算移除的模型名称
      *

package/out/engine/md-view.engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"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"}

package/out/engine/md-view.engine.js

@@ -22,24 +22,6 @@ export class MDViewEngine extends ViewEngineBase {
     get xdataControlName() {
         return this.view.model.xdataControlName;
     }
-    /**
-     * 搜索表单控制器
-     * @author lxm
-     * @date 2023-05-22 01:56:25
-     * @readonly
-     */
-    get searchForm() {
-        return this.view.getController('searchform');
-    }
-    /**
-     * 搜索栏控制器
-     * @author lxm
-     * @date 2023-05-22 01:56:25
-     * @readonly
-     */
-    get searchBar() {
-        return this.view.getController('searchbar');
-    }
     /**
      * 获取分页搜索视图上移的工具栏控制器
      * @author lxm
@@ -51,15 +33,6 @@ export class MDViewEngine extends ViewEngineBase {
     get tabToolbar() {
         return this.view.getController('tabtoolbar');
     }
-    /**
-     * 获取分页搜索视图上移的搜索表单控制器
-     * @author lxm
-     * @date 2023-05-22 01:56:25
-     * @readonly
-     */
-    get tabSearchForm() {
-        return this.view.getController('tabsearchform');
-    }
     /**
      * 获取分页搜索视图上移的搜索栏控制器
      * @author lxm
@@ -193,10 +166,6 @@ export class MDViewEngine extends ViewEngineBase {
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
     async call(key, args) {
-        if (key === SysUIActionTag.TOGGLE_FILTER) {
-            this.toggleFilter();
-            return null;
-        }
         if (key === SysUIActionTag.EDIT || key === SysUIActionTag.VIEW) {
             return this.openData(args);
         }
@@ -219,16 +188,6 @@ export class MDViewEngine extends ViewEngineBase {
             await this.exportData(args);
             return null;
         }
-        if (key === SysUIActionTag.SEARCH) {
-            const searchForm = this.searchForm || this.tabSearchForm;
-            await searchForm.search();
-            return null;
-        }
-        if (key === SysUIActionTag.RESET) {
-            const searchForm = this.searchForm || this.tabSearchForm;
-            await searchForm.reset();
-            return null;
-        }
         if (key === SysUIActionTag.COPY) {
             this.copy(args);
             return null;
@@ -447,20 +406,6 @@ export class MDViewEngine extends ViewEngineBase {
             searchBar.enableFilter === true);
         return visible;
     }
-    /**
-     * 切换搜索表单的显示与否
-     * @author lxm
-     * @date 2023-06-06 09:20:35
-     * @protected
-     */
-    toggleFilter() {
-        if (this.searchForm) {
-            const searchformContainer = this.viewLayoutPanel.panelItems.view_searchform;
-            if (searchformContainer) {
-                searchformContainer.state.visible = !searchformContainer.state.visible;
-            }
-        }
-    }
     /**
      * 计算移除的模型名称
      *

package/out/engine/view-base.engine.d.ts

@@ -1,4 +1,4 @@
-import { IViewController, IToolbarController, IViewLayoutPanelController } from '../interface';
+import { IViewController, IToolbarController, IViewLayoutPanelController, ISearchFormController, ISearchBarController } from '../interface';
 import { IViewEngine } from '../interface/engine';
 /**
  * 视图引擎基类
@@ -45,6 +45,27 @@ export declare class ViewEngineBase implements IViewEngine {
      * @type {(IToolbarController | undefined)}
      */
     protected get footerToolbar(): IToolbarController | undefined;
+    /**
+     * 搜索表单控制器
+     * @author lxm
+     * @date 2023-05-22 01:56:25
+     * @readonly
+     */
+    protected get searchForm(): ISearchFormController;
+    /**
+     * 搜索栏控制器
+     * @author lxm
+     * @date 2023-05-22 01:56:25
+     * @readonly
+     */
+    protected get searchBar(): ISearchBarController;
+    /**
+     * 获取分页搜索视图上移的搜索表单控制器
+     * @author lxm
+     * @date 2023-05-22 01:56:25
+     * @readonly
+     */
+    protected get tabSearchForm(): ISearchFormController;
     /**
      * 获取视图布局面板控制器
      * @author lxm
@@ -179,5 +200,12 @@ export declare class ViewEngineBase implements IViewEngine {
      * @return {*}  {Promise<void>}
      */
     protected handleEntityPrivilege(data: IData, context: IContext): Promise<void>;
+    /**
+     * 切换搜索表单的显示与否
+     * @author lxm
+     * @date 2023-06-06 09:20:35
+     * @protected
+     */
+    protected toggleFilter(): void;
 }
 //# sourceMappingURL=view-base.engine.d.ts.map

package/out/engine/view-base.engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-base.engine.d.ts","sourceRoot":"","sources":["../../src/engine/view-base.engine.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIlD;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,WAAW;IA4EpC,SAAS,CAAC,IAAI,EAAE,eAAe;IA3E3C;;;;;;;OAOG;IACH,SAAS,KAAK,OAAO,IAAI,kBAAkB,GAAG,SAAS,CAEtD;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAE1D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,YAAY,IAAI,kBAAkB,GAAG,SAAS,CAE3D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,aAAa,IAAI,kBAAkB,GAAG,SAAS,CAE5D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,eAAe,IAAI,0BAA0B,GAAG,SAAS,CAEtE;IAED;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,EAAE,OAAO,CAAS;IAEhD;;;;;OAKG;gBACmB,IAAI,EAAE,eAAe;IAK3C;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB;;;;;OAKG;IACH,mBAAmB,IAAI,IAAI;IAUrB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhC;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAWnC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,MAAM,EAAE;IAmC3C;;;;;;;;;OASG;IACH,OAAO,CAAC,iBAAiB;IAqBnB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAUzE;;;;;;OAMG;IAEG,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAmCzC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAsB1C;;;;;;;;OAQG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAmBzC;;;;;;OAMG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAU1C;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAiCrC;;;;;OAKG;cACa,qBAAqB,CACnC,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,IAAI,CAAC;CAYjB"}
+{"version":3,"file":"view-base.engine.d.ts","sourceRoot":"","sources":["../../src/engine/view-base.engine.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC1B,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIlD;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,WAAW;IA0GpC,SAAS,CAAC,IAAI,EAAE,eAAe;IAzG3C;;;;;;;OAOG;IACH,SAAS,KAAK,OAAO,IAAI,kBAAkB,GAAG,SAAS,CAEtD;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAE1D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,YAAY,IAAI,kBAAkB,GAAG,SAAS,CAE3D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,aAAa,IAAI,kBAAkB,GAAG,SAAS,CAE5D;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;OAKG;IACH,SAAS,KAAK,aAAa,IAAI,qBAAqB,CAEnD;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,eAAe,IAAI,0BAA0B,GAAG,SAAS,CAEtE;IAED;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,EAAE,OAAO,CAAS;IAEhD;;;;;OAKG;gBACmB,IAAI,EAAE,eAAe;IAK3C;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB;;;;;OAKG;IACH,mBAAmB,IAAI,IAAI;IAUrB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhC;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAWnC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,MAAM,EAAE;IAmC3C;;;;;;;;;OASG;IACH,OAAO,CAAC,iBAAiB;IAqBnB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAwBzE;;;;;;OAMG;IAEG,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAmCzC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAsB1C;;;;;;;;OAQG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAmBzC;;;;;;OAMG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAU1C;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAiCrC;;;;;OAKG;cACa,qBAAqB,CACnC,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,IAAI,CAAC;IAahB;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}

package/out/engine/view-base.engine.js

@@ -54,6 +54,33 @@ export class ViewEngineBase {
     get footerToolbar() {
         return this.view.getController('footertoolbar');
     }
+    /**
+     * 搜索表单控制器
+     * @author lxm
+     * @date 2023-05-22 01:56:25
+     * @readonly
+     */
+    get searchForm() {
+        return this.view.getController('searchform');
+    }
+    /**
+     * 搜索栏控制器
+     * @author lxm
+     * @date 2023-05-22 01:56:25
+     * @readonly
+     */
+    get searchBar() {
+        return this.view.getController('searchbar');
+    }
+    /**
+     * 获取分页搜索视图上移的搜索表单控制器
+     * @author lxm
+     * @date 2023-05-22 01:56:25
+     * @readonly
+     */
+    get tabSearchForm() {
+        return this.view.getController('tabsearchform');
+    }
     /**
      * 获取视图布局面板控制器
      * @author lxm
@@ -214,6 +241,20 @@ export class ViewEngineBase {
         if (key === SysUIActionTag.SHOTR_CUT) {
             return this.onShortCut(_args);
         }
+        if (key === SysUIActionTag.TOGGLE_FILTER) {
+            this.toggleFilter();
+            return null;
+        }
+        if (key === SysUIActionTag.SEARCH) {
+            const searchForm = this.searchForm || this.tabSearchForm;
+            await searchForm.search();
+            return null;
+        }
+        if (key === SysUIActionTag.RESET) {
+            const searchForm = this.searchForm || this.tabSearchForm;
+            await searchForm.reset();
+            return null;
+        }
         return undefined;
     }
     /**
@@ -388,4 +429,18 @@ export class ViewEngineBase {
         const deAuthority = await app.authority.getService(appDataEntityId);
         deAuthority.setDataAccAction({ srfkey: data.srfkey, srfsessionid: context.srfsessionid }, data.srfdataaccaction);
     }
+    /**
+     * 切换搜索表单的显示与否
+     * @author lxm
+     * @date 2023-06-06 09:20:35
+     * @protected
+     */
+    toggleFilter() {
+        if (this.searchForm) {
+            const searchformContainer = this.viewLayoutPanel.panelItems.view_searchform;
+            if (searchformContainer) {
+                searchformContainer.state.visible = !searchformContainer.state.visible;
+            }
+        }
+    }
 }

package/out/interface/controller/controller/control/i-report-panel.controller.d.ts

@@ -3,6 +3,7 @@ import { IReportPanelEvent } from '../../event';
 import { IReportPanelState } from '../../state';
 import { IControlController } from './i-control.controller';
 import { MDCtrlLoadParams } from './i-md-control.controller';
+import { IModalData } from '../../../common';
 /**
  * 报表部件控制器
  * @author lxm
@@ -27,8 +28,16 @@ export interface IReportPanelController extends IControlController<IDEReportPane
      *
      * @author tony001
      * @date 2024-06-18 16:06:59
-     * @return {*}  {Promise<boolean>}
+     * @return {*}  {Promise<IModalData>}
      */
-    openReportDesignPage(): Promise<boolean>;
+    openReportDesignPage(): Promise<IModalData>;
+    /**
+     * 刷新
+     *
+     * @author tony001
+     * @date 2024-06-19 18:06:51
+     * @return {*}  {Promise<void>}
+     */
+    refresh(): Promise<void>;
 }
 //# sourceMappingURL=i-report-panel.controller.d.ts.map

package/out/interface/controller/controller/control/i-report-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-report-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-report-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D;;;;;;;GAOG;AACH,MAAM,WAAW,sBACf,SAAQ,kBAAkB,CACxB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAClB;IACD;;;OAGG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAE9C;;;OAGG;IACH,OAAO,IAAI,KAAK,EAAE,CAAC;IAEnB;;;;;;OAMG;IACH,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1C"}
+{"version":3,"file":"i-report-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-report-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C;;;;;;;GAOG;AACH,MAAM,WAAW,sBACf,SAAQ,kBAAkB,CACxB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAClB;IACD;;;OAGG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAE9C;;;OAGG;IACH,OAAO,IAAI,KAAK,EAAE,CAAC;IAEnB;;;;;;OAMG;IACH,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B"}

package/out/interface/controller/state/control/i-report-panel.state.d.ts

@@ -16,7 +16,7 @@ export interface IReportPanelState extends IControlState {
      *
      * @type {IData}
      */
-    data: IData;
+    data: IData | IData[];
     /**
      * 是否正在处理中
      * @type {boolean}

package/out/interface/controller/state/control/i-report-panel.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-report-panel.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-report-panel.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,WAAW,iBAAkB,SAAQ,aAAa;IACtD;;;;OAIG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;OAGG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;;OAIG;IACH,IAAI,EAAE,KAAK,CAAC;IAEZ;;;OAGG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;CACpB"}
+{"version":3,"file":"i-report-panel.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-report-panel.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,WAAW,iBAAkB,SAAQ,aAAa;IACtD;;;;OAIG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;OAGG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;;OAIG;IACH,IAAI,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;IAEtB;;;OAGG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;CACpB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.25",
+  "version": "0.7.26-alpha.0",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -66,5 +66,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "09275dd3e623d439ea73c7b6d8769e175f26388c"
+  "gitHead": "1ca87b0da3c01b72e5afaf88cb841c432f955240"
 }