@ibiz-template/runtime 0.0.4-beta.3 → 0.0.4-beta.5

package/out/utils/modal/modal.d.ts

@@ -0,0 +1,33 @@
+import { ViewMode } from '../../constant';
+import { IModal, IModalData } from '../../interface';
+type ConstructorOpts = {
+    mode?: ViewMode;
+    routeDepth?: number;
+    viewUsage?: number;
+    /**
+     * 注入的模态等组件实际的关闭操作，
+     * @author lxm
+     * @date 2023-05-12 07:04:21
+     */
+    dismiss?: (data: IModalData) => void;
+};
+type ModalHooks = {
+    beforeDismiss: Array<() => Promise<boolean> | boolean>;
+};
+export declare class Modal implements IModal {
+    mode: ViewMode;
+    routeDepth?: number;
+    viewUsage: number;
+    /**
+     * 外部注入的模态等组件实际的关闭操作
+     * @author lxm
+     * @date 2023-05-12 07:06:56
+     */
+    _dismiss?: (data: IModalData) => void;
+    hooks: ModalHooks;
+    constructor(opts: ConstructorOpts);
+    dismiss(data?: IModalData): Promise<void>;
+    addBeforeDismiss(callback: () => Promise<boolean> | boolean): void;
+}
+export {};
+//# sourceMappingURL=modal.d.ts.map

package/out/utils/modal/modal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modal.d.ts","sourceRoot":"","sources":["../../../src/utils/modal/modal.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAErD,KAAK,eAAe,GAAG;IACrB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;CACtC,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,aAAa,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC;CACxD,CAAC;AAEF,qBAAa,KAAM,YAAW,MAAM;IAClC,IAAI,EAAE,QAAQ,CAAkB;IAEhC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,SAAS,EAAE,MAAM,CAAK;IAEtB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;IAEtC,KAAK,EAAE,UAAU,CAAyB;gBAE9B,IAAI,EAAE,eAAe;IAa3B,OAAO,CAAC,IAAI,GAAE,UAAmC;IAevD,gBAAgB,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO;CAK5D"}

package/out/utils/modal/modal.js

@@ -0,0 +1,37 @@
+/* eslint-disable no-await-in-loop */
+import { ViewMode } from '../../constant';
+export class Modal {
+    constructor(opts) {
+        this.mode = ViewMode.EMBED;
+        this.viewUsage = 1;
+        this.hooks = { beforeDismiss: [] };
+        if (opts.mode) {
+            this.mode = opts.mode;
+        }
+        if (opts.routeDepth) {
+            this.routeDepth = opts.routeDepth;
+        }
+        if (opts.viewUsage) {
+            this.viewUsage = opts.viewUsage;
+        }
+        this._dismiss = opts.dismiss;
+    }
+    async dismiss(data = { ok: true, data: [] }) {
+        let ifDismiss = true;
+        for (const callback of this.hooks.beforeDismiss) {
+            ifDismiss = await callback();
+            if (!ifDismiss) {
+                ibiz.log.debug('beforeDismiss结果为false,关闭中断。', callback);
+                break;
+            }
+        }
+        if (ifDismiss && this._dismiss) {
+            this._dismiss(data);
+        }
+    }
+    addBeforeDismiss(callback) {
+        if (!this.hooks.beforeDismiss.includes(callback)) {
+            this.hooks.beforeDismiss.push(callback);
+        }
+    }
+}

package/out/utils/uiaction-util/index.d.ts

@@ -0,0 +1,3 @@
+export * from './provider';
+export * from './uiaction-util';
+//# sourceMappingURL=index.d.ts.map

package/out/utils/uiaction-util/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/uiaction-util/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC"}

package/out/utils/uiaction-util/index.js

@@ -0,0 +1,2 @@
+export * from './provider';
+export * from './uiaction-util';

package/out/utils/uiaction-util/provider/backend-ui-action-provider.d.ts

