@ibiz-template/runtime 0.6.10 → 0.6.12

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 (61) hide show
  1. package/dist/index.esm.js +302 -120
  2. package/dist/index.system.min.js +1 -1
  3. package/out/command/app/open-app-view/open-app-view.js +2 -2
  4. package/out/controller/common/base.controller.d.ts +1 -1
  5. package/out/controller/common/base.controller.d.ts.map +1 -1
  6. package/out/controller/common/control/control.controller.d.ts +1 -1
  7. package/out/controller/common/control/control.controller.d.ts.map +1 -1
  8. package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map +1 -1
  9. package/out/controller/control/form/edit-form/edit-form.controller.js +8 -2
  10. package/out/controller/control/grid/grid/grid-row.state.d.ts +2 -0
  11. package/out/controller/control/grid/grid/grid-row.state.d.ts.map +1 -1
  12. package/out/controller/control/grid/grid/grid-row.state.js +15 -0
  13. package/out/controller/control/grid/grid/grid.controller.d.ts +46 -3
  14. package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
  15. package/out/controller/control/grid/grid/grid.controller.js +161 -102
  16. package/out/controller/control/kanban/kanban.controller.d.ts.map +1 -1
  17. package/out/controller/control/kanban/kanban.controller.js +32 -1
  18. package/out/controller/control/search-bar/use-searchcond.d.ts.map +1 -1
  19. package/out/controller/control/search-bar/use-searchcond.js +4 -1
  20. package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.d.ts +1 -0
  21. package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.d.ts.map +1 -1
  22. package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.js +8 -1
  23. package/out/controller/control/toolbar/toolbar.controllerr.js +1 -1
  24. package/out/de-logic/de-logic-node/prepare-param-node/prepare-param-node.js +2 -2
  25. package/out/engine/md-view.engine.js +1 -1
  26. package/out/interface/controller/controller/control/i-control.controller.d.ts +8 -1
  27. package/out/interface/controller/controller/control/i-control.controller.d.ts.map +1 -1
  28. package/out/interface/controller/controller/control/i-tab-exp-panel.controller.d.ts +6 -0
  29. package/out/interface/controller/controller/control/i-tab-exp-panel.controller.d.ts.map +1 -1
  30. package/out/interface/controller/controller/control/panel-item/i-panel-item.controller.d.ts +7 -0
  31. package/out/interface/controller/controller/control/panel-item/i-panel-item.controller.d.ts.map +1 -1
  32. package/out/interface/controller/event/view/i-tab-search-view.event.d.ts +12 -0
  33. package/out/interface/controller/event/view/i-tab-search-view.event.d.ts.map +1 -0
  34. package/out/interface/controller/event/view/i-tab-search-view.event.js +1 -0
  35. package/out/interface/controller/event/view/index.d.ts +1 -0
  36. package/out/interface/controller/event/view/index.d.ts.map +1 -1
  37. package/out/interface/controller/event/view/index.js +1 -0
  38. package/out/interface/controller/state/control/i-drbar.state.d.ts +14 -0
  39. package/out/interface/controller/state/control/i-drbar.state.d.ts.map +1 -1
  40. package/out/interface/controller/state/control/i-grid.state.d.ts +14 -0
  41. package/out/interface/controller/state/control/i-grid.state.d.ts.map +1 -1
  42. package/out/interface/controller/state/control/i-kanban.state.d.ts +11 -0
  43. package/out/interface/controller/state/control/i-kanban.state.d.ts.map +1 -1
  44. package/out/interface/controller/state/control/i-tab-exp-panel.state.d.ts +7 -0
  45. package/out/interface/controller/state/control/i-tab-exp-panel.state.d.ts.map +1 -1
  46. package/out/interface/controller/state/view/i-tab-search-view.state.d.ts +20 -0
  47. package/out/interface/controller/state/view/i-tab-search-view.state.d.ts.map +1 -0
  48. package/out/interface/controller/state/view/i-tab-search-view.state.js +1 -0
  49. package/out/interface/controller/state/view/index.d.ts +1 -0
  50. package/out/interface/controller/state/view/index.d.ts.map +1 -1
  51. package/out/interface/controller/state/view/index.js +1 -0
  52. package/out/interface/util/i-message-util/i-message-util.d.ts +51 -0
  53. package/out/interface/util/i-message-util/i-message-util.d.ts.map +1 -1
  54. package/out/interface/util/index.d.ts +1 -1
  55. package/out/interface/util/index.d.ts.map +1 -1
  56. package/out/ui-action/provider/front-ui-action-provider.d.ts +10 -0
  57. package/out/ui-action/provider/front-ui-action-provider.d.ts.map +1 -1
  58. package/out/ui-action/provider/front-ui-action-provider.js +43 -1
  59. package/out/ui-action/provider/loginout-ui-action-provider.js +2 -2
  60. package/out/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.js +2 -2
  61. package/package.json +4 -4
