@ibiz-template/runtime 0.7.41-alpha.13 → 0.7.41-alpha.131

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

@@ -1,4 +1,4 @@
-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';
@@ -30,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);
@@ -40,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;
@@ -90,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, action }, 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'));
@@ -118,39 +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， 非标准，后续优化
                 const resPath = calcResPath(resultContext, appDataEntity);
-                requestUrl += `${resPath}/${appDataEntity.deapicodeName2}/printdata/${encodeURIComponent(resultContext[appDataEntity.codeName.toLowerCase()])}`;
+                url += `${resPath}/${appDataEntity.deapicodeName2}/printdata/${encodeURIComponent(resultContext[appDataEntity.codeName.toLowerCase()])}`;
             }
             else {
                 throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.dataPrimaryKey'));
             }
+            // 识别动态打印标识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(requestUrl, {
+            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'));
@@ -169,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'));
@@ -180,6 +190,8 @@ export class FrontUIActionProvider extends UIActionProviderBase {
             dataImportViewId: frontAppViewId,
             context: resultContext,
             params: resultParams,
+            event: args.event,
+            viewOption: presetParams.viewoption,
         });
         return {
             refresh: true,
@@ -228,32 +240,62 @@ export class FrontUIActionProvider extends UIActionProviderBase {
                 Object.assign(queryParam, { srfdatatype: resultContext.srfdatatype });
             }
             //  参数
-            const params = Object.assign(Object.assign({ page: 0, size: appDEDataExport.maxRowCount ? appDEDataExport.maxRowCount : 1000 }, args.params), resultParams);
-            const app = await ibiz.hub.getAppAsync(action.appId);
-            const res = await app.net.request(url, {
-                method: 'post',
-                responseType: 'blob',
-                params: queryParam,
-                data: params,
-            });
-            if (isAsyncAction)
+            const params = Object.assign(Object.assign({ page: 0, size: appDEDataExport.maxRowCount
+                    ? appDEDataExport.maxRowCount
+                    : ibiz.config.common.maxExportRowsDefault }, args.params), resultParams);
+            // 多项数据和多项数据主键如果没有选择全部界面参数则认为导出选中行
+            const { actionTarget } = action;
+            if ((actionTarget === 'MULTIDATA' || actionTarget === 'MULTIKEY') &&
+                args.view) {
+                const srfexportdatakey = presetParams.srfexportdatakey || 'srfkey';
+                if (!args.params.srfallselected) {
+                    await args.view.call(SysUIActionTag.EXPORT_EXCEL, {
+                        params: {
+                            type: 'selectedRows',
+                            srfexportdatakey,
+                            srfexportdataset: exportDatasetCodeName,
+                            srfdataexport: appDEDataExport,
+                            srfdatatype: resultContext.srfdatatype,
+                            srfexportparams: args.params.srfexportparams,
+                        },
+                    });
+                }
+                else {
+                    await args.view.call(SysUIActionTag.EXPORT_EXCEL, {
+                        params: {
+                            type: 'maxRowCount',
+                            srfexportdatakey,
+                            srfexportdataset: exportDatasetCodeName,
+                            srfdataexport: appDEDataExport,
+                            srfdatatype: resultContext.srfdatatype,
+                            srfexportparams: args.params.srfexportparams,
+                        },
+                    });
+                }
                 return;
-            if (res.status === 200) {
-                const fileName = ibiz.util.file.getFileName(res);
-                const blob = new Blob([res.data], {
-                    type: 'application/vnd.ms-excel',
+            }
+            // 如果srfallselected存在需要删除，规范化参数
+            if (params &&
+                Object.prototype.hasOwnProperty.call(params, 'srfallselected')) {
+                delete params.srfallselected;
+            }
+            // 异步导出时只发消息不下载
+            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 {
@@ -299,6 +341,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.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":"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;IAuHF;;;;;;;;;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;IA+H3B;;;;;;;;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;IAwIF;;;;;;;;;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

@@ -27,17 +27,24 @@ export class UIActionProviderBase {
             refreshMode: action.refreshMode,
             closeView: action.closeEditView,
         };
-        const { context, params, data, view } = args;
+        const { context, params, data, view, ctrl } = 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;
         }
         // **用户操作确认**
@@ -45,6 +52,10 @@ export class UIActionProviderBase {
             result.cancel = true;
             return this.returnError(result, view);
         }
+        // ** 执行前置脚本代码**
+        if (action.beforeCode) {
+            await ScriptFactory.asyncExecScriptFn({ context, params, data, view, ctrl, args }, action.beforeCode);
+        }
         // ** 执行不同类型的界面行为独有逻辑，并且合并result
         const _result = await this.execAction(action, args);
         // 预置属性相关处理
@@ -53,6 +64,10 @@ export class UIActionProviderBase {
             view.modal.ignoreDismissCheck = true;
         }
         Object.assign(result, _result);
+        // ** 执行后置脚本代码**
+        if (action.afterCode) {
+            await ScriptFactory.asyncExecScriptFn({ context, params, data: result, view, ctrl, args }, action.afterCode);
+        }
         // 如果是取消操作则中断后续处理逻辑。
         if (result.cancel === true) {
             return this.returnError(result, view);
@@ -62,7 +77,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);
@@ -231,12 +251,14 @@ export class UIActionProviderBase {
         // 是否是多数据
         const isMultiData = ['MULTIKEY', 'MULTIDATA'].includes(action.actionTarget) &&
             data.length > 0;
+        // 非多数据场景：数据目标为NONE时传空对象，否则取第一条数据
+        const singleNavData = action.actionTarget === 'NONE' ? {} : data[0] || {};
         // 处理自定义导航上下文
-        const tempContext = convertNavData(navContexts, isMultiData ? formatMultiData(navContexts, data) : data[0] || {}, params, context);
+        const tempContext = convertNavData(navContexts, isMultiData ? formatMultiData(navContexts, data) : singleNavData, params, context);
         Object.assign(resultContext, tempContext);
         // 处理自定义导航视图参数
         const navParams = action.navigateParams;
-        const resultParams = convertNavData(navParams, isMultiData ? formatMultiData(navParams, data) : data[0] || {}, params, resultContext);
+        const resultParams = convertNavData(navParams, isMultiData ? formatMultiData(navParams, data) : singleNavData, params, resultContext);
         // 添加触发源
         ibiz.util.record.addTriggerLogic(context.srfviewid, {
             navContexts,
@@ -254,11 +276,23 @@ export class UIActionProviderBase {
             presetParams.srfexportdataset = resultParams.srfexportdataset;
             delete resultParams.srfexportdataset;
         }
+        // srfexportdatakey（指定数据导出传入数据主键属性）
+        if (resultParams.hasOwnProperty('srfexportdatakey')) {
+            presetParams.srfexportdatakey = resultParams.srfexportdatakey;
+            delete resultParams.srfexportdatakey;
+        }
         // 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;IAkChB;;;;;;;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
@@ -45,25 +57,26 @@ export class UIActionUtil {
     static async execAndResolved(actionId, params, appId) {
         var _a, _b, _c;
         const result = await this.exec(actionId, params, appId);
-        if (result.closeView) {
-            // 编辑器失焦后，调整数据后直接点击关闭按钮导致无法触发自动保存通过modal中preDismiss钩子执行，shouldDismiss钩子仅负责计算是否可关闭视图参数，不能混为一谈
-            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）模型

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

@@ -1,16 +1,11 @@
 import { IUILogicParams } from '../interface';
 /**
- * 执行界面行为
- *
- * @author chitanda
- * @date 2023-02-09 11:02:23
+ * @description 执行界面逻辑
  * @export
- * @param {IPSDEUILogic} deUILogic
- * @param {IContext} context
- * @param {(IData[] | null)} data
- * @param {IParams} params
- * @param {IParams} [opt]
- * @return {*}  {Promise<unknown>}
+ * @param {string} deUILogicId 界面逻辑标识
+ * @param {string} appDataEntityId 应用实体标识
+ * @param {IUILogicParams} parameters 界面逻辑参数
+ * @returns {*}  {Promise<unknown>}
  */
 export declare function execUILogic(deUILogicId: string, appDataEntityId: string, parameters: IUILogicParams): Promise<unknown>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ui-logic/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAQ9C;;;;;;;;;;;;GAYG;AACH,wBAAsB,WAAW,CAC/B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,OAAO,CAAC,CA6BlB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ui-logic/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAoB,MAAM,cAAc,CAAC;AAQhE;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,OAAO,CAAC,CAmClB"}

package/out/ui-logic/index.js

@@ -1,33 +1,31 @@
 import { RuntimeError } from '@ibiz-template/core';
-import { UILogic } from './ui-logic';
+import { getUILogicProvider } from '../register';
 /**
- * 界面行为实例缓存
+ * 界面逻辑实例缓存
  */
 const uiLogicMap = new Map();
 /**
- * 执行界面行为
- *
- * @author chitanda
- * @date 2023-02-09 11:02:23
+ * @description 执行界面逻辑
  * @export
- * @param {IPSDEUILogic} deUILogic
- * @param {IContext} context
- * @param {(IData[] | null)} data
- * @param {IParams} params
- * @param {IParams} [opt]
- * @return {*}  {Promise<unknown>}
+ * @param {string} deUILogicId 界面逻辑标识
+ * @param {string} appDataEntityId 应用实体标识
+ * @param {IUILogicParams} parameters 界面逻辑参数
+ * @returns {*}  {Promise<unknown>}
  */
 export async function execUILogic(deUILogicId, appDataEntityId, parameters) {
     const app = ibiz.hub.getApp(parameters.context.srfappid);
     const deUILogic = await app.getDEUILogic(deUILogicId, appDataEntityId);
-    if (!deUILogic) {
+    const appDataEntity = await ibiz.hub.getAppDataEntity(appDataEntityId, parameters.context.srfappid);
+    if (!deUILogic || !appDataEntity) {
         throw new RuntimeError(ibiz.i18n.t('runtime.uiLogic.interfaceLogic', {
             appDataEntityId,
             deUILogicId,
         }));
     }
     if (!uiLogicMap.has(deUILogic)) {
-        uiLogicMap.set(deUILogic, new UILogic(deUILogic));
+        const provider = getUILogicProvider(deUILogic, appDataEntity);
+        await provider.init();
+        uiLogicMap.set(deUILogic, provider);
     }
     ibiz.log.debug(ibiz.i18n.t('runtime.uiLogic.startExecutingInterfaceLogic', {
         appDataEntityId,

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

@@ -0,0 +1,6 @@
+/**
+ * @description 注册界面逻辑适配器
+ * @export
+ */
+export declare function presetUILogicProvider(): void;
+//# sourceMappingURL=provider.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/ui-logic/provider.ts"],"names":[],"mappings":"AA6BA;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAwF5C"}

package/out/ui-logic/provider.js

@@ -0,0 +1,32 @@
+import { registerUILogicProvider, registerUILogicNodeProvider, } from '../register';
+import { UILogic } from './ui-logic';
+import { EndNode, StartNode, MsgBoxNode, DataSetNode, DEActionNode, PFPluginNode, RawJSCodeNode, SortParamNode, BindParamNode, CopyParamNode, RenewParamNode, ResetParamNode, DebugParamNode, DEUIActionNode, AppendParamNode, PrepareJSParamNode, ExecuteDELogicNode, ThrowExceptionNode, ViewCtrlInvokeNode, ViewCtrlFireEventNode, } from './ui-logic-node';
+/**
+ * @description 注册界面逻辑适配器
+ * @export
+ */
+export function presetUILogicProvider() {
+    // 注册默认界面逻辑
+    registerUILogicProvider('DEFAULT', (uiLogic, entity) => new UILogic(uiLogic, entity));
+    // 注册界面逻辑节点
+    registerUILogicNodeProvider('BEGIN', (node) => new StartNode(node));
+    registerUILogicNodeProvider('END', (node) => new EndNode(node));
+    registerUILogicNodeProvider('DEACTION', (node) => new DEActionNode(node));
+    registerUILogicNodeProvider('DEUIACTION', (node) => new DEUIActionNode(node));
+    registerUILogicNodeProvider('PREPAREJSPARAM', (node) => new PrepareJSParamNode(node));
+    registerUILogicNodeProvider('RESETPARAM', (node) => new ResetParamNode(node));
+    registerUILogicNodeProvider('COPYPARAM', (node) => new CopyParamNode(node));
+    registerUILogicNodeProvider('BINDPARAM', (node) => new BindParamNode(node));
+    registerUILogicNodeProvider('VIEWCTRLINVOKE', (node) => new ViewCtrlInvokeNode(node));
+    registerUILogicNodeProvider('MSGBOX', (node) => new MsgBoxNode(node));
+    registerUILogicNodeProvider('DEBUGPARAM', (node) => new DebugParamNode(node));
+    registerUILogicNodeProvider('APPENDPARAM', (node) => new AppendParamNode(node));
+    registerUILogicNodeProvider('SORTPARAM', (node) => new SortParamNode(node));
+    registerUILogicNodeProvider('RENEWPARAM', (node) => new RenewParamNode(node));
+    registerUILogicNodeProvider('DEDATASET', (node) => new DataSetNode(node));
+    registerUILogicNodeProvider('THROWEXCEPTION', (node) => new ThrowExceptionNode(node));
+    registerUILogicNodeProvider('VIEWCTRLFIREEVENT', (node) => new ViewCtrlFireEventNode(node));
+    registerUILogicNodeProvider('DELOGIC', (node) => new ExecuteDELogicNode(node));
+    registerUILogicNodeProvider('PFPLUGIN', (node) => new PFPluginNode(node));
+    registerUILogicNodeProvider('RAWJSCODE', (node) => new RawJSCodeNode(node));
+}

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

@@ -41,7 +41,7 @@ export declare class UILogicContext implements IUILogicContext {
     /**
      * 数据
      */
-    get data(): IData;
+    get data(): IData[];
     /**
      * 视图参数
      */

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

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAe,YAAW,eAAe;IAgElD,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IAhEnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAM;IAEtB;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,eAAe,CAE1B;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAKtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAKvB;IAED;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;OAMG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;;OAMG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;;OAOG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}
+{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAe,YAAW,eAAe;IAgElD,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IAhEnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAM;IAEtB;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,eAAe,CAE1B;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAKtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,EAAE,CAElB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAKvB;IAED;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;OAMG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;;OAMG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;;OAOG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}

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

@@ -1,11 +1,22 @@
+import { IUILogicLinkCond } from '../../../interface';
+import { UILogicContext } from '../../ui-logic-context';
 /**
- * 界面逻辑连接条件
- *
- * @author chitanda
- * @date 2023-02-10 15:02:28
+ * @description 界面逻辑连接条件
  * @export
+ * @abstract
  * @class UILogicLinkCond
+ * @implements {IUILogicLinkCond}
  */
-export declare abstract class UILogicLinkCond {
+export declare abstract class UILogicLinkCond implements IUILogicLinkCond {
+    /**
+     * @description 条件判断
+     * @abstract
+     * @param {UILogicContext} ctx 界面逻辑执行上下文
+     * @param {IContext} context 上下文
+     * @param {IData} data 逻辑数据
+     * @returns {*}  {boolean}
+     * @memberof UILogicLinkCond
+     */
+    abstract test(ctx: UILogicContext, context: IContext, data: IData): boolean;
 }
 //# sourceMappingURL=ui-logic-link-cond.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-link-cond.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-link/ui-logic-link-cond/ui-logic-link-cond.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,8BAAsB,eAAe;CAAG"}
+{"version":3,"file":"ui-logic-link-cond.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-link/ui-logic-link-cond/ui-logic-link-cond.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD;;;;;;GAMG;AACH,8BAAsB,eAAgB,YAAW,gBAAgB;IAC/D;;;;;;;;OAQG;IACH,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAC5E"}

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

@@ -1,10 +1,9 @@
 /**
- * 界面逻辑连接条件
- *
- * @author chitanda
- * @date 2023-02-10 15:02:28
+ * @description 界面逻辑连接条件
  * @export
+ * @abstract
  * @class UILogicLinkCond
+ * @implements {IUILogicLinkCond}
  */
 export class UILogicLinkCond {
 }

package/out/ui-logic/ui-logic-link/ui-logic-link-group-cond/ui-logic-link-group-cond.d.ts

@@ -2,6 +2,7 @@ import { IDEUILogicLinkGroupCond } from '@ibiz/model-core';
 import { UILogicContext } from '../../ui-logic-context';
 import { UILogicLinkCond } from '../ui-logic-link-cond/ui-logic-link-cond';
 import { UILogicLinkSingleCond } from '../ui-logic-link-single-cond/ui-logic-link-single-cond';
+import { IUILogicLinkGroupCond } from '../../../interface';
 /**
  * 界面逻辑连接条件组
  *
@@ -11,7 +12,7 @@ import { UILogicLinkSingleCond } from '../ui-logic-link-single-cond/ui-logic-lin
  * @class UILogicLinkGroupCond
  * @extends {UILogicLinkCond}
  */
-export declare class UILogicLinkGroupCond extends UILogicLinkCond {
+export declare class UILogicLinkGroupCond extends UILogicLinkCond implements IUILogicLinkGroupCond {
     model: IDEUILogicLinkGroupCond;
     /**
      * 操作标识

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

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-link-group-cond.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-link/ui-logic-link-group-cond/ui-logic-link-group-cond.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,uBAAuB,EACxB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AAE/F;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,eAAe;IAqCpC,KAAK,EAAE,uBAAuB;IApCjD;;;;;;;;OAQG;IACH,SAAS,KAAK,EAAE,IAAI,KAAK,GAAG,IAAI,CAE/B;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,OAAO,IAAI,OAAO,CAE/B;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,CAAC,qBAAqB,GAAG,oBAAoB,CAAC,EAAE,CAAC;gBAE/C,KAAK,EAAE,uBAAuB;IAUjD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAgCnE"}
+{"version":3,"file":"ui-logic-link-group-cond.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-link/ui-logic-link-group-cond/ui-logic-link-group-cond.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,uBAAuB,EACxB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AAC/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D;;;;;;;;GAQG;AACH,qBAAa,oBACX,SAAQ,eACR,YAAW,qBAAqB;IAsCb,KAAK,EAAE,uBAAuB;IApCjD;;;;;;;;OAQG;IACH,SAAS,KAAK,EAAE,IAAI,KAAK,GAAG,IAAI,CAE/B;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,OAAO,IAAI,OAAO,CAE/B;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,CAAC,qBAAqB,GAAG,oBAAoB,CAAC,EAAE,CAAC;gBAE/C,KAAK,EAAE,uBAAuB;IAUjD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAgCnE"}