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

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 (33) hide show
  1. package/dist/index.esm.js +72 -13
  2. package/dist/index.system.min.js +1 -1
  3. package/out/controller/common/control/md-control.controller.d.ts.map +1 -1
  4. package/out/controller/common/control/md-control.controller.js +1 -0
  5. package/out/controller/control/grid/grid/grid.controller.d.ts +2 -1
  6. package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
  7. package/out/controller/control/grid/grid/grid.controller.js +8 -4
  8. package/out/controller/control/md-ctrl/md-ctrl.controller.d.ts +2 -1
  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 +8 -4
  11. package/out/controller/control/toolbar/toolbar.controller.d.ts.map +1 -1
  12. package/out/controller/control/toolbar/toolbar.controller.js +17 -2
  13. package/out/interface/api/state/control/i-api-md-control.state.d.ts +7 -0
  14. package/out/interface/api/state/control/i-api-md-control.state.d.ts.map +1 -1
  15. package/out/platform/provider/platform-provider-base.d.ts.map +1 -1
  16. package/out/platform/provider/platform-provider-base.js +9 -0
  17. package/out/service/service/control/md-control.service.d.ts +2 -1
  18. package/out/service/service/control/md-control.service.d.ts.map +1 -1
  19. package/out/service/service/control/md-control.service.js +14 -4
  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 +18 -0
  22. package/out/ui-action/provider/ui-action-provider-base.d.ts.map +1 -1
  23. package/out/ui-action/provider/ui-action-provider-base.js +5 -0
  24. package/package.json +5 -5
  25. package/src/controller/common/control/md-control.controller.ts +1 -0
  26. package/src/controller/control/grid/grid/grid.controller.ts +14 -4
  27. package/src/controller/control/md-ctrl/md-ctrl.controller.ts +14 -4
  28. package/src/controller/control/toolbar/toolbar.controller.ts +20 -0
  29. package/src/interface/api/state/control/i-api-md-control.state.ts +8 -0
  30. package/src/platform/provider/platform-provider-base.ts +15 -0
  31. package/src/service/service/control/md-control.service.ts +15 -3
  32. package/src/ui-action/provider/front-ui-action-provider.ts +22 -0
  33. package/src/ui-action/provider/ui-action-provider-base.ts +6 -0
package/out/controller/common/control/md-control.controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"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"}
package/out/controller/common/control/md-control.controller.js CHANGED
@@ -143,6 +143,7 @@ export class MDControlController extends ControlController {
143
143
  this.state.groups = [];
144
144
  this.state.hideNoDataImage = false;
145
145
  this.state.enableGroup = !!this.model.enableGroup;
146
+ this.state.isSelectedAll = false;
146
147
  }
147
148
  /**
148
149
  * 批操作工具栏
package/out/controller/control/grid/grid/grid.controller.d.ts CHANGED
@@ -509,10 +509,11 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
509
509
  * @author zk
510
510
  * @date 2023-07-20 04:07:49
511
511
  * @param {MDCtrlLoadParams} args
512
+ * @param {IParams} [fetchArgs={}] 透传给 service.fetch 的额外参数，如 srfexportdataset
512
513
  * @return {*}
513
514
  * @memberof GridController
514
515
  */
