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

package/out/ui-logic/ui-logic.js

@@ -1,6 +1,7 @@
+/* eslint-disable no-await-in-loop */
 import { UnsupportedModelError } from '@ibiz-template/model';
 import { UILogicContext } from './ui-logic-context';
-import { DEActionNode, DEUIActionNode, EndNode, PrepareJSParamNode, StartNode, } from './ui-logic-node';
+import { DEActionNode, DEUIActionNode, EndNode, PrepareJSParamNode, StartNode, ViewCtrlInvokeNode, } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
 /**
  * 界面逻辑
@@ -60,6 +61,8 @@ export class UILogic {
                 case 'COPYPARAM': // 拷贝参数
                 case 'BINDPARAM': // 绑定参数
                 case 'VIEWCTRLINVOKE': // 视图部件调用
+                    logicNode = new ViewCtrlInvokeNode(node);
+                    break;
                 case 'VIEWCTRLFIREEVENT': // 视图部件事件触发
                 case 'APPENDPARAM': // 附加到数组参数
                 case 'SORTPARAM': // 排序数组参数
@@ -98,16 +101,16 @@ export class UILogic {
      * @date 2023-02-08 21:02:58
      * @protected
      * @param {UILogicContext} ctx
-     * @param {IBizContext} context
+     * @param {IContext} context
      * @param {IData} data
      * @param {IParams} [opt]
      */
