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

package/dist/index.esm.js

@@ -30521,6 +30521,7 @@ var MDControlController = class extends ControlController {
     this.state.groups = [];
     this.state.hideNoDataImage = false;
     this.state.enableGroup = !!this.model.enableGroup;
+    this.state.isSelectedAll = false;
   }
   /**
    * 批操作工具栏
@@ -31090,7 +31091,7 @@ var MDControlController = class extends ControlController {
   /**
    * 数据导出
    *
-   * @param {MouseEvent} event 原生js点击事件
+   * @param {{ event?: MouseEvent; params?: IApiExportParams }} _args 导出参数
    * @returns {*}  {Promise<void>}
    * @memberof MDControlController
    */
@@ -32354,11 +32355,15 @@ var MDControlService2 = class extends ControlService {
    * @date 2022-08-31 17:08:41
    * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
+   * @param {IParams} [args={}] 额外参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
-  async fetch(context, params = {}) {
+  async fetch(context, params = {}, args = {}) {
     var _a3;
-    const fetchAction = ((_a3 = this.model.fetchControlAction) == null ? void 0 : _a3.appDEMethodId) || "fetchdefault";
+    let fetchAction = ((_a3 = this.model.fetchControlAction) == null ? void 0 : _a3.appDEMethodId) || "fetchdefault";
+    if (args.srfexportdataset) {
+      fetchAction = args.srfexportdataset;
+    }
     let res = await this.exec(fetchAction, context, params);
     res = this.handleResponse(res);
     return res;
@@ -32475,9 +32480,13 @@ var MDControlService2 = class extends ControlService {
       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
     );
@@ -34977,6 +34986,10 @@ var UIActionProviderBase = class {
       presetParams.srfexportdataset = resultParams.srfexportdataset;
       delete resultParams.srfexportdataset;
     }
+    if (resultParams.hasOwnProperty("srfexportdatakey")) {
+      presetParams.srfexportdatakey = resultParams.srfexportdatakey;
+      delete resultParams.srfexportdatakey;
+    }
     if (resultParams.hasOwnProperty("srfasyncaction")) {
       presetParams.srfasyncaction = resultParams.srfasyncaction;
       delete resultParams.srfasyncaction;
@@ -35485,6 +35498,35 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
         ...args.params,
         ...resultParams
       };
+      const { actionTarget } = action;
+      if ((actionTarget === "MULTIDATA" || actionTarget === "MULTIKEY") && args.view) {
+        const srfexportdatakey = presetParams.srfexportdatakey || "srfkey";
+        if (!args.params.srfallselected) {
+          await args.view.call("ExportExcel" /* EXPORT_EXCEL */, {
+            params: {
+              type: "selectedRows",
+              srfexportdatakey,
+              srfexportdataset: exportDatasetCodeName,
+              srfdataexport: appDEDataExport,
+              srfdatatype: resultContext.srfdatatype
+            }
+          });
+        } else {
+          await args.view.call("ExportExcel" /* EXPORT_EXCEL */, {
+            params: {
+              type: "maxRowCount",
+              srfexportdatakey,
+              srfexportdataset: exportDatasetCodeName,
+              srfdataexport: appDEDataExport,
+              srfdatatype: resultContext.srfdatatype
+            }
+          });
+        }
+        return;
+      }
+      if (params && Object.prototype.hasOwnProperty.call(params, "srfallselected")) {
+        delete params.srfallselected;
+      }
       if (isAsyncAction) {
         const app = await ibiz.hub.getAppAsync(action.appId);
         await app.net.request(url, {
@@ -35895,18 +35937,27 @@ var ToolbarController = class extends ControlController {
    * @memberof ToolbarController
    */
   async getToolbarEventArgs() {
-    var _a3;
+    var _a3, _b2;
     const result = this.getEventArgs();
+    const newParams = {
+      ...result.params
+    };
     let data = [];
     if (this.xdataControl) {
       data = ((_a3 = this.xdataControl) == null ? void 0 : _a3.getData()) || [];
+      if ((_b2 = this.xdataControl.state) == null ? void 0 : _b2.isSelectedAll) {
+        Object.assign(newParams, {
+          srfallselected: true
+        });
+      }
     } else {
       data = await this.ctx.view.call("GetData" /* GET_DATA */) || [];
     }
     return {
       ...result,
       data,
-      ctrl: this
+      ctrl: this,
+      params: newParams
     };
   }
   /**
@@ -36092,6 +36143,7 @@ var ToolbarController = class extends ControlController {
     }
   }
   async calcButtonState(data, appDeId, _params = {}) {
+    const app = await ibiz.hub.getApp(this.context.srfappid);
     let _data = data;
     if (data && data instanceof ControlVO) {
       _data = data.getOrigin();
@@ -36108,21 +36160,21 @@ var ToolbarController = class extends ControlController {
         itemState.visible = false;
       }
     });
-    if (this.scheduler) {
-      const logicParams = {};
-      if (_params) {
-        Object.assign(logicParams, { ..._params });
-      }
-      if (_data) {
-        logicParams.data = [_data];
-      }
-      recursiveIterate3(
-        this.model,
-        (item) => {
-          const itemState = this.state.buttonsState[item.id];
-          if (!itemState) {
-            return;
-          }
+    const logicParams = {};
+    if (_params) {
+      Object.assign(logicParams, { ..._params });
+    }
+    if (_data) {
+      logicParams.data = [_data];
+    }
+    recursiveIterate3(
+      this.model,
+      (item) => {
+        const itemState = this.state.buttonsState[item.id];
+        if (!itemState) {
+          return;
+        }
+        if (this.scheduler) {
           if (itemState.visible) {
             const dynaVisible = this.scheduler.triggerItemVisible(
               item.id,
@@ -36141,10 +36193,16 @@ var ToolbarController = class extends ControlController {
               itemState.disabled = !dynaEnable;
             }
           }
-        },
-        { childrenFields: ["detoolbarItems"] }
-      );
-    }
+        }
+        if (item.accessKey && itemState.visible) {
+          const permitted = app.authority.calcByResCode(item.accessKey);
+          if (!permitted) {
+            itemState.visible = false;
+          }
+        }
+      },
+      { childrenFields: ["detoolbarItems"] }
+    );
     this.state.hideSeparator = formatSeparator(
       "TOOLBAR",
       this.model.detoolbarItems,
@@ -53122,16 +53180,17 @@ var GridController = class extends MDControlController {
    * @author zk
    * @date 2023-07-20 04:07:49
    * @param {MDCtrlLoadParams} args
+   * @param {IParams} [fetchArgs={}] 透传给 service.fetch 的额外参数，如 srfexportdataset
    * @return {*}
    * @memberof GridController
    */
-  async loadData(args) {
+  async loadData(args, fetchArgs = {}) {
     const { context } = this.handlerAbilityParams(args);
     const params = await this.getFetchParams(args == null ? void 0 : args.viewParam);
     let res;
     await this.startLoading();
     try {
-      res = await this.service.fetch(context, params);
+      res = await this.service.fetch(context, params, fetchArgs);
     } finally {
       await this.endLoading();
     }
@@ -53280,7 +53339,12 @@ var GridController = class extends MDControlController {
         size: ((_a3 = this.dataExport) == null ? void 0 : _a3.maxRowCount) || ibiz.config.common.maxExportRowsDefault,
         page: 0
       };
-      data = await this.loadData({ viewParam });
+      data = await this.loadData(
+        { viewParam },
+        {
+          srfexportdataset: params.srfexportdataset || this.params.srfexportdataset
+        }
+      );
     } else if (type === "selectedRows") {
       data = this.getData();
     }
@@ -53296,7 +53360,10 @@ var GridController = class extends MDControlController {
    * @param params 额外参数
    */
   async excuteBackendExport(params) {
-    var _a3;
+    let tempDataExport = this.dataExport;
+    if (params.srfdataexport) {
+      tempDataExport = params.srfdataexport;
+    }
     const fetchParams = await this.getFetchParams({ ...this.params });
     let tempParams = {};
     const { type } = params;
@@ -53313,9 +53380,10 @@ var GridController = class extends MDControlController {
           ibiz.i18n.t("runtime.controller.control.grid.exported")
         );
       }
+      const srfexportdatakey = params.srfexportdatakey || this.params.srfexportdatakey || "srfkey";
       tempParams = {
         page: 0,
-        srfkeys: selectedData.map((data) => data.srfkey).join(",")
+        srfkeys: selectedData.map((data) => data[srfexportdatakey]).join(",")
       };
     } else if (type === "maxRowCount" || type === "customPage") {
       const { size } = this.state;
@@ -53325,12 +53393,21 @@ var GridController = class extends MDControlController {
         offset: (startPage - 1) * size,
         size: (endPage - startPage + 1) * size
       } : {
-        size: ((_a3 = this.dataExport) == null ? void 0 : _a3.maxRowCount) || ibiz.config.common.maxExportRowsDefault,
+        size: (tempDataExport == null ? void 0 : tempDataExport.maxRowCount) || ibiz.config.common.maxExportRowsDefault,
         page: 0
       };
     }
+    if (params.srfexportdataset) {
+      tempParams.srfexportdataset = params.srfexportdataset;
+    }
     Object.assign(fetchParams, tempParams);
-    await this.service.exportData(this.dataExport, this.context, fetchParams);
+    const tempContext = clone32(this.context);
+    if (params.srfdatatype) {
+      Object.assign(tempContext, {
+        srfdatatype: params.srfdatatype
+      });
+    }
+    await this.service.exportData(tempDataExport, tempContext, fetchParams);
   }
   /**
    * @description 导出数据
@@ -61194,16 +61271,17 @@ var MDCtrlController = class extends MDControlController {
   /**
    * @description 加载数据(只加载数据 不做其他操作)
    * @param {MDCtrlLoadParams} args
+   * @param {IParams} [fetchArgs={}] 透传给 service.fetch 的额外参数，如 srfexportdataset
    * @returns {*}  {Promise<IData[]>}
    * @memberof MDCtrlController
    */
-  async loadData(args) {
+  async loadData(args, fetchArgs = {}) {
     const { context } = this.handlerAbilityParams(args);
     const params = await this.getFetchParams(args == null ? void 0 : args.viewParam);
     let res;
     await this.startLoading();
     try {
-      res = await this.service.fetch(context, params);
+      res = await this.service.fetch(context, params, fetchArgs);
     } finally {
       await this.endLoading();
     }
@@ -61232,7 +61310,12 @@ var MDCtrlController = class extends MDControlController {
         size: ((_a3 = this.dataExport) == null ? void 0 : _a3.maxRowCount) || ibiz.config.common.maxExportRowsDefault,
         page: 0
       };
-      data = await this.loadData({ viewParam });
+      data = await this.loadData(
+        { viewParam },
+        {
+          srfexportdataset: params.srfexportdataset || this.params.srfexportdataset
+        }
+      );
     } else if (type === "selectedRows") {
       data = this.getData();
     }
@@ -61296,7 +61379,10 @@ var MDCtrlController = class extends MDControlController {
    * @memberof MDCtrlController
    */
   async excuteBackendExport(params) {
-    var _a3;
+    let tempDataExport = this.dataExport;
+    if (params.srfdataexport) {
+      tempDataExport = params.srfdataexport;
+    }
     const fetchParams = await this.getFetchParams({ ...this.params });
     let tempParams = {};
     const { type } = params;
@@ -61313,9 +61399,10 @@ var MDCtrlController = class extends MDControlController {
           ibiz.i18n.t("runtime.controller.common.md.exported")
         );
       }
+      const srfexportdatakey = params.srfexportdatakey || this.params.srfexportdatakey || "srfkey";
       tempParams = {
         page: 0,
-        srfkeys: selectedData.map((data) => data.srfkey).join(",")
+        srfkeys: selectedData.map((data) => data[srfexportdatakey]).join(",")
       };
     } else if (type === "maxRowCount" || type === "customPage") {
       const { size } = this.state;
@@ -61325,12 +61412,21 @@ var MDCtrlController = class extends MDControlController {
         offset: (startPage - 1) * size,
         size: (endPage - startPage + 1) * size
       } : {
-        size: ((_a3 = this.dataExport) == null ? void 0 : _a3.maxRowCount) || ibiz.config.common.maxExportRowsDefault,
+        size: (tempDataExport == null ? void 0 : tempDataExport.maxRowCount) || ibiz.config.common.maxExportRowsDefault,
         page: 0
       };
     }
+    if (params.srfexportdataset) {
+      tempParams.srfexportdataset = params.srfexportdataset;
+    }
     Object.assign(fetchParams, tempParams);
-    await this.service.exportData(this.dataExport, this.context, fetchParams);
+    const tempContext = clone38(this.context);
+    if (params.srfdatatype) {
+      Object.assign(tempContext, {
+        srfdatatype: params.srfdatatype
+      });
+    }
+    await this.service.exportData(tempDataExport, tempContext, fetchParams);
   }
   /**
    * @description 导出数据
@@ -68388,6 +68484,12 @@ var PlatformProviderBase = class {
    */
   async backendExport(args) {
     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,