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

package/out/service/vo/tree-node-data/tree-code-list-node-data.js

@@ -1,3 +1,5 @@
+import { isNil } from 'ramda';
+import { updateKeyDefine } from '@ibiz-template/core';
 import { calcDeCodeNameById } from '../../../model';
 import { TreeNodeData } from './tree-node-data';
 /**
@@ -12,6 +14,7 @@ export class TreeCodeListNodeData extends TreeNodeData {
     constructor(model, parentNodeData, opts) {
         super(model, parentNodeData, opts);
         const { data } = opts;
+        this._deData = data;
         this._text = data.text;
         this._value = data.value;
         // id小写
@@ -33,5 +36,39 @@ export class TreeCodeListNodeData extends TreeNodeData {
         this.srfkey = this._value;
         this.srfmajortext = this._text;
         this._icon = this.calcIcon(model);
+        const getDeKey = (key) => {
+            // deData属性上可枚举的属性，返回该属性名称
+            if (Object.prototype.hasOwnProperty.call(this._deData, key)) {
+                return key;
+            }
+        };
+        return new Proxy(this, {
+            get(target, p, _receiver) {
+                const deKey = getDeKey(p);
+                if (!isNil(deKey)) {
+                    return target._deData[deKey];
+                }
+                return target[p];
+            },
+            // 修改操作
+            set(target, p, value, _receiver) {
+                const deKey = getDeKey(p);
+                if (!isNil(deKey)) {
+                    target._deData[deKey] = value;
+                }
+                else {
+                    target[p] = value;
+                }
+                return true;
+            },
+            ownKeys(target) {
+                // 整合所有并排除重复
+                const allKeys = [
+                    ...new Set([...Object.keys(target), ...Object.keys(target._deData)]),
+                ];
+                updateKeyDefine(target, allKeys);
+                return allKeys;
+            },
+        });
     }
 }

package/out/service/vo/tree-node-data/tree-data-set-node-data.d.ts

@@ -25,6 +25,8 @@ export declare class TreeDataSetNodeData extends TreeNodeData implements ITreeNo
         data: IData;
         leaf: boolean;
         defaultExpand: boolean;
+        context?: IContext;
+        params?: IParams;
         navContext?: IParams;
         navParams?: IParams;
     });

package/out/service/vo/tree-node-data/tree-data-set-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAahD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IACpE,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,KAAK,CAAC;IAEf,UAAU,EAAE,KAAK,CAAC;IAE1B;;;;OAIG;IACK,KAAK,EAAE,MAAM,mBAAmB,CAAC;gBAGvC,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,aAAa,EAAE,OAAO,CAAC;QACvB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IAmNH;;;;;;;OAOG;cACa,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAWvE;;;;;;;OAOG;cACa,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAI3E,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAmBhE;;;;;;;OAOG;cACa,kBAAkB,CAChC,QAAQ,EAAE,mBAAmB,GAC5B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAY9B;;;;;;;OAOG;cACa,YAAY,CAC1B,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAS/B"}
+{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAahD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IACpE,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,KAAK,CAAC;IAEf,UAAU,EAAE,KAAK,CAAC;IAE1B;;;;OAIG;IACK,KAAK,EAAE,MAAM,mBAAmB,CAAC;gBAGvC,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,aAAa,EAAE,OAAO,CAAC;QACvB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IAmNH;;;;;;;OAOG;cACa,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAWvE;;;;;;;OAOG;cACa,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAI3E,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAmBhE;;;;;;;OAOG;cACa,kBAAkB,CAChC,QAAQ,EAAE,mBAAmB,GAC5B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAoB9B;;;;;;;OAOG;cACa,YAAY,CAC1B,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAS/B"}

package/out/service/vo/tree-node-data/tree-data-set-node-data.js

@@ -277,7 +277,9 @@ export class TreeDataSetNodeData extends TreeNodeData {
      */
     async calcDataItemScript(dataItem) {
         if (dataItem.customCode && dataItem.scriptCode) {
-            return ScriptFactory.execScriptFn({ data: this._deData, context: this._context, viewParam: this._params }, dataItem.scriptCode, {
+            const tempContext = Object.assign(this._fullContext || {}, this._context || {});
+            const tempParams = Object.assign(this._fullParams || {}, this._params || {});
+            return ScriptFactory.execScriptFn({ data: this._deData, context: tempContext, viewParam: tempParams }, dataItem.scriptCode, {
                 isAsync: true,
             });
         }

package/out/service/vo/tree-node-data/tree-node-data.d.ts

@@ -23,15 +23,21 @@ export declare abstract class TreeNodeData implements ITreeNodeData {
     _nodeId: string;
     _leaf: boolean;
     _defaultExpand: boolean;
+    _draggable: boolean;
     _context?: IParams;
     _params?: IParams;
     _parent?: ITreeNodeData;
     _icon?: IIcon;
     _textHtml?: string;
     _disableSelect?: boolean;
+    srfcollapsestate: -1 | 0 | 1;
+    _fullContext?: IContext;
+    _fullParams?: IParams;
     constructor(model: IDETreeNode, parentNodeData: ITreeNodeData | undefined, opts: {
         leaf: boolean;
         defaultExpand: boolean;
+        context?: IContext;
+        params?: IParams;
         navContext?: IParams;
         navParams?: IParams;
     });

package/out/service/vo/tree-node-data/tree-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;;;GAMG;AACH,8BAAsB,YAAa,YAAW,aAAa;IACzD,KAAK,EAAE,MAAM,CAAgB;IAE7B,SAAS,EAAE,MAAM,CAAC;IAElB,GAAG,EAAG,MAAM,CAAC;IAEb,SAAS,EAAG,MAAM,CAAC;IAEnB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,KAAK,EAAG,MAAM,CAAC;IAEf,SAAS,CAAC,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAExC,OAAO,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAE5B,UAAU,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAE/B,YAAY,EAAE,OAAO,CAAC;IAEtB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,KAAK,EAAE,OAAO,CAAS;IAEvB,cAAc,EAAE,OAAO,CAAS;IAEhC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,cAAc,CAAC,EAAE,OAAO,CAAC;gBAGvB,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,OAAO,CAAC;QACd,aAAa,EAAE,OAAO,CAAC;QACvB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IAkCH;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,GAAG,SAAS;IAqBzD;;;;;;OAMG;IACH,WAAW,IAAI,KAAK,GAAG,SAAS;CAiBjC"}
+{"version":3,"file":"tree-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;;;GAMG;AACH,8BAAsB,YAAa,YAAW,aAAa;IACzD,KAAK,EAAE,MAAM,CAAgB;IAE7B,SAAS,EAAE,MAAM,CAAC;IAElB,GAAG,EAAG,MAAM,CAAC;IAEb,SAAS,EAAG,MAAM,CAAC;IAEnB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,KAAK,EAAG,MAAM,CAAC;IAEf,SAAS,CAAC,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAExC,OAAO,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAE5B,UAAU,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAE/B,YAAY,EAAE,OAAO,CAAC;IAEtB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,KAAK,EAAE,OAAO,CAAS;IAEvB,cAAc,EAAE,OAAO,CAAS;IAEhC,UAAU,EAAE,OAAO,CAAS;IAE5B,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB,gBAAgB,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAM;IAElC,YAAY,CAAC,EAAE,QAAQ,CAAC;IAExB,WAAW,CAAC,EAAE,OAAO,CAAC;gBAGpB,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,OAAO,CAAC;QACd,aAAa,EAAE,OAAO,CAAC;QACvB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IA8DH;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,GAAG,SAAS;IAqBzD;;;;;;OAMG;IACH,WAAW,IAAI,KAAK,GAAG,SAAS;CAiBjC"}

package/out/service/vo/tree-node-data/tree-node-data.js

@@ -12,16 +12,29 @@ export class TreeNodeData {
         this._uuid = createUUID();
         this._leaf = false;
         this._defaultExpand = false;
+        this._draggable = false;
+        this.srfcollapsestate = -1;
         this._leaf = opts.leaf === true;
         this._defaultExpand = opts.defaultExpand === true;
         this._parent = parentNodeData;
         this._nodeType = model.treeNodeType;
         this._disableSelect = model.disableSelect === true;
         this._changedOnly = model.enableRowEditChangedOnly === true;
+        // 节点勾选了拖动、拖入、排序时允许拖拽
+        this._draggable = !!((model === null || model === void 0 ? void 0 : model.allowDrag) ||
+            (model === null || model === void 0 ? void 0 : model.allowDrop) ||
+            (model === null || model === void 0 ? void 0 : model.allowOrder));
         // 所有节点都要继承父的上下文，如果父存在则复制父的资源上下文，否则返回空对象。
         if (this._parent) {
             this._context = Object.assign({}, this._parent._context);
         }
+        // 存储完整上下文和视图参数
+        if (opts.context) {
+            this._fullContext = opts.context;
+        }
+        if (opts.params) {
+            this._fullParams = opts.params;
+        }
         // 附加导航上下文和视图参数
         if (opts.navContext) {
             this._context = Object.assign(this._context || {}, opts.navContext);
@@ -37,6 +50,20 @@ export class TreeNodeData {
             enumerable: true,
             configurable: true,
         });
+        let srfcollapsestate = opts.defaultExpand === true ? 1 : 0;
+        Object.defineProperty(this, 'srfcollapsestate', {
+            get() {
+                if (this._leaf)
+                    return -1;
+                return srfcollapsestate;
+            },
+            set(state) {
+                if (!this._leaf)
+                    srfcollapsestate = state;
+            },
+            enumerable: true,
+            configurable: true,
+        });
     }
     /**
      * 计算节点图标

package/out/types.d.ts

@@ -1,6 +1,6 @@
 import { EngineFactory } from './engine';
 import { GlobalUtil } from './global';
-import { IMessageUtil, INotificationUtil, IOpenViewUtil, IModalUtil, IConfirmUtil, ILoadingUtil, IPluginFactory, IOverlayController, IGlobalConfig, IAppHubService, IAuthService, IPlatformProvider, INoticeUtil, IMarkOpenDataService, IRenderUtil, IAppUtil, IFullscreenUtil, IThirdAuthService, IQrcodeUtil } from './interface';
+import { IMessageUtil, INotificationUtil, IOpenViewUtil, IModalUtil, IConfirmUtil, ILoadingUtil, IPluginFactory, IOverlayController, IGlobalConfig, IAppHubService, IAuthService, IPlatformProvider, INoticeUtil, IMarkOpenDataService, IRenderUtil, IAppUtil, IFullscreenUtil, IThirdAuthService, IQrcodeUtil, IInLineAIUtil, IAIChatUtil, IScreenShotUtil } from './interface';
 import { LogicSchedulerCenter } from './logic-scheduler';
 import { RegisterCenter } from './register/register-center';
 import { UIDomainManager, CollaborateManager } from './utils';
@@ -207,6 +207,21 @@ declare module '@ibiz-template/core' {
          * @type {IQrcodeUtil}
          */
         qrcodeUtil: IQrcodeUtil;
+        /**
+         * 行内AI聊天工具类
+         * @type {IInLineAIUtil}
+         */
+        inLineAIUtil: IInLineAIUtil;
+        /**
+         * AI聊天工具类
+         */
+        aiChatUtil: IAIChatUtil;
+        /**
+         * @description 屏幕截图工具类
+         * @type {IScreenShotUtil}
+         * @memberof IBizSys
+         */
+        screenShotUtil: IScreenShotUtil;
     }
     interface IEnvironment {
         /**

package/out/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX,oBAAoB,EACpB,WAAW,EACX,QAAQ,EACR,eAAe,EACf,iBAAiB,EACjB,WAAW,EACZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE9D,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;WAKG;QACH,MAAM,EAAE,WAAW,CAAC;QAEpB;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;;WAOG;QACH,MAAM,EAAE,WAAW,CAAC;QAEpB;;;;;;WAMG;QACH,OAAO,EAAE,QAAQ,CAAC;QAElB;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,YAAY,CAAC;QAEnB;;;;;;WAMG;QACH,SAAS,EAAE,iBAAiB,CAAC;QAE7B;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,iBAAiB,CAAC;QAE5B;;;;;;WAMG;QACH,eAAe,EAAE,eAAe,CAAC;QAEjC;;;;;;WAMG;QACH,kBAAkB,EAAE,kBAAkB,CAAC;QAEvC;;;;;WAKG;QACH,YAAY,EAAE,oBAAoB,CAAC;QAEnC;;;;;WAKG;QACH,cAAc,EAAE,eAAe,CAAC;QAEhC;;;;;WAKG;QACH,UAAU,EAAE,WAAW,CAAC;KACzB;IAED,UAAU,YAAY;QACpB;;;;;;;WAOG;QACH,YAAY,CAAC,EAAE,aAAa,CAAC;KAC9B;CACF"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX,oBAAoB,EACpB,WAAW,EACX,QAAQ,EACR,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,aAAa,EACb,WAAW,EACX,eAAe,EAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE9D,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;WAKG;QACH,MAAM,EAAE,WAAW,CAAC;QAEpB;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;;WAOG;QACH,MAAM,EAAE,WAAW,CAAC;QAEpB;;;;;;WAMG;QACH,OAAO,EAAE,QAAQ,CAAC;QAElB;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,YAAY,CAAC;QAEnB;;;;;;WAMG;QACH,SAAS,EAAE,iBAAiB,CAAC;QAE7B;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,iBAAiB,CAAC;QAE5B;;;;;;WAMG;QACH,eAAe,EAAE,eAAe,CAAC;QAEjC;;;;;;WAMG;QACH,kBAAkB,EAAE,kBAAkB,CAAC;QAEvC;;;;;WAKG;QACH,YAAY,EAAE,oBAAoB,CAAC;QAEnC;;;;;WAKG;QACH,cAAc,EAAE,eAAe,CAAC;QAEhC;;;;;WAKG;QACH,UAAU,EAAE,WAAW,CAAC;QAExB;;;WAGG;QACH,YAAY,EAAE,aAAa,CAAC;QAE5B;;WAEG;QACH,UAAU,EAAE,WAAW,CAAC;QAExB;;;;WAIG;QACH,cAAc,EAAE,eAAe,CAAC;KACjC;IAED,UAAU,YAAY;QACpB;;;;;;;WAOG;QACH,YAAY,CAAC,EAAE,aAAa,CAAC;KAC9B;CACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"backend-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/backend-ui-action-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,oBAAoB;IACzD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAkF5B"}
+{"version":3,"file":"backend-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/backend-ui-action-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAGjE;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,oBAAoB;IACzD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CA8F5B"}

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

@@ -2,6 +2,7 @@ import { RuntimeModelError } from '@ibiz-template/core';
 import { isArray } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
 import { UIActionProviderBase } from './ui-action-provider-base';
+import { calcDeCodeNameById } from '../../model';
 /**
  * 后台调用界面行为适配器
  *
@@ -50,6 +51,17 @@ export class BackendUIActionProvider extends UIActionProviderBase {
             .map(item => { var _a; return ((_a = item.getOrigin) === null || _a === void 0 ? void 0 : _a.call(item)) || item || {}; })
             .map(item => Object.assign(item, tempParams)); // 界面行为视图参数和data合并一起传给后台
         const isMultiData = ['MULTIKEY', 'MULTIDATA'].includes(action.actionTarget);
+        // 修正多数据类型界面行为上下文，修复请求接口报错
+        if (isMultiData) {
+            const deName = action.appDataEntityId
+                ? calcDeCodeNameById(action.appDataEntityId)
+                : undefined;
+            if (deName &&
+                resultContext[deName] &&
+                resultContext[deName].indexOf(',') !== -1) {
+                resultContext[deName] = resultContext[deName].split(',').join(';');
+            }
+        }
         const res = await app.deService.exec(entityName, methodName, resultContext, isMultiData ? _data : _data[0], tempParams);
         // 适配界面行为成功提示信息
         if (res.ok) {

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;IAgG3B;;;;;;;;OAQG;cACa,OAAO,CACrB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAkC3B;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IA8DhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA6B3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAkFhB;;;;;;;;OAQG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+D3B;;;;;;;;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';
 /**
  * 前台调用界面行为适配器
  *
@@ -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'));
@@ -121,12 +132,14 @@ export class FrontUIActionProvider extends UIActionProviderBase {
             if (resultContext &&
                 resultContext[appDataEntity.codeName.toLowerCase()]) {
                 // TODO 临时写死printdata， 非标准，后续优化
-                requestUrl += `/${appDataEntity.deapicodeName2}/printdata/${resultContext[appDataEntity.codeName.toLowerCase()]}`;
+                const resPath = calcResPath(resultContext, appDataEntity);
+                requestUrl += `${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, {
+            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),
@@ -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,12 +241,15 @@ 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,
                 data: params,
             });
+            if (isAsyncAction)
+                return;
             if (res.status === 200) {
                 const fileName = ibiz.util.file.getFileName(res);
                 const blob = new Blob([res.data], {
@@ -275,6 +311,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;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;IAuG3B;;;;;;;;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,7 +27,7 @@ export class UIActionProviderBase {
             refreshMode: action.refreshMode,
             closeView: action.closeEditView,
         };
-        const { view } = args;
+        const { context, params, data, view } = args;
         if (action.closeEditView) {
             view.state.isClosing = true;
         }
@@ -36,7 +37,10 @@ export class UIActionProviderBase {
             if (!appDEUILogicId) {
                 throw new RuntimeModelError(action, ibiz.i18n.t('runtime.logicScheduler.executor.noConfiguredLogic'));
             }
-            await execUILogic(appDEUILogicId, appDataEntityId, args);
+            const { resultContext, resultParams } = await this.handleParams(action, context, data, params);
+            const res = await execUILogic(appDEUILogicId, appDataEntityId, Object.assign(Object.assign({}, args), { context: resultContext, params: Object.assign(Object.assign({}, params), resultParams) }));
+            if (res)
+                result.data = Array.isArray(res) ? res : [res];
             return result;
         }
         // **用户操作确认**
@@ -46,6 +50,11 @@ export class UIActionProviderBase {
         }
         // ** 执行不同类型的界面行为独有逻辑，并且合并result
         const _result = await this.execAction(action, args);
+        // 预置属性相关处理
+        const { presetParams } = await this.handleParams(action, context, data, params);
+        if (presetParams.ignoredirtycheck === 'true') {
+            view.modal.ignoreDismissCheck = true;
+        }
         Object.assign(result, _result);
         // 如果是取消操作则中断后续处理逻辑。
         if (result.cancel === true) {
@@ -236,7 +245,31 @@ export class UIActionProviderBase {
             navContexts,
             navParams,
         }, tempContext);
-        return { resultContext, resultData, resultParams };
+        // 预置属性处理
+        // ignoredirtycheck(忽略脏值检查)
+        const presetParams = {};
+        if (resultParams.hasOwnProperty('ignoredirtycheck')) {
+            presetParams.ignoredirtycheck = resultParams.ignoredirtycheck;
+            delete resultParams.ignoredirtycheck;
+        }
+        // srfexportdataset（指定数据导出数据集标识）
+        if (resultParams.hasOwnProperty('srfexportdataset')) {
+            presetParams.srfexportdataset = resultParams.srfexportdataset;
+            delete resultParams.srfexportdataset;
+        }
+        // srfasyncaction（指定当前界面行为是否异步（目前仅数据导出使用））
+        if (resultParams.hasOwnProperty('srfasyncaction')) {
+            presetParams.srfasyncaction = resultParams.srfasyncaction;
+            delete resultParams.srfasyncaction;
+        }
+        // viewoption（指定导入视图的打开方式与宽高，参数值格式为viewoption={"modalOption":{"width":"80%","height":"80%"},"openMode":"POPUPMODAL"}，openMode打开方式的可选值有：INDEXVIEWTAB（顶级容器分页）、INDEXVIEWTAB_POPUP（顶级容器分页（非模态弹出））、INDEXVIEWTAB_POPUPMODAL（顶级容器分页（模态弹出））、POPUP（非模式弹出）、POPUPMODAL（模式弹出）、POPOVER（气泡卡片）、DRAWER_LEFT（模态左侧抽屉弹出）、DRAWER_RIGHT（模态右侧抽屉弹出）、DRAWER_TOP（模态上方抽屉弹出）、DRAWER_BOTTOM（模态下方抽屉弹出））
+        if (resultParams.hasOwnProperty('viewoption')) {
+            if (resultParams.viewoption) {
+                presetParams.viewoption = JSON.parse(resultParams.viewoption);
+            }
+            delete resultParams.viewoption;
+        }
+        return { resultContext, resultData, resultParams, presetParams };
     }
     /**
      * 计算消息信息（动态，多语言资源）

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

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

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

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