@ibiz-template/runtime 0.7.41-alpha.5 → 0.7.41-alpha.52

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

@@ -0,0 +1,67 @@
+import { IAppViewEngine } from '@ibiz/model-core';
+import { IController, ICtrlEngine, IMDControlController } from '../../interface';
+import { ViewController } from '../../controller';
+/**
+ * @description 挂载界面引擎基类
+ * @export
+ * @class CtrlEngineBase
+ * @implements {ICtrlEngine}
+ */
+export declare class CtrlEngineBase implements ICtrlEngine {
+    protected engine: IAppViewEngine;
+    protected view: ViewController;
+    /**
+     * @description 触发源部件名称
+     * @protected
+     * @type {(string | undefined)}
+     * @memberof CtrlEngineBase
+     */
+    protected sourceCtrlName: string | undefined;
+    /**
+     * @description 目标源部件名称
+     * @protected
+     * @type {(string | undefined)}
+     * @memberof CtrlEngineBase
+     */
+    protected targetCtrlName: string | undefined;
+    /**
+     * @description 源部件
+     * @readonly
+     * @type {(IController | undefined)}
+     * @memberof CtrlEngineBase
+     */
+    get resourceCtrl(): IController | undefined;
+    /**
+     * @description 目标源部件
+     * @readonly
+     * @type {(IMDControlController | undefined)}
+     * @memberof CtrlEngineBase
+     */
+    get targetCtrl(): IMDControlController | undefined;
+    /**
+     * Creates an instance of CtrlEngineBase.
+     * @param {IAppViewEngine} engine
+     * @param {ViewController} view
+     * @memberof CtrlEngineBase
+     */
+    constructor(engine: IAppViewEngine, view: ViewController);
+    /**
+     * @description 视图created生命周期执行逻辑
+     * @returns {*}  {Promise<void>}
+     * @memberof CtrlEngineBase
+     */
+    onCreated(): Promise<void>;
+    /**
+     * @description 视图mounted生命周期执行逻辑
+     * @returns {*}  {Promise<void>}
+     * @memberof CtrlEngineBase
+     */
+    onMounted(): Promise<void>;
+    /**
+     * @description 视图destroyed生命周期执行逻辑
+     * @returns {*}  {Promise<void>}
+     * @memberof CtrlEngineBase
+     */
+    onDestroyed(): Promise<void>;
+}
+//# sourceMappingURL=ctrl-base.engine.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ctrl-base.engine.d.ts","sourceRoot":"","sources":["../../../src/engine/ctrl-engine/ctrl-base.engine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EACL,WAAW,EACX,WAAW,EACX,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD;;;;;GAKG;AACH,qBAAa,cAAe,YAAW,WAAW;IAkD9C,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,IAAI,EAAE,cAAc;IAlDhC;;;;;OAKG;IACH,SAAS,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7C;;;;;OAKG;IACH,SAAS,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7C;;;;;OAKG;IACH,IAAI,YAAY,IAAI,WAAW,GAAG,SAAS,CAI1C;IAED;;;;;OAKG;IACH,IAAI,UAAU,IAAI,oBAAoB,GAAG,SAAS,CAMjD;IAED;;;;;OAKG;gBAES,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc;IAShC;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAEhC;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuChC;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CACnC"}

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