@@ -0,0 +1,16 @@
+import { IAppDEUIAction } from '@ibiz/model-core';
+import { IUILogicParams, IUIActionResult } from '../../../interface';
+import { UIActionProviderBase } from './ui-action-provider-base';
+/**
+ * 后台调用界面行为适配器
+ *
+ * @author lxm
+ * @date 2022-10-25 15:10:51
+ * @export
+ * @class BackendUIActionProvider
+ * @implements {IUIActionProvider}
+ */
+export declare class BackendUIActionProvider extends UIActionProviderBase {
+    execAction(action: IAppDEUIAction, args: IUILogicParams): Promise<IUIActionResult>;
+}
+//# sourceMappingURL=backend-ui-action-provider.d.ts.map

package/out/utils/uiaction-util/provider/backend-ui-action-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"backend-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../../src/utils/uiaction-util/provider/backend-ui-action-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EACL,cAAc,EACd,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,oBAAoB;IACzD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAoE5B"}

package/out/utils/uiaction-util/provider/backend-ui-action-provider.js

@@ -0,0 +1,61 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { isArray } from 'qx-util';
+import { OpenAppViewCommand } from '../../../command';
+import { UIActionProviderBase } from './ui-action-provider-base';
+/**
+ * 后台调用界面行为适配器
+ *
+ * @author lxm
+ * @date 2022-10-25 15:10:51
+ * @export
+ * @class BackendUIActionProvider
+ * @implements {IUIActionProvider}
+ */
+export class BackendUIActionProvider extends UIActionProviderBase {
+    async execAction(action, args) {
+        var _a, _b;
+        const { context, params, data, event } = args;
+        const actionResult = {};
+        const entityName = action.appDataEntityId;
+        const methodName = action.appDEMethodId;
+        if (!entityName || !methodName) {
+            throw new RuntimeModelError(action, '未配置实体或实体行为');
+        }
+        // 处理参数
+        const { resultContext, resultParams, resultData } = await this.handleParams(action, context, data, params);
+        const tempParams = Object.assign(Object.assign({}, params), resultParams);
+        // 如果有打开视图，打开视图，并把返回的数据作为子实体数据
+        const frontPSAppView = action.frontAppViewId;
+        if (frontPSAppView) {
+            const res = await ibiz.commands.execute(OpenAppViewCommand.TAG, frontPSAppView, resultContext, resultParams, { event });
+            if (!(res === null || res === void 0 ? void 0 : res.ok)) {
+                actionResult.cancel = true;
+                return actionResult;
+            }
+            if ((res === null || res === void 0 ? void 0 : res.ok) && res.data) {
+                // 空数据补充一个数据
+                if (resultData.length === 0) {
+                    resultData.push({});
+                }
+                resultData.forEach(item => {
+                    item.srfactionparam = res.data;
+                });
+            }
+        }
+        const app = ibiz.hub.getApp(context === null || context === void 0 ? void 0 : context.srfappid);
+        const _data = resultData.length > 0
+            ? ((_b = (_a = resultData[0]).getRequestData) === null || _b === void 0 ? void 0 : _b.call(_a)) || resultData[0]
+            : {};
+        const res = await app.deService.exec(entityName, methodName, resultContext, _data, tempParams);
+        // 适配界面行为成功提示信息
+        if (res.ok && action.successMsg) {
+            ibiz.message.success(action.successMsg);
+        }
+        Object.assign(actionResult, {
+            data: isArray(res.data) ? res.data : [res.data],
+            nextContext: resultContext,
+            nextParams: tempParams,
+        });
+        return actionResult;
+    }
+}

package/out/utils/uiaction-util/provider/front-ui-action-provider.d.ts

@@ -0,0 +1,16 @@
+import { IAppDEUIAction } from '@ibiz/model-core';
+import { IUIActionResult, IUILogicParams } from '../../../interface';
+import { UIActionProviderBase } from './ui-action-provider-base';
+/**
+ * 前台调用界面行为适配器
+ *
+ * @author lxm
+ * @date 2022-10-25 15:10:51
+ * @export
+ * @class FrontUIActionProvider
+ * @implements {IUIActionProvider}
+ */
+export declare class FrontUIActionProvider extends UIActionProviderBase {
+    execAction(action: IAppDEUIAction, args: IUILogicParams): Promise<IUIActionResult>;
+}
+//# sourceMappingURL=front-ui-action-provider.d.ts.map

