@ibiz-template/runtime 0.0.3-beta.5 → 0.0.3-beta.7

package/out/utils/app-de-ui-action-util/handler/backend-ui-action-handler.d.ts

@@ -1,4 +1,3 @@
-import { IBizContext } from '@ibiz-template/core';
 import { IPSAppDEUIAction } from '@ibiz-template/model';
 import { IUIActionResult } from '../../../interface';
 import { UIActionHandler } from './ui-action-handler';
@@ -12,6 +11,17 @@ import { UIActionHandler } from './ui-action-handler';
  * @extends {UIActionHandler}
  */
 export declare class BackendUIActionHandler extends UIActionHandler {
-    execAction(action: IPSAppDEUIAction, context: IBizContext, data: IData[] | null, params: IParams, _opts?: IData | undefined): Promise<IUIActionResult>;
+    /**
+     * 打开实体行为前选择视图
+     * @author lxm
+     * @date 2023-03-27 11:21:01
+     * @param {IPSAppDEUIAction} action
+     * @param {IContext} context
+     * @param {IParams} params
+     * @param {(IData | undefined)} [opts]
+     * @return {*}
+     */
+    openSelectView(action: IPSAppDEUIAction, context: IContext, params: IParams, opts?: IData | undefined): Promise<undefined>;
+    execAction(action: IPSAppDEUIAction, context: IContext, data: IDatum[], params: IParams, opts?: IData | undefined): Promise<IUIActionResult>;
 }
 //# sourceMappingURL=backend-ui-action-handler.d.ts.map

package/out/utils/app-de-ui-action-util/handler/backend-ui-action-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backend-ui-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/backend-ui-action-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,eAAe;IACnD,UAAU,CACd,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,KAAK,CAAC,EAAE,KAAK,GAAG,SAAS,GACxB,OAAO,CAAC,eAAe,CAAC;CAmC5B"}
+{"version":3,"file":"backend-ui-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/backend-ui-action-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,OAAO,EAAc,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,eAAe;IACzD;;;;;;;;;OASG;IACG,cAAc,CAClB,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS;IAgBpB,UAAU,CACd,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;CAmE5B"}

package/out/utils/app-de-ui-action-util/handler/backend-ui-action-handler.js

@@ -1,4 +1,6 @@
+import { DefectModelError } from '@ibiz-template/model';
 import { isArray } from 'lodash-es';
