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

package/out/ui-action/provider/ui-action-provider-base.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-prototype-builtins */
 import { RuntimeModelError } from '@ibiz-template/core';
 import { calcDeCodeNameById } from '../../model';
 import { execUILogic } from '../../ui-logic';
@@ -26,7 +27,7 @@ export class UIActionProviderBase {
             refreshMode: action.refreshMode,
             closeView: action.closeEditView,
         };
-        const { view } = args;
+        const { context, params, data, view } = args;
         if (action.closeEditView) {
             view.state.isClosing = true;
         }
@@ -36,7 +37,10 @@ export class UIActionProviderBase {
             if (!appDEUILogicId) {
                 throw new RuntimeModelError(action, ibiz.i18n.t('runtime.logicScheduler.executor.noConfiguredLogic'));
             }
-            await execUILogic(appDEUILogicId, appDataEntityId, args);
+            const { resultContext, resultParams } = await this.handleParams(action, context, data, params);
+            const res = await execUILogic(appDEUILogicId, appDataEntityId, Object.assign(Object.assign({}, args), { context: resultContext, params: Object.assign(Object.assign({}, params), resultParams) }));
+            if (res)
+                result.data = Array.isArray(res) ? res : [res];
             return result;
         }
         // **用户操作确认**
@@ -46,6 +50,11 @@ export class UIActionProviderBase {
         }
         // ** 执行不同类型的界面行为独有逻辑，并且合并result
         const _result = await this.execAction(action, args);
+        // 预置属性相关处理
+        const { presetParams } = await this.handleParams(action, context, data, params);
+        if (presetParams.ignoredirtycheck === 'true') {
+            view.modal.ignoreDismissCheck = true;
+        }
         Object.assign(result, _result);
         // 如果是取消操作则中断后续处理逻辑。
         if (result.cancel === true) {
@@ -236,7 +245,31 @@ export class UIActionProviderBase {
             navContexts,
             navParams,
         }, tempContext);
