@ibiz-template/runtime 0.7.41-alpha.1 → 0.7.41-alpha.100

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

@@ -1,10 +1,11 @@
-import { StringUtil, RuntimeModelError, ModelError, RuntimeError, } from '@ibiz-template/core';
+import { StringUtil, ModelError, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
 import { clone, mergeRight } from 'ramda';
 import { OpenAppViewCommand } from '../../command';
 import { ScriptFactory } from '../../utils';
 import { UIActionProviderBase } from './ui-action-provider-base';
 import { openDataImport } from '../../controller/utils';
 import { SysUIActionTag } from '../../constant';
+import { calcResPath } from '../../service';
 /**
  * 前台调用界面行为适配器
  *
@@ -29,7 +30,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
                     throw new RuntimeModelError(action, ibiz.i18n.t('runtime.uiAction.noConfiguredopenView'));
                 }
                 // 处理参数
-                const { resultContext, resultParams } = await this.handleParams(action, context, data, params);
+                const { resultContext, resultParams, resultData } = await this.handleParams(action, context, data, params);
                 // 获取视图数据能力部件
                 const { xdataControlName = '' } = view.model;
                 const xdataControl = view.getController(xdataControlName);
@@ -39,7 +40,8 @@ export class FrontUIActionProvider extends UIActionProviderBase {
                 }
                 //  解析自定义 视图 option 参数
                 const options = this.handleViewOptionParams(resultParams);
-                const res = await ibiz.commands.execute(OpenAppViewCommand.TAG, frontPSAppView, resultContext, resultParams, Object.assign({ ctx: view.getCtx(), event, noWaitRoute }, options));
+                const res = await ibiz.commands.execute(OpenAppViewCommand.TAG, frontPSAppView, resultContext, resultParams, Object.assign({ ctx: view.getCtx(), event,
+                    noWaitRoute, parentData: resultData }, options));
                 // 打开视图取消操作
                 if (!(res === null || res === void 0 ? void 0 : res.ok)) {
                     actionResult.cancel = true;
@@ -89,14 +91,23 @@ export class FrontUIActionProvider extends UIActionProviderBase {
      * @return {*}
      */
     async doOther(action, args) {
-        const { scriptCode, uiactionTag } = action;
         const { context, params, data, event, view, ctrl } = args;
+        const { resultContext, resultParams } = await this.handleParams(action, context, data, params);
+        const { scriptCode, uiactionTag } = action;
         if (uiactionTag === SysUIActionTag.SHOTR_CUT) {
             const result = await view.callUIAction(uiactionTag, args);
             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: resultContext,
+                params: Object.assign(Object.assign({}, params), resultParams),
+                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'));
@@ -117,37 +128,39 @@ export class FrontUIActionProvider extends UIActionProviderBase {
             return print.id === action.appDEPrintId;
         });
         if (appDEPrint) {
-            let requestUrl = '';
+            let url = '';
             if (resultContext &&
                 resultContext[appDataEntity.codeName.toLowerCase()]) {
                 // TODO 临时写死printdata， 非标准，后续优化
-                requestUrl += `/${appDataEntity.deapicodeName2}/printdata/${resultContext[appDataEntity.codeName.toLowerCase()]}`;
+                const resPath = calcResPath(resultContext, appDataEntity);
+                url += `${resPath}/${appDataEntity.deapicodeName2}/printdata/${encodeURIComponent(resultContext[appDataEntity.codeName.toLowerCase()])}`;
             }
             else {
                 throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.dataPrimaryKey'));
             }
-            const res = await ibiz.net.request(requestUrl, {
+            // 识别动态打印标识srfdynaprinttag，拼接格式为srfdynaprinttag@printtag，当srfdynaprinttag值为''时不拼接
+            let printTag = '';
+            if (resultContext.srfdynaprinttag) {
+                printTag += `${resultContext.srfdynaprinttag}@`;
+            }
+            printTag += appDEPrint.codeName;
+            const params = Object.assign({ srfprinttag: printTag }, resultParams);
+            const app = await ibiz.hub.getAppAsync(action.appId);
+            const res = await app.net.request(url, {
                 method: 'get',
                 responseType: 'blob',
-                params: Object.assign({ srfprinttag: appDEPrint.codeName }, resultParams),
+                params,
             });
             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');
-                }
+                const success = await ibiz.printPreview.execPrint(resultContext, resultParams, res.data);
+                if (success)
+                    return;
+                ibiz.platform.backendExport({
+                    url,
+                    params,
+                    method: 'get',
+                    newWindow: !resultParams.srfcontenttype,
+                });
             }
             else {
                 throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.printFailure'));
@@ -166,7 +179,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
      */
     async executeDataImport(action, args) {
         // 处理参数
-        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 { appDataEntityId, appDEDataImportId, frontAppViewId } = action;
         if (!appDataEntityId || !appDEDataImportId) {
             throw new RuntimeModelError(action, ibiz.i18n.t('runtime.controller.common.control.noImportModel'));
@@ -177,6 +190,8 @@ export class FrontUIActionProvider extends UIActionProviderBase {
             dataImportViewId: frontAppViewId,
             context: resultContext,
             params: resultParams,
+            event: args.event,
+            viewOption: presetParams.viewoption,
         });
         return {
             refresh: true,
@@ -191,16 +206,34 @@ 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 && appDEDataExport.appDEDataSetId) {
+                exportDatasetCodeName = appDEDataExport.appDEDataSetId;
+            }
+            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 isAsyncAction = presetParams.srfasyncaction === 'true';
+            const resPath = calcResPath(resultContext, appDataEntity);
+            const url = `${resPath}/${appDataEntity.deapicodeName2}/${isAsyncAction ? 'asyncexportdata' : 'exportdata'}/${exportDatasetCodeName}`;
             //  查询参数
             const queryParam = { srfexporttag: appDEDataExport.codeName };
             if (resultContext === null || resultContext === void 0 ? void 0 : resultContext.srfdatatype) {
@@ -208,28 +241,23 @@ 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, {
-                method: 'post',
-                responseType: 'blob',
-                params: queryParam,
-                data: params,
-            });
-            if (res.status === 200) {
-                const fileName = ibiz.util.file.getFileName(res);
-                const blob = new Blob([res.data], {
-                    type: 'application/vnd.ms-excel',
+            // 异步导出时只发消息不下载
+            if (isAsyncAction) {
+                const app = await ibiz.hub.getAppAsync(action.appId);
+                await app.net.request(url, {
+                    method: 'post',
+                    responseType: 'blob',
+                    params: queryParam,
+                    data: params,
                 });
-                const elink = document.createElement('a');
-                elink.download = fileName;
-                elink.style.display = 'none';
-                elink.href = URL.createObjectURL(blob);
-                document.body.appendChild(elink);
-                elink.click();
-                URL.revokeObjectURL(elink.href); // 释放URL 对象
-                document.body.removeChild(elink);
             }
             else {
-                throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.exportRequestFailed'));
+                await ibiz.platform.backendExport({
+                    url,
+                    data: params,
+                    method: 'post',
+                    params: queryParam,
+                });
             }
         }
         else {
@@ -275,6 +303,9 @@ export class FrontUIActionProvider extends UIActionProviderBase {
                 }
                 hasSave = true;
             },
+            onFinish: (_eventArgs) => {
+                overlay === null || overlay === void 0 ? void 0 : overlay.dismiss();
+            },
         }, popoverOpts);
         overlay.present(event.target);
         await overlay.onWillDismiss();

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;IAmGF;;;;;;;;;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;IA8G3B;;;;;;;;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;IA+HF;;;;;;;;;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,17 +27,24 @@ 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;
         }
         // ** 界面逻辑替换执行界面行为
-        const { appDEUILogicId, appDataEntityId, uilogicAttachMode } = action;
+        const { appDEUILogicId, appDataEntityId, uilogicAttachMode, appId } = action;
         if (uilogicAttachMode === 'REPLACE') {
             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);
+            // 修正应用上下文中srfappid
+            Object.assign(resultContext, {
+                srfappid: appId,
+            });
+            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 +54,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) {
@@ -56,7 +69,12 @@ export class UIActionProviderBase {
             if (!appDEUILogicId) {
                 throw new RuntimeModelError(action, ibiz.i18n.t('runtime.logicScheduler.executor.noConfiguredLogic'));
             }
-            await execUILogic(appDEUILogicId, appDataEntityId, this.mergeArgsByResult(args, result));
+            const tempParams = this.mergeArgsByResult(args, result);
+            // 修正应用上下文中srfappid
+            Object.assign(tempParams.context, {
+                srfappid: appId,
+            });
+            await execUILogic(appDEUILogicId, appDataEntityId, tempParams);
         }
         // ** 后续界面行为
         const nextActionParams = this.mergeArgsByResult(args, result);
@@ -165,9 +183,13 @@ export class UIActionProviderBase {
     async handleParams(action, context, data, params) {
         let resultData = [];
         // 准备实体名称
-        const deName = calcDeCodeNameById(action.appDataEntityId);
-        const entity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
-        const keyField = entity.keyAppDEFieldId; // 主键属性名称
+        const deName = action.appDataEntityId
+            ? calcDeCodeNameById(action.appDataEntityId)
+            : undefined;
+        const entity = action.appDataEntityId
+            ? await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId)
+            : undefined;
+        const keyField = entity === null || entity === void 0 ? void 0 : entity.keyAppDEFieldId; // 主键属性名称
         // 根据数据目标处理数据集合
         switch (action.actionTarget) {
             // 数据目标为无数据时，清空数据
@@ -185,7 +207,7 @@ export class UIActionProviderBase {
             // 多项数据主键传递数组，数组内只有一个主键
             case 'MULTIKEY':
                 resultData =
-                    deName && data.length > 0
+                    deName && keyField && data.length > 0
                         ? data.map(item => ({ [keyField]: item.srfkey || item[keyField] }))
                         : [{}];
                 break;
@@ -193,9 +215,10 @@ export class UIActionProviderBase {
             case 'SINGLEKEY':
                 {
                     const originData = data[0] || {};
-                    resultData = deName
-                        ? [{ [keyField]: originData.srfkey || originData[keyField] }]
-                        : [{}];
+                    resultData =
+                        deName && keyField
+                            ? [{ [keyField]: originData.srfkey || originData[keyField] }]
+                            : [{}];
                 }
                 break;
             default:
@@ -231,7 +254,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

@@ -16,6 +16,14 @@ export declare class UIActionUtil {
      * @memberof UIActionUtil
      */
     static exec(actionId: string, params: IUILogicParams, appId: string): Promise<IUIActionResult>;
+    /**
+     * 执行界面逻辑
+     * @param appDEUILogicId
+     * @param appDataEntityId
+     * @param args
+     * @returns
+     */
+    static execUILogic(appDEUILogicId: string, appDataEntityId: string, args: IUILogicParams): Promise<unknown>;
     /**
      * @description 执行界面行为并处理返回值
      * @static

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;AAK/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;;;;;;OAMG;WACU,WAAW,CACtB,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC;IAOnB;;;;;;;;OAQG;WACU,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAoChB;;;;;;;OAOG;mBACkB,iBAAiB;IAMtC;;;;;;;OAOG;mBACkB,sBAAsB;CAW5C"}

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

@@ -2,6 +2,7 @@ import { RuntimeError } from '@ibiz-template/core';
 import { PresetIdentifier, SysUIActionTag, ViewCallTag } from '../constant';
 import { getUIActionById } from '../model';
 import { getUIActionProvider } from '../register';
+import { execUILogic } from '../ui-logic';
 /**
  * @description 界面行为工具类
  * @export
@@ -33,6 +34,17 @@ export class UIActionUtil {
         const provider = await getUIActionProvider(action);
         return provider.exec(action, params);
     }
+    /**
+     * 执行界面逻辑
+     * @param appDEUILogicId
+     * @param appDataEntityId
+     * @param args
+     * @returns
+     */
+    static async execUILogic(appDEUILogicId, appDataEntityId, args) {
+        const result = await execUILogic(appDEUILogicId, appDataEntityId, Object.assign({}, args));
+        return result;
+    }
     /**
      * @description 执行界面行为并处理返回值
      * @static
@@ -43,33 +55,36 @@ 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;
-            params.view.closeView({ ok: true });
-        }
-        else if (result.refresh) {
+        // 先处理刷新引用视图，再处理关闭，避免关闭时刷新无效
+        if (result.refresh) {
             switch (result.refreshMode) {
                 case 1:
-                    params.view.callUIAction(SysUIActionTag.REFRESH);
+                    await params.view.callUIAction(SysUIActionTag.REFRESH);
                     break;
                 case 2:
-                    (_a = params.view.parentView) === null || _a === void 0 ? void 0 : _a.callUIAction(SysUIActionTag.REFRESH);
+                    await ((_a = params.view.parentView) === null || _a === void 0 ? void 0 : _a.callUIAction(SysUIActionTag.REFRESH));
                     break;
                 case 3:
-                    (_b = params.view.getTopView()) === null || _b === void 0 ? void 0 : _b.callUIAction(SysUIActionTag.REFRESH);
+                    await ((_b = params.view.getTopView()) === null || _b === void 0 ? void 0 : _b.callUIAction(SysUIActionTag.REFRESH));
                     break;
                 default:
             }
         }
+        if (result.closeView) {
+            // 编辑器失焦后，调整数据后直接点击关闭按钮导致无法触发自动保存通过modal中preDismiss钩子执行，shouldDismiss钩子仅负责计算是否可关闭视图参数，不能混为一谈
+            params.view.modal.ignoreDismissCheck = true;
+            params.view.closeView({ ok: true });
+        }
         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]);
     }