@ibiz-template/runtime 0.7.41-alpha.117 → 0.7.41-alpha.118

package/src/controller/control/md-ctrl/md-ctrl.controller.ts

@@ -698,7 +698,10 @@ export class MDCtrlController
       // 识别用户定义的视图参数导出数据集合
       data = await this.loadData(
         { viewParam },
-        { srfexportdataset: this.params.srfexportdataset },
+        {
+          srfexportdataset:
+            params.srfexportdataset || this.params.srfexportdataset,
+        },
       );
     } else if (type === 'selectedRows') {
       data = this.getData();
@@ -768,6 +771,11 @@ export class MDCtrlController
    * @memberof MDCtrlController
    */
   async excuteBackendExport(params: IApiExportParams): Promise<void> {
+    // 构建导出模型
+    let tempDataExport = this.dataExport;
+    if (params.srfdataexport) {
+      tempDataExport = params.srfdataexport as IAppDEDataExport;
+    }
     // 准备参数
     const fetchParams = await this.getFetchParams({ ...this.params });
     let tempParams: IParams = {};
@@ -786,7 +794,8 @@ export class MDCtrlController
         );
       }
       // 用户通过视图参数srfexportdatakey指定导出选中数据的数据主键属性
-      const srfexportdatakey = this.params.srfexportdatakey || 'srfkey';
+      const srfexportdatakey =
+        params.srfexportdatakey || this.params.srfexportdatakey || 'srfkey';
       tempParams = {
         page: 0,
         srfkeys: selectedData.map(data => data[srfexportdatakey]).join(','),
@@ -803,14 +812,25 @@ export class MDCtrlController
             }
           : {
               size:
-                this.dataExport?.maxRowCount ||
+                tempDataExport?.maxRowCount ||
                 ibiz.config.common.maxExportRowsDefault,
               page: 0,
             };
     }
+    // 自定义导出数据集，优先使用外部传入，避免被上面分支的整体赋值覆盖
+    if (params.srfexportdataset) {
+      tempParams.srfexportdataset = params.srfexportdataset;
+    }
     Object.assign(fetchParams, tempParams);
+    // 构建上下文
+    const tempContext = clone(this.context);
+    if (params.srfdatatype) {
+      Object.assign(tempContext, {
+        srfdatatype: params.srfdatatype,
+      });
+    }
     // 执行导出
-    await this.service.exportData(this.dataExport!, this.context, fetchParams);
+    await this.service.exportData(tempDataExport!, tempContext, fetchParams);
   }
 
   /**

package/src/controller/control/toolbar/toolbar.controller.ts

@@ -489,23 +489,23 @@ export class ToolbarController<
         itemState.visible = false;
       }
     });
-    // 计算菜单项逻辑的预置逻辑
-    if (this.scheduler) {
-      const logicParams: IData = {};
-      if (_params) {
-        Object.assign(logicParams, { ..._params });
-      }
-      if (_data) {
-        logicParams.data = [_data];
-      }
-      // 遍历所有的项
-      recursiveIterate(
-        this.model,
-        (item: IDEToolbarItem) => {
-          const itemState = this.state.buttonsState[item.id!] as IButtonState;
-          if (!itemState) {
-            return;
-          }
+    const logicParams: IData = {};
+    if (_params) {
+      Object.assign(logicParams, { ..._params });
+    }
+    if (_data) {
+      logicParams.data = [_data];
+    }
+    // 遍历所有的项
+    recursiveIterate(
+      this.model,
+      (item: IDEToolbarItem) => {
+        const itemState = this.state.buttonsState[item.id!] as IButtonState;
+        if (!itemState) {
+          return;
+        }
+        // 计算菜单项逻辑的预置逻辑
+        if (this.scheduler) {
           // 计算项显示逻辑
           if (itemState.visible) {
             const dynaVisible = this.scheduler!.triggerItemVisible(
@@ -527,18 +527,18 @@ export class ToolbarController<
               itemState.disabled = !dynaEnable;
             }
           }
+        }
 
-          // 如果有统一资源且当前项显示，无权限则隐藏
-          if (item.accessKey && itemState.visible) {
-            const permitted = app.authority.calcByResCode(item.accessKey);
-            if (!permitted) {
-              itemState.visible = false;
-            }
+        // 如果有统一资源且当前项显示，无权限则隐藏
+        if (item.accessKey && itemState.visible) {
+          const permitted = app.authority.calcByResCode(item.accessKey);
+          if (!permitted) {
+            itemState.visible = false;
           }
-        },
-        { childrenFields: ['detoolbarItems'] },
-      );
-    }
+        }
+      },
+      { childrenFields: ['detoolbarItems'] },
+    );
     this.state.hideSeparator = formatSeparator(
       'TOOLBAR',
       this.model.detoolbarItems,

package/src/interface/api/common/i-api-export-params.ts

@@ -24,4 +24,32 @@ export interface IApiExportParams {
    * @memberof IApiExportParams
    */
   endPage?: number;
