@ibiz-template/runtime 0.7.41-alpha.8 → 0.7.41-alpha.80

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

@@ -25,9 +25,16 @@ export declare class TreeDataSetNodeData extends TreeNodeData implements ITreeNo
         data: IData;
         leaf: boolean;
         defaultExpand: boolean;
+        context?: IContext;
+        params?: IParams;
         navContext?: IParams;
         navParams?: IParams;
     });
+    /**
+     * 初始化异步数据
+     * @param model 节点模型
+     */
+    initAsyncData(model: IDETreeDataSetNode): Promise<void>;
     /**
      * 初始化节点图标
      * @author ljx
@@ -65,5 +72,9 @@ export declare class TreeDataSetNodeData extends TreeNodeData implements ITreeNo
      * @return {*}  {(string | undefined)}
      */
     protected calcTextHtml(model: IDETreeDataSetNode): Promise<string | undefined>;
+    /**
+     * 获取原始数据
+     */
+    getOrigin(): IData;
 }
 //# sourceMappingURL=tree-data-set-node-data.d.ts.map

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;IAkNH;;;OAGG;IACU,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAKpE;;;;;;;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;IAU9B;;OAEG;IACH,SAAS,IAAI,KAAK;CAGnB"}

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

@@ -28,8 +28,9 @@ export class TreeDataSetNodeData extends TreeNodeData {
         const { data } = opts;
         this._deData = data;
         this._oldDeData = data.clone();
+        const { idAppDEFieldId } = model;
         // id小写
-        const selfId = `${model.id}@${data.srfkey}`.toLowerCase();
+        const selfId = `${model.id}@${data.srfkey || data[idAppDEFieldId]}`.toLowerCase();
         Object.defineProperty(this, '_id', {
             get() {
                 return this._parent ? `${this._parent._id}:${selfId}` : selfId;
@@ -80,8 +81,6 @@ export class TreeDataSetNodeData extends TreeNodeData {
                 [deName]: data.srfkey,
             });
         }
-        this.initIcon(model);
-        this.initTextHtml(model);
         // 识别叶子节点标识属性，根据后台数据赋值leaf
         if (model.leafFlagAppDEFieldId) {
             this._leaf = fieldValueToBoolean(data[model.leafFlagAppDEFieldId]);
@@ -219,6 +218,14 @@ export class TreeDataSetNodeData extends TreeNodeData {
             },
         });
     }
+    /**
+     * 初始化异步数据
+     * @param model 节点模型
+     */
+    async initAsyncData(model) {
+        await this.initIcon(model);
+        await this.initTextHtml(model);
+    }
     /**
      * 初始化节点图标
      * @author ljx
@@ -277,7 +284,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,
             });
         }
@@ -299,4 +308,10 @@ export class TreeDataSetNodeData extends TreeNodeData {
         }
         return html;
     }
+    /**
+     * 获取原始数据
+     */
+    getOrigin() {
+        return this._deData;
+    }
 }

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

@@ -1,4 +1,4 @@
-import { IDETreeNode } from '@ibiz/model-core';
+import { IDETreeNode, ISysImage } from '@ibiz/model-core';
 import { IIcon, ITreeNodeData } from '../../../interface';
 /**
  * 树节点数据基类
@@ -23,27 +23,31 @@ 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;
     });
     /**
      * 计算节点图标
-     * @author lxm
-     * @date 2023-08-15 02:24:55
-     * @protected
-     * @param {IDETreeNode} model
-     * @return {*}  {(IIcon | undefined)}
+     * @param model
+     * @param dataImage
+     * @returns
      */
-    protected calcIcon(model: IDETreeNode): IIcon | undefined;
+    protected calcIcon(model: IDETreeNode, dataImage?: ISysImage): IIcon | undefined;
     /**
      * 获取改变数据
      * @author zzq

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,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG1D,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;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAChB,KAAK,EAAE,WAAW,EAClB,SAAS,CAAC,EAAE,SAAS,GACpB,KAAK,GAAG,SAAS;IA4BpB;;;;;;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,17 +50,34 @@ 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,
+        });
     }
     /**
      * 计算节点图标
-     * @author lxm
-     * @date 2023-08-15 02:24:55
-     * @protected
-     * @param {IDETreeNode} model
-     * @return {*}  {(IIcon | undefined)}
+     * @param model
+     * @param dataImage
+     * @returns
      */