@@ -0,0 +1,95 @@
+/**
+ * @description 挂载界面引擎基类
+ * @export
+ * @class CtrlEngineBase
+ * @implements {ICtrlEngine}
+ */
+export class CtrlEngineBase {
+    /**
+     * @description 源部件
+     * @readonly
+     * @type {(IController | undefined)}
+     * @memberof CtrlEngineBase
+     */
+    get resourceCtrl() {
+        if (this.sourceCtrlName) {
+            return this.view.getController(this.sourceCtrlName);
+        }
+    }
+    /**
+     * @description 目标源部件
+     * @readonly
+     * @type {(IMDControlController | undefined)}
+     * @memberof CtrlEngineBase
+     */
+    get targetCtrl() {
+        if (this.targetCtrlName) {
+            return this.view.getController(this.targetCtrlName);
+        }
+    }
+    /**
+     * Creates an instance of CtrlEngineBase.
+     * @param {IAppViewEngine} engine
+     * @param {ViewController} view
+     * @memberof CtrlEngineBase
+     */
+    constructor(engine, view) {
+        this.engine = engine;
+        this.view = view;
+        const { params = [] } = this.engine;
+        const resourceCtrl = params.find(x => x.name === 'CTRL') || {};
+        this.sourceCtrlName = resourceCtrl.ctrlName;
+        const targetCtrl = params.find(x => x.name === 'TRIGGER') || {};
+        this.targetCtrlName = targetCtrl.ctrlName;
+    }
+    /**
+     * @description 视图created生命周期执行逻辑
+     * @returns {*}  {Promise<void>}
+     * @memberof CtrlEngineBase
+     */
+    async onCreated() { }
+    /**
+     * @description 视图mounted生命周期执行逻辑
+     * @returns {*}  {Promise<void>}
+     * @memberof CtrlEngineBase
+     */
+    async onMounted() {
+        if (this.resourceCtrl) {
+            // 搜索部件搜索、数据选中、数据加载都触发目标部件源加载
+            this.resourceCtrl.evt.onAll((eventName) => {
+                if ([
+                    'onSearch',
+                    'onLoadSuccess',
+                    'onLoadDraftSuccess',
+                    'onSelectionChange',
+                ].includes(eventName)) {
+                    if (this.targetCtrl && this.targetCtrl.load) {
+                        this.targetCtrl.load({ isInitialLoad: true });
+                    }
+                }
+            });
+        }
+        if (this.targetCtrl) {
+            this.targetCtrl.evt.on('onBeforeLoad', (args) => {
+                const { params } = args;
+                const filterParams = {};
+                // 触发源是搜索类部件是添加搜索参数
+                if (this.resourceCtrl && this.resourceCtrl.getFilterParams) {
+                    Object.assign(filterParams, this.resourceCtrl.getFilterParams());
+                }
+                // searchconds参数特殊合并
+                if (filterParams.searchconds) {
+                    params.srfsearchconds = filterParams.searchconds;
+                    delete filterParams.searchconds;
+                }
+                Object.assign(params, filterParams);
+            });
+        }
+    }
+    /**
+     * @description 视图destroyed生命周期执行逻辑
+     * @returns {*}  {Promise<void>}
+     * @memberof CtrlEngineBase
+     */
+    async onDestroyed() { }
+}

package/out/engine/ctrl-engine/ctrl-load-and-search.engine.d.ts

@@ -0,0 +1,16 @@
+import { CtrlEngineBase } from './ctrl-base.engine';
+/**
+ * @description 搜索部件加载并搜索（参数可指定触发部件）
+ * @export
+ * @class CtrlLoadAndSearchEngine
+ * @extends {CtrlEngineBase}
+ */
+export declare class CtrlLoadAndSearchEngine extends CtrlEngineBase {
+    /**
+     * @description 视图mounted生命周期执行逻辑
+     * @returns {*}  {Promise<void>}
+     * @memberof CtrlLoadAndSearchEngine
+     */
+    onMounted(): Promise<void>;
+}
+//# sourceMappingURL=ctrl-load-and-search.engine.d.ts.map

package/out/engine/ctrl-engine/ctrl-load-and-search.engine.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ctrl-load-and-search.engine.d.ts","sourceRoot":"","sources":["../../../src/engine/ctrl-engine/ctrl-load-and-search.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;GAKG;AACH,qBAAa,uBAAwB,SAAQ,cAAc;IACzD;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAYjC"}

package/out/engine/ctrl-engine/ctrl-load-and-search.engine.js

