@ibiz-template/runtime 0.7.41-alpha.7 → 0.7.41-alpha.9

package/out/service/utils/util/util.js

@@ -82,3 +82,29 @@ export function convertListMapToArray(obj) {
     });
     return result;
 }
+/**
+ * @description 获取没有预置字段的上下文
+ * @export
+ * @param {IContext} context
+ * @returns {*}  {IData}
+ */
+export function getTempContext(context) {
+    const result = {};
+    // 预置上下文字段
+    const presetContext = [
+        'srfappid',
+        'srfsimple',
+        'srfviewid',
+        'srfrunmode',
+        'srfreadonly',
+        'srfnavctrlid',
+        'srfsessionid',
+        'srfnavlogicid',
+    ];
+    Object.keys(context).forEach(key => {
+        if (!presetContext.includes(key)) {
+            result[key] = context[key];
+        }
+    });
+    return result;
+}

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

@@ -6,7 +6,7 @@ export class CustomUIActionProvider extends UIActionProviderBase {
         const { scriptCode } = action;
         const { context, params, data, event, view, ctrl } = args;
         if (scriptCode) {
-            const result = (await ScriptFactory.asyncExecScriptFn({ context, params, data, el: event === null || event === void 0 ? void 0 : event.target, view, ctrl }, scriptCode));
+            const result = (await ScriptFactory.asyncExecScriptFn({ context, params, data, el: event === null || event === void 0 ? void 0 : event.target, view, ctrl, action }, scriptCode));
             return result || {};
         }
         throw new RuntimeModelError(action, ibiz.i18n.t('runtime.uiAction.missingConfigurationScriptCode'));

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

@@ -1 +1 @@
-{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,cAAc,EACd,WAAW,EACX,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,cAAc,EACd,eAAe,EAKhB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAIjE;;;;;;GAMG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA8F3B;;;;;;;;OAQG;cACa,OAAO,CACrB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAoB3B;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IA4DhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+B3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAgEhB;;;;;;;;OAQG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4D3B;;;;;;;;OAQG;cACa,aAAa,CAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAuD3B;;;;;;;;OAQG;IACH,SAAS,CAAC,kBAAkB,CAC1B,SAAS,EAAE,WAAW,GAAG,SAAS,EAClC,WAAW,CAAC,EAAE,aAAa,GAC1B,WAAW,GAAG,SAAS;IAc1B;;;;;;;;OAQG;cACa,UAAU,CACxB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAyB5B"}
+{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,cAAc,EACd,WAAW,EACX,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,cAAc,EACd,eAAe,EAKhB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAKjE;;;;;;GAMG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA8F3B;;;;;;;;OAQG;cACa,OAAO,CACrB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAoB3B;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IA0EhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+B3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IA4EhB;;;;;;;;OAQG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4D3B;;;;;;;;OAQG;cACa,aAAa,CAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAuD3B;;;;;;;;OAQG;IACH,SAAS,CAAC,kBAAkB,CAC1B,SAAS,EAAE,WAAW,GAAG,SAAS,EAClC,WAAW,CAAC,EAAE,aAAa,GAC1B,WAAW,GAAG,SAAS;IAc1B;;;;;;;;OAQG;cACa,UAAU,CACxB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CA0B5B"}

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

@@ -5,6 +5,7 @@ import { ScriptFactory } from '../../utils';
 import { UIActionProviderBase } from './ui-action-provider-base';
 import { openDataImport } from '../../controller/utils';
 import { SysUIActionTag } from '../../constant';
+import { calcResPath } from '../../service';
 /**
  * 前台调用界面行为适配器
  *
@@ -96,7 +97,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
             return result || {};
         }
         if (scriptCode) {
-            const result = (await ScriptFactory.asyncExecScriptFn({ context, params, data, el: event === null || event === void 0 ? void 0 : event.target, view, ctrl }, scriptCode));
+            const result = (await ScriptFactory.asyncExecScriptFn({ context, params, data, el: event === null || event === void 0 ? void 0 : event.target, view, ctrl, action }, scriptCode));
             return result || {};
         }
         throw new RuntimeModelError(action, ibiz.i18n.t('runtime.uiAction.missingConfigurationScriptCode'));
@@ -109,52 +110,63 @@ export class FrontUIActionProvider extends UIActionProviderBase {
      * @return {*}
      */
     async executePrint(action, args) {
-        var _a;
-        // 处理参数
-        const { resultContext, resultParams } = await this.handleParams(action, args.context, args.data, args.params);
-        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
-        const appDEPrint = (_a = appDataEntity.appDEPrints) === null || _a === void 0 ? void 0 : _a.find(print => {
-            return print.id === action.appDEPrintId;
-        });
-        if (appDEPrint) {
-            let requestUrl = '';
-            if (resultContext &&
-                resultContext[appDataEntity.codeName.toLowerCase()]) {
-                // TODO 临时写死printdata， 非标准，后续优化
-                requestUrl += `/${appDataEntity.deapicodeName2}/printdata/${resultContext[appDataEntity.codeName.toLowerCase()]}`;
-            }
-            else {
-                throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.dataPrimaryKey'));
-            }
-            const res = await ibiz.net.request(requestUrl, {
-                method: 'get',
-                responseType: 'blob',
-                params: Object.assign({ srfprinttag: appDEPrint.codeName }, resultParams),
+        const execute = async (data) => {
+            var _a;
+            // 处理参数
+            const { resultContext, resultParams } = await this.handleParams(action, args.context, data, args.params);
+            const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
+            const appDEPrint = (_a = appDataEntity.appDEPrints) === null || _a === void 0 ? void 0 : _a.find(print => {
+                return print.id === action.appDEPrintId;
             });
-            if (res.ok) {
-                // 存在srfcontenttype参数需响应文件
-                if (resultParams && resultParams.srfcontenttype) {
-                    const fileName = ibiz.util.file.getFileName(res);
-                    const href = URL.createObjectURL(res.data);
-                    const a = document.createElement('a');
-                    a.href = href;
-                    a.download = fileName;
-                    document.body.appendChild(a);
-                    a.click();
-                    document.body.removeChild(a);
-                    URL.revokeObjectURL(href);
+            if (appDEPrint) {
+                let requestUrl = '';
+                if (resultContext &&
+                    resultContext[appDataEntity.codeName.toLowerCase()]) {
+                    // TODO 临时写死printdata， 非标准，后续优化
+                    const resPath = calcResPath(resultContext, appDataEntity);
+                    requestUrl += `${resPath}/${appDataEntity.deapicodeName2}/printdata/${resultContext[appDataEntity.codeName.toLowerCase()]}`;
+                }
+                else {
+                    throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.dataPrimaryKey'));
+                }
+                const app = await ibiz.hub.getAppAsync(action.appId);
+                const res = await app.net.request(requestUrl, {
+                    method: 'get',
+                    responseType: 'blob',
+                    params: Object.assign({ srfprinttag: appDEPrint.codeName }, resultParams),
+                });
+                if (res.ok) {
+                    // 存在srfcontenttype参数需响应文件
+                    if (resultParams && resultParams.srfcontenttype) {
+                        const fileName = ibiz.util.file.getFileName(res);
+                        const href = URL.createObjectURL(res.data);
+                        const a = document.createElement('a');
+                        a.href = href;
+                        a.download = fileName;
+                        document.body.appendChild(a);
+                        a.click();
+                        document.body.removeChild(a);
+                        URL.revokeObjectURL(href);
+                    }
+                    else {
+                        const link = window.URL.createObjectURL(res.data);
+                        window.open(link, '_blank');
+                    }
                 }
                 else {
-                    const link = window.URL.createObjectURL(res.data);
-                    window.open(link, '_blank');
+                    throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.printFailure'));
                 }
             }
             else {
-                throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.printFailure'));
+                throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.physicalPrint'));
             }
+        };
+        const isMultiData = ['MULTIKEY', 'MULTIDATA'].includes(action.actionTarget);
+        if (isMultiData) {
+            await Promise.all(args.data.map(item => execute([item])));
         }
         else {
-            throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.physicalPrint'));
+            await execute(args.data);
         }
     }
     /**
@@ -191,16 +203,29 @@ export class FrontUIActionProvider extends UIActionProviderBase {
      * @return {*}
      */
     async executeDataExport(action, args) {
-        var _a;
+        var _a, _b;
         // 处理参数
-        const { resultContext, resultParams } = await this.handleParams(action, args.context, args.data, args.params);
+        const { resultContext, resultParams, presetParams } = await this.handleParams(action, args.context, args.data, args.params);
         const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
         const appDEDataExport = (_a = appDataEntity.appDEDataExports) === null || _a === void 0 ? void 0 : _a.find(dataExport => {
             return dataExport.id === action.appDEDataExportId;
         });
         if (appDEDataExport) {
-            // TODO 临时写死fetchdefault，应该从appDEDataExport的主表格上获取加载行为，但现在缺主表格模型，后续优化
-            const url = `/${appDataEntity.deapicodeName2}/exportdata/fetchdefault`;
+            // 导出数据集优先通过界面行为参数srfexportdataset获取，若未配置则获取当前界面行为实体默认数据集，都没有则抛出异常
+            let exportDatasetCodeName = presetParams.srfexportdataset;
+            if (!exportDatasetCodeName) {
+                const defaultDataset = (_b = appDataEntity.appDEMethods) === null || _b === void 0 ? void 0 : _b.find(appDEMethod => {
+                    return appDEMethod.dataSetTag === 'Default';
+                });
+                if (defaultDataset) {
+                    exportDatasetCodeName = defaultDataset.codeName;
+                }
+            }
+            if (!exportDatasetCodeName) {
+                throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.exportWithNoDataSet'));
+            }
+            const resPath = calcResPath(resultContext, appDataEntity);
+            const url = `${resPath}/${appDataEntity.deapicodeName2}/exportdata/${exportDatasetCodeName}`;
             //  查询参数
             const queryParam = { srfexporttag: appDEDataExport.codeName };
             if (resultContext === null || resultContext === void 0 ? void 0 : resultContext.srfdatatype) {
@@ -208,7 +233,8 @@ export class FrontUIActionProvider extends UIActionProviderBase {
             }
             //  参数
             const params = Object.assign(Object.assign({ page: 0, size: appDEDataExport.maxRowCount ? appDEDataExport.maxRowCount : 1000 }, args.params), resultParams);
-            const res = await ibiz.net.request(url, {
+            const app = await ibiz.hub.getAppAsync(action.appId);
+            const res = await app.net.request(url, {
                 method: 'post',
                 responseType: 'blob',
                 params: queryParam,

package/out/ui-action/provider/ui-action-provider-base.d.ts

@@ -95,6 +95,7 @@ export declare abstract class UIActionProviderBase implements IUIActionProvider
         resultContext: IContext;
         resultData: IData[];
         resultParams: IParams;
+        presetParams: IParams;
     }>;
     /**
      * 计算消息信息（动态，多语言资源）

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

@@ -1 +1 @@
-{"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAgC,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAgF3B;;;;;;;;OAQG;IACH,SAAS,CAAC,iBAAiB,CACzB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,eAAe,GACtB,cAAc;IASjB;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CACnB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,eAAe,GACpB,eAAe;IAUlB;;;;;;;OAOG;IACG,SAAS,CACb,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC;IAWnB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,EACb,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;IAqGF;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,SAAS,GAAG,SAAS,EAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,MAAM,GAAG,SAAS;IA4CrB;;;;;;;;OAQG;IACH,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;CAc5C"}
+{"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAgC,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4F3B;;;;;;;;OAQG;IACH,SAAS,CAAC,iBAAiB,CACzB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,eAAe,GACtB,cAAc;IASjB;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CACnB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,eAAe,GACpB,eAAe;IAUlB;;;;;;;OAOG;IACG,SAAS,CACb,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC;IAWnB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,EACb,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;IAkHF;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,SAAS,GAAG,SAAS,EAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,MAAM,GAAG,SAAS;IA4CrB;;;;;;;;OAQG;IACH,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;CAc5C"}

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;
         }
@@ -46,6 +47,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 +242,19 @@ 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;
+        }
+        return { resultContext, resultData, resultParams, presetParams };
     }
     /**
      * 计算消息信息（动态，多语言资源）

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

@@ -46,8 +46,8 @@ export class UIActionUtil {
         var _a, _b;
         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) {

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/modal/modal.d.ts

@@ -18,6 +18,9 @@ export declare class Modal implements IModal {
     viewUsage: number;
     ignoreDismissCheck: boolean;
     hooks: {
+        preDismiss: AsyncSeriesHook<[], {
+            allowNext?: boolean | undefined;
+        }>;
         shouldDismiss: AsyncSeriesHook<[], {
             allowClose?: boolean | undefined;
         }>;

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

@@ -1 +1 @@
-{"version":3,"file":"modal.d.ts","sourceRoot":"","sources":["../../../src/utils/modal/modal.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAErD,KAAK,eAAe,GAAG;IACrB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;CACtC,CAAC;AACF,qBAAa,KAAM,YAAW,MAAM;IAClC,IAAI,EAAE,QAAQ,CAAkB;IAEhC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,SAAS,EAAE,MAAM,CAAK;IAEtB,kBAAkB,EAAE,OAAO,CAAS;IAEpC,KAAK;;;;;MAGH;gBAEU,IAAI,EAAE,eAAe;IAejC;;;;OAIG;IACH,QAAQ,SAAU,UAAU,KAAG,IAAI,CAKjC;IAEF;;;;;OAKG;IACH,aAAa,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI;IAIlD,OAAO,CAAC,IAAI,GAAE,UAAoC,GAAG,OAAO,CAAC,OAAO,CAAC;IAoB3E;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,IAAI;CAI1B"}
+{"version":3,"file":"modal.d.ts","sourceRoot":"","sources":["../../../src/utils/modal/modal.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAErD,KAAK,eAAe,GAAG;IACrB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;CACtC,CAAC;AACF,qBAAa,KAAM,YAAW,MAAM;IAClC,IAAI,EAAE,QAAQ,CAAkB;IAEhC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,SAAS,EAAE,MAAM,CAAK;IAEtB,kBAAkB,EAAE,OAAO,CAAS;IAEpC,KAAK;;;;;;;;MAIH;gBAEU,IAAI,EAAE,eAAe;IAejC;;;;OAIG;IACH,QAAQ,SAAU,UAAU,KAAG,IAAI,CAKjC;IAEF;;;;;OAKG;IACH,aAAa,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI;IAIlD,OAAO,CAAC,IAAI,GAAE,UAAoC,GAAG,OAAO,CAAC,OAAO,CAAC;IA2B3E;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,IAAI;CAK1B"}

package/out/utils/modal/modal.js

@@ -7,6 +7,7 @@ export class Modal {
         this.viewUsage = 4;
         this.ignoreDismissCheck = false;
         this.hooks = {
+            preDismiss: new AsyncSeriesHook(),
             shouldDismiss: new AsyncSeriesHook(),
             beforeDismiss: new AsyncSeriesHook(),
         };
@@ -42,6 +43,11 @@ export class Modal {
     }
     async dismiss(data = { ok: false, data: [] }) {
         const context = {};
+        // 关闭前执行操作
+        await this.hooks.preDismiss.call(context);
+        if (context.allowNext === false) {
+            return false;
+        }
         if (this.ignoreDismissCheck !== true) {
             // 判断是否执行关闭
             await this.hooks.shouldDismiss.call(context);
@@ -64,6 +70,7 @@ export class Modal {
      * @protected
      */
     destroy() {
+        this.hooks.preDismiss.clear();
         this.hooks.shouldDismiss.clear();
         this.hooks.beforeDismiss.clear();
     }

package/out/utils/open-redirect-view/open-redirect-view.js

@@ -362,7 +362,7 @@ export async function calcDERdTag(entity, rdView, params, data) {
     // 自定义重定向
     if (typeFieldId) {
         const { codeName } = findFieldById(entity, typeFieldId);
-        const value = data[codeName.toLowerCase()];
+        const value = `${data[codeName.toLowerCase()]}`;
         if (notNilEmpty(value)) {
             // 如果是 view://协议开头直接返回,示例: view://{app}/{viewcodename}?srfwftag={wftag}
             if (value.startsWith('view://')) {
@@ -389,13 +389,13 @@ export async function calcDERdTag(entity, rdView, params, data) {
     // 从索引属性获取重定向视图类型
     if (entity.indexTypeAppDEFieldId) {
         const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId);
-        typeValue = data[codeName.toLowerCase()];
+        typeValue = `${data[codeName.toLowerCase()]}`;
     }
     if (isNilOrEmpty(typeValue)) {
         // 从多表单属性判断重定向视图类型
         if (entity.formTypeAppDEFieldId) {
             const { codeName } = findFieldById(entity, entity.formTypeAppDEFieldId);
-            typeValue = data[codeName.toLowerCase()];
+            typeValue = `${data[codeName.toLowerCase()]}`;
         }
     }
     if (notNilEmpty(typeValue)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.41-alpha.7",
+  "version": "0.7.41-alpha.9",
   "description": "运行时逻辑库",
   "type": "module",
   "main": "out/index.js",
@@ -37,8 +37,8 @@
     "jsencrypt": "^3.3.2"
   },
   "devDependencies": {
-    "@ibiz-template/core": "^0.7.41-alpha.7",
-    "@ibiz/model-core": "^0.1.77",
+    "@ibiz-template/core": "^0.7.41-alpha.9",
+    "@ibiz/model-core": "^0.1.78",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
@@ -56,7 +56,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.6.0",
-    "@ibiz/model-core": "^0.1.77",
+    "@ibiz/model-core": "^0.1.78",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -68,5 +68,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "79a6a1ef6d1b814b2a2b19e85bf1238d14a9d026"
+  "gitHead": "b3e1bdd577e6a55f67748a769f1b9123e7b557c4"
 }