package/out/utils/uiaction-util/provider/front-ui-action-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../../src/utils/uiaction-util/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAEL,eAAe,EACf,cAAc,EACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAmD5B"}

package/out/utils/uiaction-util/provider/front-ui-action-provider.js

@@ -0,0 +1,49 @@
+import { StringUtil, RuntimeModelError, ModelError } from '@ibiz-template/core';
+import { OpenAppViewCommand } from '../../../command';
+import { UIActionProviderBase } from './ui-action-provider-base';
+/**
+ * 前台调用界面行为适配器
+ *
+ * @author lxm
+ * @date 2022-10-25 15:10:51
+ * @export
+ * @class FrontUIActionProvider
+ * @implements {IUIActionProvider}
+ */
+export class FrontUIActionProvider extends UIActionProviderBase {
+    async execAction(action, args) {
+        const { context, params, data, event } = args;
+        const actionResult = {};
+        // todo
+        switch (action.frontProcessType) {
+            case 'OPENHTMLPAGE': {
+                const url = StringUtil.fill(action.htmlPageUrl, context, data === null || data === void 0 ? void 0 : data[0]);
+                window.open(url, '_blank');
+                break;
+            }
+            case 'TOP':
+            case 'WIZARD': {
+                const frontPSAppView = action.frontAppViewId;
+                if (!frontPSAppView) {
+                    throw new RuntimeModelError(action, '未配置打开视图');
+                }
+                // 处理参数
+                const { resultContext, resultParams } = await this.handleParams(action, context, data, params);
+                const res = await ibiz.commands.execute(OpenAppViewCommand.TAG, frontPSAppView, context, params, { event });
+                // 打开视图取消操作
+                if (!(res === null || res === void 0 ? void 0 : res.ok)) {
+                    actionResult.cancel = true;
+                }
+                if ((res === null || res === void 0 ? void 0 : res.ok) && res.data) {
+                    actionResult.data = res.data;
+                    actionResult.nextContext = resultContext;
+                    actionResult.nextParams = Object.assign(Object.assign({}, params), resultParams);
+                }
+                break;
+            }
+            default:
+                throw new ModelError(action, `未支持的前台处理模式[${action.frontProcessType}]`);
+        }
+        return actionResult;
+    }
+}

package/out/{provider/ui-action → utils/uiaction-util/provider}/index.d.ts

@@ -1,5 +1,5 @@
 import { BackendUIActionProvider } from './backend-ui-action-provider';
-import { CommonSysUIActionProvider } from './common-sys-ui-action-provider';
+import { SysUIActionProvider } from './sys-ui-action-provider';
 import { FrontUIActionProvider } from './front-ui-action-provider';
 import { WFWithdrawUIActionProvider } from './wf-withdraw-ui-action-provider';
 /**
@@ -10,5 +10,5 @@ import { WFWithdrawUIActionProvider } from './wf-withdraw-ui-action-provider';
  * @export
  */
 export declare function presetUIActionProvider(): void;
-export { FrontUIActionProvider, CommonSysUIActionProvider, BackendUIActionProvider, WFWithdrawUIActionProvider, };
+export { FrontUIActionProvider, SysUIActionProvider, BackendUIActionProvider, WFWithdrawUIActionProvider, };
 //# sourceMappingURL=index.d.ts.map

package/out/utils/uiaction-util/provider/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/uiaction-util/provider/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAE9E;;;;;;GAMG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAkB7C;AAED,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,uBAAuB,EACvB,0BAA0B,GAC3B,CAAC"}

package/out/utils/uiaction-util/provider/index.js