@@ -0,0 +1,24 @@
+import { CtrlEngineBase } from './ctrl-base.engine';
+/**
+ * @description 搜索部件加载并搜索（参数可指定触发部件）
+ * @export
+ * @class CtrlLoadAndSearchEngine
+ * @extends {CtrlEngineBase}
+ */
+export class CtrlLoadAndSearchEngine extends CtrlEngineBase {
+    /**
+     * @description 视图mounted生命周期执行逻辑
+     * @returns {*}  {Promise<void>}
+     * @memberof CtrlLoadAndSearchEngine
+     */
+    async onMounted() {
+        super.onMounted();
+        if (this.resourceCtrl &&
+            this.resourceCtrl.load &&
+            this.resourceCtrl.load instanceof Function) {
+            this.resourceCtrl.evt.on('onMounted', () => {
+                this.resourceCtrl.load();
+            });
+        }
+    }
+}

package/out/engine/ctrl-engine/ctrl-load-trigger.engine.d.ts

@@ -0,0 +1,10 @@
+import { CtrlEngineBase } from './ctrl-base.engine';
+/**
+ * @description 部件加载（参数可指定触发部件）
+ * @export
+ * @class CtrlLoadTriggerEngine
+ * @extends {CtrlEngineBase}
+ */
+export declare class CtrlLoadTriggerEngine extends CtrlEngineBase {
+}
+//# sourceMappingURL=ctrl-load-trigger.engine.d.ts.map

package/out/engine/ctrl-engine/ctrl-load-trigger.engine.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ctrl-load-trigger.engine.d.ts","sourceRoot":"","sources":["../../../src/engine/ctrl-engine/ctrl-load-trigger.engine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;GAKG;AACH,qBAAa,qBAAsB,SAAQ,cAAc;CAAG"}

package/out/engine/ctrl-engine/ctrl-load-trigger.engine.js

@@ -0,0 +1,9 @@
+import { CtrlEngineBase } from './ctrl-base.engine';
+/**
+ * @description 部件加载（参数可指定触发部件）
+ * @export
+ * @class CtrlLoadTriggerEngine
+ * @extends {CtrlEngineBase}
+ */
+export class CtrlLoadTriggerEngine extends CtrlEngineBase {
+}

package/out/engine/ctrl-engine/index.d.ts

@@ -0,0 +1,2 @@
+export declare const installCtrlEngine: () => void;
+//# sourceMappingURL=index.d.ts.map

package/out/engine/ctrl-engine/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/engine/ctrl-engine/index.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,iBAAiB,QAAO,IAWpC,CAAC"}

package/out/engine/ctrl-engine/index.js

@@ -0,0 +1,7 @@
+import { CtrlLoadAndSearchEngine } from './ctrl-load-and-search.engine';
+import { CtrlLoadTriggerEngine } from './ctrl-load-trigger.engine';
+// 安装部件引擎
+export const installCtrlEngine = () => {
+    ibiz.engine.registerCtrl('CTRL_CtrlLoadAndSearch', (model, c) => new CtrlLoadAndSearchEngine(model, c));
+    ibiz.engine.registerCtrl('CTRL_CtrlLoadTrigger', (model, c) => new CtrlLoadTriggerEngine(model, c));
+};

package/out/engine/engine-factory.d.ts

@@ -1,6 +1,7 @@
 import { IAppViewEngine } from '@ibiz/model-core';
-import { IViewEngine } from '../interface/engine';
+import { ICtrlEngine, IViewEngine } from '../interface/engine';
 type NewEngine = (...args: any[]) => IViewEngine;
+type NEWCtrlEngine = (...args: any[]) => ICtrlEngine;
 /**
  * 引擎工厂
  * @author lxm
@@ -16,6 +17,12 @@ export declare class EngineFactory {
      * @protected
      */
     protected viewEngines: Map<string, NewEngine>;
+    /**
+     * @description 部件引擎classMap
+     * @protected
+     * @memberof EngineFactory
+     */
+    protected ctrlEngines: Map<string, NEWCtrlEngine>;
     /**
      * 注册视图引擎
      * @author lxm
@@ -24,6 +31,13 @@ export declare class EngineFactory {
      * @param {IViewEngine} engine
      */
     register(key: string, engine: NewEngine): void;