@@ -28,8 +28,8 @@ export class OpenAppViewCommand {
28
28
  */
29
29
  async exec(appViewId, _context, params = {}, opts = {}) {
30
30
  const context = clone(_context);
31
- if (context.srfsimple !== null) {
32
- context.srfsimple = undefined;
31
+ if (context.srfsimple) {
32
+ delete context.srfsimple;
33
33
  }
34
34
  const appView = await ibiz.hub.config.view.get(appViewId);
35
35
  if (!appView) {
@@ -63,7 +63,7 @@ export declare class BaseController<T extends IModelObject = IModelObject, S ext
63
63
  * @date 2023-04-25 11:03:44
64
64
  * @return {*} {Omit<EventBase, 'eventName'>}
65
65
  */
66
- protected getEventArgs(): Omit<EventBase, 'eventName'>;
66
+ getEventArgs(): Omit<EventBase, 'eventName'>;
67
67
  /**
68
68
  * 事件触发器
69
69
  * @author lxm
@@ -1 +1 @@
1
- {"version":3,"file":"base.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/common/base.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EACL,SAAS,EACT,eAAe,EACf,WAAW,EACX,eAAe,EAChB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI5D;;;;;;GAMG;AACH,qBAAa,cAAc,CACzB,CAAC,SAAS,YAAY,GAAG,YAAY,EACrC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,YAAW,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aAgCb,KAAK,EAAE,CAAC;aACR,OAAO,EAAE,QAAQ;aACjB,MAAM,EAAE,OAAO;IAC/B,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG;IAjC7B,EAAE,EAAE,MAAM,CAAgB;IAE1B;;;;;;OAMG;IACH,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,KAAK,EAAE,CAAC,CAAW;IAEnB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAM;IAElB;;;;;OAKG;gBAEe,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACZ,GAAG,EAAE,GAAG;IAQ7B;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAUtD;;;;;OAKG;IACH,GAAG,EAAE,eAAe,CAAC,CAAC,CAAC,CAErB;IAEF;;;;;OAKG;IACH,YAAY,EAAE,eAAe,CAAgD;IAE7E;;;;;OAKG;IACH,UAAU,EAAE,MAAM,EAAE,CAAM;IAE1B;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAY9B;;;;OAIG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1C;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;OAMG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxC;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5C;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,WAAW,GAAG,SAAS;IAIvE,UAAU,IAAI,eAAe;IAI7B;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI;IAIrE;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAG3C"}
1
+ {"version":3,"file":"base.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/common/base.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EACL,SAAS,EACT,eAAe,EACf,WAAW,EACX,eAAe,EAChB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI5D;;;;;;GAMG;AACH,qBAAa,cAAc,CACzB,CAAC,SAAS,YAAY,GAAG,YAAY,EACrC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,YAAW,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aAgCb,KAAK,EAAE,CAAC;aACR,OAAO,EAAE,QAAQ;aACjB,MAAM,EAAE,OAAO;IAC/B,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG;IAjC7B,EAAE,EAAE,MAAM,CAAgB;IAE1B;;;;;;OAMG;IACH,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,KAAK,EAAE,CAAC,CAAW;IAEnB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAM;IAElB;;;;;OAKG;gBAEe,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACZ,GAAG,EAAE,GAAG;IAQ7B;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;OAKG;IACH,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAU5C;;;;;OAKG;IACH,GAAG,EAAE,eAAe,CAAC,CAAC,CAAC,CAErB;IAEF;;;;;OAKG;IACH,YAAY,EAAE,eAAe,CAAgD;IAE7E;;;;;OAKG;IACH,UAAU,EAAE,MAAM,EAAE,CAAM;IAE1B;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAY9B;;;;OAIG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1C;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;OAMG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxC;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5C;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,WAAW,GAAG,SAAS;IAIvE,UAAU,IAAI,eAAe;IAI7B;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI;IAIrE;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAG3C"}
@@ -74,7 +74,7 @@ export declare class ControlController<T extends IControl = IControl, S extends
74
74
  * @date 2023-03-26 11:42:21
75
75
  * @readonly
76
76
  */
77
- protected getEventArgs(): Omit<EventBase, 'eventName'>;
77
+ getEventArgs(): Omit<EventBase, 'eventName'>;
78
78
  protected initState(): void;
79
79
  protected onCreated(): Promise<void>;
80
80
  protected onMounted(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/control.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/control.controller.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/D,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B,IAAI,IAAI,IAAI,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAM1E;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,KAAK,CAAmB;IAE3C;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAY1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACG,SAAS,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA2B1D;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA+CtC;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA8CrD;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IAuEjD;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IA0CzD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC;IAe9B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6D7D;;;;;;;OAOG;IACG,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBvD;;;;;;;OAOG;IACG,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB/B;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,IAAI,KAAK;IAa9B;;;;;OAKG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;CAqBjC"}
1
+ {"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/D,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B,IAAI,IAAI,IAAI,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAM1E;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,KAAK,CAAmB;IAE3C;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAY1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACG,SAAS,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA2B1D;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA+CtC;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA8CrD;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IAuEjD;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IA0CzD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC;IAe9B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6D7D;;;;;;;OAOG;IACG,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBvD;;;;;;;OAOG;IACG,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB/B;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,IAAI,KAAK;IAiB9B;;;;;OAKG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;CAqBjC"}
@@ -1,4 +1,4 @@
1
- import { awaitTimeout, mergeInLeft, RuntimeError, } from '@ibiz-template/core';
1
+ import { awaitTimeout, IBizContext, isElementSame, mergeInLeft, RuntimeError, } from '@ibiz-template/core';
2
2
  import { debounce } from 'lodash-es';
3
3
  import { createUUID } from 'qx-util';
4
4
  import { clone } from 'ramda';
@@ -451,6 +451,7 @@ export class EditFormController extends FormController {
451
451
  switch (autoSaveMode) {
452
452
  case 3:
453
453
  saveParam.data = this.getDiffData();
454
+ saveParam.context = IBizContext.create({ srfsimple: true });
454
455
  break;
455
456
  default:
456
457
  }
@@ -475,7 +476,12 @@ export class EditFormController extends FormController {
475
476
  const diffData = {};
476
477
  Object.keys(data).forEach(key => {
477
478
  // 值不一致 || 属性为主键
478
- if (data[key] !== this.oldData[key] || key === data.srfkeyfield) {
479
+ if (Array.isArray(data[key])) {
480
+ if (!isElementSame(data[key], this.oldData[key])) {
481
+ diffData[key] = data[key];
482
+ }
483
+ }
484
+ else if (data[key] !== this.oldData[key] || key === data.srfkeyfield) {
479
485
  diffData[key] = data[key];
480
486
  }
481
487
  });
@@ -11,6 +11,7 @@ import { GridController } from './grid.controller';
11
11
  */
12
12
  export declare class GridRowState implements IGridRowState {
13
13
  data: ControlVO;
14
+ oldData: ControlVO;
14
15
  cacheData?: ControlVO;
15
16
  /**
16
17
  * 错误信息集合,p是对应属性名称
@@ -82,6 +83,7 @@ export declare class GridRowState implements IGridRowState {
82
83
  * @memberof GridRowState
83
84
  */
84
85
  processing: boolean;
86
+ getDiffData(): ControlVO;
85
87
  constructor(data: ControlVO, grid: GridController);
86
88
  }
87
89
  //# sourceMappingURL=grid-row.state.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"grid-row.state.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid-row.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,YAAa,YAAW,aAAa;IAChD,IAAI,EAAE,SAAS,CAAC;IAEhB,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAM;IAE5C;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,aAAa,EAAE;QACb,CAAC,CAAC,EAAE,MAAM,GAAG;YACX,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;SACnB,CAAC;KACH,CAAM;IAEP;;;;;;;OAOG;IACH,mBAAmB,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEjE;;;;;;OAMG;IACH,WAAW,EAAE,OAAO,CAAS;IAE7B;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAS;gBAEhB,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc;CA8BlD"}
1
+ {"version":3,"file":"grid-row.state.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid-row.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,YAAa,YAAW,aAAa;IAChD,IAAI,EAAE,SAAS,CAAC;IAEhB,OAAO,EAAE,SAAS,CAAC;IAEnB,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAM;IAE5C;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,aAAa,EAAE;QACb,CAAC,CAAC,EAAE,MAAM,GAAG;YACX,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;SACnB,CAAC;KACH,CAAM;IAEP;;;;;;;OAOG;IACH,mBAAmB,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEjE;;;;;;OAMG;IACH,WAAW,EAAE,OAAO,CAAS;IAE7B;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAS;IAE5B,WAAW,IAAI,SAAS;gBAgBZ,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc;CA+BlD"}
@@ -1,3 +1,4 @@
1
+ import { ControlVO } from '../../../../service';
1
2
  /**
2
3
  * 表格行数据状态管理控制器
3
4
  *
@@ -7,6 +8,19 @@
7
8
  * @class GridRowState
8
9
  */
9
10
  export class GridRowState {
11
+ getDiffData() {
12
+ const diffData = {};
13
+ Object.keys(this.data).forEach(key => {
14
+ // 值不一致 || 属性为主键
15
+ if (this.data[key] !== this.oldData[key] ||
16
+ key === this.data.srfkeyfield) {
17
+ diffData[key] = this.data[key];
18
+ }
19
+ });
20
+ diffData.srfuf = this.data.srfuf;
21
+ diffData.srfkey = this.data.srfkey;
22
+ return new ControlVO(diffData, this.oldData.$dataUIMap);
23
+ }
10
24
  constructor(data, grid) {
11
25
  /**
12
26
  * 错误信息集合,p是对应属性名称
@@ -66,6 +80,7 @@ export class GridRowState {
66
80
  */
67
81
  this.processing = false;
68
82
  this.data = data;
83
+ this.oldData = data.clone();
69
84
  // vue监控没有空值没法自动响应式更新
70
85
  Object.keys(this.data).forEach(key => {
71
86
  if (this.errors[key] === undefined) {
@@ -120,13 +120,27 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
120
120
  * @type {IDEDataExport}
121
121
  */
122
122
  dataExport: IDEDataExport | undefined;
123
+ /**
124
+ * 数据导出参数
125
+ * @author zzq
126
+ * @date 2024-03-20 16:11:00
127
+ * @type {IData}
128
+ */
129
+ dataExportParam: IData;
123
130
  /**
124
131
  * 数据导出列
125
132
  * @author lxm
126
133
  * @date 2023-08-07 04:11:00
127
134
  * @type {IDEDataExport}
128
135
  */
129
- allExportColumns: IExportColumn[] | undefined;
136
+ allExportColumns: IExportColumn[];
137
+ /**
138
+ * 数据导出代码表
139
+ * @author zzq
140
+ * @date 2024-03-20 16:11:00
141
+ * @type {Map<string, readonly CodeListItem[]>}
142
+ */
143
+ allExportCodelistMap: Map<string, readonly CodeListItem[]>;
130
144
  /**
131
145
  * 分组代码表项集合
132
146
  * @author lxm
@@ -175,6 +189,14 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
175
189
  * @return {*} {Promise<void>}
176
190
  */
177
191
  initByEntitySchema(): Promise<void>;
192
+ /**
193
+ * 初始化数据导出对象
194
+ * @author zzq
195
+ * @date 2024-03-20 16:10:17
196
+ * @protected
197
+ * @return {*} {Promise<void>}
198
+ */
199
+ protected initExportData(): Promise<void>;
178
200
  /**
179
201
  * 初始化表格分组
180
202
  * @author lxm
@@ -353,7 +375,28 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
353
375
  * @author: zhujiamin
354
376
  * @Date: 2023-11-21 18:54:16
355
377
  */
356
- findAllExportColumns(dataExport: IDEDataExport): Promise<IExportColumn[] | undefined>;
378
+ findAllExportColumns(dataExport: IDEDataExport): Promise<IExportColumn[]>;
379
+ /**
380
+ * 值格式化
381
+ * @return {string}
382
+ * @author: zzq
383
+ * @Date: 2024-03-20 17:54:16
384
+ */
385
+ formatValue: (valueFormat?: string, value?: unknown) => string;
386
+ /**
387
+ * 格式化导出数据
388
+ * @return {string}
389
+ * @author: zzq
390
+ * @Date: 2024-03-20 17:54:16
391
+ */
392
+ formatExcelData(data: IData[]): IData[];
393
+ /**
394
+ * 获取导出数据
395
+ * @return {Promise<IData[]>}
396
+ * @author: zzq
397
+ * @Date: 2024-03-20 17:54:16
398
+ */
399
+ getExportData(params: IData): Promise<IData[]>;
357
400
  /**
358
401
  * 数据导出
359
402
  *
@@ -361,7 +404,7 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
361
404
  * @returns {*} {Promise<void>}
362
405
  * @memberof MDControlController
363
406
  */
364
- exportData(_args: {
407
+ exportData(args: {
365
408
  event: MouseEvent;
366
409
  params: IData;
367
410
  }): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,OAAO,EAEP,aAAa,EACb,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,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,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,gBAAgB,EAEjB,MAAM,uBAAuB,CAAC;AAG/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,EACL,eAAe,EAKhB,MAAM,gBAAgB,CAAC;AAIxB;;;;;;;;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;;;;;OAKG;IACH,iBAAiB,EAAE,OAAO,CAAS;IAEnC;;;;;OAKG;IACH,kBAAkB,EAAE,OAAO,CAAS;IAEpC;;;;;OAKG;IACH,eAAe,EAAE,OAAO,CAAS;IAEjC;;;;;;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,CAAQ;IAExB;;;;;OAKG;IACH,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC;IAEtC;;;;;OAKG;IACH,gBAAgB,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAE9C;;;;;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,YAAY,IAAI,MAAM,GAAG,UAAU,CAEtC;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAW3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCzC;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAkDpC,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IA6CvB;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAmC7C;;;;;;OAMG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBxC,cAAc,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAOjE;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAS7C;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAmB9B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkD7B;;;;;;;OAOG;IACG,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDpC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B;;;;;;OAMG;cACa,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC3E;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAuClC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAqBjC;;;;;;OAMG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC;IAyBhB;;;;;;;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;IAS7C,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC;;;;;;OAMG;IACG,aAAa,CACjB,GAAG,EAAE,YAAY,EACjB,QAAQ,CAAC,EAAE,OAAO,EAClB,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAoDhB;;;;;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;IAQvD;;;;;;;OAOG;IACG,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8C5E;;;;;;;;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,GAAG,SAAS,CAAC;IAsBvC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,KAAK,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiH5E;;;;;;;;OAQG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,KAAK;IAsBvD;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM;IAQtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,SAAS;IAKpD;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAU5C;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAsB1C;;;;;;OAMG;IACH,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,IAAI;IAMjD;;;;;;OAMG;IACH,cAAc,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAe5C;;;;;OAKG;IACH,qBAAqB,CACnB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,IAAI;IAcP;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;CAmBzB"}
1
+ {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  /* eslint-disable no-param-reassign */
2
2
  import { awaitTimeout, debounceAndAsyncMerge, mergeDefaultInLeft, recursiveIterate, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
3
3
  import { clone } from 'ramda';
4
+ import dayjs from 'dayjs';
4
5
  import { GridRowState } from './grid-row.state';
5
6
  import { GridService } from './grid.service';
6
7
  import { calcDeCodeNameById } from '../../../../model';
@@ -91,6 +92,45 @@ export class GridController extends MDControlController {
91
92
  * @type {string}
92
93
  */
93
94
  this.aggTitle = '合计';
95
+ /**
96
+ * 数据导出参数
97
+ * @author zzq
98
+ * @date 2024-03-20 16:11:00
99
+ * @type {IData}
100
+ */
101
+ this.dataExportParam = {};
102
+ /**
103
+ * 数据导出列
104
+ * @author lxm
105
+ * @date 2023-08-07 04:11:00
106
+ * @type {IDEDataExport}
107
+ */
108
+ this.allExportColumns = [];
109
+ /**
110
+ * 数据导出代码表
111
+ * @author zzq
112
+ * @date 2024-03-20 16:11:00
113
+ * @type {Map<string, readonly CodeListItem[]>}
114
+ */
115
+ this.allExportCodelistMap = new Map();
116
+ /**
117
+ * 值格式化
118
+ * @return {string}
119
+ * @author: zzq
120
+ * @Date: 2024-03-20 17:54:16
121
+ */
122
+ this.formatValue = (valueFormat, value = '') => {
123
+ // 根据格式化配置格式化显示
124
+ const strVal = `${value}`;
125
+ if (!valueFormat) {
126
+ return strVal;
127
+ }
128
+ if (dayjs(strVal, valueFormat, true).isValid()) {
129
+ const formatVal = dayjs(strVal).format(valueFormat);
130
+ return formatVal;
131
+ }
132
+ return ibiz.util.text.format(strVal, valueFormat);
133
+ };
94
134
  }
95
135
  get _evt() {
96
136
  return this.evt;
@@ -166,6 +206,8 @@ export class GridController extends MDControlController {
166
206
  }, 200);
167
207
  // 初始化表格分组
168
208
  await this.initGroup();
209
+ // 初始化数据导出对象
210
+ await this.initExportData();
169
211
  }
170
212
  /**
171
213
  * 根据jsonschema初始化自定义表格列
@@ -200,6 +242,43 @@ export class GridController extends MDControlController {
200
242
  ];
201
243
  }
202
244
  }
245
+ /**
246
+ * 初始化数据导出对象
247
+ * @author zzq
248
+ * @date 2024-03-20 16:10:17
249
+ * @protected
250
+ * @return {*} {Promise<void>}
251
+ */
252
+ async initExportData() {
253
+ var _a;
254
+ if (this.model.dedataExportId) {
255
+ this.dataExport = (_a = this.dataEntity.appDEDataExports) === null || _a === void 0 ? void 0 : _a.find(dataExport => {
256
+ return dataExport.id === this.model.dedataExportId;
257
+ });
258
+ if (this.dataExport) {
259
+ this.allExportColumns = await this.findAllExportColumns(this.dataExport);
260
+ }
261
+ }
262
+ if (this.allExportColumns.length > 0) {
263
+ this.allExportColumns.forEach((exportColumn) => {
264
+ if (exportColumn.codeListItems) {
265
+ this.allExportCodelistMap.set(exportColumn.appDEFieldId, exportColumn.codeListItems);
266
+ }
267
+ });
268
+ this.dataExportParam.fields = this.allExportColumns.map(x => x.appDEFieldId);
269
+ this.dataExportParam.header = this.allExportColumns.map(x => x.caption);
270
+ }
271
+ else {
272
+ Object.keys(this.fieldColumns).forEach((key) => {
273
+ if (this.fieldColumns[key].codeList) {
274
+ this.allExportCodelistMap.set(key, this.fieldColumns[key].codeListItems);
275
+ }
276
+ });
277
+ const { degridColumns = [] } = this.model;
278
+ this.dataExportParam.fields = degridColumns.map(item => item.id);
279
+ this.dataExportParam.header = degridColumns.map(item => item.caption);
280
+ }
281
+ }
203
282
  /**
204
283
  * 初始化表格分组
205
284
  * @author lxm
@@ -450,6 +529,9 @@ export class GridController extends MDControlController {
450
529
  if (!isValid) {
451
530
  throw new RuntimeError('行数据校验不通过,保存取消');
452
531
  }
532
+ if (this.model.enableRowEditChangedOnly) {
533
+ data = rowState.getDiffData();
534
+ }
453
535
  let res;
454
536
  const deName = calcDeCodeNameById(this.model.appDataEntityId);
455
537
  const tempContext = this.context.clone();
@@ -471,6 +553,8 @@ export class GridController extends MDControlController {
471
553
  const index = this.findRowStateIndex(data);
472
554
  this.state.items.splice(index, 1, res.data);
473
555
  rowState.data = res.data;
556
+ // 保存结束后更新旧数据
557
+ rowState.oldData = res.data.clone();
474
558
  rowState.modified = false;
475
559
  this.gridStateNotify(rowState, GridNotifyState.SAVE);
476
560
  await this._evt.emit('onSaveSuccess', undefined);
@@ -840,7 +924,75 @@ export class GridController extends MDControlController {
840
924
  if (exportColumnsPromises) {
841
925
  return Promise.all(exportColumnsPromises);
842
926
  }
843
- return undefined;
927
+ return [];
928
+ }
929
+ /**
930
+ * 格式化导出数据
931
+ * @return {string}
932
+ * @author: zzq
933
+ * @Date: 2024-03-20 17:54:16
934
+ */
935
+ formatExcelData(data) {
936
+ const { fields = [] } = this.dataExportParam;
937
+ const cloneData = clone(data.map(item => {
938
+ return fields.reduce((obj, key) => {
939
+ obj[key] = item[key];
940
+ return obj;
941
+ }, {});
942
+ }));
943
+ cloneData.forEach(item => {
944
+ Object.keys(item).forEach((key) => {
945
+ var _a;
946
+ let value = item[key];
947
+ const exportColumn = this.allExportColumns.find(c => c.appDEFieldId === key);
948
+ const fieldColumnC = this.fieldColumns[key];
949
+ const format = (exportColumn === null || exportColumn === void 0 ? void 0 : exportColumn.format) || (fieldColumnC === null || fieldColumnC === void 0 ? void 0 : fieldColumnC.valueFormat);
950
+ const unitName = (fieldColumnC === null || fieldColumnC === void 0 ? void 0 : fieldColumnC.model.unitName) || '';
951
+ if (this.allExportCodelistMap.get(key)) {
952
+ value =
953
+ ((_a = this.allExportCodelistMap.get(key).find(x => x.value === item[key])) === null || _a === void 0 ? void 0 : _a.text) || value;
954
+ }
955
+ else {
956
+ value = this.formatValue(format, value) + unitName;
957
+ }
958
+ item[key] = value;
959
+ });
960
+ });
961
+ return cloneData;
962
+ }
963
+ /**
964
+ * 获取导出数据
965
+ * @return {Promise<IData[]>}
966
+ * @author: zzq
967
+ * @Date: 2024-03-20 17:54:16
968
+ */
969
+ async getExportData(params) {
970
+ var _a;
971
+ const { type } = params;
972
+ let data = [];
973
+ // 未指定类型时,默认导出当前页
974
+ if (!type || type === 'activatedPage') {
975
+ data = this.state.rows.map(row => row.data);
976
+ }
977
+ else if (type === 'maxRowCount' || type === 'customPage') {
978
+ const { size } = this.state;
979
+ const { startPage, endPage } = params;
980
+ const viewParam = type === 'customPage'
981
+ ? {
982
+ page: 0,
983
+ offset: (startPage - 1) * size,
984
+ size: (endPage - startPage + 1) * size,
985
+ }
986
+ : { size: ((_a = this.dataExport) === null || _a === void 0 ? void 0 : _a.maxRowCount) || 1000, page: 0 };
987
+ data = await this.loadData({ viewParam });
988
+ }
989
+ else if (type === 'selectedRows') {
990
+ data = this.getData();
991
+ }
992
+ if (data.length === 0) {
993
+ throw new RuntimeError('无导出数据');
994
+ }
995
+ return data;
844
996
  }
845
997
  /**
846
998
  * 数据导出
@@ -849,108 +1001,15 @@ export class GridController extends MDControlController {
849
1001
  * @returns {*} {Promise<void>}
850
1002
  * @memberof MDControlController
851
1003
  */
852
- async exportData(_args) {
853
- var _a;
854
- // 初始化导出对象
855
- if (this.model.dedataExportId && !this.dataExport) {
856
- this.dataExport = (_a = this.dataEntity.appDEDataExports) === null || _a === void 0 ? void 0 : _a.find(dataExport => {
857
- return dataExport.id === this.model.dedataExportId;
858
- });
859
- if (this.dataExport) {
860
- this.allExportColumns = await this.findAllExportColumns(this.dataExport);
861
- }
862
- }
863
- // 数据格式化
864
- const formatExcelData = (data) => {
865
- var _a;
866
- const codeListMap = new Map();
867
- if (this.allExportColumns && this.allExportColumns.length > 0) {
868
- (_a = this.allExportColumns) === null || _a === void 0 ? void 0 : _a.forEach((exportColumn) => {
869
- if (exportColumn.codeListItems) {
870
- codeListMap.set(exportColumn.appDEFieldId, exportColumn.codeListItems);
871
- }
872
- });
873
- }
874
- else {
875
- Object.keys(this.fieldColumns).forEach((key) => {
876
- if (this.fieldColumns[key].codeList) {
877
- codeListMap.set(key, this.fieldColumns[key].codeListItems);
878
- }
879
- });
880
- }
881
- const cloneData = clone(data.map(item => {
882
- return item.getOrigin();
883
- }));
884
- cloneData.forEach(item => {
885
- const fields = Object.keys(item);
886
- fields.forEach((key) => {
887
- var _a;
888
- if (codeListMap.get(key)) {
889
- item[key] =
890
- ((_a = codeListMap.get(key).find(_item => {
891
- return _item.value === item[key];
892
- })) === null || _a === void 0 ? void 0 : _a.text) || item[key];
893
- }
894
- });
895
- });
896
- return cloneData;
897
- };
898
- // 获取导出数据
899
- const getExportData = async () => {
900
- var _a;
901
- const type = (_a = _args.params) === null || _a === void 0 ? void 0 : _a.type;
902
- let data = [];
903
- // 未指定类型时,默认导出当前页
904
- if (!type || type === 'activatedPage') {
905
- data = this.state.rows.map(row => row.data);
906
- }
907
- else if (type === 'maxRowCount' || type === 'customPage') {
908
- const { size } = this.state;
909
- const { startPage, endPage } = _args.params;
910
- const params = type === 'customPage'
911
- ? {
912
- page: 0,
913
- offset: (startPage - 1) * size,
914
- size: (endPage - startPage + 1) * size,
915
- }
916
- : { size: 1000, page: 0 };
917
- data = await this.loadData({ viewParam: params });
918
- }
919
- else if (type === 'selectedRows') {
920
- data = this.getData();
921
- }
922
- if (data.length === 0) {
923
- throw new RuntimeError('无导出数据');
924
- }
925
- return formatExcelData(data);
926
- };
927
- // 一维数组转成二维数组
928
- const formatArrayData = (filterVal, tableData) => {
929
- return tableData.map(v => {
930
- return filterVal.map(j => {
931
- return v[j];
932
- });
933
- });
934
- };
935
- // 头部id数组
936
- let filterVal = [];
937
- // 表头数组
938
- let header = [];
939
- if (this.allExportColumns && this.allExportColumns.length > 0) {
940
- filterVal = this.allExportColumns.map((column) => column.appDEFieldId);
941
- header = this.allExportColumns.map((column) => column.caption);
942
- }
943
- else {
944
- const { degridColumns } = this.model;
945
- if (!degridColumns) {
946
- throw new RuntimeError('无表格列');
947
- }
948
- filterVal = degridColumns.map(item => item.id);
949
- header = degridColumns.map(item => item.caption);
1004
+ async exportData(args) {
1005
+ const { header } = this.dataExportParam;
1006
+ if (!header) {
1007
+ throw new RuntimeError('无表格列');
950
1008
  }
951
- // 二维数组
952
- const data = formatArrayData(filterVal, await getExportData());
953
- await exportData(header, data, this.model.logicName);
1009
+ const data = await this.getExportData(args.params);
1010
+ const formatData = this.formatExcelData(data);
1011
+ const table = formatData.map(v => Object.values(v));
1012
+ await exportData(header, table, this.model.logicName);
954
1013
  }
955
1014
  /**
956
1015
  * 计算默认值并返回一个对象,对象里的属性就是要填充的默认值
@@ -1 +1 @@
1
- {"version":3,"file":"kanban.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/kanban/kanban.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"kanban.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/kanban/kanban.controller.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ import { calcDeCodeNameById } from '../../../model';
4
4
  import { DataViewControlController } from '../data-view';
5
5
  import { KanbanService } from './kanban.service';
6
6
  import { UIActionUtil } from '../../../ui-action';
7
+ import { ButtonContainerState, UIActionButtonState } from '../../utils';
7
8
  export class KanbanController extends DataViewControlController {
8
9
  /**
9
10
  * 允许调整顺序
@@ -37,6 +38,7 @@ export class KanbanController extends DataViewControlController {
37
38
  this.state.selectGroupKey = '';
38
39
  // 支持调整顺序和分组时
39
40
  this.state.draggable = this.enableEditOrder || this.enableEditGroup;
41
+ this.state.uaState = {};
40
42
  }
41
43
  /**
42
44
  * 初始化
@@ -82,9 +84,38 @@ export class KanbanController extends DataViewControlController {
82
84
  items.sort((a, b) => isAsc ? a[sortField] - b[sortField] : b[sortField] - a[sortField]);
83
85
  }
84
86
  async afterLoad(args, items) {
87
+ var _a;
85
88
  // 每次加载回来先本地排序,把数据的排序属性规范一下
86
89
  this.sortItems(this.state.items);
87
- return super.afterLoad(args, items);
90
+ super.afterLoad(args, items);
91
+ const actions = [];
92
+ (_a = this.model.dedataViewItems) === null || _a === void 0 ? void 0 : _a.forEach((item) => {
93
+ if (item.itemType === 'ACTIONITEM') {
94
+ if (item.deuiactionGroup && item.deuiactionGroup.uiactionGroupDetails) {
95
+ actions.push(...item.deuiactionGroup.uiactionGroupDetails);
96
+ }
97
+ }
98
+ });
99
+ if (actions && actions.length > 0) {
100
+ items.forEach((item) => {
101
+ const containerState = new ButtonContainerState();
102
+ actions.forEach((action) => {
103
+ const actionid = action.uiactionId;
104
+ if (actionid) {
105
+ const buttonState = new UIActionButtonState(action.id, this.context.srfappid, actionid);
106
+ containerState.addState(action.id, buttonState);
107
+ }
108
+ });
109
+ this.state.uaState[item.srfkey] = containerState;
110
+ });
111
+ }
112
+ items.forEach((item) => {
113
+ if (this.state.uaState[item.srfkey] &&
114
+ Object.keys(this.state.uaState[item.srfkey]).length > 0) {
115
+ this.state.uaState[item.srfkey].update(this.context, item.getOrigin(), this.model.appDataEntityId);
116
+ }
117
+ });
118
+ return items;
88
119
  }
89
120
  /**
90
121
  * 当展开批操作工具栏时需进行行点击拦截
@@ -1 +1 @@
1
- {"version":3,"file":"use-searchcond.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/use-searchcond.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAElE;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,EAAE,CAQpD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK,CA+BtD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,CA+BrD;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,EAAE,GACzB,KAAK,EAAE,GAAG,SAAS,CAiBrB"}
1
+ {"version":3,"file":"use-searchcond.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/use-searchcond.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAKlE;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,EAAE,CAQpD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK,CA+BtD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,CA+BrD;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,EAAE,GACzB,KAAK,EAAE,GAAG,SAAS,CAoBrB"}