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

package/src/interface/api/state/control/i-api-md-control.state.ts

@@ -175,6 +175,14 @@ export interface IApiMDControlState extends IApiControlState {
    * @memberof IApiMDControlState
    */
   enableGroup: boolean;
+
+  /**
+   * @description 是否全选，该状态目前仅PC端表格使用。
+   * @type {boolean}
+   * @default false
+   * @memberof IApiMDControlState
+   */
+  isSelectedAll: boolean;
 }
 
 /**

package/src/platform/provider/platform-provider-base.ts

@@ -80,6 +80,21 @@ export abstract class PlatformProviderBase implements IPlatformProvider {
    */
   async backendExport(args: IBackendExportParams): Promise<boolean> {
     const { baseURL, url, method, params, data, newWindow } = args;
+
+    // 规范化参数
+    if (
+      data &&
+      Object.prototype.hasOwnProperty.call(data, 'srfexportdataset')
+    ) {
+      delete data.srfexportdataset;
+    }
+    if (
+      data &&
+      Object.prototype.hasOwnProperty.call(data, 'srfexportdatakey')
+    ) {
+      delete data.srfexportdatakey;
+    }
+
     const response = await (ibiz.net.request(url, {
       data,
       method,

package/src/service/service/control/md-control.service.ts

@@ -14,14 +14,20 @@ export class MDControlService<
    * @date 2022-08-31 17:08:41
    * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
+   * @param {IParams} [args={}] 额外参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async fetch(
     context: IContext,
     params: IParams = {},
+    args: IParams = {},
   ): Promise<IHttpResponse<ControlVO[]>> {
-    const fetchAction =
+    let fetchAction =
       this.model.fetchControlAction?.appDEMethodId || 'fetchdefault';
+    // 识别用户定义参数导出数据集合
+    if (args.srfexportdataset) {
+      fetchAction = args.srfexportdataset;
+    }
     let res = await this.exec(fetchAction, context, params);
     res = this.handleResponse(res);
     return res as IHttpResponse<ControlVO[]>;
@@ -166,10 +172,16 @@ export class MDControlService<
       context,
       this.model.appDataEntityId!,
     );
+    let tempFetchAction =
+      dataExport.appDEDataSetId ||
+      this.model.fetchControlAction!.appDEMethodId!;
+    // 识别用户定义的视图参数导出数据集合
+    if (params.srfexportdataset) {
+      tempFetchAction = params.srfexportdataset;
+    }
     return entityService.file.export(
       dataExport,
-      dataExport.appDEDataSetId ||
-        this.model.fetchControlAction!.appDEMethodId!,
+      tempFetchAction,
       context,
       params,
     );

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

@@ -357,6 +357,28 @@ export class FrontUIActionProvider extends UIActionProviderBase {
         ...args.params,
         ...resultParams,
       };
+      // 多项数据和多项数据主键如果没有选择全部界面参数则认为导出选中行
+      const { actionTarget } = action;
+      if (
+        (actionTarget === 'MULTIDATA' || actionTarget === 'MULTIKEY') &&
+        !args.params.srfallselected
+      ) {
+        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(','),
+          });
+        }
+        Object.assign(params, tempParams);
+      }
+      // 如果srfallselected存在需要删除，规范化参数
+      if (
+        params &&
+        Object.prototype.hasOwnProperty.call(params, 'srfallselected')
+      ) {
+        delete params.srfallselected;
+      }
 
       // 异步导出时只发消息不下载
       if (isAsyncAction) {

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

@@ -406,6 +406,12 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
       delete resultParams.srfexportdataset;
     }
 
+    // srfexportdatakey（指定数据导出传入数据主键属性）
+    if (resultParams.hasOwnProperty('srfexportdatakey')) {
+      presetParams.srfexportdatakey = resultParams.srfexportdatakey;
+      delete resultParams.srfexportdatakey;
+    }
+
     // srfasyncaction（指定当前界面行为是否异步（目前仅数据导出使用））
     if (resultParams.hasOwnProperty('srfasyncaction')) {
       presetParams.srfasyncaction = resultParams.srfasyncaction;