+    /**
+     * @description 注册部件引擎
+     * @param {string} key
+     * @param {NEWCtrlEngine} engine
+     * @memberof EngineFactory
+     */
+    registerCtrl(key: string, engine: NEWCtrlEngine): void;
     /**
      * 注销视图引擎
      * @author lxm
@@ -31,6 +45,12 @@ export declare class EngineFactory {
      * @param {string} key
      */
     unRegister(key: string): void;
+    /**
+     * @description 注销部件引擎
+     * @param {string} key
+     * @memberof EngineFactory
+     */
+    unRegisterCtrl(key: string): void;
     /**
      * 获取视图引擎
      * @author lxm
@@ -40,6 +60,14 @@ export declare class EngineFactory {
      * @return {*}  {(ViewEngine | undefined)}
      */
     getEngine(model: IAppViewEngine, ...args: Parameters<NewEngine>): IViewEngine | undefined;
+    /**
+     * @description 获取部件引擎
+     * @param {IAppViewEngine} model
+     * @param {...Parameters<NEWCtrlEngine>} args
+     * @returns {*}  {(ICtrlEngine | undefined)}
+     * @memberof EngineFactory
+     */
+    getCtrlEngine(model: IAppViewEngine, ...args: Parameters<NEWCtrlEngine>): ICtrlEngine | undefined;
 }
 export {};
 //# sourceMappingURL=engine-factory.d.ts.map

package/out/engine/engine-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine-factory.d.ts","sourceRoot":"","sources":["../../src/engine/engine-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGlD,KAAK,SAAS,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,WAAW,CAAC;AAEjD;;;;;;GAMG;AACH,qBAAa,aAAa;IACxB;;;;;OAKG;IACH,SAAS,CAAC,WAAW,yBAAgC;IAErD;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI;IAI9C;;;;;OAKG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI7B;;;;;;;OAOG;IACH,SAAS,CACP,KAAK,EAAE,cAAc,EACrB,GAAG,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,GAC7B,WAAW,GAAG,SAAS;CAe3B"}
+{"version":3,"file":"engine-factory.d.ts","sourceRoot":"","sources":["../../src/engine/engine-factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE/D,KAAK,SAAS,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,WAAW,CAAC;AAEjD,KAAK,aAAa,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,WAAW,CAAC;AAErD;;;;;;GAMG;AACH,qBAAa,aAAa;IACxB;;;;;OAKG;IACH,SAAS,CAAC,WAAW,yBAAgC;IAErD;;;;OAIG;IACH,SAAS,CAAC,WAAW,6BAAoC;IAEzD;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI;IAI9C;;;;;OAKG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI;IAItD;;;;;OAKG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI7B;;;;OAIG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIjC;;;;;;;OAOG;IACH,SAAS,CACP,KAAK,EAAE,cAAc,EACrB,GAAG,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,GAC7B,WAAW,GAAG,SAAS;IAgB1B;;;;;;OAMG;IACH,aAAa,CACX,KAAK,EAAE,cAAc,EACrB,GAAG,IAAI,EAAE,UAAU,CAAC,aAAa,CAAC,GACjC,WAAW,GAAG,SAAS;CAe3B"}

package/out/engine/engine-factory.js

@@ -14,6 +14,12 @@ export class EngineFactory {
          * @protected
          */
         this.viewEngines = new Map();
+        /**
+         * @description 部件引擎classMap
+         * @protected
+         * @memberof EngineFactory
+         */
+        this.ctrlEngines = new Map();
     }
     /**
      * 注册视图引擎
@@ -25,6 +31,15 @@ export class EngineFactory {
     register(key, engine) {
         this.viewEngines.set(key, engine);
     }
+    /**
+     * @description 注册部件引擎
+     * @param {string} key
+     * @param {NEWCtrlEngine} engine
+     * @memberof EngineFactory
+     */
+    registerCtrl(key, engine) {
+        this.ctrlEngines.set(key, engine);
+    }
     /**
      * 注销视图引擎
      * @author lxm
@@ -34,6 +49,14 @@ export class EngineFactory {
     unRegister(key) {
         this.viewEngines.delete(key);
     }
+    /**
+     * @description 注销部件引擎
+     * @param {string} key
+     * @memberof EngineFactory
+     */
+    unRegisterCtrl(key) {
+        this.ctrlEngines.delete(key);
+    }
     /**
      * 获取视图引擎
      * @author lxm
@@ -52,4 +75,21 @@ export class EngineFactory {
         }
         ibiz.log.error(ibiz.i18n.t('runtime.engine.correspondingEngine', { key }), model);
     }
+    /**
+     * @description 获取部件引擎
+     * @param {IAppViewEngine} model
+     * @param {...Parameters<NEWCtrlEngine>} args
+     * @returns {*}  {(ICtrlEngine | undefined)}
+     * @memberof EngineFactory
+     */
+    getCtrlEngine(model, ...args) {
+        const { engineType, engineCat } = model;
+        const key = `${engineCat}_${engineType}`;
+        const func = this.ctrlEngines.get(key);
+        // 存在则执行，生成对象
+        if (func) {
+            return func(model, ...args);
+        }
+        ibiz.log.error(ibiz.i18n.t('runtime.engine.correspondingEngine', { key }), model);
+    }
 }

