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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. package/dist/index.esm.js +84 -41
  2. package/dist/index.system.min.js +1 -1
  3. package/out/controller/common/control/md-control.controller.d.ts +4 -3
  4. package/out/controller/common/control/md-control.controller.d.ts.map +1 -1
  5. package/out/controller/common/control/md-control.controller.js +1 -1
  6. package/out/controller/control/grid/grid/grid.controller.d.ts +1 -1
  7. package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
  8. package/out/controller/control/grid/grid/grid.controller.js +22 -5
  9. package/out/controller/control/md-ctrl/md-ctrl.controller.d.ts.map +1 -1
  10. package/out/controller/control/md-ctrl/md-ctrl.controller.js +22 -5
  11. package/out/controller/control/toolbar/toolbar.controller.js +22 -22
  12. package/out/interface/api/common/i-api-export-params.d.ts +24 -0
  13. package/out/interface/api/common/i-api-export-params.d.ts.map +1 -1
  14. package/out/interface/api/controller/control/i-api-tree-grid.controller.d.ts +3 -3
  15. package/out/interface/api/controller/control/i-api-tree-grid.controller.d.ts.map +1 -1
  16. package/out/interface/controller/controller/control/i-grid.controller.d.ts +3 -3
  17. package/out/interface/controller/controller/control/i-grid.controller.d.ts.map +1 -1
  18. package/out/interface/controller/controller/control/i-md-control.controller.d.ts +4 -3
  19. package/out/interface/controller/controller/control/i-md-control.controller.d.ts.map +1 -1
  20. package/out/ui-action/provider/front-ui-action-provider.d.ts.map +1 -1
  21. package/out/ui-action/provider/front-ui-action-provider.js +22 -6
  22. package/package.json +2 -2
  23. package/src/controller/common/control/md-control.controller.ts +6 -2
  24. package/src/controller/control/grid/grid/grid.controller.ts +26 -5
  25. package/src/controller/control/md-ctrl/md-ctrl.controller.ts +24 -4
  26. package/src/controller/control/toolbar/toolbar.controller.ts +27 -27
  27. package/src/interface/api/common/i-api-export-params.ts +28 -0
  28. package/src/interface/api/controller/control/i-api-tree-grid.controller.ts +2 -2
  29. package/src/interface/controller/controller/control/i-grid.controller.ts +3 -3
  30. package/src/interface/controller/controller/control/i-md-control.controller.ts +6 -2
  31. package/src/ui-action/provider/front-ui-action-provider.ts +21 -6
package/dist/index.esm.js CHANGED
@@ -31091,7 +31091,7 @@ var MDControlController = class extends ControlController {
31091
31091
  /**
31092
31092
  * 数据导出
31093
31093
  *
31094
- * @param {MouseEvent} event 原生js点击事件
31094
+ * @param {{ event?: MouseEvent; params?: IApiExportParams }} _args 导出参数
31095
31095
  * @returns {*} {Promise<void>}
31096
31096
  * @memberof MDControlController
31097
31097
  */
@@ -35499,15 +35499,30 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
35499
35499
  ...resultParams
35500
35500
  };
35501
35501
  const { actionTarget } = action;