-    calcIcon(model) {
-        const { sysImage } = model;
+    calcIcon(model, dataImage) {
+        let { sysImage } = model;
+        // 数据中附加图标优先级更高
+        if (dataImage &&
+            (dataImage.cssClass || dataImage.imagePath || dataImage.rawContent)) {
+            sysImage = dataImage;
+        }
         const icon = {};
         if (sysImage) {
             if (sysImage.cssClass) {

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, IPrintPreviewUtil } from './interface';
 import { LogicSchedulerCenter } from './logic-scheduler';
 import { RegisterCenter } from './register/register-center';
 import { UIDomainManager, CollaborateManager } from './utils';
@@ -91,6 +91,10 @@ declare module '@ibiz-template/core' {
          * @type {IAppUtil}
          */
         appUtil: IAppUtil;
+        /**
+         * 打印预览服务
+         */
+        printPreview: IPrintPreviewUtil;
         /**
          * 全局多种组件呈现工具类
          *
@@ -207,6 +211,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,EACf,iBAAiB,EAClB,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;;WAEG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;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/front-ui-action-provider.d.ts

@@ -1,4 +1,4 @@
-import { IAppDEUIAction, IDEEditForm, IDEFormDetail } from '@ibiz/model-core';
+import { IDEEditForm, IDEFormDetail, IAppDEUIAction } from '@ibiz/model-core';
 import { IUILogicParams, IUIActionResult } from '../../interface';
 import { UIActionProviderBase } from './ui-action-provider-base';
 /**

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;AAKjE;;;;;;GAMG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA8F3B;;;;;;;;OAQG;cACa,OAAO,CACrB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAoB3B;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IA0EhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+B3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAkEhB;;;;;;;;OAQG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4D3B;;;;;;;;OAQG;cACa,aAAa,CAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAuD3B;;;;;;;;OAQG;IACH,SAAS,CAAC,kBAAkB,CAC1B,SAAS,EAAE,WAAW,GAAG,SAAS,EAClC,WAAW,CAAC,EAAE,aAAa,GAC1B,WAAW,GAAG,SAAS;IAc1B;;;;;;;;OAQG;cACa,UAAU,CACxB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CA0B5B"}
+{"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,WAAW,EAEX,aAAa,EACb,cAAc,EACf,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAIL,cAAc,EACd,eAAe,EAEhB,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;IAkEhB;;;;;;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;IA0EhB;;;;;;;;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

@@ -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'));
@@ -110,63 +120,54 @@ export class FrontUIActionProvider extends UIActionProviderBase {
      * @return {*}
      */
     async executePrint(action, args) {
-        const execute = async (data) => {
-            var _a;
-            // 处理参数
-            const { resultContext, resultParams } = await this.handleParams(action, args.context, data, args.params);
-            const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
-            const appDEPrint = (_a = appDataEntity.appDEPrints) === null || _a === void 0 ? void 0 : _a.find(print => {
-                return print.id === action.appDEPrintId;
+        var _a;
+        // 处理参数
+        const { resultContext, resultParams } = await this.handleParams(action, args.context, args.data, args.params);
+        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
+        const appDEPrint = (_a = appDataEntity.appDEPrints) === null || _a === void 0 ? void 0 : _a.find(print => {
+            return print.id === action.appDEPrintId;
+        });
+        if (appDEPrint) {
+            let url = '';
+            if (resultContext &&
+                resultContext[appDataEntity.codeName.toLowerCase()]) {
+                // TODO 临时写死printdata， 非标准，后续优化
+                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'));
+            }
+            // 识别动态打印标识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,
             });
-            if (appDEPrint) {
-                let requestUrl = '';
-                if (resultContext &&
-                    resultContext[appDataEntity.codeName.toLowerCase()]) {
-                    // TODO 临时写死printdata， 非标准，后续优化
-                    const resPath = calcResPath(resultContext, appDataEntity);
-                    requestUrl += `${resPath}/${appDataEntity.deapicodeName2}/printdata/${resultContext[appDataEntity.codeName.toLowerCase()]}`;
-                }
-                else {
-                    throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.dataPrimaryKey'));
-                }
-                const app = await ibiz.hub.getAppAsync(action.appId);
-                const res = await app.net.request(requestUrl, {
+            if (res.ok) {
+                const success = await ibiz.printPreview.execPrint(resultContext, resultParams, res.data);
+                if (success)
+                    return;
+                ibiz.platform.backendExport({
+                    url,
+                    params,
                     method: 'get',
-                    responseType: 'blob',
-                    params: Object.assign({ srfprinttag: appDEPrint.codeName }, resultParams),
+                    newWindow: !resultParams.srfcontenttype,
                 });
-                if (res.ok) {
-                    // 存在srfcontenttype参数需响应文件
-                    if (resultParams && resultParams.srfcontenttype) {
-                        const fileName = ibiz.util.file.getFileName(res);
-                        const href = URL.createObjectURL(res.data);
-                        const a = document.createElement('a');
-                        a.href = href;
-                        a.download = fileName;
-                        document.body.appendChild(a);
-                        a.click();
-                        document.body.removeChild(a);
-                        URL.revokeObjectURL(href);
-                    }
-                    else {
-                        const link = window.URL.createObjectURL(res.data);
-                        window.open(link, '_blank');
-                    }
-                }
-                else {
-                    throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.printFailure'));
-                }
             }
             else {
-                throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.physicalPrint'));
+                throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.printFailure'));
             }
-        };
-        const isMultiData = ['MULTIKEY', 'MULTIDATA'].includes(action.actionTarget);
-        if (isMultiData) {
-            await Promise.all(args.data.map(item => execute([item])));
         }
         else {
-            await execute(args.data);
+            throw new RuntimeError(ibiz.i18n.t('runtime.uiAction.physicalPrint'));
         }
     }
     /**
@@ -178,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'));
@@ -189,6 +190,8 @@ export class FrontUIActionProvider extends UIActionProviderBase {
             dataImportViewId: frontAppViewId,
             context: resultContext,
             params: resultParams,
+            event: args.event,
+            viewOption: presetParams.viewoption,
         });
         return {
             refresh: true,
@@ -203,17 +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的主表格上获取加载行为，但现在缺主表格模型，后续优化
+            // 导出数据集优先通过界面行为参数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}/exportdata/fetchdefault`;
+            const url = `${resPath}/${appDataEntity.deapicodeName2}/${isAsyncAction ? 'asyncexportdata' : 'exportdata'}/${exportDatasetCodeName}`;
             //  查询参数
             const queryParam = { srfexporttag: appDEDataExport.codeName };
             if (resultContext === null || resultContext === void 0 ? void 0 : resultContext.srfdatatype) {
@@ -221,29 +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 app = await ibiz.hub.getAppAsync(action.appId);
-            const res = await app.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 {
@@ -289,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.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;IA4GF;;;;;;;;;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

@@ -37,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;
         }
         // **用户操作确认**
@@ -242,12 +245,30 @@ export class UIActionProviderBase {
             navContexts,
             navParams,
         }, tempContext);
-        // 预置属性（ignoredirtycheck）处理
+        // 预置属性处理
+        // 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 };
     }
     /**