-    initLogicParams(ctx, context, data, params, opt) {
+    initLogicParams(ctx) {
         this.params.forEach(param => {
             if (param.model.source.default) {
                 ctx.defaultParamName = param.model.name;
             }
-            param.calc(ctx, context, data, params, opt);
+            param.calc(ctx);
         });
     }
     /**
@@ -115,17 +118,17 @@ export class UILogic {
      *
      * @author chitanda
      * @date 2023-02-08 21:02:09
-     * @param {IBizContext} context
+     * @param {IContext} context
      * @param {IData} data
      * @param {IParams} [opt]
      * @return {*}  {Promise<IData>}
      */
     async exec(context, data, params, opt) {
-        const ctx = new UILogicContext();
-        this.initLogicParams(ctx, context, data, params, opt);
+        const ctx = new UILogicContext(this.params, context, data, params, opt);
+        this.initLogicParams(ctx);
         if (this.model.startNode && this.nodes.has(this.model.startNode.codeName)) {
             const start = this.nodes.get(this.model.startNode.codeName);
-            await this.deepExec(start, ctx, context, data, params, opt);
+            await this.deepExec(start, ctx);
         }
         else {
             throw new UnsupportedModelError(this.model.source, `未设置起始节点`);
@@ -146,22 +149,22 @@ export class UILogic {
      * @protected
      * @param {UILogicNode} node
      * @param {UILogicContext} ctx
-     * @param {IBizContext} context
+     * @param {IContext} context
      * @param {(IDatum[] | null)} data
      * @param {IParams} params
      * @param {IParams} [opt]
      * @return {*}  {(Promise<IData | null>)}
      */
-    async deepExec(node, ctx, context, data, params, opt) {
+    async deepExec(node, ctx) {
         // 执行逻辑节点
-        await node.exec(ctx, context, data, params, opt);
+        await node.exec(ctx);
         const { links } = node;
         // 遍历所有节点连接，递归执行下级连接节点
         for (let index = 0; index < links.length; index++) {
             const link = links[index];
-            const bol = await link.exec(ctx, context, data, params, opt);
+            const bol = await link.exec(ctx);
             if (bol && link.dstNode) {
-                await this.deepExec(link.dstNode, ctx, context, data, params, opt);
+                await this.deepExec(link.dstNode, ctx);
                 // 平行输出: 在满足连接条件并逻辑执行完毕后若是非平行输出则执行完成
                 if (node.model.parallel === false) {
                     break;

package/out/ui-logic/utils/handle-src-params.d.ts

@@ -0,0 +1,12 @@
+import { IPSDEUILogicNodeParam } from '@ibiz-template/model';
+import { UILogicContext } from '../ui-logic-context';
+/**
+ * 解析模型并获取源参数或其中的某个属性
+ * @author lxm
+ * @date 2023-03-24 09:41:10
+ * @export
+ * @param {IPSDELogicNodeParam} nodeParam
+ * @param {DELogicContext} ctx
+ */
+export declare function handleSrcParams(nodeParam: IPSDEUILogicNodeParam, ctx: UILogicContext): unknown;
+//# sourceMappingURL=handle-src-params.d.ts.map

package/out/ui-logic/utils/handle-src-params.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handle-src-params.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-params.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EAEtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,qBAAqB,EAChC,GAAG,EAAE,cAAc,WA+CpB"}

package/out/ui-logic/utils/handle-src-params.js

@@ -0,0 +1,53 @@
+import { UnsupportedModelError, } from '@ibiz-template/model';
+import { clone } from 'ramda';
+/**
+ * 解析模型并获取源参数或其中的某个属性
+ * @author lxm
+ * @date 2023-03-24 09:41:10
+ * @export
+ * @param {IPSDELogicNodeParam} nodeParam
+ * @param {DELogicContext} ctx
+ */
+export function handleSrcParams(nodeParam, ctx) {
+    const { srcValueType, srcFieldName, srcValue } = nodeParam;
+    let value;
+    switch (srcValueType) {
+        // 源逻辑参数
+        case 'SRCDLPARAM':
+            {
+                const srcParam = nodeParam.getSrcPSDEUILogicParam();
+                const srcField = srcFieldName === null || srcFieldName === void 0 ? void 0 : srcFieldName.toLowerCase();
+                value = srcField
+                    ? ctx.params[srcParam.codeName][srcField]
+                    : ctx.params[srcParam.codeName];
+            }
+            break;
+        // 空值类型
+        case 'NULLVALUE':
+            value = null;
+            break;
+        // 无值类型
+        case 'NONEVALUE':
+            value = undefined;
+            break;
+        // 直接值
+        case 'SRCVALUE':
+            value = srcValue;
+            break;
+        // // 视图参数
+        // case 'VIEWPARAM':
+        //   value = ctx.viewParams[srcFieldName.toLowerCase()];
+        //   break;
+        // // 应用上下文
+        // case 'APPDATA':
+        //   value = ctx.context[srcFieldName.toLowerCase()];
+        //   break;
+        // 当前环境参数
+        case 'ENVPARAM':
+            value = clone(ibiz.env);
+            break;
+        default:
+            throw new UnsupportedModelError(nodeParam, `暂未支持源值类型${srcValueType}`);
+    }
+    return value;
+}

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

@@ -1,4 +1,3 @@
-import { IBizContext } from '@ibiz-template/core';
 import { IPSAppDEUIAction } from '@ibiz-template/model';
 import { IUIActionResult } from '../../interface';
 /**
@@ -17,12 +16,12 @@ export declare class AppDEUIActionUtil {
      * @date 2022-08-29 15:08:47
      * @static
      * @param {IPSAppDEUIAction} action
-     * @param {IBizContext} context
+     * @param {IContext} context
      * @param {(IData | null)} data
      * @param {IParams} [params]
      * @param {IData} [opts]
      * @return {*}  {Promise<IUIActionResult>}
      */
-    static exec(action: IPSAppDEUIAction, context: IBizContext, data: IDatum[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
+    static exec(action: IPSAppDEUIAction, context: IContext, data: IDatum[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
 }
 //# sourceMappingURL=app-de-ui-action-util.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"app-de-ui-action-util.d.ts","sourceRoot":"","sources":["../../../src/utils/app-de-ui-action-util/app-de-ui-action-util.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,iBAAiB,CAAC;AAElD;;;;;;;GAOG;AACH,qBAAa,iBAAiB;IAC5B;;;;;;;;;;;;OAYG;WACU,IAAI,CACf,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,eAAe,CAAC;CAK5B"}
+{"version":3,"file":"app-de-ui-action-util.d.ts","sourceRoot":"","sources":["../../../src/utils/app-de-ui-action-util/app-de-ui-action-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD;;;;;;;GAOG;AACH,qBAAa,iBAAiB;IAC5B;;;;;;;;;;;;OAYG;WACU,IAAI,CACf,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,eAAe,CAAC;CAK5B"}

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

@@ -14,7 +14,7 @@ export class AppDEUIActionUtil {
      * @date 2022-08-29 15:08:47
      * @static
      * @param {IPSAppDEUIAction} action
-     * @param {IBizContext} context
+     * @param {IContext} context
      * @param {(IData | null)} data
      * @param {IParams} [params]
      * @param {IData} [opts]

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: IDatum[], 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,EAAoB,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE1E,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,MAAM,EAAE,EACd,MAAM,EAAE,OAAO,EACf,KAAK,CAAC,EAAE,KAAK,GAAG,SAAS,GACxB,OAAO,CAAC,eAAe,CAAC;CAsC5B"}
+{"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,5 +1,6 @@
 import { DefectModelError } from '@ibiz-template/model';
 import { isArray } from 'lodash-es';
+import { OpenAppViewCommand } from '../../../command';
 import { UIActionHandler } from './ui-action-handler';
 /**
  * 后台调用界面行为处理器
@@ -11,8 +12,27 @@ import { UIActionHandler } from './ui-action-handler';
  * @extends {UIActionHandler}
  */
 export class BackendUIActionHandler extends UIActionHandler {
-    async execAction(action, context, data, params, _opts) {
+    /**
+     * 打开实体行为前选择视图
+     * @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) {
@@ -21,6 +41,25 @@ export class BackendUIActionHandler extends UIActionHandler {
         // 处理参数
         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
@@ -31,10 +70,11 @@ export class BackendUIActionHandler extends UIActionHandler {
         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: IDatum[] | 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,MAAM,EAAE,GAAG,IAAI,EACrB,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: IDatum[], 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,MAAM,EAAE,EACd,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/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,7 @@ import { IUIActionHandler, IUIActionResult } from '../../../interface';
  * @class UIActionHandler
  */
 export declare abstract class UIActionHandler implements IUIActionHandler {
-    exec(action: IPSAppDEUIAction, context: IBizContext, data: IDatum[], params: IParams, opts?: IData): Promise<IUIActionResult>;
+    exec(action: IPSAppDEUIAction, context: IContext, data: IDatum[], params: IParams, opts?: IData): Promise<IUIActionResult>;
     /**
      * 有错误和取消时对result做的处理
      * @author lxm
@@ -37,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 {IContext} context
      * @param {(IDatum[])} data
      * @param {IParams} params
      * @param {(IData | undefined)} [opts]
      * @returns {*}  {Promise<IUIActionResult>}
      */
-    abstract execAction(action: IPSAppDEUIAction, context: IBizContext, data: IDatum[], 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 {IContext} context
      * @param {(IDatum[])} data
      * @param {IParams} params
      * @param {(IData | undefined)} [opts]
      * @returns {*}  {Promise<void>}
      */
-    doNextAction(action: IPSAppDEUIAction, context: IBizContext, data: IDatum[], params: IParams, opts?: IData | undefined): Promise<IUIActionResult | void>;
+    doNextAction(action: IPSAppDEUIAction, context: IContext, data: IDatum[], params: IParams, opts?: IData | undefined): Promise<IUIActionResult | void>;
     /**
      * 参数处理(根据数据目标和数据参数，导航参数)
      *
@@ -65,17 +64,17 @@ export declare abstract class UIActionHandler implements IUIActionHandler {
      * @protected
      * @static
      * @param {IPSAppDEUIAction} action 界面行为
-     * @param {IBizContext} context 上下文
+     * @param {IContext} context 上下文
      * @param {(IDatum[])} data 数据集合
      * @param {IParams} params 视图参数
      * @returns {*}  {Promise<{
-     *     resultContext: IBizContext; 处理后的上下文
+     *     resultContext: IContext; 处理后的上下文
      *     resultData: IDatum[]; 处理后的数据集合
      *     resultParams: IParams; 处理后的视图参数
      *   }>}
      */
-    protected handleParams(action: IPSAppDEUIAction, context: IBizContext, data: IDatum[], params: IParams): Promise<{
-        resultContext: IBizContext;
+    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,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,WAAW,EACpB,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,WAAW,EACpB,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,WAAW,EACpB,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,WAAW,EACpB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,WAAW,CAAC;QAC3B,UAAU,EAAE,MAAM,EAAE,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;CA+DH"}
+{"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

@@ -82,7 +82,7 @@ export class UIActionHandler {
      * @author lxm
      * @date 2022-10-25 15:10:54
      * @param {IPSAppDEUIAction} action
-     * @param {IBizContext} context
+     * @param {IContext} context
      * @param {(IDatum[])} data
      * @param {IParams} params
      * @param {(IData | undefined)} [opts]
@@ -102,11 +102,11 @@ export class UIActionHandler {
      * @protected
      * @static
      * @param {IPSAppDEUIAction} action 界面行为
-     * @param {IBizContext} context 上下文
+     * @param {IContext} context 上下文
      * @param {(IDatum[])} data 数据集合
      * @param {IParams} params 视图参数
      * @returns {*}  {Promise<{
-     *     resultContext: IBizContext; 处理后的上下文
+     *     resultContext: IContext; 处理后的上下文
      *     resultData: IDatum[]; 处理后的数据集合
      *     resultParams: IParams; 处理后的视图参数
      *   }>}

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: IDatum[] | 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,MAAM,EAAE,GAAG,IAAI,EACrB,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';