35502
- if ((actionTarget === "MULTIDATA" || actionTarget === "MULTIKEY") && !args.params.srfallselected) {
35502
+ if ((actionTarget === "MULTIDATA" || actionTarget === "MULTIKEY") && args.view) {
35503
35503
  const srfexportdatakey = presetParams.srfexportdatakey || "srfkey";
35504
- const tempParams = {};
35505
- if (args && args.data && args.data.length > 0) {
35506
- Object.assign(tempParams, {
35507
- srfkeys: args.data.map((data) => data[srfexportdatakey]).join(",")
35504
+ if (!args.params.srfallselected) {
35505
+ await args.view.call("ExportExcel" /* EXPORT_EXCEL */, {
35506
+ params: {
35507
+ type: "selectedRows",
35508
+ srfexportdatakey,
35509
+ srfexportdataset: exportDatasetCodeName,
35510
+ srfdataexport: appDEDataExport,
35511
+ srfdatatype: resultContext.srfdatatype
35512
+ }
35513
+ });
35514
+ } else {
35515
+ await args.view.call("ExportExcel" /* EXPORT_EXCEL */, {
35516
+ params: {
35517
+ type: "maxRowCount",
35518
+ srfexportdatakey,
35519
+ srfexportdataset: exportDatasetCodeName,
35520
+ srfdataexport: appDEDataExport,
35521
+ srfdatatype: resultContext.srfdatatype
35522
+ }
35508
35523
  });
35509
35524
  }
35510
- Object.assign(params, tempParams);
35525
+ return;
35511
35526
  }
35512
35527
  if (params && Object.prototype.hasOwnProperty.call(params, "srfallselected")) {
35513
35528
  delete params.srfallselected;
@@ -36145,21 +36160,21 @@ var ToolbarController = class extends ControlController {
36145
36160
  itemState.visible = false;
36146
36161
  }
36147
36162
  });
36148
- if (this.scheduler) {
36149
- const logicParams = {};
36150
- if (_params) {
36151
- Object.assign(logicParams, { ..._params });
36152
- }
36153
- if (_data) {
36154
- logicParams.data = [_data];
36155
- }
36156
- recursiveIterate3(
36157
- this.model,
36158
- (item) => {
36159
- const itemState = this.state.buttonsState[item.id];
36160
- if (!itemState) {
36161
- return;
36162
- }
36163
+ const logicParams = {};
36164
+ if (_params) {
36165
+ Object.assign(logicParams, { ..._params });
36166
+ }
36167
+ if (_data) {
36168
+ logicParams.data = [_data];
36169
+ }
36170
+ recursiveIterate3(
36171
+ this.model,
36172
+ (item) => {
36173
+ const itemState = this.state.buttonsState[item.id];
36174
+ if (!itemState) {
36175
+ return;
36176
+ }
36177
+ if (this.scheduler) {
36163
36178
  if (itemState.visible) {
36164
36179
  const dynaVisible = this.scheduler.triggerItemVisible(
36165
36180
  item.id,
@@ -36178,16 +36193,16 @@ var ToolbarController = class extends ControlController {
36178
36193
  itemState.disabled = !dynaEnable;
36179
36194
  }
36180
36195
  }
36181
- if (item.accessKey && itemState.visible) {
36182
- const permitted = app.authority.calcByResCode(item.accessKey);
36183
- if (!permitted) {
36184
- itemState.visible = false;
36185
- }
36196
+ }
36197
+ if (item.accessKey && itemState.visible) {
36198
+ const permitted = app.authority.calcByResCode(item.accessKey);
36199
+ if (!permitted) {
36200
+ itemState.visible = false;
36186
36201
  }
36187
- },
36188
- { childrenFields: ["detoolbarItems"] }
36189
- );
36190
- }
36202
+ }
36203
+ },
36204
+ { childrenFields: ["detoolbarItems"] }
36205
+ );
36191
36206
  this.state.hideSeparator = formatSeparator(
36192
36207
  "TOOLBAR",
36193
36208
  this.model.detoolbarItems,
@@ -53326,7 +53341,9 @@ var GridController = class extends MDControlController {
53326
53341
  };
53327
53342
  data = await this.loadData(
53328
53343
  { viewParam },
53329
- { srfexportdataset: this.params.srfexportdataset }
53344
+ {
53345
+ srfexportdataset: params.srfexportdataset || this.params.srfexportdataset
53346
+ }
53330
53347
  );
53331
53348
  } else if (type === "selectedRows") {
53332
53349
  data = this.getData();
@@ -53343,7 +53360,10 @@ var GridController = class extends MDControlController {
53343
53360
  * @param params 额外参数
53344
53361
  */
53345
53362
  async excuteBackendExport(params) {
53346
- var _a3;
53363
+ let tempDataExport = this.dataExport;
53364
+ if (params.srfdataexport) {
53365
+ tempDataExport = params.srfdataexport;
53366
+ }
53347
53367
  const fetchParams = await this.getFetchParams({ ...this.params });
53348
53368
  let tempParams = {};
53349
53369
  const { type } = params;
@@ -53360,7 +53380,7 @@ var GridController = class extends MDControlController {
53360
53380
  ibiz.i18n.t("runtime.controller.control.grid.exported")
53361
53381
  );
53362
53382
  }
53363
- const srfexportdatakey = this.params.srfexportdatakey || "srfkey";
53383
+ const srfexportdatakey = params.srfexportdatakey || this.params.srfexportdatakey || "srfkey";
53364
53384
  tempParams = {
53365
53385
  page: 0,
53366
53386
  srfkeys: selectedData.map((data) => data[srfexportdatakey]).join(",")
@@ -53373,12 +53393,21 @@ var GridController = class extends MDControlController {
53373
53393
  offset: (startPage - 1) * size,
53374
53394
  size: (endPage - startPage + 1) * size
53375
53395
  } : {
53376
- size: ((_a3 = this.dataExport) == null ? void 0 : _a3.maxRowCount) || ibiz.config.common.maxExportRowsDefault,
53396
+ size: (tempDataExport == null ? void 0 : tempDataExport.maxRowCount) || ibiz.config.common.maxExportRowsDefault,
53377
53397
  page: 0
53378
53398
  };
53379
53399
  }
53400
+ if (params.srfexportdataset) {
53401
+ tempParams.srfexportdataset = params.srfexportdataset;
53402
+ }
53380
53403
  Object.assign(fetchParams, tempParams);
53381
- await this.service.exportData(this.dataExport, this.context, fetchParams);
53404
+ const tempContext = clone32(this.context);
53405
+ if (params.srfdatatype) {
53406
+ Object.assign(tempContext, {
53407
+ srfdatatype: params.srfdatatype
53408
+ });
53409
+ }
53410
+ await this.service.exportData(tempDataExport, tempContext, fetchParams);
53382
53411
  }
53383
53412
  /**
53384
53413
  * @description 导出数据
@@ -61283,7 +61312,9 @@ var MDCtrlController = class extends MDControlController {
61283
61312
  };
61284
61313
  data = await this.loadData(
61285
61314
  { viewParam },
61286
- { srfexportdataset: this.params.srfexportdataset }
61315
+ {
61316
+ srfexportdataset: params.srfexportdataset || this.params.srfexportdataset
61317
+ }
61287
61318
  );
61288
61319
  } else if (type === "selectedRows") {
61289
61320
  data = this.getData();
@@ -61348,7 +61379,10 @@ var MDCtrlController = class extends MDControlController {
61348
61379
  * @memberof MDCtrlController
61349
61380
  */
61350
61381
  async excuteBackendExport(params) {
61351
- var _a3;
61382
+ let tempDataExport = this.dataExport;
61383
+ if (params.srfdataexport) {
61384
+ tempDataExport = params.srfdataexport;
61385
+ }
61352
61386
  const fetchParams = await this.getFetchParams({ ...this.params });
61353
61387
  let tempParams = {};
61354
61388
  const { type } = params;
@@ -61365,7 +61399,7 @@ var MDCtrlController = class extends MDControlController {
61365
61399
  ibiz.i18n.t("runtime.controller.common.md.exported")
61366
61400
  );
61367
61401
  }
61368
- const srfexportdatakey = this.params.srfexportdatakey || "srfkey";
61402
+ const srfexportdatakey = params.srfexportdatakey || this.params.srfexportdatakey || "srfkey";
61369
61403
  tempParams = {
61370
61404
  page: 0,
61371
61405
  srfkeys: selectedData.map((data) => data[srfexportdatakey]).join(",")
@@ -61378,12 +61412,21 @@ var MDCtrlController = class extends MDControlController {
61378
61412
  offset: (startPage - 1) * size,
61379
61413
  size: (endPage - startPage + 1) * size
61380
61414
  } : {
61381
- size: ((_a3 = this.dataExport) == null ? void 0 : _a3.maxRowCount) || ibiz.config.common.maxExportRowsDefault,
61415
+ size: (tempDataExport == null ? void 0 : tempDataExport.maxRowCount) || ibiz.config.common.maxExportRowsDefault,
61382
61416
  page: 0
61383
61417
  };
61384
61418
  }
61419
+ if (params.srfexportdataset) {
61420
+ tempParams.srfexportdataset = params.srfexportdataset;
61421
+ }
61385
61422
  Object.assign(fetchParams, tempParams);
61386
- await this.service.exportData(this.dataExport, this.context, fetchParams);
61423
+ const tempContext = clone38(this.context);
61424
+ if (params.srfdatatype) {
61425
+ Object.assign(tempContext, {
61426
+ srfdatatype: params.srfdatatype
61427
+ });
61428
+ }
61429
+ await this.service.exportData(tempDataExport, tempContext, fetchParams);
61387
61430
  }
61388
61431
  /**
61389
61432
  * @description 导出数据