package/out/engine/index.d.ts

@@ -2,4 +2,5 @@ export * from './engine-factory';
 export * from './view-base.engine';
 export * from './md-view.engine';
 export * from './de-main-view.engine';
+export { installCtrlEngine } from './ctrl-engine';
 //# sourceMappingURL=index.d.ts.map

package/out/engine/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/engine/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/engine/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC"}

package/out/engine/index.js

@@ -2,3 +2,4 @@ export * from './engine-factory';
 export * from './view-base.engine';
 export * from './md-view.engine';
 export * from './de-main-view.engine';
+export { installCtrlEngine } from './ctrl-engine';

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, MDCtrlRemoveParams, ISearchBarController, MDCtrlLoadParams, EventBase, IUIActionResult, IToolbarController } from '../interface';
+import { IMDViewEvent, IMDViewState, IMDControlController, MDCtrlRemoveParams, ISearchBarController, MDCtrlLoadParams, EventBase, IUIActionResult, IToolbarController, IApiMDViewCall } from '../interface';
 import { ViewEngineBase } from './view-base.engine';
 /**
  * 多数据视图引擎
@@ -62,7 +62,7 @@ export declare class MDViewEngine extends ViewEngineBase {
      * @return {*}  {Promise<void>}
      */
     protected onXDataActive(event: EventBase): Promise<void>;
-    call(key: string, args: any): Promise<IData | null | undefined>;
+    call(key: keyof IApiMDViewCall, args: any): Promise<IData | null | undefined>;
     protected getData(): IData[];
     /**
      * 打开编辑数据视图
@@ -80,7 +80,7 @@ export declare class MDViewEngine extends ViewEngineBase {
         params?: IParams;
     }): Promise<IUIActionResult>;
     /**
-     * 打开编辑数据视图
+     * 打开新建数据视图
      *
      * @author lxm
      * @date 2022-09-01 18:09:19
@@ -92,6 +92,7 @@ export declare class MDViewEngine extends ViewEngineBase {
         data: IData[];
         event?: MouseEvent;
         copyMode?: boolean;
+        params?: IParams;
     }): Promise<IUIActionResult>;
     /**
      * 视图删除
@@ -122,6 +123,13 @@ export declare class MDViewEngine extends ViewEngineBase {
      * @return {*}  {Promise<void>}
      */
     protected reLoad(): Promise<void>;
+    /**
+     * @description 设置选中数据
+     * @protected
+     * @param {IData[]} items
+     * @memberof MDViewEngine
+     */
+    protected setSelectedData(items: IData[]): void;
     /**
      * 获取搜索相关的查询参数
      * @author lxm
@@ -129,6 +137,15 @@ export declare class MDViewEngine extends ViewEngineBase {
      * @return {*}  {IParams}
      */
     protected getSearchParams(): IParams;