515
- loadData(args: MDCtrlLoadParams): Promise<ControlVO[]>;
516
+ loadData(args: MDCtrlLoadParams, fetchArgs?: IParams): Promise<ControlVO[]>;
516
517
  /**
517
518
  * 初始化数据导出列
518
519
  * @return {*}
package/out/controller/control/grid/grid/grid.controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,OAAO,EACP,aAAa,EACb,aAAa,EACb,aAAa,EAEb,gBAAgB,EAIjB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,sBAAsB,EACtB,6BAA6B,EAC9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EAEnB,qBAAqB,EACrB,gBAAgB,EAEjB,MAAM,uBAAuB,CAAC;AAM/B,OAAO,EAAE,SAAS,EAAS,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAKL,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAcxB;;;;;;;;GAQG;AACH,qBAAa,cAAc,CACvB,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACnC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC;;;;;;OAMG;IACK,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,UAAU,CAKtC;IAED;;;;;;OAMG;IACH,IAAI,eAAe,IAAI,OAAO,CAQ7B;IAED;;;;;OAKG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,KAAK,GAAG,KAAK,CAUzC;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,WAAW,GAAG,MAAM,GAAG,QAAQ,CAKlD;IAED;;;;;;;OAOG;IACH,IAAI,mBAAmB,IAAI,SAAS,GAAG,OAAO,CAK7C;IAED;;;;;OAKG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,OAAO,GAAG,QAAQ,CAG7C;IAED;;;;;OAKG;IACH,iBAAiB,EAAE,OAAO,CAAS;IAEnC;;;;;OAKG;IACH,kBAAkB,EAAE,OAAO,CAAS;IAEpC;;;;;OAKG;IACH,eAAe,EAAE,OAAO,CAAS;IAEjC;;;;;;OAMG;IACH,gBAAgB,EAAE,OAAO,CAAM;IAE/B;;;;;OAKG;IACH,WAAW,EAAE,MAAM,EAAE,CAAM;IAE3B;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;OAMG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAAE,CAAM;IAEhE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAE1D;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,6BAA6B,CAAA;KAAE,CAAM;IAEnE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;IAE7C;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,CAAwD;IAExE;;;;;OAKG;IACH,UAAU,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAEzC;;;;;OAKG;IACH,gBAAgB,EAAE,aAAa,EAAE,CAAM;IAEvC;;;;;OAKG;IACH,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,CAAC,CAAa;IAEvE;;;;OAIG;IACH,gBAAgB,EAAE,aAAa,EAAE,CAAM;IAEvC;;;;;OAKG;IACH,IAAI,kBAAkB,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAE7D;IAED;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,kBAAkB,IAAI,OAAO,CAEhC;IAED;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IAElC,SAAS,CAAC,SAAS,IAAI,IAAI;IAkB3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC1C;;;;OAIG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB9C;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IASnC;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAOtC;;;;;OAKG;IAEH,YAAY,CAAC,SAAS,EAAE,KAAK,GAAG,IAAI;IA4BpC;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqCzC;;;;;;OAMG;cACa,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC/C;;;;;;OAMG;cACa,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BtD;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAoDpC,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IAoCvB;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAMzD;;;OAGG;IACG,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBtD;;;;;;OAMG;IACG,SAAS,CAAC,GAAG,EAAE,iBAAiB,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B3E;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAuC7C;;;;;;OAMG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BxC,cAAc,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAQjE;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAMnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAmB9B;;;;;OAKG;IACG,MAAM,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuDxD;;;;;;;OAOG;IACG,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAkEpC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B;;;;;;OAMG;cACa,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAqC3E;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAelE;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAmDlC;;;;;;OAMG;IACH,SAAS,CAAC,qBAAqB,CAC7B,IAAI,EAAE,YAAY,EAAE,EACpB,KAAK,EAAE,YAAY,EAAE,GACpB,YAAY,EAAE;IAiBjB;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAqBjC;;;;;;OAMG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;;;;;;;;OASG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,IAAI,CAAC;IA+BhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI;IAOhE;;;;;;;OAOG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IASnD;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAS/B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IASpC;;;;;;OAMG;IACG,aAAa,CACjB,GAAG,EAAE,YAAY,EACjB,QAAQ,CAAC,EAAE,OAAO,EAClB,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAwDhB;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAWvD;;;;;;;OAOG;IACG,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgD5E;;;;;;;;OAQG;IACG,QAAQ,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAe5D;;;;;OAKG;IACG,oBAAoB,CACxB,UAAU,EAAE,aAAa,GACxB,OAAO,CAAC,aAAa,EAAE,CAAC;IA2B3B;;;;;OAKG;IACH,WAAW,WACD,OAAO,gBACD,MAAM,UACb,OAAO,KACb,MAAM,CAWP;IAEF;;;OAGG;IACH,iBAAiB,IAAI;QACnB,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,aAAa,EAAE,KAAK,EAAE,CAAC;QACvB,SAAS,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KAC9B;IA6CD;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE;IAmDzD;;;;;OAKG;IACG,aAAa,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAkC/D;;;OAGG;IACG,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4ClE;;;;;OAKG;IACG,UAAU,CAAC,IAAI,EAAE;QACrB,MAAM,EAAE,gBAAgB,CAAC;QACzB,KAAK,EAAE,UAAU,CAAC;KACnB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwDjB;;;;;;;;OAQG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,KAAK;IAsBvD;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM;IAwBtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,SAAS;IAKpD;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5C;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAuB1C;;;;;;OAMG;IACH,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,IAAI;IASjD;;;;;;OAMG;IACH,cAAc,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA8C5C;;;;;OAKG;IACH,qBAAqB,CACnB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,IAAI;IAcP;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAoBxB;;;;;;;OAOG;IACH,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QACL,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;QACvB,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,QAAQ,CAAC,EAAE,aAAa,CAAC;KAC1B,GACA,IAAI;IAqBP;;;;;OAKG;IACG,YAAY,CAChB,QAAQ,EAAE,aAAa,EACvB,IAAI,EAAE,aAAa,EACnB,QAAQ,EAAE,MAAM,GAAG,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC;IAwBhB;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAoBrB;;;;;OAKG;IACH,cAAc,CAAC,MAAM,GAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,IAAI;IAoBrE;;;;;OAKG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAWlD;;;;;;;OAOG;IACH,aAAa,CAAC,CAAC,SAAS,MAAM,qBAAqB,EACjD,IAAI,EAAE,CAAC,EACP,EAAE,EAAE,MAAM,GACT,qBAAqB,CAAC,CAAC,CAAC;IAI3B;;;;;OAKG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAI7C"}
1
+ {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}
package/out/controller/control/grid/grid/grid.controller.js CHANGED
@@ -1238,10 +1238,11 @@ export class GridController extends MDControlController {
1238
1238
  * @author zk
1239
1239
  * @date 2023-07-20 04:07:49
1240
1240
  * @param {MDCtrlLoadParams} args
1241
+ * @param {IParams} [fetchArgs={}] 透传给 service.fetch 的额外参数，如 srfexportdataset
1241
1242
  * @return {*}
1242
1243
  * @memberof GridController
1243
1244
  */