@@ -0,0 +1,28 @@
+import { registerUIActionProvider } from '../../../register';
+import { BackendUIActionProvider } from './backend-ui-action-provider';
+import { SysUIActionProvider } from './sys-ui-action-provider';
+import { FrontUIActionProvider } from './front-ui-action-provider';
+import { WFWithdrawUIActionProvider } from './wf-withdraw-ui-action-provider';
+/**
+ * 预置默认的界面行为适配器
+ *
+ * @author lxm
+ * @date 2022-09-19 22:09:50
+ * @export
+ */
+export function presetUIActionProvider() {
+    // *前台调用
+    const frontUIActionProvider = new FrontUIActionProvider();
+    registerUIActionProvider('FRONT', () => frontUIActionProvider);
+    // *后台调用
+    const backendUIActionProvider = new BackendUIActionProvider();
+    registerUIActionProvider('BACKEND', () => backendUIActionProvider);
+    // *系统预置界面行为
+    const sysUIActionProvider = new SysUIActionProvider();
+    registerUIActionProvider('SYS', () => sysUIActionProvider);
+    // 预置插件
+    // 工作流撤回
+    const wfWithdrawUIActionProvider = new WFWithdrawUIActionProvider();
+    registerUIActionProvider('DEUIACTION_WFWithdraw', () => wfWithdrawUIActionProvider);
+}
+export { FrontUIActionProvider, SysUIActionProvider, BackendUIActionProvider, WFWithdrawUIActionProvider, };

package/out/utils/uiaction-util/provider/sys-ui-action-provider.d.ts

@@ -0,0 +1,16 @@
+import { IAppDEUIAction } from '@ibiz/model-core';
+import { IUIActionResult, IUILogicParams } from '../../../interface';
+import { UIActionProviderBase } from './ui-action-provider-base';
+/**
+ * 系统预置界面行为适配器
+ *
+ * @author lxm
+ * @date 2022-10-25 15:10:51
+ * @export
+ * @class SysUIActionProvider
+ * @implements {IUIActionProvider}
+ */
+export declare class SysUIActionProvider extends UIActionProviderBase {
+    execAction(action: IAppDEUIAction, args: IUILogicParams): Promise<IUIActionResult>;
+}
+//# sourceMappingURL=sys-ui-action-provider.d.ts.map

package/out/utils/uiaction-util/provider/sys-ui-action-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sys-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../../src/utils/uiaction-util/provider/sys-ui-action-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,SAAQ,oBAAoB;IACrD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAkB5B"}

package/out/utils/uiaction-util/provider/sys-ui-action-provider.js

@@ -0,0 +1,27 @@
+import { UIActionProviderBase } from './ui-action-provider-base';
+/**
+ * 系统预置界面行为适配器
+ *
+ * @author lxm
+ * @date 2022-10-25 15:10:51
+ * @export
+ * @class SysUIActionProvider
+ * @implements {IUIActionProvider}
+ */
+export class SysUIActionProvider extends UIActionProviderBase {
+    async execAction(action, args) {
+        const { view } = args;
+        const uIActionTag = action.uiactionTag;
+        const result = {};
+        await view.call(uIActionTag, args);
+        // 需要关闭视图的
+        if (['SaveAndExit', 'Exit', 'RemoveAndExit'].indexOf(uIActionTag) !== -1) {
+            result.closeView = true;
+        }
+        // 需要刷新界面的
+        if (['Refresh', 'New', 'Edit'].indexOf(uIActionTag) !== -1) {
+            result.refresh = true;
+        }
+        return result;
+    }
+}

package/out/utils/{app-de-ui-action-util/handler/ui-action-handler.d.ts → uiaction-util/provider/ui-action-provider-base.d.ts}

@@ -1,15 +1,23 @@
 import { IAppDEUIAction } from '@ibiz/model-core';
-import { IUIActionHandler, IUIActionResult } from '../../../interface';
+import { IUIActionProvider, IUIActionResult, IUILogicParams } from '../../../interface';
 /**
  * 界面行为处理器基类
  *
  * @author lxm
  * @date 2022-10-25 14:10:31
  * @export
- * @class UIActionHandler
+ * @class UIActionProviderBase
  */