+
+  /**
+   * @description 自定义导出数据主键属性
+   * @type {string}
+   * @memberof IApiExportParams
+   */
+  srfexportdatakey?: string;
+
+  /**
+   * @description 自定义导出数据集
+   * @type {string}
+   * @memberof IApiExportParams
+   */
+  srfexportdataset?: string;
+
+  /**
+   * @description 自定义导出模型对象
+   * @type {IData}
+   * @memberof IApiExportParams
+   */
+  srfdataexport?: IData;
+
+  /**
+   * @description 自定义导出数据类型
+   * @type {string}
+   * @memberof IApiExportParams
+   */
+  srfdatatype?: string;
 }

package/src/interface/api/controller/control/i-api-tree-grid.controller.ts

@@ -37,9 +37,9 @@ export interface IApiTreeGridController<
 
   /**
    * @description 数据导出
-   * @param {{ event: MouseEvent; params: IApiExportParams }} _args 导出参数
+   * @param {{ event?: MouseEvent; params?: IApiExportParams }} _args 导出参数
    * @returns {*}  {Promise<void>}
    * @memberof IApiTreeGridController
    */
-  exportData(_args: {event: MouseEvent;params: IApiExportParams}): Promise<void>;
+  exportData(_args: {event?: MouseEvent;params?: IApiExportParams}): Promise<void>;
 }

package/src/interface/controller/controller/control/i-grid.controller.ts

@@ -58,13 +58,13 @@ export interface IGridController<
 
   /**
    * @description 导出数据
-   * @param {{ event: MouseEvent; params: IApiExportParams }} args
+   * @param {{ event?: MouseEvent; params: IApiExportParams }} args
    * @returns {*}  {Promise<void>}
    * @memberof IGridController
    */
   exportData(args: {
-    event: MouseEvent;
-    params: IApiExportParams;
+    event?: MouseEvent;
+    params?: IApiExportParams;
   }): Promise<void>;
 }
 

package/src/interface/controller/controller/control/i-md-control.controller.ts

@@ -7,6 +7,7 @@ import {
   IApiMDControlController,
   IApiMDCtrlLoadParams,
   IApiMDCtrlRemoveParams,
+  IApiExportParams,
 } from '../../../api';
 import { IViewController } from '../view';
 /**
@@ -69,9 +70,12 @@ export interface IMDControlController<
 
   /**
    * @description 导出数据
-   * @param {{ event: MouseEvent }} _args
+   * @param {{ event?: MouseEvent; params?: IApiExportParams }} _args
    * @returns {*}  {Promise<void>}
    * @memberof IMDControlController
    */
-  exportData(_args: { event: MouseEvent }): Promise<void>;
+  exportData(_args: {
+    event?: MouseEvent;
+    params?: IApiExportParams;
+  }): Promise<void>;
 }

package/src/ui-action/provider/front-ui-action-provider.ts

@@ -361,16 +361,31 @@ export class FrontUIActionProvider extends UIActionProviderBase {
       const { actionTarget } = action;
       if (
         (actionTarget === 'MULTIDATA' || actionTarget === 'MULTIKEY') &&
-        !args.params.srfallselected
+        args.view
       ) {
         const srfexportdatakey = presetParams.srfexportdatakey || 'srfkey';
-        const tempParams = {};
-        if (args && args.data && args.data.length > 0) {
-          Object.assign(tempParams, {
-            srfkeys: args.data.map(data => data[srfexportdatakey]).join(','),
+        if (!args.params.srfallselected) {
+          await args.view.call(SysUIActionTag.EXPORT_EXCEL, {
+            params: {
+              type: 'selectedRows',
+              srfexportdatakey,
+              srfexportdataset: exportDatasetCodeName,
+              srfdataexport: appDEDataExport,
+              srfdatatype: resultContext.srfdatatype,
+            },
+          });
+        } else {
+          await args.view.call(SysUIActionTag.EXPORT_EXCEL, {
+            params: {
+              type: 'maxRowCount',
+              srfexportdatakey,
+              srfexportdataset: exportDatasetCodeName,
+              srfdataexport: appDEDataExport,
+              srfdatatype: resultContext.srfdatatype,
+            },
           });
         }
-        Object.assign(params, tempParams);
+        return;
       }
       // 如果srfallselected存在需要删除，规范化参数
       if (