1244
- async loadData(args) {
1245
+ async loadData(args, fetchArgs = {}) {
1245
1246
  // *查询参数处理
1246
1247
  const { context } = this.handlerAbilityParams(args);
1247
1248
  const params = await this.getFetchParams(args === null || args === void 0 ? void 0 : args.viewParam);
@@ -1249,7 +1250,7 @@ export class GridController extends MDControlController {
1249
1250
  // *发起请求
1250
1251
  await this.startLoading();
1251
1252
  try {
1252
- res = await this.service.fetch(context, params);
1253
+ res = await this.service.fetch(context, params, fetchArgs);
1253
1254
  }
1254
1255
  finally {
1255
1256
  await this.endLoading();
@@ -1401,7 +1402,8 @@ export class GridController extends MDControlController {
1401
1402
  ibiz.config.common.maxExportRowsDefault,
1402
1403
  page: 0,
1403
1404
  };
1404
- data = await this.loadData({ viewParam });
1405
+ // 识别用户定义的视图参数导出数据集合
1406
+ data = await this.loadData({ viewParam }, { srfexportdataset: this.params.srfexportdataset });
1405
1407
  }
1406
1408
  else if (type === 'selectedRows') {
1407
1409
  data = this.getData();
@@ -1433,9 +1435,11 @@ export class GridController extends MDControlController {
1433
1435
  if (selectedData.length === 0) {
1434
1436
  throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.grid.exported'));
1435
1437
  }
1438
+ // 用户通过视图参数srfexportdatakey指定导出选中数据的数据主键属性
1439
+ const srfexportdatakey = this.params.srfexportdatakey || 'srfkey';
1436
1440
  tempParams = {
1437
1441
  page: 0,
1438
- srfkeys: selectedData.map(data => data.srfkey).join(','),
1442
+ srfkeys: selectedData.map(data => data[srfexportdatakey]).join(','),
1439
1443
  };
1440
1444
  }
1441
1445
  else if (type === 'maxRowCount' || type === 'customPage') {
package/out/controller/control/md-ctrl/md-ctrl.controller.d.ts CHANGED
@@ -229,10 +229,11 @@ export declare class MDCtrlController extends MDControlController<IDEMobMDCtrl,
229
229
  /**
230
230
  * @description 加载数据(只加载数据 不做其他操作)
231
231
  * @param {MDCtrlLoadParams} args
232
+ * @param {IParams} [fetchArgs={}] 透传给 service.fetch 的额外参数，如 srfexportdataset
232
233
  * @returns {*} {Promise<IData[]>}
233
234
  * @memberof MDCtrlController
234
235
  */
235
- loadData(args: MDCtrlLoadParams): Promise<IData[]>;
236
+ loadData(args: MDCtrlLoadParams, fetchArgs?: IParams): Promise<IData[]>;
236
237
  /**
237
238
  * @description 获取导出数据
238
239
  * @param {IApiExportParams} params
package/out/controller/control/md-ctrl/md-ctrl.controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"md-ctrl.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/md-ctrl/md-ctrl.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"md-ctrl.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/md-ctrl/md-ctrl.controller.ts"],"names":[],"mappings":"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"}
package/out/controller/control/md-ctrl/md-ctrl.controller.js CHANGED
@@ -493,10 +493,11 @@ export class MDCtrlController extends MDControlController {
493
493
  /**
494
494
  * @description 加载数据(只加载数据 不做其他操作)
495
495
  * @param {MDCtrlLoadParams} args
496
+ * @param {IParams} [fetchArgs={}] 透传给 service.fetch 的额外参数，如 srfexportdataset
496
497
  * @returns {*} {Promise<IData[]>}
497
498
  * @memberof MDCtrlController
498
499
  */
499
- async loadData(args) {
500
+ async loadData(args, fetchArgs = {}) {
500
501
  // *查询参数处理
501
502
  const { context } = this.handlerAbilityParams(args);
502
503
  const params = await this.getFetchParams(args === null || args === void 0 ? void 0 : args.viewParam);
@@ -504,7 +505,7 @@ export class MDCtrlController extends MDControlController {
504
505
  // *发起请求
505
506
  await this.startLoading();
506
507
  try {
507
- res = await this.service.fetch(context, params);
508
+ res = await this.service.fetch(context, params, fetchArgs);
508
509
  }
509
510
  finally {
510
511
  await this.endLoading();
@@ -539,7 +540,8 @@ export class MDCtrlController extends MDControlController {
539
540
  ibiz.config.common.maxExportRowsDefault,
540
541
  page: 0,
541
542
  };
542
- data = await this.loadData({ viewParam });
543
+ // 识别用户定义的视图参数导出数据集合
544
+ data = await this.loadData({ viewParam }, { srfexportdataset: this.params.srfexportdataset });
543
545
  }
544
546
  else if (type === 'selectedRows') {
545
547
  data = this.getData();
@@ -618,9 +620,11 @@ export class MDCtrlController extends MDControlController {
618
620
  if (selectedData.length === 0) {
619
621
  throw new RuntimeError(ibiz.i18n.t('runtime.controller.common.md.exported'));
620
622
  }
623
+ // 用户通过视图参数srfexportdatakey指定导出选中数据的数据主键属性
624
+ const srfexportdatakey = this.params.srfexportdatakey || 'srfkey';
621
625
  tempParams = {
622
626
  page: 0,
623
- srfkeys: selectedData.map(data => data.srfkey).join(','),
627
+ srfkeys: selectedData.map(data => data[srfexportdatakey]).join(','),
624
628
  };
625
629
  }
626
630
  else if (type === 'maxRowCount' || type === 'customPage') {
package/out/controller/control/toolbar/toolbar.controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"toolbar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"toolbar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controller.ts"],"names":[],"mappings":"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"}
package/out/controller/control/toolbar/toolbar.controller.js CHANGED
@@ -154,16 +154,23 @@ export class ToolbarController extends ControlController {
154
154
  * @memberof ToolbarController
155
155
  */
156
156
  async getToolbarEventArgs() {
157
- var _a;
157
+ var _a, _b;
158
158
  const result = this.getEventArgs();
159
+ const newParams = Object.assign({}, result.params);
159
160
  let data = [];
160
161
  if (this.xdataControl) {
161
162
  data = ((_a = this.xdataControl) === null || _a === void 0 ? void 0 : _a.getData()) || [];
163
+ // 数据导出界面行为需要界面是否选择全部状态，选择全部则导出全部，否则按选中数据导出
164
+ if ((_b = this.xdataControl.state) === null || _b === void 0 ? void 0 : _b.isSelectedAll) {
165
+ Object.assign(newParams, {
166
+ srfallselected: true,
167
+ });
168
+ }
162
169
  }
163
170
  else {
164
171
  data = (await this.ctx.view.call(ViewCallTag.GET_DATA)) || [];
165
172
  }
166
- return Object.assign(Object.assign({}, result), { data, ctrl: this });
173
+ return Object.assign(Object.assign({}, result), { data, ctrl: this, params: newParams });
167
174
  }
168
175
  /**
169
176
  * 初始化工具栏项适配器
@@ -341,6 +348,7 @@ export class ToolbarController extends ControlController {
341
348
  }
342
349
  }
343
350
  async calcButtonState(data, appDeId, _params = {}) {
351
+ const app = await ibiz.hub.getApp(this.context.srfappid);
344
352
  let _data = data;
345
353
  if (data && data instanceof ControlVO) {
346
354
  _data = data.getOrigin();
@@ -382,6 +390,13 @@ export class ToolbarController extends ControlController {
382
390
  itemState.disabled = !dynaEnable;
383
391
  }
384
392
  }
393
+ // 如果有统一资源且当前项显示，无权限则隐藏
394
+ if (item.accessKey && itemState.visible) {
395
+ const permitted = app.authority.calcByResCode(item.accessKey);
396
+ if (!permitted) {
397
+ itemState.visible = false;
398
+ }
399
+ }
385
400
  }, { childrenFields: ['detoolbarItems'] });
386
401
  }
387
402
  this.state.hideSeparator = formatSeparator('TOOLBAR', this.model.detoolbarItems, this.state.buttonsState);
package/out/interface/api/state/control/i-api-md-control.state.d.ts CHANGED
@@ -154,6 +154,13 @@ export interface IApiMDControlState extends IApiControlState {
154
154
  * @memberof IApiMDControlState
155
155
  */
156
156
  enableGroup: boolean;
157
+ /**
158
+ * @description 是否全选，该状态目前仅PC端表格使用。
159
+ * @type {boolean}
160
+ * @default false
161
+ * @memberof IApiMDControlState
162
+ */
163
+ isSelectedAll: boolean;
157
164
  }
158
165
  /**
159
166
  * @description 分组UI数据接口
package/out/interface/api/state/control/i-api-md-control.state.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"i-api-md-control.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/state/control/i-api-md-control.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAErD;;;;;;GAMG;AACH,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D;;;;;OAKG;IACH,KAAK,EAAE,QAAQ,EAAE,CAAC;IAElB;;;;;OAKG;IACH,YAAY,EAAE,QAAQ,EAAE,CAAC;IAEzB;;;;;OAKG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;;;OAKG;IACH,gBAAgB,EAAE,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAErC;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,YAAY,EAAE,UAAU,CAAC;IAEzB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,MAAM,EAAE,uBAAuB,EAAE,CAAC;IAElC;;;;;OAKG;IACH,eAAe,EAAE,OAAO,CAAC;IAEzB;;;;;OAKG;IACH,aAAa,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,aAAa,EAAE,OAAO,CAAC;IAEvB;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;CACtB;AAED;;;;GAIG;AACH,MAAM,WAAW,uBAAuB;IACtC;;;;OAIG;IACH,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAErB;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IAErB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,wBAAwB,CAAC;IAEjD;;;;OAIG;IACH,YAAY,CAAC,EAAE,QAAQ,EAAE,CAAC;CAC3B"}
1
+ {"version":3,"file":"i-api-md-control.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/state/control/i-api-md-control.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAErD;;;;;;GAMG;AACH,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D;;;;;OAKG;IACH,KAAK,EAAE,QAAQ,EAAE,CAAC;IAElB;;;;;OAKG;IACH,YAAY,EAAE,QAAQ,EAAE,CAAC;IAEzB;;;;;OAKG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;;;OAKG;IACH,gBAAgB,EAAE,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAErC;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,YAAY,EAAE,UAAU,CAAC;IAEzB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,MAAM,EAAE,uBAAuB,EAAE,CAAC;IAElC;;;;;OAKG;IACH,eAAe,EAAE,OAAO,CAAC;IAEzB;;;;;OAKG;IACH,aAAa,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,aAAa,EAAE,OAAO,CAAC;IAEvB;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,aAAa,EAAE,OAAO,CAAC;CACxB;AAED;;;;GAIG;AACH,MAAM,WAAW,uBAAuB;IACtC;;;;OAIG;IACH,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAErB;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IAErB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,wBAAwB,CAAC;IAEjD;;;;OAIG;IACH,YAAY,CAAC,EAAE,QAAQ,EAAE,CAAC;CAC3B"}
package/out/platform/provider/platform-provider-base.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"platform-provider-base.d.ts","sourceRoot":"","sources":["../../../src/platform/provider/platform-provider-base.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAGzB;;;;;;;;;GASG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IAErE,WAAW,SAAkB;IAE7B,IAAI,IAAI,IAAI;IAEN,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAErB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAEhC;;;;;;;OAOG;IACG,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,GACrC,OAAO,CAAC,OAAO,CAAC;IAInB;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAmB/D;;;;;OAKG;IACG,aAAa,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAsBjE;;;;;OAKG;IACG,WAAW,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IAK7D;;;;OAIG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAmBrC"}
1
+ {"version":3,"file":"platform-provider-base.d.ts","sourceRoot":"","sources":["../../../src/platform/provider/platform-provider-base.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAGzB;;;;;;;;;GASG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IAErE,WAAW,SAAkB;IAE7B,IAAI,IAAI,IAAI;IAEN,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAErB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAEhC;;;;;;;OAOG;IACG,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,GACrC,OAAO,CAAC,OAAO,CAAC;IAInB;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAmB/D;;;;;OAKG;IACG,aAAa,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAqCjE;;;;;OAKG;IACG,WAAW,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IAK7D;;;;OAIG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAmBrC"}
package/out/platform/provider/platform-provider-base.js CHANGED
@@ -63,6 +63,15 @@ export class PlatformProviderBase {
63
63
  */
64
64
  async backendExport(args) {
65
65
  const { baseURL, url, method, params, data, newWindow } = args;
66
+ // 规范化参数
67
+ if (data &&
68
+ Object.prototype.hasOwnProperty.call(data, 'srfexportdataset')) {
69
+ delete data.srfexportdataset;
70
+ }
71
+ if (data &&
72
+ Object.prototype.hasOwnProperty.call(data, 'srfexportdatakey')) {
73
+ delete data.srfexportdatakey;
74
+ }
66
75
  const response = await ibiz.net.request(url, {
67
76
  data,
68
77
  method,
package/out/service/service/control/md-control.service.d.ts CHANGED
@@ -10,9 +10,10 @@ export declare class MDControlService<T extends IMDAjaxControl = IMDAjaxControl>
10
10
  * @date 2022-08-31 17:08:41
11
11
  * @param {IContext} context 上下文
12
12
  * @param {IParams} [params={}] 视图参数
13
+ * @param {IParams} [args={}] 额外参数
13
14
  * @returns {*} {Promise<IHttpResponse>}
14
15
  */
15
- fetch(context: IContext, params?: IParams): Promise<IHttpResponse<ControlVO[]>>;
16
+ fetch(context: IContext, params?: IParams, args?: IParams): Promise<IHttpResponse<ControlVO[]>>;
16
17
  /**
17
18
  * 执行获取单条数据方法
18
19
  *
package/out/service/service/control/md-control.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"md-control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/md-control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAQtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EAAE,GAChB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;OAOG;IACG,UAAU,CACd,UAAU,EAAE,gBAAgB,EAC5B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,OAAO,CAAC;IAcnB;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CA8BvD"}
1
+ {"version":3,"file":"md-control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/md-control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;;OASG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,OAAY,GACjB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EAAE,GAChB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;OAOG;IACG,UAAU,CACd,UAAU,EAAE,gBAAgB,EAC5B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,OAAO,CAAC;IAoBnB;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CA8BvD"}
package/out/service/service/control/md-control.service.js CHANGED
@@ -8,11 +8,16 @@ export class MDControlService extends ControlService {
8
8
  * @date 2022-08-31 17:08:41
9
9
  * @param {IContext} context 上下文
10
10
  * @param {IParams} [params={}] 视图参数
11
+ * @param {IParams} [args={}] 额外参数
11
12
  * @returns {*} {Promise<IHttpResponse>}
12
13
  */
13
- async fetch(context, params = {}) {
14
+ async fetch(context, params = {}, args = {}) {
14
15
  var _a;
15
- const fetchAction = ((_a = this.model.fetchControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'fetchdefault';
16
+ let fetchAction = ((_a = this.model.fetchControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'fetchdefault';
17
+ // 识别用户定义参数导出数据集合
18
+ if (args.srfexportdataset) {
19
+ fetchAction = args.srfexportdataset;
20
+ }
16
21
  let res = await this.exec(fetchAction, context, params);
17
22
  res = this.handleResponse(res);
18
23
  return res;
@@ -122,8 +127,13 @@ export class MDControlService extends ControlService {
122
127
  */
123
128
  async exportData(dataExport, context, params = {}) {
124
129
  const entityService = await this.app.deService.getService(context, this.model.appDataEntityId);
125
- return entityService.file.export(dataExport, dataExport.appDEDataSetId ||
126
- this.model.fetchControlAction.appDEMethodId, context, params);
130
+ let tempFetchAction = dataExport.appDEDataSetId ||
131
+ this.model.fetchControlAction.appDEMethodId;
132
+ // 识别用户定义的视图参数导出数据集合
133
+ if (params.srfexportdataset) {
134
+ tempFetchAction = params.srfexportdataset;
135
+ }
136
+ return entityService.file.export(dataExport, tempFetchAction, context, params);
127
137
  }
128
138
  /**
129
139
  * 处理响应
package/out/ui-action/provider/front-ui-action-provider.d.ts.map CHANGED
@@ -1 +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,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;IA4EhB;;;;;;;;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"}
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,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;IAkGhB;;;;;;;;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 CHANGED
@@ -243,6 +243,24 @@ export class FrontUIActionProvider extends UIActionProviderBase {
243
243
  const params = Object.assign(Object.assign({ page: 0, size: appDEDataExport.maxRowCount
244
244
  ? appDEDataExport.maxRowCount
245
245
  : ibiz.config.common.maxExportRowsDefault }, args.params), resultParams);
246
+ // 多项数据和多项数据主键如果没有选择全部界面参数则认为导出选中行
247
+ const { actionTarget } = action;
248
+ if ((actionTarget === 'MULTIDATA' || actionTarget === 'MULTIKEY') &&
249
+ !args.params.srfallselected) {
250
+ const srfexportdatakey = presetParams.srfexportdatakey || 'srfkey';
251
+ const tempParams = {};
252
+ if (args && args.data && args.data.length > 0) {
253
+ Object.assign(tempParams, {
254
+ srfkeys: args.data.map(data => data[srfexportdatakey]).join(','),
255
+ });
256
+ }
257
+ Object.assign(params, tempParams);
258
+ }
259
+ // 如果srfallselected存在需要删除，规范化参数
260
+ if (params &&
261
+ Object.prototype.hasOwnProperty.call(params, 'srfallselected')) {
262
+ delete params.srfallselected;
263
+ }
246
264
  // 异步导出时只发消息不下载
247
265
  if (isAsyncAction) {
248
266
  const app = await ibiz.hub.getAppAsync(action.appId);
package/out/ui-action/provider/ui-action-provider-base.d.ts.map CHANGED
@@ -1 +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;IA+H3B;;;;;;;;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;IAkIF;;;;;;;;;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"}
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;IA+H3B;;;;;;;;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;IAwIF;;;;;;;;;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 CHANGED
@@ -276,6 +276,11 @@ export class UIActionProviderBase {
276
276
  presetParams.srfexportdataset = resultParams.srfexportdataset;
277
277
  delete resultParams.srfexportdataset;
278
278
  }
279
+ // srfexportdatakey（指定数据导出传入数据主键属性）
280
+ if (resultParams.hasOwnProperty('srfexportdatakey')) {
281
+ presetParams.srfexportdatakey = resultParams.srfexportdatakey;
282
+ delete resultParams.srfexportdatakey;
283
+ }
279
284
  // srfasyncaction（指定当前界面行为是否异步（目前仅数据导出使用））
280
285
  if (resultParams.hasOwnProperty('srfasyncaction')) {
281
286
  presetParams.srfasyncaction = resultParams.srfasyncaction;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ibiz-template/runtime",
3
- "version": "0.7.41-alpha.116",
3
+ "version": "0.7.41-alpha.117",
4
4
  "description": "运行时逻辑库",
5
5
  "type": "module",
6
6
  "main": "out/index.js",
@@ -39,8 +39,8 @@
39
39
  "jsencrypt": "^3.3.2"
40
40
  },
41
41
  "devDependencies": {
42
- "@ibiz-template/core": "^0.7.41-alpha.113",
43
- "@ibiz/model-core": "^0.1.88",
42
+ "@ibiz-template/core": "^0.7.41-alpha.117",
43
+ "@ibiz/model-core": "^0.1.89",
44
44
  "@types/animejs": "^3.1.12",
45
45
  "@types/path-browserify": "^1.0.2",
46
46
  "@types/qs": "^6.9.11",
@@ -58,7 +58,7 @@
58
58
  },
59
59
  "peerDependencies": {
60
60
  "@ibiz-template/core": "^0.6.0",
61
- "@ibiz/model-core": "^0.1.88",
61
+ "@ibiz/model-core": "^0.1.89",
62
62
  "async-validator": "^4.2.5",
63
63
  "dayjs": "^1.11.7",
64
64
  "echarts": "^5.4.3",
@@ -70,5 +70,5 @@
70
70
  "qx-util": "^0.4.8",
71
71
  "ramda": "^0.29.0"
72
72
  },
73
- "gitHead": "884c135f203cf1a0ae3977442b559b757acd6b47"
73
+ "gitHead": "d78a9099a5f4b8820786c9e58372ef68d8e30c4c"
74
74
  }
package/src/controller/common/control/md-control.controller.ts CHANGED
@@ -187,6 +187,7 @@ export class MDControlController<
187
187
  this.state.groups = [];
188
188
  this.state.hideNoDataImage = false;
189
189
  this.state.enableGroup = !!(this.model as IData).enableGroup;
190
+ this.state.isSelectedAll = false;
190
191
  }
191
192
 
192
193
  /**
package/src/controller/control/grid/grid/grid.controller.ts CHANGED
@@ -1571,10 +1571,14 @@ export class GridController<
1571
1571
  * @author zk
1572
1572
  * @date 2023-07-20 04:07:49
1573
1573
  * @param {MDCtrlLoadParams} args
1574
+ * @param {IParams} [fetchArgs={}] 透传给 service.fetch 的额外参数，如 srfexportdataset
1574
1575
  * @return {*}
1575
1576
  * @memberof GridController
1576
1577
  */
1577
- async loadData(args: MDCtrlLoadParams): Promise<ControlVO[]> {
1578
+ async loadData(
1579
+ args: MDCtrlLoadParams,
1580
+ fetchArgs: IParams = {},
1581
+ ): Promise<ControlVO[]> {
1578
1582
  // *查询参数处理
1579
1583
  const { context } = this.handlerAbilityParams(args);
1580
1584
  const params = await this.getFetchParams(args?.viewParam);
@@ -1582,7 +1586,7 @@ export class GridController<
1582
1586
  // *发起请求
1583
1587
  await this.startLoading();
1584
1588
  try {
1585
- res = await this.service.fetch(context, params);
1589
+ res = await this.service.fetch(context, params, fetchArgs);
1586
1590
  } finally {
1587
1591
  await this.endLoading();
1588
1592
  }
@@ -1786,7 +1790,11 @@ export class GridController<
1786
1790
  ibiz.config.common.maxExportRowsDefault,
1787
1791
  page: 0,
1788
1792
  };
1789
- data = await this.loadData({ viewParam });
1793
+ // 识别用户定义的视图参数导出数据集合
1794
+ data = await this.loadData(
1795
+ { viewParam },
1796
+ { srfexportdataset: this.params.srfexportdataset },
1797
+ );
1790
1798
  } else if (type === 'selectedRows') {
1791
1799
  data = this.getData();
1792
1800
  }
@@ -1820,9 +1828,11 @@ export class GridController<
1820
1828
  ibiz.i18n.t('runtime.controller.control.grid.exported'),
1821
1829
  );
1822
1830
  }
1831
+ // 用户通过视图参数srfexportdatakey指定导出选中数据的数据主键属性
1832
+ const srfexportdatakey = this.params.srfexportdatakey || 'srfkey';
1823
1833
  tempParams = {
1824
1834
  page: 0,
1825
- srfkeys: selectedData.map(data => data.srfkey).join(','),
1835
+ srfkeys: selectedData.map(data => data[srfexportdatakey]).join(','),
1826
1836
  };
1827
1837
  } else if (type === 'maxRowCount' || type === 'customPage') {
1828
1838
  const { size } = this.state;
package/src/controller/control/md-ctrl/md-ctrl.controller.ts CHANGED
@@ -645,10 +645,14 @@ export class MDCtrlController
645
645
  /**
646
646
  * @description 加载数据(只加载数据 不做其他操作)
647
647
  * @param {MDCtrlLoadParams} args
648
+ * @param {IParams} [fetchArgs={}] 透传给 service.fetch 的额外参数，如 srfexportdataset
648
649
  * @returns {*} {Promise<IData[]>}
649
650
  * @memberof MDCtrlController
650
651
  */
651
- async loadData(args: MDCtrlLoadParams): Promise<IData[]> {
652
+ async loadData(
653
+ args: MDCtrlLoadParams,
654
+ fetchArgs: IParams = {},
655
+ ): Promise<IData[]> {
652
656
  // *查询参数处理
653
657
  const { context } = this.handlerAbilityParams(args);
654
658
  const params = await this.getFetchParams(args?.viewParam);
@@ -656,7 +660,7 @@ export class MDCtrlController
656
660
  // *发起请求
657
661
  await this.startLoading();
658
662
  try {
659
- res = await this.service.fetch(context, params);
663
+ res = await this.service.fetch(context, params, fetchArgs);
660
664
  } finally {
661
665
  await this.endLoading();
662
666
  }
@@ -691,7 +695,11 @@ export class MDCtrlController
691
695
  ibiz.config.common.maxExportRowsDefault,
692
696
  page: 0,
693
697
  };
694
- data = await this.loadData({ viewParam });
698
+ // 识别用户定义的视图参数导出数据集合
699
+ data = await this.loadData(
700
+ { viewParam },
701
+ { srfexportdataset: this.params.srfexportdataset },
702
+ );
695
703
  } else if (type === 'selectedRows') {
696
704
  data = this.getData();
697
705
  }
@@ -777,9 +785,11 @@ export class MDCtrlController
777
785
  ibiz.i18n.t('runtime.controller.common.md.exported'),
778
786
  );
779
787
  }
788
+ // 用户通过视图参数srfexportdatakey指定导出选中数据的数据主键属性
789
+ const srfexportdatakey = this.params.srfexportdatakey || 'srfkey';
780
790
  tempParams = {
781
791
  page: 0,
782
- srfkeys: selectedData.map(data => data.srfkey).join(','),
792
+ srfkeys: selectedData.map(data => data[srfexportdatakey]).join(','),
783
793
  };
784
794
  } else if (type === 'maxRowCount' || type === 'customPage') {
785
795
  const { size } = this.state;
package/src/controller/control/toolbar/toolbar.controller.ts CHANGED
@@ -228,9 +228,18 @@ export class ToolbarController<
228
228
  */
229
229
  async getToolbarEventArgs(): Promise<Omit<EventBase, 'eventName'>> {
230
230
  const result = this.getEventArgs();
231
+ const newParams = {
232
+ ...result.params,
233
+ };
231
234
  let data: IData[] = [];
232
235
  if (this.xdataControl) {
233
236
  data = this.xdataControl?.getData() || [];
237
+ // 数据导出界面行为需要界面是否选择全部状态，选择全部则导出全部，否则按选中数据导出
238
+ if ((this.xdataControl as IData).state?.isSelectedAll) {
239
+ Object.assign(newParams, {
240
+ srfallselected: true,
241
+ });
242
+ }
234
243
  } else {
235
244
  data = (await this.ctx.view.call(ViewCallTag.GET_DATA)) || [];
236
245
  }
@@ -238,6 +247,7 @@ export class ToolbarController<
238
247
  ...result,
239
248
  data,
240
249
  ctrl: this,
250
+ params: newParams,
241
251
  };
242
252
  }
243
253
 
@@ -460,6 +470,8 @@ export class ToolbarController<
460
470
  appDeId?: string,
461
471
  _params: IParams = {},
462
472
  ): Promise<void> {
473
+ const app = await ibiz.hub.getApp(this.context.srfappid);
474
+
463
475
  let _data = data;
464
476
  if (data && data instanceof ControlVO) {
465
477
  _data = data.getOrigin();
@@ -515,6 +527,14 @@ export class ToolbarController<
515
527
  itemState.disabled = !dynaEnable;
516
528
  }
517
529
  }
530
+
531
+ // 如果有统一资源且当前项显示，无权限则隐藏
532
+ if (item.accessKey && itemState.visible) {
533
+ const permitted = app.authority.calcByResCode(item.accessKey);
534
+ if (!permitted) {
535
+ itemState.visible = false;
536
+ }
537
+ }
518
538
  },
519
539
  { childrenFields: ['detoolbarItems'] },
520
540
  );