-export declare abstract class UIActionHandler implements IUIActionHandler {
-    exec(action: IAppDEUIAction, context: IContext, data: IDatum[], params: IParams, opts?: IData): Promise<IUIActionResult>;
+export declare abstract class UIActionProviderBase implements IUIActionProvider {
+    /**
+     * 界面行为执行入口，处理公共逻辑，子类一般不要重写
+     * @author lxm
+     * @date 2023-05-08 10:02:10
+     * @param {IAppDEUIAction} action
+     * @param {IUILogicParams} params
+     * @return {*}  {Promise<IUIActionResult>}
+     */
+    exec(action: IAppDEUIAction, args: IUILogicParams): Promise<IUIActionResult>;
     /**
      * 有错误和取消时对result做的处理
      * @author lxm
@@ -42,7 +50,7 @@ export declare abstract class UIActionHandler implements IUIActionHandler {
      * @param {(IData | undefined)} [opts]
      * @returns {*}  {Promise<IUIActionResult>}
      */
-    abstract execAction(action: IAppDEUIAction, context: IContext, data: IDatum[], params: IParams, opts?: IData | undefined): Promise<IUIActionResult>;
+    abstract execAction(action: IAppDEUIAction, params: IUILogicParams): Promise<IUIActionResult>;
     /**
      * 执行后续界面行为
      *
@@ -55,7 +63,7 @@ export declare abstract class UIActionHandler implements IUIActionHandler {
      * @param {(IData | undefined)} [opts]
      * @returns {*}  {Promise<void>}
      */
-    doNextAction(action: IAppDEUIAction, context: IContext, data: IDatum[], params: IParams, opts?: IData | undefined): Promise<IUIActionResult | void>;
+    doNextAction(action: IAppDEUIAction, params: IUILogicParams): Promise<IUIActionResult | undefined>;
     /**
      * 参数处理(根据数据目标和数据参数，导航参数)
      *
@@ -79,4 +87,4 @@ export declare abstract class UIActionHandler implements IUIActionHandler {
         resultParams: IParams;
     }>;
 }
-//# sourceMappingURL=ui-action-handler.d.ts.map
+//# sourceMappingURL=ui-action-provider-base.d.ts.map

package/out/utils/uiaction-util/provider/ui-action-provider-base.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../../src/utils/uiaction-util/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACf,MAAM,oBAAoB,CAAC;AAI5B;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAwD3B;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe;IAO/D;;;;;;;OAOG;IACG,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAOzD;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,MAAM,EAAE,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;CAgEH"}

package/out/utils/{app-de-ui-action-util/handler/ui-action-handler.js → uiaction-util/provider/ui-action-provider-base.js}

@@ -1,15 +1,24 @@
 import { convertNavData } from '../../nav-params/nav-params';
-import { AppDEUIActionUtil } from '../app-de-ui-action-util';
+import { UIActionUtil } from '../uiaction-util';
 /**
  * 界面行为处理器基类
  *
  * @author lxm
  * @date 2022-10-25 14:10:31
  * @export
- * @class UIActionHandler
+ * @class UIActionProviderBase
  */
-export class UIActionHandler {
-    async exec(action, context, data, params, opts) {
+export class UIActionProviderBase {
+    /**
+     * 界面行为执行入口，处理公共逻辑，子类一般不要重写
+     * @author lxm
+     * @date 2023-05-08 10:02:10
+     * @param {IAppDEUIAction} action
+     * @param {IUILogicParams} params
+     * @return {*}  {Promise<IUIActionResult>}
+     */
+    async exec(action, args) {
+        const { context, params, data } = args;
         const result = {
             refresh: action.reloadData,
             closeView: action.closeEditView,
@@ -26,14 +35,14 @@ export class UIActionHandler {
             return this.returnError(result);
         }
         // ** 执行不同类型的界面行为独有逻辑，并且合并result
-        const _result = await this.execAction(action, context, data, params, opts);
+        const _result = await this.execAction(action, args);
         Object.assign(result, _result);
         // 如果是取消操作则中断后续处理逻辑。
         if (result.cancel === true) {
             return this.returnError(result);
         }
         // ** 后续界面行为
-        const nextResult = await this.doNextAction(action, result.nextContext || context, result.data || data, result.nextParams || params, opts);
+        const nextResult = await this.doNextAction(action, Object.assign(Object.assign({}, args), { context: result.nextContext || context, data: result.data || data, params: result.nextParams || params }));
         if (nextResult) {
             Object.assign(result, nextResult);
             if (nextResult.cancel === true) {
@@ -93,10 +102,10 @@ export class UIActionHandler {
      * @param {(IData | undefined)} [opts]
      * @returns {*}  {Promise<void>}
      */
-    async doNextAction(action, context, data, params, opts) {
-        const nextAction = undefined;
-        if (nextAction) {
-            return AppDEUIActionUtil.exec(nextAction, context, data, params, opts);
+    async doNextAction(action, params) {
+        const nextActionId = action.nextId;
+        if (nextActionId) {
+            return UIActionUtil.exec(nextActionId, params);
         }
     }
     /**

package/out/utils/uiaction-util/provider/wf-withdraw-ui-action-provider.d.ts

@@ -0,0 +1,16 @@
+import { IAppDEUIAction } from '@ibiz/model-core';
+import { IUIActionResult, IUILogicParams } from '../../../interface';
+import { UIActionProviderBase } from './ui-action-provider-base';
+/**
+ * 工作流流程撤回界面行为适配器
+ *
+ * @author lxm
+ * @date 2022-10-25 15:10:51
+ * @export
+ * @class WFWithdrawUIActionProvider
+ * @implements {IUIActionProvider}
+ */
+export declare class WFWithdrawUIActionProvider extends UIActionProviderBase {
+    execAction(_action: IAppDEUIAction, args: IUILogicParams): Promise<IUIActionResult>;
+}
+//# sourceMappingURL=wf-withdraw-ui-action-provider.d.ts.map

package/out/utils/uiaction-util/provider/wf-withdraw-ui-action-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wf-withdraw-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../../src/utils/uiaction-util/provider/wf-withdraw-ui-action-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,0BAA2B,SAAQ,oBAAoB;IAC5D,UAAU,CACd,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAgB5B"}

package/out/utils/uiaction-util/provider/wf-withdraw-ui-action-provider.js

@@ -0,0 +1,28 @@
+import { UIActionProviderBase } from './ui-action-provider-base';
+/**
+ * 工作流流程撤回界面行为适配器
+ *
+ * @author lxm
+ * @date 2022-10-25 15:10:51
+ * @export
+ * @class WFWithdrawUIActionProvider
+ * @implements {IUIActionProvider}
+ */
+export class WFWithdrawUIActionProvider extends UIActionProviderBase {
+    async execAction(_action, args) {
+        const { view } = args;
+        const isWithdraw = await ibiz.modal.confirm({
+            title: '提示',
+            desc: '是否确认执行撤回操作？',
+        });
+        let isCloseView = false;
+        if (isWithdraw && view) {
+            await view.call('WFWithdraw', args);
+            isCloseView = true;
+        }
+        return {
+            refresh: false,
+            closeView: isCloseView,
+        };
+    }
+}

package/out/utils/{app-de-ui-action-util/app-de-ui-action-util.d.ts → uiaction-util/uiaction-util.d.ts}

@@ -1,13 +1,13 @@
-import { IUIActionResult } from '../../interface';
+import { IUIActionResult, IUILogicParams } from '../../interface';
 /**
- * 应用实体界面行为
+ * 界面行为工具类
  *
  * @author chitanda
  * @date 2022-08-26 00:08:17
  * @export
  * @class AppDEUIActionUtil
  */
-export declare class AppDEUIActionUtil {
+export declare class UIActionUtil {
     /**
      * 执行界面行为
      *
@@ -21,6 +21,6 @@ export declare class AppDEUIActionUtil {
      * @param {IData} [opts]
      * @return {*}  {Promise<IUIActionResult>}
      */
-    static exec(actionid: string, context: IContext, data: IDatum[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
+    static exec(actionId: string, params: IUILogicParams): Promise<IUIActionResult>;
 }
-//# sourceMappingURL=app-de-ui-action-util.d.ts.map
+//# sourceMappingURL=uiaction-util.d.ts.map

package/out/utils/uiaction-util/uiaction-util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uiaction-util.d.ts","sourceRoot":"","sources":["../../../src/utils/uiaction-util/uiaction-util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGlE;;;;;;;GAOG;AACH,qBAAa,YAAY;IACvB;;;;;;;;;;;;OAYG;WACU,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;CAQ5B"}

package/out/utils/uiaction-util/uiaction-util.js

@@ -0,0 +1,33 @@
+import { RuntimeError } from '@ibiz-template/core';
+import { getUIActionProvider } from '../../register';
+/**
+ * 界面行为工具类
+ *
+ * @author chitanda
+ * @date 2022-08-26 00:08:17
+ * @export
+ * @class AppDEUIActionUtil
+ */
+export class UIActionUtil {
+    /**
+     * 执行界面行为
+     *
+     * @author chitanda
+     * @date 2022-08-29 15:08:47
+     * @static
+     * @param {IAppDEUIAction} action
+     * @param {IContext} context
+     * @param {(IData | null)} data
+     * @param {IParams} [params]
+     * @param {IData} [opts]
+     * @return {*}  {Promise<IUIActionResult>}
+     */
+    static async exec(actionId, params) {
+        const action = await ibiz.hub.getUIAction(actionId);
+        if (!action) {
+            throw new RuntimeError(`没找到${actionId}的界面行为模型`);
+        }
+        const provider = await getUIActionProvider(action);
+        return provider.exec(action, params);
+    }
+}

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

@@ -32,7 +32,7 @@ export class ViewLayoutUtil {
      */
     fill(viewModel) {
         const { viewLayoutPanel } = viewModel;
-        if (viewLayoutPanel && viewLayoutPanel.useDefaultLayout === true) {
+        if (!viewLayoutPanel || viewLayoutPanel.useDefaultLayout === true) {
             const { viewType, viewStyle } = viewModel;
             const tag = `${viewType}_${viewStyle}`;
             if (this.cache.has(tag)) {

package/out/view-logic/view-logic-trigger/view-logic-event-trigger.js

@@ -94,7 +94,7 @@ export class ViewLogicEventTrigger extends ViewLogicTrigger {
             result = await Promise.all(matchLogics.map(async (viewlogic) => {
                 return executeViewLogic(viewlogic, event.context || this.defaultContext, event.data || [], event.params || this.defaultParams, {
                     event: event.event,
-                    ctx: event.ctx,
+                    // ctx: event.ctx,
                 });
             }));
         }

package/out/view-logic/view-logic.d.ts

@@ -1,4 +1,4 @@
-import { IAppViewLogic } from '@ibiz/model-core';
+import { IAppUINewDataLogic, IAppUIOpenDataLogic, IAppViewLogic } from '@ibiz/model-core';
 import { IUIActionResult } from '../interface';
 /**
  * 执行视图逻辑
@@ -13,4 +13,30 @@ import { IUIActionResult } from '../interface';
  * @param {IData} [opts] 额外参数，event是js原生事件
  */
 export declare function executeViewLogic(viewLogic: IAppViewLogic, context: IContext, data: IDatum[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
+/**
+ * 执行应用预置界面逻辑opendata
+ *
+ * @author lxm
+ * @date 2022-08-22 14:08:03
+ * @export
+ * @param {IPSAppUIOpenDataLogic} appUILogic 应用预置界面逻辑opendata模型对象
+ * @param {IContext} context 上下文参数
+ * @param {(IData | null)} data 数据集合
+ * @param {IParams} params 视图参数
+ * @param {IData} [opts] 额外参数，event是js原生事件
+ */
+export declare function executeOpenDataAppUILogic(appUILogic: IAppUIOpenDataLogic, context: IContext, data: IDatum[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
+/**
+ * 执行应用预置界面逻辑newdata
+ *
+ * @author lxm
+ * @date 2022-08-22 14:08:03
+ * @export
+ * @param {IPSAppUINewDataLogic} appUILogic 应用预置界面逻辑newdata模型对象
+ * @param {IContext} context 上下文参数
+ * @param {(IData | null)} data 数据集合
+ * @param {IParams} params 视图参数
+ * @param {IData} [opts] 额外参数，event是js原生事件
+ */
+export declare function executeNewDataAppUILogic(appUILogic: IAppUINewDataLogic, context: IContext, data: IDatum[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
 //# sourceMappingURL=view-logic.d.ts.map

package/out/view-logic/view-logic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-logic.d.ts","sourceRoot":"","sources":["../../src/view-logic/view-logic.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/C;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,aAAa,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CA+C1B"}
+{"version":3,"file":"view-logic.d.ts","sourceRoot":"","sources":["../../src/view-logic/view-logic.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAK/C;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,aAAa,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CA6C1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,mBAAmB,EAC/B,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CA6C1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,kBAAkB,EAC9B,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CA2C1B"}