-        return { resultContext, resultData, resultParams };
+        // 预置属性处理
+        // ignoredirtycheck(忽略脏值检查)
+        const presetParams = {};
+        if (resultParams.hasOwnProperty('ignoredirtycheck')) {
+            presetParams.ignoredirtycheck = resultParams.ignoredirtycheck;
+            delete resultParams.ignoredirtycheck;
+        }
+        // srfexportdataset（指定数据导出数据集标识）
+        if (resultParams.hasOwnProperty('srfexportdataset')) {
+            presetParams.srfexportdataset = resultParams.srfexportdataset;
+            delete resultParams.srfexportdataset;
+        }
+        // srfasyncaction（指定当前界面行为是否异步（目前仅数据导出使用））
+        if (resultParams.hasOwnProperty('srfasyncaction')) {
+            presetParams.srfasyncaction = resultParams.srfasyncaction;
+            delete resultParams.srfasyncaction;
+        }
+        // viewoption（指定导入视图的打开方式与宽高，参数值格式为viewoption={"modalOption":{"width":"80%","height":"80%"},"openMode":"POPUPMODAL"}，openMode打开方式的可选值有：INDEXVIEWTAB（顶级容器分页）、INDEXVIEWTAB_POPUP（顶级容器分页（非模态弹出））、INDEXVIEWTAB_POPUPMODAL（顶级容器分页（模态弹出））、POPUP（非模式弹出）、POPUPMODAL（模式弹出）、POPOVER（气泡卡片）、DRAWER_LEFT（模态左侧抽屉弹出）、DRAWER_RIGHT（模态右侧抽屉弹出）、DRAWER_TOP（模态上方抽屉弹出）、DRAWER_BOTTOM（模态下方抽屉弹出））
+        if (resultParams.hasOwnProperty('viewoption')) {
+            if (resultParams.viewoption) {
+                presetParams.viewoption = JSON.parse(resultParams.viewoption);
+            }
+            delete resultParams.viewoption;
+        }
+        return { resultContext, resultData, resultParams, presetParams };
     }
     /**
      * 计算消息信息（动态，多语言资源）

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

@@ -1 +1 @@
-{"version":3,"file":"uiaction-util.d.ts","sourceRoot":"","sources":["../../src/ui-action/uiaction-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/D;;;;;GAKG;AACH,qBAAa,YAAY;IACvB;;;;;;;;OAQG;WACU,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,CAAC;IAkB3B;;;;;;;;OAQG;WACU,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IA8BhB;;;;;;;OAOG;mBACkB,iBAAiB;IAMtC;;;;;;;OAOG;mBACkB,sBAAsB;CAW5C"}
+{"version":3,"file":"uiaction-util.d.ts","sourceRoot":"","sources":["../../src/ui-action/uiaction-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/D;;;;;GAKG;AACH,qBAAa,YAAY;IACvB;;;;;;;;OAQG;WACU,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,CAAC;IAkB3B;;;;;;;;OAQG;WACU,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;;;OAOG;mBACkB,iBAAiB;IAMtC;;;;;;;OAOG;mBACkB,sBAAsB;CAW5C"}

package/out/ui-action/uiaction-util.js

@@ -43,11 +43,11 @@ export class UIActionUtil {
      * @memberof UIActionUtil
      */
     static async execAndResolved(actionId, params, appId) {
-        var _a, _b;
+        var _a, _b, _c;
         const result = await this.exec(actionId, params, appId);
         if (result.closeView) {
-            // 修复编辑器失焦后，调整数据后直接点击关闭按钮导致无法触发自动保存
-            // params.view.modal.ignoreDismissCheck = true;
+            // 编辑器失焦后，调整数据后直接点击关闭按钮导致无法触发自动保存通过modal中preDismiss钩子执行，shouldDismiss钩子仅负责计算是否可关闭视图参数，不能混为一谈
+            params.view.modal.ignoreDismissCheck = true;
             params.view.closeView({ ok: true });
         }
         else if (result.refresh) {
@@ -66,10 +66,12 @@ export class UIActionUtil {
         }
         const action = await getUIActionById(actionId, appId);
         // 异步行为模型配置方式:
+        // 界面行为模型基于选择的实体行为的返回值类型计算异步行为（asyncAction）模型
         // 1、配置实体行为 返回值类型选择为 异步操作对象
         // 2、配置界面行为 界面行为类型选择 后台调用 、配置实体行为
-        // 界面行为模型基于选择的实体行为的返回值类型计算异步行为（asyncAction）模型
-        if (action.asyncAction && !result.cancel) {
+        // 3、界面行为有配置界面行为参数srfasyncaction=true
+        if ((action.asyncAction && !result.cancel) ||
+            ((_c = action.uiactionParamJO) === null || _c === void 0 ? void 0 : _c.srfasyncaction)) {
             this.handleAsyncAction(params.event);
         }
     }

package/out/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-link-single-cond.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,eAAe;IAmCrC,KAAK,EAAE,sBAAsB;IAlChD;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IAED,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;gBAEkB,KAAK,EAAE,sBAAsB;IAMhD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAqFnE"}
+{"version":3,"file":"ui-logic-link-single-cond.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,eAAe;IAmCrC,KAAK,EAAE,sBAAsB;IAlChD;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IAED,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;gBAEkB,KAAK,EAAE,sBAAsB;IAMhD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAuFnE"}

package/out/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.js

@@ -46,16 +46,13 @@ export class UILogicLinkSingleCond extends UILogicLinkCond {
             srcDEUILogicParamId: this.dstParam,
             srcFieldName: this.dstField,
         });
-        let result;
+        let result = false;
         let compareValue;
         if (this.op === 'CONTAINS') {
             const dstObj = ctx.params[this.dstParam];
             if (dstObj && typeof dstObj === 'object' && this.dstField) {
                 result = dstObj.hasOwnProperty(this.dstField);
             }
-            else {
-                result = false;
-            }
             ibiz.log.debug(ibiz.i18n.t('runtime.uiLogic.interfaceConnectionConditionalContains', {
                 name: this.model.name,
                 dstField: this.dstField,
@@ -64,35 +61,40 @@ export class UILogicLinkSingleCond extends UILogicLinkCond {
             }), ibiz.i18n.t('runtime.deLogic.deLogicLink.compareResults'), result);
             return result;
         }
-        switch (this.type) {
-            case 'ENTITYFIELD': {
-                if (!this.value) {
-                    throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.uiLogic.currentConditionValue'));
+        try {
+            switch (this.type) {
+                case 'ENTITYFIELD': {
+                    if (!this.value) {
+                        throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.uiLogic.currentConditionValue'));
+                    }
+                    // 数据对象属性
+                    const value = data[this.value] != null ? data[this.value] : context[this.value];
+                    compareValue = value;
+                    result = testCond(dstVal, this.op, value);
+                    break;
                 }
-                // 数据对象属性
-                const value = data[this.value] != null ? data[this.value] : context[this.value];
-                compareValue = value;
-                result = testCond(dstVal, this.op, value);
-                break;
-            }
-            case 'SRCENTITYFIELD': {
-                if (!this.value) {
-                    throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.uiLogic.sourceDataObjectAttribute'));
+                case 'SRCENTITYFIELD': {
+                    if (!this.value) {
+                        throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.uiLogic.sourceDataObjectAttribute'));
+                    }
+                    // 源数据对象属性
+                    const srcVal = handleSrcVal(ctx, {
+                        srcDEUILogicParamId: this.srcParam,
+                        srcFieldName: this.value,
+                    });
+                    compareValue = srcVal;
+                    result = testCond(dstVal, this.op, srcVal);
+                    break;
                 }
-                // 源数据对象属性
-                const srcVal = handleSrcVal(ctx, {
-                    srcDEUILogicParamId: this.srcParam,
-                    srcFieldName: this.value,
-                });
-                compareValue = srcVal;
-                result = testCond(dstVal, this.op, srcVal);
-                break;
+                case 'CURTIME': // 当前时间
+                    throw new ModelError(this.model, ibiz.i18n.t('runtime.uiLogic.currentTime'));
+                default: // 直接使用目标对象参数属性和值做对比
+                    compareValue = this.value;
+                    result = testCond(dstVal, this.op, this.value);
             }
-            case 'CURTIME': // 当前时间
-                throw new ModelError(this.model, ibiz.i18n.t('runtime.uiLogic.currentTime'));
-            default: // 直接使用目标对象参数属性和值做对比
-                compareValue = this.value;
-                result = testCond(dstVal, this.op, this.value);
+        }
+        catch (error) {
+            ibiz.log.error(error);
         }
         ibiz.log.debug(ibiz.i18n.t('runtime.uiLogic.interfaceConnectionConditionalTypeName', {
             name: this.model.name,

package/out/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-ui-action-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,WAAW;IACrC,KAAK,EAAE,gBAAgB,CAAC;IAE1B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAwC/C"}
+{"version":3,"file":"de-ui-action-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,WAAW;IACrC,KAAK,EAAE,gBAAgB,CAAC;IAE1B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAmD/C"}

package/out/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.js

@@ -12,7 +12,7 @@ import { UILogicNode } from '../ui-logic-node';
  */
 export class DEUIActionNode extends UILogicNode {
     async exec(ctx) {
-        const { dstAppDEUIActionId, dstDEUILogicParamId, dstAppDataEntityId } = this.model;
+        const { dstAppDEUIActionId, dstDEUILogicParamId, dstAppDataEntityId, retDEUILogicParamId, } = this.model;
         const { data, parameters } = ctx;
         if (!dstAppDEUIActionId) {
             throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.uiLogic.noConfiguredInterfaceBehavior'));
@@ -27,12 +27,16 @@ export class DEUIActionNode extends UILogicNode {
                 actionData = [param];
             }
         }
+        const res = await UIActionUtil.exec(dstAppDEUIActionId, Object.assign(Object.assign({}, parameters), { context: ctx.context, params: ctx.viewParam, data: actionData }), this.model.appId);
+        if (!res.cancel) {
+            ctx.params[retDEUILogicParamId] = res.data;
+            ctx.setLastReturn(ctx.params[retDEUILogicParamId]);
+        }
         ibiz.log.debug(ibiz.i18n.t('runtime.uiLogic.interfaceLogicNodeEntityInterfaceAction', {
             id: this.model.id,
             dstAppDEUIActionId,
             dstAppDataEntityId,
             dstDEUILogicParamId,
-        }));
-        await UIActionUtil.execAndResolved(dstAppDEUIActionId, Object.assign(Object.assign({}, parameters), { context: ctx.context, params: ctx.viewParam, data: actionData }), this.model.appId);
+        }), ctx.params[retDEUILogicParamId]);
     }
 }

package/out/ui-logic/ui-logic-node/msg-box-node/msg-box-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"msg-box-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/msg-box-node/msg-box-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,UAAW,SAAQ,WAAW;IACjC,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,OAAO;;;;;MAKN;IAEL,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAmF/C"}
+{"version":3,"file":"msg-box-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/msg-box-node/msg-box-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,UAAW,SAAQ,WAAW;IACjC,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,OAAO;;;;;MAKN;IAEL,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAuG/C"}

package/out/ui-logic/ui-logic-node/msg-box-node/msg-box-node.js

@@ -55,6 +55,22 @@ export class MsgBoxNode extends UILogicNode {
                 modalParams.showCancelButton = true;
                 resultTags = ['yes', 'no'];
                 break;
+            case 'YESNOCANCEL':
+                modalParams.confirmButtonText = ibiz.i18n.t('runtime.uiLogic.yes');
+                modalParams.cancelButtonText = ibiz.i18n.t('runtime.uiLogic.no');
+                modalParams.showConfirmButton = true;
+                modalParams.showCancelButton = true;
+                if (ibiz.env.isMob) {
+                    modalParams.options = {
+                        closeOnClickOverlay: true,
+                    };
+                }
+                else {
+                    modalParams.options = {
+                        distinguishCancelAndClose: true,
+                    };
+                }
+                break;
             case 'OK':
                 modalParams.confirmButtonText = ibiz.i18n.t('runtime.uiLogic.determine');
                 modalParams.showConfirmButton = true;
@@ -78,6 +94,11 @@ export class MsgBoxNode extends UILogicNode {
             type,
             message,
         }));
+        if (buttonsType === 'YESNOCANCEL') {
+            const result = await ibiz.modal.extendConfirm(modalParams);
+            ctx.setLastReturn(result);
+            return;
+        }
         const result = await ibiz.modal.confirm(modalParams);
         ctx.setLastReturn(resultTags[result ? 0 : 1]);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAmBL,WAAW,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,UAAU;IA+FvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAsBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
+{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAmBL,WAAW,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,UAAU;IA+FvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}

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

@@ -1,5 +1,6 @@
 /* eslint-disable no-await-in-loop */
-import { ModelError, RuntimeModelError } from '@ibiz-template/core';
+import { IBizContext, ModelError, RuntimeModelError, } from '@ibiz-template/core';
+import { clone } from 'ramda';
 import { UILogicContext } from './ui-logic-context';
 import { AppendParamNode, BindParamNode, CopyParamNode, DataSetNode, DEActionNode, DebugParamNode, DEUIActionNode, EndNode, ExecuteDELogicNode, MsgBoxNode, PFPluginNode, PrepareJSParamNode, RawJSCodeNode, RenewParamNode, ResetParamNode, SortParamNode, StartNode, ThrowExceptionNode, ViewCtrlFireEventNode, ViewCtrlInvokeNode, } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
@@ -156,6 +157,9 @@ export class UILogic {
      * @return {*}  {Promise<IData>}
      */
     async exec(parameters) {
+        // 克隆传入应用上下文参数和视图参数
+        parameters.context = IBizContext.create(parameters.context);
+        parameters.params = clone(parameters.params || {});
         const ctx = new UILogicContext(this.params, parameters);
         this.initLogicParams(ctx);
         const { startDEUILogicNodeId } = this.model;

package/out/utils/bi-report-util/bi-report-util.d.ts

@@ -95,6 +95,7 @@ export declare class BIReportUtil {
      * @memberof BIReportUtil
      */
     translateDataToAppBIReport(arg: {
+        context: IContext;
         reportTag: string;
         selectChartType: string;
         selectCubeId: string;

package/out/utils/bi-report-util/bi-report-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bi-report-util.d.ts","sourceRoot":"","sources":["../../../src/utils/bi-report-util/bi-report-util.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAErE;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,sBAAsB,CAAC;IAErC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,YAAY;IACvB;;;;;;;;;OASG;IACG,cAAc,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,UAAU,CAAC;IAkDtB;;;;;;;;OAQG;IACG,yBAAyB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA+F5D;;;;;;OAMG;IACG,4BAA4B,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IA6GzE;;;;;;;;;;;;;OAaG;IACG,0BAA0B,CAAC,GAAG,EAAE;QACpC,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,KAAK,CAAC;QACZ,KAAK,EAAE,KAAK,CAAC;QACb,MAAM,EAAE,KAAK,CAAC;KACf,GAAG,OAAO,CAAC,KAAK,CAAC;IAuElB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,IAAI,CAAC;IAsBhB;;;;;;;;OAQG;IACG,4BAA4B,CAChC,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,IAAI,CAAC;IAoBhB;;;;;;;;OAQG;IACG,gBAAgB,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAwB5E"}
+{"version":3,"file":"bi-report-util.d.ts","sourceRoot":"","sources":["../../../src/utils/bi-report-util/bi-report-util.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAErE;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,sBAAsB,CAAC;IAErC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,YAAY;IACvB;;;;;;;;;OASG;IACG,cAAc,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,UAAU,CAAC;IAkDtB;;;;;;;;OAQG;IACG,yBAAyB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA+F5D;;;;;;OAMG;IACG,4BAA4B,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IA6GzE;;;;;;;;;;;;;OAaG;IACG,0BAA0B,CAAC,GAAG,EAAE;QACpC,OAAO,EAAE,QAAQ,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,KAAK,CAAC;QACZ,KAAK,EAAE,KAAK,CAAC;QACb,MAAM,EAAE,KAAK,CAAC;KACf,GAAG,OAAO,CAAC,KAAK,CAAC;IAwElB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,IAAI,CAAC;IAsBhB;;;;;;;;OAQG;IACG,4BAA4B,CAChC,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,KAAK,GAChB,OAAO,CAAC,IAAI,CAAC;IAoBhB;;;;;;;;OAQG;IACG,gBAAgB,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAwB5E"}

package/out/utils/bi-report-util/bi-report-util.js

@@ -282,8 +282,8 @@ export class BIReportUtil {
      * @memberof BIReportUtil
      */
     async translateDataToAppBIReport(arg) {
-        const { reportTag, selectChartType, selectCubeId, caption, data, style, extend, } = arg;
-        const app = ibiz.hub.getApp(ibiz.env.appId);
+        const { context, reportTag, selectChartType, selectCubeId, caption, data, style, extend, } = arg;
+        const app = ibiz.hub.getApp(context.srfappid);
         const tempUIReportModel = {
             selectChartType,
             style,

package/out/utils/change-tracker/change-history-item.d.ts

@@ -0,0 +1,29 @@
+import { IApiChangeHistoryItem } from '../../interface';
+/**
+ * @description 历史项
+ * @export
+ * @class ChangeHistoryItem
+ * @implements {IApiChangeHistoryItem<T>}
+ * @template T
+ */
+export declare class ChangeHistoryItem<T> implements IApiChangeHistoryItem<T> {
+    /**
+     * @description 状态
+     * @type {T}
+     * @memberof ChangeHistoryItem
+     */
+    state: T;
+    /**
+     * @description 时间戳
+     * @type {number}
+     * @memberof ChangeHistoryItem
+     */
+    timestamp: number;
+    /**
+     * Creates an instance of ChangeHistoryItem.
+     * @param {T} state
+     * @memberof ChangeHistoryItem
+     */
+    constructor(state: T);
+}
+//# sourceMappingURL=change-history-item.d.ts.map

package/out/utils/change-tracker/change-history-item.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-history-item.d.ts","sourceRoot":"","sources":["../../../src/utils/change-tracker/change-history-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD;;;;;;GAMG;AACH,qBAAa,iBAAiB,CAAC,CAAC,CAAE,YAAW,qBAAqB,CAAC,CAAC,CAAC;IACnE;;;;OAIG;IACH,KAAK,EAAE,CAAC,CAAC;IAET;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;OAIG;gBACS,KAAK,EAAE,CAAC;CAIrB"}

package/out/utils/change-tracker/change-history-item.js

@@ -0,0 +1,18 @@
+/**
+ * @description 历史项
+ * @export
+ * @class ChangeHistoryItem
+ * @implements {IApiChangeHistoryItem<T>}
+ * @template T
+ */
+export class ChangeHistoryItem {
+    /**
+     * Creates an instance of ChangeHistoryItem.
+     * @param {T} state
+     * @memberof ChangeHistoryItem
+     */
+    constructor(state) {
+        this.state = state;
+        this.timestamp = Date.now();
+    }
+}

package/out/utils/change-tracker/change-tracker.d.ts

@@ -0,0 +1,110 @@
+import { IApiChangeTracker } from '../../interface';
+/**
+ * @description 变更追踪器
+ * @export
+ * @class ChangeTracker
+ * @implements {IApiChangeTracker<T>}
+ * @template T
+ */
+export declare class ChangeTracker<T> implements IApiChangeTracker<T> {
+    /**
+     * @description 当前值前序清单
+     * @private
+     * @type {ChangeHistoryItem<T>[]}
+     * @memberof ChangeTracker
+     */
+    private past;
+    /**
+     * @description 当前值
+     * @private
+     * @type {(ChangeHistoryItem<T> | null)}
+     * @memberof ChangeTracker
+     */
+    private present;
+    /**
+     * @description 当前值后序清单
+     * @private
+     * @type {ChangeHistoryItem<T>[]}
+     * @memberof ChangeTracker
+     */
+    private future;
+    /**
+     * @description 历史记录限制条数，默认历史记录限制100条
+     * @private
+     * @type {number}
+     * @memberof ChangeTracker
+     */
+    private readonly limit;
+    /**
+     * Creates an instance of ChangeTracker.
+     * @param {{ limit?: number }} [options={}]
+     * @memberof ChangeTracker
+     */
+    constructor(options?: {
+        limit?: number;
+    });
+    /**
+     * @description 添加状态
+     * @param {T} state
+     * @memberof ChangeTracker
+     */
+    add(state: T): void;
+    /**
+     * @description 重置状态
+     * @param {T} state
+     * @memberof ChangeTracker
+     */
+    reset(state: T): void;
+    /**
+     * @description 撤销上一步操作
+     * @returns {*}  {(T | null)}
+     * @memberof ChangeTracker
+     */
+    undo(): T | null;
+    /**
+     * @description 重做下一步操作
+     * @returns {*}  {(T | null)}
+     * @memberof ChangeTracker
+     */
+    redo(): T | null;
+    /**
+     * @description 获取当前状态
+     * @returns {*}  {(T | null)}
+     * @memberof ChangeTracker
+     */
+    getState(): T | null;
+    /**
+     * @description 是否可以撤销
+     * @returns {*}  {boolean}
+     * @memberof ChangeTracker
+     */
+    canUndo(): boolean;
+    /**
+     * @description 是否可以重做
+     * @returns {*}  {boolean}
+     * @memberof ChangeTracker
+     */
+    canRedo(): boolean;
+    /**
+     * @description 清空历史记录
+     * @memberof ChangeTracker
+     */
+    clearHistory(): void;
+    /**
+     * @description 获取历史记录长度信息
+     * @returns {*}  {{ past: number; future: number }}
+     * @memberof ChangeTracker
+     */
+    getHistorySize(): {
+        past: number;
+        future: number;
+    };
+    /**
+     * @description 限制历史记录长度
+     * @private
+     * @param {IApiChangeHistoryItem<T>[]} history 历史记录数组
+     * @memberof ChangeTracker
+     */
+    private trimHistory;
+}
+//# sourceMappingURL=change-tracker.d.ts.map

package/out/utils/change-tracker/change-tracker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-tracker.d.ts","sourceRoot":"","sources":["../../../src/utils/change-tracker/change-tracker.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAG3E;;;;;;GAMG;AACH,qBAAa,aAAa,CAAC,CAAC,CAAE,YAAW,iBAAiB,CAAC,CAAC,CAAC;IAC3D;;;;;OAKG;IACH,OAAO,CAAC,IAAI,CAA8B;IAE1C;;;;;OAKG;IACH,OAAO,CAAC,OAAO,CAAqC;IAEpD;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAA8B;IAE5C;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAE/B;;;;OAIG;gBACS,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAO;IAI5C;;;;OAIG;IACH,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI;IASnB;;;;OAIG;IACH,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI;IAKrB;;;;OAIG;IACH,IAAI,IAAI,CAAC,GAAG,IAAI;IAUhB;;;;OAIG;IACH,IAAI,IAAI,CAAC,GAAG,IAAI;IAUhB;;;;OAIG;IACH,QAAQ,IAAI,CAAC,GAAG,IAAI;IAIpB;;;;OAIG;IACH,OAAO,IAAI,OAAO;IAIlB;;;;OAIG;IACH,OAAO,IAAI,OAAO;IAIlB;;;OAGG;IACH,YAAY,IAAI,IAAI;IAMpB;;;;OAIG;IACH,cAAc,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;IAOlD;;;;;OAKG;IACH,OAAO,CAAC,WAAW;CAMpB"}

package/out/utils/change-tracker/change-tracker.js

@@ -0,0 +1,146 @@
+import { ChangeHistoryItem } from './change-history-item';
+/**
+ * @description 变更追踪器
+ * @export
+ * @class ChangeTracker
+ * @implements {IApiChangeTracker<T>}
+ * @template T
+ */
+export class ChangeTracker {
+    /**
+     * Creates an instance of ChangeTracker.
+     * @param {{ limit?: number }} [options={}]
+     * @memberof ChangeTracker
+     */
+    constructor(options = {}) {
+        /**
+         * @description 当前值前序清单
+         * @private
+         * @type {ChangeHistoryItem<T>[]}
+         * @memberof ChangeTracker
+         */
+        this.past = [];
+        /**
+         * @description 当前值
+         * @private
+         * @type {(ChangeHistoryItem<T> | null)}
+         * @memberof ChangeTracker
+         */
+        this.present = null;
+        /**
+         * @description 当前值后序清单
+         * @private
+         * @type {ChangeHistoryItem<T>[]}
+         * @memberof ChangeTracker
+         */
+        this.future = [];
+        this.limit = options.limit || 100;
+    }
+    /**
+     * @description 添加状态
+     * @param {T} state
+     * @memberof ChangeTracker
+     */
+    add(state) {
+        if (this.present) {
+            this.past.push(this.present);
+            this.trimHistory(this.past);
+        }
+        this.present = new ChangeHistoryItem(state);
+        this.future = [];
+    }
+    /**
+     * @description 重置状态
+     * @param {T} state
+     * @memberof ChangeTracker
+     */
+    reset(state) {
+        this.clearHistory();
+        this.add(state);
+    }
+    /**
+     * @description 撤销上一步操作
+     * @returns {*}  {(T | null)}
+     * @memberof ChangeTracker
+     */
+    undo() {
+        if (this.past.length === 0 || !this.present) {
+            return null;
+        }
+        const previous = this.past.pop();
+        this.future.unshift(this.present);
+        this.present = previous;
+        return this.getState();
+    }
+    /**
+     * @description 重做下一步操作
+     * @returns {*}  {(T | null)}
+     * @memberof ChangeTracker
+     */
+    redo() {
+        if (this.future.length === 0 || !this.present) {
+            return null;
+        }
+        const next = this.future.shift();
+        this.past.push(this.present);
+        this.present = next;
+        return this.getState();
+    }
+    /**
+     * @description 获取当前状态
+     * @returns {*}  {(T | null)}
+     * @memberof ChangeTracker
+     */
+    getState() {
+        var _a, _b;
+        return (_b = (_a = this.present) === null || _a === void 0 ? void 0 : _a.state) !== null && _b !== void 0 ? _b : null;
+    }
+    /**
+     * @description 是否可以撤销
+     * @returns {*}  {boolean}
+     * @memberof ChangeTracker
+     */
+    canUndo() {
+        return this.past.length > 0;
+    }
+    /**
+     * @description 是否可以重做
+     * @returns {*}  {boolean}
+     * @memberof ChangeTracker
+     */
+    canRedo() {
+        return this.future.length > 0;
+    }
+    /**
+     * @description 清空历史记录
+     * @memberof ChangeTracker
+     */
+    clearHistory() {
+        this.past = [];
+        this.future = [];
+        this.present = null;
+    }
+    /**
+     * @description 获取历史记录长度信息
+     * @returns {*}  {{ past: number; future: number }}
+     * @memberof ChangeTracker
+     */
+    getHistorySize() {
+        return {
+            past: this.past.length,
+            future: this.future.length,
+        };
+    }
+    /**
+     * @description 限制历史记录长度
+     * @private
+     * @param {IApiChangeHistoryItem<T>[]} history 历史记录数组
+     * @memberof ChangeTracker
+     */
+    trimHistory(history) {
+        if (history.length > this.limit) {
+            const excess = history.length - this.limit;
+            history.splice(0, excess);
+        }
+    }
+}