+import { OpenAppViewCommand } from '../../../command';
 import { UIActionHandler } from './ui-action-handler';
 /**
  * 后台调用界面行为处理器
@@ -10,27 +12,69 @@ import { UIActionHandler } from './ui-action-handler';
  * @extends {UIActionHandler}
  */
 export class BackendUIActionHandler extends UIActionHandler {
-    async execAction(action, context, data, params, _opts) {
-        var _a, _b, _c;
+    /**
+     * 打开实体行为前选择视图
+     * @author lxm
+     * @date 2023-03-27 11:21:01
+     * @param {IPSAppDEUIAction} action
+     * @param {IContext} context
+     * @param {IParams} params
+     * @param {(IData | undefined)} [opts]
+     * @return {*}
+     */
+    async openSelectView(action, context, params, opts) {
+        const frontPSAppView = action.getFrontPSAppView();
+        if (!frontPSAppView) {
+            return;
+        }
+        await frontPSAppView.fill(true);
+        return ibiz.commands.execute(OpenAppViewCommand.TAG, frontPSAppView, context, params, opts);
+    }
+    async execAction(action, context, data, params, opts) {
+        var _a, _b, _c, _d;
+        const actionResult = {};
         const entityName = (_a = action.getPSAppDataEntity()) === null || _a === void 0 ? void 0 : _a.codeName;
         const methodName = (_b = action.getPSAppDEMethod()) === null || _b === void 0 ? void 0 : _b.codeName;
         if (!entityName || !methodName) {
-            throw new Error('找不到实体或实体行为');
+            throw new DefectModelError(action, '未配置实体或实体行为');
         }
         // 处理参数
         const { resultContext, resultParams, resultData } = await this.handleParams(action, context, data, params);
+        const tempParams = Object.assign(Object.assign({}, params), resultParams);
+        // 如果有打开视图，打开视图，并把返回的数据作为子实体数据
+        const frontPSAppView = action.getFrontPSAppView();
+        if (frontPSAppView) {
+            await frontPSAppView.fill(true);
+            const res = await ibiz.commands.execute(OpenAppViewCommand.TAG, frontPSAppView, resultContext, resultParams, opts);
+            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(action.getPSModelService().app);
         const deService = await app.es.getService(entityName);
         const _data = resultData.length > 0
-            ? ((_c = resultData[0]) === null || _c === void 0 ? void 0 : _c.getRequestData()) || resultData[0]
+            ? ((_d = (_c = resultData[0]).getRequestData) === null || _d === void 0 ? void 0 : _d.call(_c)) || resultData[0]
             : {};
-        const res = await deService.exec(methodName, resultContext, _data, resultParams);
+        const res = await deService.exec(methodName, resultContext, _data, tempParams);
         // 适配界面行为成功提示信息
         if (res.ok && action.successMsg) {
             ibiz.message.success(action.successMsg);
         }
-        return {
+        Object.assign(actionResult, {
             data: isArray(res.data) ? res.data : [res.data],
-        };
+            nextContext: resultContext,
+            nextParams: tempParams,
+        });
+        return actionResult;
     }
 }

package/out/utils/app-de-ui-action-util/handler/common-sys-ui-action-handler.d.ts

@@ -1,4 +1,3 @@
-import { IBizContext } from '@ibiz-template/core';
 import { IPSAppDEUIAction } from '@ibiz-template/model';
 import { IUIActionResult } from '../../../interface';
 import { UIActionHandler } from './ui-action-handler';
@@ -12,6 +11,6 @@ import { UIActionHandler } from './ui-action-handler';
  * @extends {UIActionHandler}
  */
 export declare class CommonSysUIActionHandler extends UIActionHandler {
-    execAction(action: IPSAppDEUIAction, context: IBizContext, data: IData[] | null, params: IParams, opts?: IData | undefined): Promise<IUIActionResult>;
+    execAction(action: IPSAppDEUIAction, context: IContext, data: IDatum[] | null, params: IParams, opts?: IData | undefined): Promise<IUIActionResult>;
 }
 //# sourceMappingURL=common-sys-ui-action-handler.d.ts.map

package/out/utils/app-de-ui-action-util/handler/common-sys-ui-action-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common-sys-ui-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/common-sys-ui-action-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,wBAAyB,SAAQ,eAAe;IACrD,UAAU,CACd,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;CAuG5B"}
+{"version":3,"file":"common-sys-ui-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/common-sys-ui-action-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,wBAAyB,SAAQ,eAAe;IACrD,UAAU,CACd,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;CAuG5B"}

package/out/utils/app-de-ui-action-util/handler/common-sys-ui-action-handler.js

@@ -10,85 +10,85 @@ import { UIActionHandler } from './ui-action-handler';
  */
 export class CommonSysUIActionHandler extends UIActionHandler {
     async execAction(action, context, data, params, opts) {
-        const { neuron, event } = opts;
+        const { neuron, event, view } = opts;
         const { uIActionTag } = action;
         const result = {};
         // 打开新建数据视图
         if (uIActionTag === 'New') {
-            if (!neuron.call.newData) {
+            if (!view.newData) {
                 throw new Error(`该视图不存在newData能力`);
             }
-            await neuron.call.newData(event);
+            await view.newData(event);
         }
         // 打开编辑数据视图
         if (uIActionTag === 'Edit') {
-            if (!neuron.call.openData) {
+            if (!view.openData) {
                 throw new Error(`该视图不存在openData能力`);
             }
-            await neuron.call.openData(data === null || data === void 0 ? void 0 : data[0], event);
+            await view.openData(data === null || data === void 0 ? void 0 : data[0], event);
         }
         // 保存能力
         const saveTags = ['SaveAndExit', 'Save', 'SaveRow'];
         if (saveTags.indexOf(uIActionTag) !== -1) {
-            if (!neuron.call.save) {
+            if (!neuron.save) {
                 throw new Error(`该视图不存在save能力`);
             }
-            await neuron.call.save();
+            await neuron.save();
         }
         // 保存并新建
         if (uIActionTag === 'SaveAndNew') {
-            if (!neuron.call.saveAndNew) {
+            if (!neuron.saveAndNew) {
                 throw new Error(`该视图不存在saveAndNew能力`);
             }
-            await neuron.call.saveAndNew();
+            await neuron.saveAndNew();
         }
         // 删除能力
         if (uIActionTag === 'Remove' || uIActionTag === 'RemoveAndExit') {
-            if (!neuron.call.remove) {
+            if (!neuron.remove) {
                 throw new Error(`该视图不存在remove能力`);
             }
-            await neuron.call.remove();
+            await neuron.remove();
         }
         // 新建行能力
         if (uIActionTag === 'NewRow') {
-            if (!neuron.call.newRow) {
+            if (!neuron.newRow) {
                 throw new Error(`该视图不存在newRow能力`);
             }
-            await neuron.call.newRow();
+            await neuron.newRow();
         }
         // 切换搜索表单能力
         if (uIActionTag === 'ToggleFilter') {
-            if (!neuron.call.toggleFilter) {
+            if (!neuron.toggleFilter) {
                 throw new Error(`该视图不存在ToggleFilter能力`);
             }
-            neuron.call.toggleFilter();
+            neuron.toggleFilter();
         }
         // 数据导入能力
         if (uIActionTag === 'Import') {
-            if (!neuron.call.importData) {
+            if (!neuron.importData) {
                 throw new Error(`该视图不存在Import能力`);
             }
-            neuron.call.importData();
+            neuron.importData();
         }
         // 数据导出能力
         if (uIActionTag === 'ExportExcel') {
-            if (!neuron.call.exportData) {
+            if (!neuron.exportData) {
                 throw new Error(`该视图不存在ExportExcel能力`);
             }
-            neuron.call.exportData(event);
+            neuron.exportData(event);
         }
         // 工作流相关
         if (uIActionTag === 'SaveAndStart') {
-            if (!neuron.call.wfStart) {
+            if (!neuron.wfStart) {
                 throw new Error(`该视图不存在SaveAndStart能力`);
             }
-            await neuron.call.wfStart();
+            await neuron.wfStart();
         }
         if (uIActionTag === 'ViewWFStep') {
-            if (!neuron.call.wfSubmit) {
+            if (!neuron.wfSubmit) {
                 throw new Error(`该视图不存在ViewWFStep能力`);
             }
-            await neuron.call.wfSubmit();
+            await neuron.wfSubmit();
         }
         // 需要关闭视图的
         if (['SaveAndExit', 'Exit', 'RemoveAndExit'].indexOf(uIActionTag) !== -1) {

package/out/utils/app-de-ui-action-util/handler/front-ui-action-handler.d.ts

@@ -1,4 +1,3 @@
-import { IBizContext } from '@ibiz-template/core';
 import { IPSAppDEUIAction } from '@ibiz-template/model';
 import { IUIActionResult } from '../../../interface';
 import { UIActionHandler } from './ui-action-handler';
@@ -12,6 +11,6 @@ import { UIActionHandler } from './ui-action-handler';
  * @extends {UIActionHandler}
  */
 export declare class FrontUIActionHandler extends UIActionHandler {
-    execAction(action: IPSAppDEUIAction, context: IBizContext, data: IData[] | null, params: IParams, opts?: IParams | undefined): Promise<IUIActionResult>;
+    execAction(action: IPSAppDEUIAction, context: IContext, data: IDatum[], params: IParams, opts?: IParams | undefined): Promise<IUIActionResult>;
 }
 //# sourceMappingURL=front-ui-action-handler.d.ts.map

package/out/utils/app-de-ui-action-util/handler/front-ui-action-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"front-ui-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/front-ui-action-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAc,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAEL,gBAAgB,EAEjB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAc,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,eAAe;IACjD,UAAU,CACd,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GACzB,OAAO,CAAC,eAAe,CAAC;CAkD5B"}
+{"version":3,"file":"front-ui-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/front-ui-action-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,gBAAgB,EAEjB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAc,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,eAAe;IACjD,UAAU,CACd,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GACzB,OAAO,CAAC,eAAe,CAAC;CAkD5B"}

package/out/utils/app-de-ui-action-util/handler/front-ui-action-handler.js

@@ -30,14 +30,14 @@ export class FrontUIActionHandler extends UIActionHandler {
                 // 处理参数
                 const { resultContext, resultParams } = await this.handleParams(action, context, data, params);
                 const res = await ibiz.commands.execute(OpenAppViewCommand.TAG, frontPSAppView, resultContext, resultParams, opts);
-                // 打开视图取消操作时，不执行刷新和关闭视图操作。
-                if ((res === null || res === void 0 ? void 0 : res.ok) === false) {
-                    actionResult.closeView = false;
-                    actionResult.refresh = false;
+                // 打开视图取消操作
+                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;
             }

package/out/utils/app-de-ui-action-util/handler/ui-action-handler.d.ts

@@ -1,4 +1,3 @@
-import { IBizContext } from '@ibiz-template/core';
 import { IPSAppDEUIAction } from '@ibiz-template/model';
 import { IUIActionHandler, IUIActionResult } from '../../../interface';
 /**
@@ -10,7 +9,17 @@ import { IUIActionHandler, IUIActionResult } from '../../../interface';
  * @class UIActionHandler
  */
 export declare abstract class UIActionHandler implements IUIActionHandler {
-    exec(action: IPSAppDEUIAction, context: IBizContext, data: IData[] | null, params: IParams, opts?: IData | undefined): Promise<IUIActionResult>;
+    exec(action: IPSAppDEUIAction, context: IContext, data: IDatum[], params: IParams, opts?: IData): Promise<IUIActionResult>;
+    /**
+     * 有错误和取消时对result做的处理
+     * @author lxm
+     * @date 2023-03-15 07:43:21
+     * @protected
+     * @param {IUIActionResult} result
+     * @returns {*}  {IUIActionResult}
+     * @memberof UIActionHandler
+     */
+    protected returnError(result: IUIActionResult): IUIActionResult;
     /**
      * 用户操作确认
      *
@@ -27,26 +36,26 @@ export declare abstract class UIActionHandler implements IUIActionHandler {
      * @date 2022-10-25 15:10:03
      * @abstract
      * @param {IPSAppDEUIAction} action
-     * @param {IBizContext} context
-     * @param {(IData[] | null)} data
+     * @param {IContext} context
+     * @param {(IDatum[])} data
      * @param {IParams} params
      * @param {(IData | undefined)} [opts]
      * @returns {*}  {Promise<IUIActionResult>}
      */
-    abstract execAction(action: IPSAppDEUIAction, context: IBizContext, data: IData[] | null, params: IParams, opts?: IData | undefined): Promise<IUIActionResult>;
+    abstract execAction(action: IPSAppDEUIAction, context: IContext, data: IDatum[], params: IParams, opts?: IData | undefined): Promise<IUIActionResult>;
     /**
      * 执行后续界面行为
      *
      * @author lxm
      * @date 2022-10-25 15:10:54
      * @param {IPSAppDEUIAction} action
-     * @param {IBizContext} context
-     * @param {(IData[] | null)} data
+     * @param {IContext} context
+     * @param {(IDatum[])} data
      * @param {IParams} params
      * @param {(IData | undefined)} [opts]
      * @returns {*}  {Promise<void>}
      */
-    doNextAction(action: IPSAppDEUIAction, context: IBizContext, data: IData[] | null, params: IParams, opts?: IData | undefined): Promise<void>;
+    doNextAction(action: IPSAppDEUIAction, context: IContext, data: IDatum[], params: IParams, opts?: IData | undefined): Promise<IUIActionResult | void>;
     /**
      * 参数处理(根据数据目标和数据参数，导航参数)
      *
@@ -55,18 +64,18 @@ export declare abstract class UIActionHandler implements IUIActionHandler {
      * @protected
      * @static
      * @param {IPSAppDEUIAction} action 界面行为
-     * @param {IBizContext} context 上下文
-     * @param {(IData[] | null)} data 数据集合
+     * @param {IContext} context 上下文
+     * @param {(IDatum[])} data 数据集合
      * @param {IParams} params 视图参数
      * @returns {*}  {Promise<{
-     *     resultContext: IBizContext; 处理后的上下文
-     *     resultData: IData[]; 处理后的数据集合
+     *     resultContext: IContext; 处理后的上下文
+     *     resultData: IDatum[]; 处理后的数据集合
      *     resultParams: IParams; 处理后的视图参数
      *   }>}
      */
-    protected handleParams(action: IPSAppDEUIAction, context: IBizContext, data: IData[] | null, params: IParams): Promise<{
-        resultContext: IBizContext;
-        resultData: IData[];
+    protected handleParams(action: IPSAppDEUIAction, context: IContext, data: IDatum[], params: IParams): Promise<{
+        resultContext: IContext;
+        resultData: IDatum[];
         resultParams: IParams;
     }>;
 }

package/out/utils/app-de-ui-action-util/handler/ui-action-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/ui-action-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAEL,gBAAgB,EAEjB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAKvE;;;;;;;GAOG;AACH,8BAAsB,eAAgB,YAAW,gBAAgB;IACzD,IAAI,CACR,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;IA8C3B;;;;;;;OAOG;IACG,SAAS,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAO3D;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,IAAI,CAAC;IAUhB;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,WAAW,CAAC;QAC3B,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;CA0DH"}
+{"version":3,"file":"ui-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/ui-action-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAKvE;;;;;;;GAOG;AACH,8BAAsB,eAAgB,YAAW,gBAAgB;IACzD,IAAI,CACR,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,eAAe,CAAC;IAuD3B;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe;IAO/D;;;;;;;OAOG;IACG,SAAS,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAO3D;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAUlC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,gBAAgB,EACxB,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;CA+DH"}

package/out/utils/app-de-ui-action-util/handler/ui-action-handler.js

@@ -1,5 +1,4 @@
 import { getPSUIActionByModelObject, } from '@ibiz-template/model';
-import { notNilEmpty } from 'qx-util';
 import { execUILogic } from '../../../ui-logic';
 import { convertNavData } from '../../nav-params/nav-params';
 import { AppDEUIActionUtil } from '../app-de-ui-action-util';
@@ -13,40 +12,56 @@ import { AppDEUIActionUtil } from '../app-de-ui-action-util';
  */
 export class UIActionHandler {
     async exec(action, context, data, params, opts) {
+        const result = {
+            refresh: action.reloadData,
+            closeView: action.closeEditView,
+        };
+        // ** 界面逻辑替换执行界面行为
         const deUILogic = action.getPSAppDEUILogic();
-        // 界面逻辑替换执行界面行为
         if (deUILogic && action.uILogicAttachMode === 'REPLACE') {
             await execUILogic(deUILogic, context, data, params, opts);
-            return {
-                refresh: false,
-                closeView: false,
-            };
+            return result;
         }
         // **用户操作确认**
         if (!(await this.isConfirm(action))) {
-            return {
-                refresh: false,
-                closeView: false,
-            };
+            return this.returnError(result);
         }
-        const result = {
-            refresh: action.reloadData,
-            closeView: action.closeEditView,
-        };
-        // 执行不同类型的界面行为独有逻辑，并且合并result
+        // ** 执行不同类型的界面行为独有逻辑，并且合并result
         const _result = await this.execAction(action, context, data, params, opts);
         Object.assign(result, _result);
         // 如果是取消操作则中断后续处理逻辑。
         if (result.cancel === true) {
-            return result;
+            return this.returnError(result);
+        }
+        // ** 后续界面行为
+        const nextResult = await this.doNextAction(action, result.nextContext || context, result.data || data, result.nextParams || params, opts);
+        if (nextResult) {
+            Object.assign(result, nextResult);
+            if (nextResult.cancel === true) {
+                return this.returnError(result);
+            }
         }
-        await this.doNextAction(action, context, _result.data || data, params, opts);
-        // 界面行为执行之后，执行界面逻辑
+        // ** 界面行为执行之后，执行界面逻辑
         if (deUILogic && action.uILogicAttachMode === 'AFTER') {
-            await execUILogic(deUILogic, context, data, params, opts);
+            await execUILogic(deUILogic, result.nextContext || context, result.data || data, result.nextParams || params, opts);
         }
         return result;
     }
+    /**
+     * 有错误和取消时对result做的处理
+     * @author lxm
+     * @date 2023-03-15 07:43:21
+     * @protected
+     * @param {IUIActionResult} result
+     * @returns {*}  {IUIActionResult}
+     * @memberof UIActionHandler
+     */
+    returnError(result) {
+        return Object.assign(result, {
+            refresh: false,
+            closeView: false,
+        });
+    }
     /**
      * 用户操作确认
      *
@@ -67,8 +82,8 @@ export class UIActionHandler {
      * @author lxm
      * @date 2022-10-25 15:10:54
      * @param {IPSAppDEUIAction} action
-     * @param {IBizContext} context
-     * @param {(IData[] | null)} data
+     * @param {IContext} context
+     * @param {(IDatum[])} data
      * @param {IParams} params
      * @param {(IData | undefined)} [opts]
      * @returns {*}  {Promise<void>}
@@ -76,7 +91,7 @@ export class UIActionHandler {
     async doNextAction(action, context, data, params, opts) {
         const nextAction = (await getPSUIActionByModelObject(action, 'getNextPSUIAction'));
         if (nextAction) {
-            await AppDEUIActionUtil.exec(nextAction, context, data, params, opts);
+            return AppDEUIActionUtil.exec(nextAction, context, data, params, opts);
         }
     }
     /**
@@ -87,52 +102,68 @@ export class UIActionHandler {
      * @protected
      * @static
      * @param {IPSAppDEUIAction} action 界面行为
-     * @param {IBizContext} context 上下文
-     * @param {(IData[] | null)} data 数据集合
+     * @param {IContext} context 上下文
+     * @param {(IDatum[])} data 数据集合
      * @param {IParams} params 视图参数
      * @returns {*}  {Promise<{
-     *     resultContext: IBizContext; 处理后的上下文
-     *     resultData: IData[]; 处理后的数据集合
+     *     resultContext: IContext; 处理后的上下文
+     *     resultData: IDatum[]; 处理后的数据集合
      *     resultParams: IParams; 处理后的视图参数
      *   }>}
      */
     async handleParams(action, context, data, params) {
-        let resultData = data || [];
+        let resultData = [];
         // 数据目标不支持提示
-        if (['SINGLEDATA', 'MULTIDATA', 'MULTIKEY'].indexOf(action.actionTarget) !==
-            -1) {
+        if (['MULTIDATA', 'MULTIKEY'].indexOf(action.actionTarget) !== -1) {
             throw new Error(`数据类型${action.actionTarget}暂未支持,请配置无数据或单项数据主键`);
         }
-        // 数据目标为无数据时，清空数据
-        if (action.actionTarget === 'NONE') {
-            resultData = [];
+        // 准备实体名称
+        const appDataEntity = action.getPSAppDataEntity();
+        if (appDataEntity) {
+            await appDataEntity.fill(true);
+        }
+        const deName = appDataEntity === null || appDataEntity === void 0 ? void 0 : appDataEntity.codeName.toLowerCase();
+        const originData = data[0] || {};
+        const deSrfkey = originData.srfkey || originData[deName || ''];
+        // 根据数据目标处理数据集合
+        switch (action.actionTarget) {
+            // 数据目标为无数据时，清空数据
+            case 'NONE':
+                resultData = [];
+                break;
+            // 单项数据给单个数据
+            case 'SINGLEDATA':
+                resultData = [data[0]];
+                break;
+            // 多项数据传递数组
+            case 'MULTIDATA':
+                resultData = data;
+                break;
+            // 单项数据主键，传递包含一个对象的数组，对象里只含有一个主键
+            case 'SINGLEKEY':
+                resultData = deName ? [{ [deName]: deSrfkey }] : [];
+                break;
+            default:
+                break;
         }
         // 处理上下文导航参数
-        let tempContext = {};
+        const resultContext = context.clone();
         const navContexts = action.getPSNavigateContexts() || [];
-        // 单项数据主键时，在导航参数开头加一个主键的导航参数，可以被配置的同名导航参数覆盖。
+        // 单项数据主键或单项数据时，在导航参数开头加一个主键的导航参数，可以被配置的同名导航参数覆盖。
         // 数据项名称替换主键的取值属性，参数项名称替换处理后主键在上下文的名称
-        const appDataEntity = action.getPSAppDataEntity();
-        const { valueItem, paramItem } = action;
-        if (appDataEntity && action.actionTarget === 'SINGLEKEY') {
-            await (appDataEntity === null || appDataEntity === void 0 ? void 0 : appDataEntity.fill(true));
-            const appDeName = appDataEntity.codeName.toLowerCase();
-            navContexts.unshift({
-                key: paramItem || appDeName,
-                value: valueItem || 'srfkey',
-                rawValue: false,
-            });
+        if (deName && ['SINGLEKEY', 'SINGLEDATA'].includes(action.actionTarget)) {
+            const { valueItem, paramItem } = action;
+            const key = paramItem || deName;
+            const value = valueItem ? originData[valueItem] : deSrfkey;
+            resultContext[key] = value;
         }
-        if (notNilEmpty(navContexts)) {
-            tempContext = convertNavData(navContexts, context, params, (data === null || data === void 0 ? void 0 : data[0]) || {});
-        }
-        const resultContext = Object.assign(context.clone(), tempContext);
-        // 处理导航视图参数
-        let resultParams = {};
+        // 处理自定义导航上下文
+        const datum = (resultData === null || resultData === void 0 ? void 0 : resultData[0]) || {};
+        const tempContext = convertNavData(navContexts, context, params, datum);
+        Object.assign(resultContext, tempContext);
+        // 处理自定义导航视图参数
         const navParams = action.getPSNavigateParams();
-        if (notNilEmpty(navParams)) {
-            resultParams = convertNavData(navParams, context, params, (data === null || data === void 0 ? void 0 : data[0]) || {});
-        }
+        const resultParams = convertNavData(navParams, context, params, datum);
         return { resultContext, resultData, resultParams };
     }
 }

package/out/utils/app-de-ui-action-util/handler/wf-withdraw-handler.d.ts

@@ -1,4 +1,3 @@
-import { IBizContext } from '@ibiz-template/core';
 import { IPSAppDEUIAction } from '@ibiz-template/model';
 import { IUIActionResult } from '../../../interface';
 import { UIActionHandler } from './ui-action-handler';
@@ -12,6 +11,6 @@ import { UIActionHandler } from './ui-action-handler';
  * @extends {UIActionHandler}
  */
 export declare class WFWithdrawUIActionHandler extends UIActionHandler {
-    execAction(action: IPSAppDEUIAction, context: IBizContext, data: IData[] | null, params: IParams, opts?: IData | undefined): Promise<IUIActionResult>;
+    execAction(action: IPSAppDEUIAction, context: IContext, data: IDatum[] | null, params: IParams, opts?: IData | undefined): Promise<IUIActionResult>;
 }
 //# sourceMappingURL=wf-withdraw-handler.d.ts.map

package/out/utils/app-de-ui-action-util/handler/wf-withdraw-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wf-withdraw-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/wf-withdraw-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,yBAA0B,SAAQ,eAAe;IACtD,UAAU,CACd,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;CAe5B"}
+{"version":3,"file":"wf-withdraw-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/wf-withdraw-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,yBAA0B,SAAQ,eAAe;IACtD,UAAU,CACd,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;CAe5B"}

package/out/utils/app-de-ui-action-util/handler/wf-withdraw-handler.js

@@ -16,7 +16,7 @@ export class WFWithdrawUIActionHandler extends UIActionHandler {
         });
         let isCloseView = false;
         if (isWithdraw && (opts === null || opts === void 0 ? void 0 : opts.neuron)) {
-            await opts.neuron.call.wfWithdraw(context, params, (data === null || data === void 0 ? void 0 : data[0]) || []);
+            await opts.neuron.wfWithdraw(context, params, (data === null || data === void 0 ? void 0 : data[0]) || []);
             isCloseView = true;
         }
         return {

package/out/utils/index.d.ts

@@ -1,6 +1,7 @@
 export { calcNavParams } from './nav-params/calc-nav-params';
 export * from './nav-params/nav-params';
 export * from './app-de-ui-action-util';
-export { openRedirectView } from './open-redirect-view/open-redirect-view';
+export { toLocalOpenWFRedirectView, openRedirectView, } from './open-redirect-view/open-redirect-view';
 export * from './verify';
+export * from './wf-helper/wf-helper';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,cAAc,uBAAuB,CAAC"}

package/out/utils/index.js

@@ -1,5 +1,6 @@
 export { calcNavParams } from './nav-params/calc-nav-params';
 export * from './nav-params/nav-params';
 export * from './app-de-ui-action-util';
-export { openRedirectView } from './open-redirect-view/open-redirect-view';
+export { toLocalOpenWFRedirectView, openRedirectView, } from './open-redirect-view/open-redirect-view';
 export * from './verify';
+export * from './wf-helper/wf-helper';