+    /**
+     * @description 处理搜索参数
+     * @protected
+     * @param {IParams} params
+     * @param {IParams} newParams
+     * @returns {*}  {IParams}
+     * @memberof MDViewEngine
+     */
+    protected handleSearchParams(params: IParams, newParams: IParams): IParams;
     /**
      * 导入数据
      * @author lxm

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

@@ -83,8 +83,8 @@ export class MDViewEngine extends ViewEngineBase {
         this.xdataControl.evt.on('onSelectionChange', async (event) => {
             var _a, _b;
             // 更新工具栏状态
-            (_a = this.toolbar) === null || _a === void 0 ? void 0 : _a.calcButtonState(event.data[0], this.xdataControl.model.appDataEntityId);
-            (_b = this.tabToolbar) === null || _b === void 0 ? void 0 : _b.calcButtonState(event.data[0], this.xdataControl.model.appDataEntityId);
+            (_a = this.toolbar) === null || _a === void 0 ? void 0 : _a.calcButtonState(event.data[0], this.xdataControl.model.appDataEntityId, event);
+            (_b = this.tabToolbar) === null || _b === void 0 ? void 0 : _b.calcButtonState(event.data[0], this.xdataControl.model.appDataEntityId, event);
         });
         this.xdataControl.evt.on('onBeforeLoad', () => {
             this.xdataControl.state.searchParams = this.getSearchParams();
@@ -93,8 +93,8 @@ export class MDViewEngine extends ViewEngineBase {
         this.xdataControl.evt.on('onLoadSuccess', event => {
             var _a, _b;
             // 更新工具栏状态
-            (_a = this.toolbar) === null || _a === void 0 ? void 0 : _a.calcButtonState(undefined, this.xdataControl.model.appDataEntityId);
-            (_b = this.tabToolbar) === null || _b === void 0 ? void 0 : _b.calcButtonState(undefined, this.xdataControl.model.appDataEntityId);
+            (_a = this.toolbar) === null || _a === void 0 ? void 0 : _a.calcButtonState(undefined, this.xdataControl.model.appDataEntityId, event);
+            (_b = this.tabToolbar) === null || _b === void 0 ? void 0 : _b.calcButtonState(undefined, this.xdataControl.model.appDataEntityId, event);
             this.view.evt.emit('onDataChange', Object.assign(Object.assign({}, event), { actionType: 'LOAD' }));
         });
         this.xdataControl.evt.on('onRemoveSuccess', event => {
@@ -107,8 +107,8 @@ export class MDViewEngine extends ViewEngineBase {
         this.xdataControl.evt.on('onRefreshSuccess', async (event) => {
             var _a, _b, _c;
             if (((_a = event.data) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-                (_b = this.toolbar) === null || _b === void 0 ? void 0 : _b.calcButtonState(event.data[0], this.xdataControl.model.appDataEntityId);
-                (_c = this.tabToolbar) === null || _c === void 0 ? void 0 : _c.calcButtonState(event.data[0], this.xdataControl.model.appDataEntityId);
+                (_b = this.toolbar) === null || _b === void 0 ? void 0 : _b.calcButtonState(event.data[0], this.xdataControl.model.appDataEntityId, event);
+                (_c = this.tabToolbar) === null || _c === void 0 ? void 0 : _c.calcButtonState(event.data[0], this.xdataControl.model.appDataEntityId, event);
             }
         });
         // 搜索表单搜索触发加载
@@ -177,8 +177,9 @@ export class MDViewEngine extends ViewEngineBase {
             this.refresh();
         }
     }
+    async call(key, 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
-    async call(key, args) {
+    args) {
         if (key === SysUIActionTag.EDIT || key === SysUIActionTag.VIEW) {
             return this.openData(args);
         }
@@ -213,6 +214,10 @@ export class MDViewEngine extends ViewEngineBase {
         if (key === ViewCallTag.GET_ALL_DATA) {
             return this.xdataControl.state.items;
         }
+        if (key === ViewCallTag.SET_SELECTED_DATA) {
+            this.setSelectedData(args.data);
+            return null;
+        }
         return super.call(key, args);
     }
     getData() {
@@ -249,13 +254,19 @@ export class MDViewEngine extends ViewEngineBase {
             throw new RuntimeModelError(this.view.model, ibiz.i18n.t('runtime.engine.logicOpendata'));
         }
         else {
+            if (result && result.ok && result.data && result.data.length > 0) {
+                this.view.evt.emit('onDataChange', {
+                    data: result.data,
+                    actionType: 'EDIT',
+                });
+            }
             return {
                 cancel: result ? !result.ok : true,
             };
         }
     }
     /**
-     * 打开编辑数据视图
+     * 打开新建数据视图
      *
      * @author lxm
      * @date 2022-09-01 18:09:19
@@ -274,6 +285,9 @@ export class MDViewEngine extends ViewEngineBase {
         if (copyMode) {
             params.srfcopymode = copyMode;
         }
+        if (args.params) {
+            Object.assign(params, Object.assign({}, args.params));
+        }
         const result = await ((_c = this.view.scheduler) === null || _c === void 0 ? void 0 : _c.triggerCustom('newdata', {
             context: this.view.context,
             params,
@@ -285,6 +299,12 @@ export class MDViewEngine extends ViewEngineBase {
             throw new RuntimeModelError(this.view.model, ibiz.i18n.t('runtime.engine.logicNewdata'));
         }
         else {
+            if (result.ok && result.data && result.data.length > 0) {
+                this.view.evt.emit('onDataChange', {
+                    data: result.data,
+                    actionType: 'NEW',
+                });
+            }
             return {
                 cancel: result ? !result.ok : true,
             };
@@ -327,6 +347,15 @@ export class MDViewEngine extends ViewEngineBase {
     async reLoad() {
         await this.xdataControl.load({ isInitialLoad: true });
     }
+    /**
+     * @description 设置选中数据
+     * @protected
+     * @param {IData[]} items
+     * @memberof MDViewEngine
+     */
+    setSelectedData(items) {
+        this.xdataControl.setSelectedData(items);
+    }
     /**
      * 获取搜索相关的查询参数
      * @author lxm
@@ -335,24 +364,49 @@ export class MDViewEngine extends ViewEngineBase {
      */
     getSearchParams() {
         const params = {};
-        // 有搜索表单的整合相关参数
-        if (this.searchForm) {
-            Object.assign(params, this.searchForm.getFilterParams());
-        }
         // 有搜索栏的整合相关参数
         if (this.searchBar) {
             Object.assign(params, this.searchBar.getFilterParams());
         }
         // 有搜索表单的整合相关参数
-        if (this.tabSearchForm) {
-            Object.assign(params, this.tabSearchForm.getFilterParams());
+        if (this.searchForm) {
+            const resultParams = this.searchForm.getFilterParams();
+            Object.assign(params, this.handleSearchParams(params, resultParams));
         }
         // 有搜索栏的整合相关参数
         if (this.tabSearchBar) {
             Object.assign(params, this.tabSearchBar.getFilterParams());
         }
+        // 有搜索表单的整合相关参数
+        if (this.tabSearchForm) {
+            const resultParams = this.tabSearchForm.getFilterParams();
+            Object.assign(params, this.handleSearchParams(params, resultParams));
+        }
         return params;
     }
+    /**
+     * @description 处理搜索参数
+     * @protected
+     * @param {IParams} params
+     * @param {IParams} newParams
+     * @returns {*}  {IParams}
+     * @memberof MDViewEngine
+     */
+    handleSearchParams(params, newParams) {
+        const _params = Object.assign({}, newParams);
+        if (params.searchconds && newParams.searchconds) {
+            Object.assign(_params, {
+                searchconds: [
+                    {
+                        condop: 'AND',
+                        condtype: 'GROUP',
+                        searchconds: [...params.searchconds, ...newParams.searchconds],
+                    },
+                ],
+            });
+        }
+        return _params;
+    }
     /**
      * 导入数据
      * @author lxm