@ibiz-template/runtime 0.7.29 → 0.7.30

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 (83) hide show
  1. package/dist/index.esm.js +799 -243
  2. package/dist/index.system.min.js +1 -1
  3. package/out/constant/control-type.d.ts +6 -0
  4. package/out/constant/control-type.d.ts.map +1 -1
  5. package/out/constant/control-type.js +20 -0
  6. package/out/constant/index.d.ts +1 -1
  7. package/out/constant/index.d.ts.map +1 -1
  8. package/out/constant/index.js +1 -1
  9. package/out/controller/common/control/control.controller.d.ts +1 -0
  10. package/out/controller/common/control/control.controller.d.ts.map +1 -1
  11. package/out/controller/common/control/control.controller.js +4 -0
  12. package/out/controller/common/control/md-control.controller.d.ts +32 -0
  13. package/out/controller/common/control/md-control.controller.d.ts.map +1 -1
  14. package/out/controller/common/control/md-control.controller.js +85 -0
  15. package/out/controller/control/chart/chart.controller.d.ts +28 -0
  16. package/out/controller/control/chart/chart.controller.d.ts.map +1 -1
  17. package/out/controller/control/chart/chart.controller.js +102 -0
  18. package/out/controller/control/chart/generator/base-series-generator.d.ts +8 -1
  19. package/out/controller/control/chart/generator/base-series-generator.d.ts.map +1 -1
  20. package/out/controller/control/chart/generator/base-series-generator.js +30 -7
  21. package/out/controller/control/chart/generator/chart-options-generator.d.ts.map +1 -1
  22. package/out/controller/control/chart/generator/chart-options-generator.js +22 -6
  23. package/out/controller/control/dashboard/custom-dashboard.controller.d.ts.map +1 -1
  24. package/out/controller/control/dashboard/custom-dashboard.controller.js +1 -0
  25. package/out/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.d.ts +2 -2
  26. package/out/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.d.ts.map +1 -1
  27. package/out/controller/control/data-view/data-view.controller.d.ts +1 -1
  28. package/out/controller/control/data-view/data-view.controller.d.ts.map +1 -1
  29. package/out/controller/control/data-view/data-view.controller.js +11 -4
  30. package/out/controller/control/grid/grid/grid-column.controller.d.ts +1 -1
  31. package/out/controller/control/grid/grid/grid-column.controller.d.ts.map +1 -1
  32. package/out/controller/control/grid/grid/grid-column.controller.js +15 -3
  33. package/out/controller/control/grid/grid/grid.controller.d.ts +3 -3
  34. package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
  35. package/out/controller/control/grid/grid/grid.controller.js +6 -7
  36. package/out/controller/control/list/list.controller.d.ts +1 -1
  37. package/out/controller/control/list/list.controller.d.ts.map +1 -1
  38. package/out/controller/control/list/list.controller.js +11 -4
  39. package/out/controller/control/md-ctrl/md-ctrl.controller.d.ts +1 -1
  40. package/out/controller/control/md-ctrl/md-ctrl.controller.d.ts.map +1 -1
  41. package/out/controller/control/md-ctrl/md-ctrl.controller.js +11 -4
  42. package/out/controller/control/search-bar/interface-util.d.ts.map +1 -1
  43. package/out/controller/control/search-bar/interface-util.js +29 -0
  44. package/out/engine/md-view.engine.js +2 -2
  45. package/out/global/global-util/global-util.d.ts +8 -1
  46. package/out/global/global-util/global-util.d.ts.map +1 -1
  47. package/out/global/global-util/global-util.js +8 -1
  48. package/out/interface/controller/controller/control/i-control.controller.d.ts +8 -0
  49. package/out/interface/controller/controller/control/i-control.controller.d.ts.map +1 -1
  50. package/out/interface/controller/controller/control/i-md-control.controller.d.ts +32 -0
  51. package/out/interface/controller/controller/control/i-md-control.controller.d.ts.map +1 -1
  52. package/out/interface/controller/state/control/search-bar/i-filter-node.d.ts +43 -1
  53. package/out/interface/controller/state/control/search-bar/i-filter-node.d.ts.map +1 -1
  54. package/out/interface/controller/state/control/search-bar/i-search-cond-ex.d.ts +21 -2
  55. package/out/interface/controller/state/control/search-bar/i-search-cond-ex.d.ts.map +1 -1
  56. package/out/interface/controller/state/control/search-bar/i-search-cond.d.ts +14 -1
  57. package/out/interface/controller/state/control/search-bar/i-search-cond.d.ts.map +1 -1
  58. package/out/interface/controller/state/control/search-bar/index.d.ts +3 -3
  59. package/out/interface/controller/state/control/search-bar/index.d.ts.map +1 -1
  60. package/out/interface/util/i-fullscreen-util/i-fullscreen-util.d.ts +8 -2
  61. package/out/interface/util/i-fullscreen-util/i-fullscreen-util.d.ts.map +1 -1
  62. package/out/interface/util/i-record-nav-util/i-record-nav-util.d.ts +78 -0
  63. package/out/interface/util/i-record-nav-util/i-record-nav-util.d.ts.map +1 -0
  64. package/out/interface/util/i-record-nav-util/i-record-nav-util.js +1 -0
  65. package/out/interface/util/index.d.ts +1 -0
  66. package/out/interface/util/index.d.ts.map +1 -1
  67. package/out/locale/en/index.d.ts +5 -0
  68. package/out/locale/en/index.d.ts.map +1 -1
  69. package/out/locale/en/index.js +5 -0
  70. package/out/locale/zh-CN/index.d.ts +5 -0
  71. package/out/locale/zh-CN/index.d.ts.map +1 -1
  72. package/out/locale/zh-CN/index.js +5 -0
  73. package/out/utils/bi-report-util/bi-report-util.d.ts +1 -0
  74. package/out/utils/bi-report-util/bi-report-util.d.ts.map +1 -1
  75. package/out/utils/bi-report-util/bi-report-util.js +33 -5
  76. package/out/utils/index.d.ts +1 -0
  77. package/out/utils/index.d.ts.map +1 -1
  78. package/out/utils/index.js +1 -0
  79. package/out/utils/record-nav-util/record-nav-util.d.ts +89 -0
  80. package/out/utils/record-nav-util/record-nav-util.d.ts.map +1 -0
  81. package/out/utils/record-nav-util/record-nav-util.js +192 -0
  82. package/out/utils/verify/form-dynamic-logic.js +1 -1
  83. package/package.json +6 -7
@@ -180,4 +180,10 @@ export declare enum ControlType {
180
180
  */
181
181
  CONTEXT_MENU = "CONTEXTMENU"
182
182
  }
183
+ /**
184
+ * 多数据部件类型集合
185
+ *
186
+ * @export
187
+ */
188
+ export declare const MDControlTypes: string[];
183
189
  //# sourceMappingURL=control-type.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"control-type.d.ts","sourceRoot":"","sources":["../../src/constant/control-type.ts"],"names":[],"mappings":"AACA;;;;;;;GAOG;AACH,oBAAY,WAAW;IACrB;;OAEG;IACH,QAAQ,YAAY;IACpB;;OAEG;IACH,IAAI,SAAS;IACb;;OAEG;IACH,IAAI,SAAS;IACb;;OAEG;IACH,UAAU,eAAe;IACzB;;OAEG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,KAAK,UAAU;IAEf;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,iBAAiB,oBAAoB;IAErC;;OAEG;IACH,QAAQ,aAAa;IAErB;;OAEG;IACH,QAAQ,aAAa;IAErB;;OAEG;IACH,SAAS,aAAa;IAEtB;;OAEG;IACH,QAAQ,aAAa;IAErB;;OAEG;IACH,YAAY,eAAe;IAE3B;;OAEG;IACH,aAAa,iBAAiB;IAE9B;;OAEG;IACH,KAAK,UAAU;IAEf;;OAEG;IACH,KAAK,UAAU;IAEf;;OAEG;IACH,YAAY,gBAAgB;IAE5B;;OAEG;IACH,IAAI,SAAS;IAEb;;OAEG;IACH,UAAU,cAAc;IAExB;;OAEG;IACH,oBAAoB,uBAAuB;IAE3C;;OAEG;IACH,YAAY,gBAAgB;IAE5B;;OAEG;IACH,YAAY,gBAAgB;IAE5B;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,QAAQ,aAAa;IAErB;;OAEG;IACH,KAAK,UAAU;IAEf;;OAEG;IACH,iBAAiB,oBAAoB;IAErC;;OAEG;IACH,GAAG,QAAQ;IAEX;;OAEG;IACH,KAAK,UAAU;IAEf;;OAEG;IACH,WAAW,eAAe;IAE1B;;OAEG;IACH,MAAM,WAAW;IAEjB;;OAEG;IACH,eAAe,mBAAmB;IAElC;;OAEG;IACH,YAAY,gBAAgB;IAE5B;;OAEG;IACH,gBAAgB,mBAAmB;IAEnC;;OAEG;IACH,YAAY,gBAAgB;IAE5B;;OAEG;IACH,WAAW,eAAe;IAE1B;;OAEG;IACH,WAAW,eAAe;IAE1B;;OAEG;IACH,UAAU,cAAc;IAExB;;OAEG;IACH,kBAAkB,qBAAqB;IAEvC;;OAEG;IACH,aAAa,gBAAgB;IAE7B;;OAEG;IACH,MAAM,WAAW;IAEjB;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,YAAY,gBAAgB;CAC7B"}
1
+ {"version":3,"file":"control-type.d.ts","sourceRoot":"","sources":["../../src/constant/control-type.ts"],"names":[],"mappings":"AACA;;;;;;;GAOG;AACH,oBAAY,WAAW;IACrB;;OAEG;IACH,QAAQ,YAAY;IACpB;;OAEG;IACH,IAAI,SAAS;IACb;;OAEG;IACH,IAAI,SAAS;IACb;;OAEG;IACH,UAAU,eAAe;IACzB;;OAEG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,KAAK,UAAU;IAEf;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,iBAAiB,oBAAoB;IAErC;;OAEG;IACH,QAAQ,aAAa;IAErB;;OAEG;IACH,QAAQ,aAAa;IAErB;;OAEG;IACH,SAAS,aAAa;IAEtB;;OAEG;IACH,QAAQ,aAAa;IAErB;;OAEG;IACH,YAAY,eAAe;IAE3B;;OAEG;IACH,aAAa,iBAAiB;IAE9B;;OAEG;IACH,KAAK,UAAU;IAEf;;OAEG;IACH,KAAK,UAAU;IAEf;;OAEG;IACH,YAAY,gBAAgB;IAE5B;;OAEG;IACH,IAAI,SAAS;IAEb;;OAEG;IACH,UAAU,cAAc;IAExB;;OAEG;IACH,oBAAoB,uBAAuB;IAE3C;;OAEG;IACH,YAAY,gBAAgB;IAE5B;;OAEG;IACH,YAAY,gBAAgB;IAE5B;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,QAAQ,aAAa;IAErB;;OAEG;IACH,KAAK,UAAU;IAEf;;OAEG;IACH,iBAAiB,oBAAoB;IAErC;;OAEG;IACH,GAAG,QAAQ;IAEX;;OAEG;IACH,KAAK,UAAU;IAEf;;OAEG;IACH,WAAW,eAAe;IAE1B;;OAEG;IACH,MAAM,WAAW;IAEjB;;OAEG;IACH,eAAe,mBAAmB;IAElC;;OAEG;IACH,YAAY,gBAAgB;IAE5B;;OAEG;IACH,gBAAgB,mBAAmB;IAEnC;;OAEG;IACH,YAAY,gBAAgB;IAE5B;;OAEG;IACH,WAAW,eAAe;IAE1B;;OAEG;IACH,WAAW,eAAe;IAE1B;;OAEG;IACH,UAAU,cAAc;IAExB;;OAEG;IACH,kBAAkB,qBAAqB;IAEvC;;OAEG;IACH,aAAa,gBAAgB;IAE7B;;OAEG;IACH,MAAM,WAAW;IAEjB;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,YAAY,gBAAgB;CAC7B;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,EAAE,MAAM,EAclC,CAAC"}
@@ -182,3 +182,23 @@ export var ControlType;
182
182
  */
183
183
  ControlType["CONTEXT_MENU"] = "CONTEXTMENU";
184
184
  })(ControlType || (ControlType = {}));
185
+ /**
186
+ * 多数据部件类型集合
187
+ *
188
+ * @export
189
+ */
190
+ export const MDControlTypes = [
191
+ ControlType.CALENDAR,
192
+ ControlType.CHART,
193
+ ControlType.DATAVIEW,
194
+ ControlType.GANTT,
195
+ ControlType.GRID,
196
+ ControlType.KANBAN,
197
+ ControlType.LIST,
198
+ ControlType.MAP,
199
+ ControlType.MOB_MDCTRL,
200
+ ControlType.MULTI_EDIT_VIEWPANEL,
201
+ ControlType.TREEGRID,
202
+ ControlType.TREEVIEW,
203
+ ControlType.TREE_GRIDEX,
204
+ ];
@@ -1,4 +1,4 @@
1
- export { ControlType } from './control-type';
1
+ export { ControlType, MDControlTypes } from './control-type';
2
2
  export { PlatformType } from './platform-type';
3
3
  export { RouteConst } from './route';
4
4
  export * from './studio-event';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/constant/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/constant/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC"}
@@ -1,4 +1,4 @@
1
- export { ControlType } from './control-type';
1
+ export { ControlType, MDControlTypes } from './control-type';
2
2
  export { PlatformType } from './platform-type';
3
3
  export { RouteConst } from './route';
4
4
  export * from './studio-event';
@@ -19,6 +19,7 @@ export type DEDataChangeType = 'create' | 'update' | 'remove';
19
19
  export declare class ControlController<T extends IControl = IControl, S extends IControlState = IControlState, E extends IControlEvent = IControlEvent> extends BaseController<T, S, E> implements IControlController<T, S, E> {
20
20
  protected get _evt(): ControllerEvent<IControlEvent>;
21
21
  get view(): IViewController;
22
+ get ctrlId(): string;
22
23
  /**
23
24
  * 部件逻辑调度器
24
25
  * @author lxm
@@ -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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"}
@@ -21,6 +21,10 @@ export class ControlController extends BaseController {
21
21
  get view() {
22
22
  return this.ctx.view;
23
23
  }
24
+ // 部件标识
25
+ get ctrlId() {
26
+ return `${this.view.model.id}@${this.model.id}`;
27
+ }
24
28
  /**
25
29
  * Creates an instance of ControlController.
26
30
  *
@@ -208,5 +208,37 @@ export declare class MDControlController<T extends IMDControl = IMDControl, S ex
208
208
  * @return {*} {void}
209
209
  */
210
210
  protected onDEDataChange(msg: IPortalMessage): void;
211
+ /**
212
+ * 跳转第一页
213
+ *
214
+ * @author tony001
215
+ * @date 2024-07-15 14:07:03
216
+ * @return {*} {Promise<IData[]>}
217
+ */
218
+ goToFirstPage(): Promise<IData[]>;
219
+ /**
220
+ * 跳转上一页
221
+ *
222
+ * @author tony001
223
+ * @date 2024-07-15 14:07:28
224
+ * @return {*} {Promise<IData[]>}
225
+ */
226
+ goToPreviousPage(): Promise<IData[]>;
227
+ /**
228
+ * 跳转下一页
229
+ *
230
+ * @author tony001
231
+ * @date 2024-07-15 14:07:34
232
+ * @return {*} {Promise<IData[]>}
233
+ */
234
+ goToNextPage(): Promise<IData[]>;
235
+ /**
236
+ * 跳转最后一页
237
+ *
238
+ * @author tony001
239
+ * @date 2024-07-15 14:07:44
240
+ * @return {*} {Promise<IData[]>}
241
+ */
242
+ goToLastPage(): Promise<IData[]>;
211
243
  }
212
244
  //# sourceMappingURL=md-control.controller.d.ts.map
@@ -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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"}
@@ -554,4 +554,89 @@ export class MDControlController extends ControlController {
554
554
  });
555
555
  }
556
556
  }
557
+ /**
558
+ * 跳转第一页
559
+ *
560
+ * @author tony001
561
+ * @date 2024-07-15 14:07:03
562
+ * @return {*} {Promise<IData[]>}
563
+ */
564
+ async goToFirstPage() {
565
+ const { curPage, items } = this.state;
566
+ const { pagingMode } = this.model;
567
+ let result = items;
568
+ // 分页模式为分页栏且当前页面不是第一个页面才查询
569
+ if (curPage !== 1 && pagingMode === 1) {
570
+ this.state.curPage = 1;
571
+ result = await this.load();
572
+ }
573
+ return result;
574
+ }
575
+ /**
576
+ * 跳转上一页
577
+ *
578
+ * @author tony001
579
+ * @date 2024-07-15 14:07:28
580
+ * @return {*} {Promise<IData[]>}
581
+ */
582
+ async goToPreviousPage() {
583
+ const { curPage } = this.state;
584
+ const { pagingMode } = this.model;
585
+ let result = [];
586
+ // 分页模式为分页栏且当前页面大于1才查询
587
+ if (pagingMode === 1 && curPage > 1) {
588
+ this.state.curPage -= 1;
589
+ result = await this.load();
590
+ }
591
+ return result;
592
+ }
593
+ /**
594
+ * 跳转下一页
595
+ *
596
+ * @author tony001
597
+ * @date 2024-07-15 14:07:34
598
+ * @return {*} {Promise<IData[]>}
599
+ */
600
+ async goToNextPage() {
601
+ const { curPage, totalPages } = this.state;
602
+ const { pagingMode } = this.model;
603
+ let result = [];
604
+ // 分页模式存在且前页小于总页数才加载下一页
605
+ if (pagingMode && curPage < totalPages) {
606
+ // 分页栏模式
607
+ if (pagingMode === 1) {
608
+ this.state.curPage += 1;
609
+ result = await this.load();
610
+ }
611
+ else {
612
+ result = await this.load({ isLoadMore: true });
613
+ }
614
+ }
615
+ return result;
616
+ }
617
+ /**
618
+ * 跳转最后一页
619
+ *
620
+ * @author tony001
621
+ * @date 2024-07-15 14:07:44
622
+ * @return {*} {Promise<IData[]>}
623
+ */
624
+ async goToLastPage() {
625
+ const { curPage, items, totalPages, total } = this.state;
626
+ const { pagingMode } = this.model;
627
+ let result = items;
628
+ // 当前页小于最大页时才加载数据
629
+ if (pagingMode && curPage < totalPages) {
630
+ // 分页栏模式
631
+ if (pagingMode === 1) {
632
+ this.state.curPage = totalPages;
633
+ result = await this.load();
634
+ }
635
+ else {
636
+ this.state.size = total;
637
+ result = await this.load({ isInitialLoad: true });
638
+ }
639
+ }
640
+ return result;
641
+ }
557
642
  }
@@ -29,9 +29,37 @@ export declare class ChartController extends MDControlController<IDEChart, IChar
29
29
  * @type {EChartsOption}
30
30
  */
31
31
  options?: EChartsOption;
32
+ /**
33
+ * 图表tooltip的默认状态
34
+ *
35
+ * @memberof ChartController
36
+ */
37
+ tooltipState: boolean;
32
38
  protected initState(): void;
33
39
  protected onCreated(): Promise<void>;
34
40
  afterLoad(args: MDCtrlLoadParams, items: IData[]): Promise<IData[]>;
41
+ /**
42
+ * 改变tooltip的显示状态
43
+ *
44
+ * @param {boolean} [tag=true]
45
+ * @memberof ChartController
46
+ */
47
+ changeTooltipState(tag?: boolean): void;
48
+ /**
49
+ * 计算当前点击序列的模型
50
+ *
51
+ * @param {IData} arg
52
+ * @memberof ChartController
53
+ */
54
+ computedClickSerieModel(arg: IData): IData | undefined;
55
+ /**
56
+ * 处理查看明细参数
57
+ *
58
+ * @param {IData} arg
59
+ * @return {*}
60
+ * @memberof ChartController
61
+ */
62
+ computedDrillDetailParam(arg: IData): IData;
35
63
  /**
36
64
  * 解析表格相关参数
37
65
  *
@@ -1 +1 @@
1
- {"version":3,"file":"chart.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/chart/chart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,EAAG,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,SAAS,CAAC,SAAS,IAAI,IAAI;cASX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUzE;;;;OAIG;IACI,cAAc,IAAI,IAAI;IAc7B;;;;;;OAMG;IACI,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAW/C;;;;;;OAMG;IACI,yBAAyB,IAAI,IAAI;IAuDxC;;;;;;;;OAQG;IACI,2BAA2B,IAAI,IAAI;IAwD1C;;;;OAIG;IACI,eAAe,IAAI,IAAI;IAU9B;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAUnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,GAAE,KAAK,EAAqB,GAAG,IAAI;IASnD;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBlC;;;;OAIG;IACH,WAAW,IAAI,IAAI;cAMH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7C"}
1
+ {"version":3,"file":"chart.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/chart/chart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,EAAG,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB;;;;OAIG;IACH,YAAY,UAAQ;IAEpB,SAAS,CAAC,SAAS,IAAI,IAAI;cASX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUzE;;;;;OAKG;IACI,kBAAkB,CAAC,GAAG,GAAE,OAAc,GAAG,IAAI;IAWpD;;;;;OAKG;IACI,uBAAuB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS;IAmB7D;;;;;;OAMG;IACI,wBAAwB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK;IA0ClD;;;;OAIG;IACI,cAAc,IAAI,IAAI;IAc7B;;;;;;OAMG;IACI,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAW/C;;;;;;OAMG;IACI,yBAAyB,IAAI,IAAI;IAuDxC;;;;;;;;OAQG;IACI,2BAA2B,IAAI,IAAI;IAwD1C;;;;OAIG;IACI,eAAe,IAAI,IAAI;IAU9B;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAUnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,GAAE,KAAK,EAAqB,GAAG,IAAI;IASnD;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBlC;;;;OAIG;IACH,WAAW,IAAI,IAAI;cAMH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7C"}
@@ -1,8 +1,18 @@
1
1
  import { RuntimeError } from '@ibiz-template/core';
2
+ import { clone } from 'ramda';
2
3
  import { ChartOptionsGenerator } from './generator/chart-options-generator';
3
4
  import { ChartService } from './chart.service';
4
5
  import { MDControlController } from '../../common';
5
6
  export class ChartController extends MDControlController {
7
+ constructor() {
8
+ super(...arguments);
9
+ /**
10
+ * 图表tooltip的默认状态
11
+ *
12
+ * @memberof ChartController
13
+ */
14
+ this.tooltipState = true;
15
+ }
6
16
  get _evt() {
7
17
  return this.evt;
8
18
  }
@@ -35,6 +45,98 @@ export class ChartController extends MDControlController {
35
45
  this.calcOptions();
36
46
  return result;
37
47
  }
48
+ /**
49
+ * 改变tooltip的显示状态
50
+ *
51
+ * @param {boolean} [tag=true]
52
+ * @memberof ChartController
53
+ */
54
+ changeTooltipState(tag = true) {
55
+ if (this.options && this.options.tooltip) {
56
+ if (tag) {
57
+ Object.assign(this.options.tooltip, { show: this.tooltipState });
58
+ }
59
+ else {
60
+ Object.assign(this.options.tooltip, { show: false });
61
+ }
62
+ this.updateChart();
63
+ }
64
+ }
65
+ /**
66
+ * 计算当前点击序列的模型
67
+ *
68
+ * @param {IData} arg
69
+ * @memberof ChartController
70
+ */
71
+ computedClickSerieModel(arg) {
72
+ var _a;
73
+ const { data, seriesType } = arg;
74
+ let tempConfig = {};
75
+ if (seriesType === 'pie') {
76
+ // 饼图
77
+ if (data && data.value && Array.isArray(data.value)) {
78
+ tempConfig = data.value.at(1);
79
+ }
80
+ }
81
+ else if (data && Array.isArray(data)) {
82
+ // 其他图
83
+ tempConfig = data.at(2);
84
+ }
85
+ const serieid = tempConfig._seriesModelId;
86
+ const targetSerie = (_a = this.model.dechartSerieses) === null || _a === void 0 ? void 0 : _a.find((item) => {
87
+ return item.id === serieid;
88
+ });
89
+ return targetSerie;
90
+ }
91
+ /**
92
+ * 处理查看明细参数
93
+ *
94
+ * @param {IData} arg
95
+ * @return {*}
96
+ * @memberof ChartController
97
+ */
98
+ computedDrillDetailParam(arg) {
99
+ var _a;
100
+ const { seriesType, data } = arg;
101
+ const targetSerie = this.computedClickSerieModel(arg);
102
+ let measureId = '';
103
+ const dimension = [];
104
+ if (targetSerie) {
105
+ measureId = targetSerie.valueField;
106
+ if (seriesType === 'pie') {
107
+ if (data && data.value && Array.isArray(data.value)) {
108
+ const value = data.value.at(1);
109
+ const tempData = clone(value.$origin);
110
+ Object.keys(tempData).forEach((key) => {
111
+ if (key !== targetSerie.valueField && key !== '$origin') {
112
+ dimension.push({
113
+ name: key,
114
+ value: tempData[key],
115
+ });
116
+ }
117
+ });
118
+ }
119
+ }
120
+ else {
121
+ const value = arg.name;
122
+ const tempDimension = (_a = this.generator.seriesGenerators) === null || _a === void 0 ? void 0 : _a[0].catalogMap.get(value);
123
+ if (tempDimension) {
124
+ Object.keys(tempDimension).forEach((key) => {
125
+ dimension.push({
126
+ name: key,
127
+ value: tempDimension[key],
128
+ });
129
+ });
130
+ }
131
+ }
132
+ }
133
+ return {
134
+ measure: {
135
+ name: measureId,
136
+ },
137
+ dimension,
138
+ };
139
+ }
38
140
  /**
39
141
  * 解析表格相关参数
40
142
  *
@@ -108,6 +108,13 @@ export declare class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeri
108
108
  * @type {boolean}
109
109
  */
110
110
  autoCompleteCategory: boolean;
111
+ /**
112
+ * 多维度分层时的维度映射,记录序列值与分层的关系
113
+ *
114
+ * @type {Map<string, Array<IData>>}
115
+ * @memberof BaseSeriesGenerator
116
+ */
117
+ catalogMap: Map<string, IData>;
111
118
  /**
112
119
  * Creates an instance of BaseSeriesGenerator.
113
120
  * @author lxm
@@ -158,7 +165,7 @@ export declare class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeri
158
165
  * @return {*}
159
166
  * @memberof BaseSeriesGenerator
160
167
  */
161
- handleMultiCatalogGroup(prevItems: IData[], nextItems: IData[]): IData[];
168
+ handleMultiCatalogGroup(prevItems: IData, nextItems: IData): IData[];
162
169
  /**
163
170
  * 计算分组数据
164
171
  * @author lxm
@@ -1 +1 @@
1
- {"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AASnD,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;CACxB,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElD,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAiH/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAjHjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAM;IAE1B;;;;;OAKG;IACH,aAAa,EAAE,KAAK,EAAE,CAAM;IAE5B;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,YAAY,EAAE,UAAU,EAAE,CAAM;IAEhC;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;OAKG;IACH,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAa;IAE3C;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IAqDjD;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAmB3C;;;;;;;;;;;OAWG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,SAAS,GAAE,OAAe,GACzB,MAAM,GAAG,SAAS;IAkBrB;;;;;;OAMG;IACH,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAWrC;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CACxB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,IAAI;IAcP;;;;;;;OAOG;IACH,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,GAAG,KAAK,EAAE;IA+CpE;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IAgJjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IA2B/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAevD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;IAO/D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmDtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+BnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAgInC"}
@@ -61,6 +61,13 @@ export class BaseSeriesGenerator {
61
61
  * @type {boolean}
62
62
  */
63
63
  this.autoCompleteCategory = true;
64
+ /**
65
+ * 多维度分层时的维度映射,记录序列值与分层的关系
66
+ *
67
+ * @type {Map<string, Array<IData>>}
68
+ * @memberof BaseSeriesGenerator
69
+ */
70
+ this.catalogMap = new Map();
64
71
  this.model = model;
65
72
  this.chartGenerator = chartGenerator;
66
73
  const { chartSeriesEncode, caption, id, userParam } = model;
@@ -198,8 +205,12 @@ export class BaseSeriesGenerator {
198
205
  handleMultiCatalogGroup(prevItems, nextItems) {
199
206
  let tempItems = [];
200
207
  if (prevItems.length === 0) {
201
- tempItems = nextItems.map((item) => {
208
+ tempItems = nextItems.codelist.map((item) => {
209
+ this.catalogMap.set(item.text, { [nextItems.codename]: item.value });
202
210
  return {
211
+ codename: {
212
+ [nextItems.codename]: item.value,
213
+ },
203
214
  text: item.text,
204
215
  value: item.value,
205
216
  };
@@ -207,16 +218,19 @@ export class BaseSeriesGenerator {
207
218
  }
208
219
  else {
209
220
  for (let prev = 0; prev < prevItems.length; prev++) {
210
- if (nextItems.length > 0) {
211
- for (let next = 0; next < nextItems.length; next++) {
221
+ if (nextItems.codelist.length > 0) {
222
+ for (let next = 0; next < nextItems.codelist.length; next++) {
223
+ this.catalogMap.set(`${prevItems[prev].text}_${nextItems.codelist[next].text}`, Object.assign(Object.assign({}, prevItems[prev].codename), { [nextItems.codename]: nextItems.codelist[next].value }));
212
224
  tempItems.push({
213
- text: `${prevItems[prev].text}_${nextItems[next].text}`,
214
- value: nextItems[next].value,
225
+ codename: Object.assign(Object.assign({}, prevItems[prev].codename), { [nextItems.codename]: nextItems.codelist[next].value }),
226
+ text: `${prevItems[prev].text}_${nextItems.codelist[next].text}`,
227
+ value: nextItems.codelist[next].value,
215
228
  });
216
229
  }
217
230
  }
218
231
  else {
219
232
  tempItems.push({
233
+ codename: Object.assign({}, prevItems[prev].codename),
220
234
  text: prevItems[prev].text,
221
235
  value: prevItems[prev].value,
222
236
  });
@@ -259,10 +273,19 @@ export class BaseSeriesGenerator {
259
273
  let tempCodes = [];
260
274
  const tempCodeLists = [];
261
275
  this.catalogFields.forEach((catalog) => {
262
- const { codelistId } = catalog;
276
+ const { codelistId, codename, mode } = catalog;
263
277
  if (codelistId && this.autoCompleteCategory) {
264
278
  const codeListItems = this.chartGenerator.codeListMap.get(codelistId);
265
- tempCodeLists.push(clone(codeListItems));
279
+ tempCodeLists.push({ codename, codelist: clone(codeListItems) });
280
+ }
281
+ else if (mode === 'field') {
282
+ const tempdata = data.map((_data) => {
283
+ return {
284
+ text: _data[codename],
285
+ value: _data[codename],
286
+ };
287
+ });
288
+ tempCodeLists.push({ codename, codelist: tempdata });
266
289
  }
267
290
  });
268
291
  for (let i = 0; i < tempCodeLists.length; i++) {
@@ -1 +1 @@
1
- {"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,cAAc,EACd,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAmCrD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAmBzE;AAED,qBAAa,qBAAqB;IAoEb,KAAK,EAAE,QAAQ;IAnElC;;;;;OAKG;IACH,MAAM,EAAG,cAAc,CAAC;IAExB;;;;;OAKG;IACH,aAAa,EAAE,aAAa,CAI1B;IAEF;;;;;OAKG;IACH,OAAO,EAAE,aAAa,CAAM;IAE5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,mBAAmB,EAAE,CAAM;IAE7C;;;;;OAKG;IACH,QAAQ,gCAAuC;IAE/C;;;;OAIG;IACH,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAa;IAE/D;;;;;OAKG;IACH,uBAAuB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAa;gBAEnD,KAAK,EAAE,QAAQ;IAoClC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAoCtC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAmB5E,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,cAAc,GAC1B,aAAa,CAAC,QAAQ,CAAC;IAe1B,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GACzC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE;IA2ClD;;;;;;;;;;OAUG;IACH,gBAAgB,CACd,KAAK,EAAE,SAAS,YAAY,EAAE,EAC9B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,KAAK,GAAE,OAAc,GACpB,KAAK,EAAE;IAoBV;;;;;;;;OAQG;IACH,eAAe,CACb,QAAQ,EAAE,KAAK,EAAE,EACjB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,KAAK,EAAE,GAChB,KAAK,EAAE;IAeV;;;;;;;OAOG;IACH,aAAa,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAOpE;;;;;;OAMG;IACH,+BAA+B,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,GAAG,IAAI;IAkCxE;;;;;OAKG;IACG,qBAAqB,CACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC;IA0OhB;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D;;;;;;OAMG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtC;;;;;;;;;OASG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA2CrE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,aAAa;IAoE/C;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;CAkEhE"}
1
+ {"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"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"}
@@ -505,6 +505,16 @@ export class ChartOptionsGenerator {
505
505
  left: (catalogLength + 1) * 40,
506
506
  });
507
507
  }
508
+ const tempyAxis = this.chartUserParam.yAxis;
509
+ let nameTextStyle = {};
510
+ if (tempyAxis) {
511
+ if (Array.isArray(tempyAxis)) {
512
+ nameTextStyle = tempyAxis[0].nameTextStyle || {};
513
+ }
514
+ else {
515
+ nameTextStyle = tempyAxis.nameTextStyle || {};
516
+ }
517
+ }
508
518
  // 计算完纵轴分层布局数据并合并用户参数
509
519
  tempaxis.push({
510
520
  type: 'category',
@@ -514,9 +524,7 @@ export class ChartOptionsGenerator {
514
524
  data: [
515
525
  {
516
526
  value: mergeName.split('').join('\n'),
517
- textStyle: {
518
- padding: [0, catalogLength * 40, 0, 0],
519
- },
527
+ textStyle: Object.assign({ padding: [0, catalogLength * 40, 0, 0] }, nameTextStyle),
520
528
  },
521
529
  ],
522
530
  position: 'left',
@@ -536,6 +544,16 @@ export class ChartOptionsGenerator {
536
544
  bottom: (catalogLength + 2) * 24,
537
545
  });
538
546
  }
547
+ const tempxAxis = this.chartUserParam.xAxis;
548
+ let nameTextStyle = {};
549
+ if (tempxAxis) {
550
+ if (Array.isArray(tempxAxis)) {
551
+ nameTextStyle = tempxAxis[0].nameTextStyle || {};
552
+ }
553
+ else {
554
+ nameTextStyle = tempxAxis.nameTextStyle || {};
555
+ }
556
+ }
539
557
  tempaxis.push({
540
558
  type: 'category',
541
559
  gridIndex,
@@ -544,9 +562,7 @@ export class ChartOptionsGenerator {
544
562
  data: [
545
563
  {
546
564
  value: mergeName,
547
- textStyle: {
548
- padding: [24 * catalogLength + 1, 0, 0, 0],
549
- },
565
+ textStyle: Object.assign({ padding: [24 * catalogLength + 1, 0, 0, 0] }, nameTextStyle),
550
566
  },
551
567
  ],
552
568
  position: 'bottom',
@@ -1 +1 @@
1
- {"version":3,"file":"custom-dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/custom-dashboard.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;GAMG;AACH,qBAAa,yBAA0B,YAAW,aAAa;IAyHpD,KAAK,EAAE,UAAU;IACjB,SAAS,EAAE,mBAAmB;IAzHvC;;;;;OAKG;IACH,eAAe,EAAE,KAAK,EAAE,CAAM;IAE9B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAM;IAE1B;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAM;IAExB;;;;;OAKG;IACH,aAAa,EAAE,KAAK,CAAM;IAE1B;;;;;;OAMG;IACH,MAAM,EAAE,aAAa,GAAG,SAAS,CAAC;IAElC;;;;;;OAMG;IACH,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAE9B;;;;;;OAMG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;;OAMG;IACH,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAc;IAElD;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAM;IAEvB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAM;IAErB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAQ;IAE9B;;;;;OAKG;gBAEM,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,mBAAmB;IAOvC;;;;;;OAMG;IACH,OAAO,CAAC,IAAI;IAqCZ;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAkBtB;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,KAAK,CAAC;IAsC3C;;;;OAIG;IACG,oBAAoB,IAAI,OAAO,CAAC,KAAK,CAAC;IAK5C;;;;;OAKG;IACG,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,GAAE,KAAU,GAAG,OAAO,CAAC,KAAK,CAAC;CA8B5E"}
1
+ {"version":3,"file":"custom-dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/custom-dashboard.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;GAMG;AACH,qBAAa,yBAA0B,YAAW,aAAa;IAyHpD,KAAK,EAAE,UAAU;IACjB,SAAS,EAAE,mBAAmB;IAzHvC;;;;;OAKG;IACH,eAAe,EAAE,KAAK,EAAE,CAAM;IAE9B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAM;IAE1B;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAM;IAExB;;;;;OAKG;IACH,aAAa,EAAE,KAAK,CAAM;IAE1B;;;;;;OAMG;IACH,MAAM,EAAE,aAAa,GAAG,SAAS,CAAC;IAElC;;;;;;OAMG;IACH,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAE9B;;;;;;OAMG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;;OAMG;IACH,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAc;IAElD;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAM;IAEvB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAM;IAErB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAQ;IAE9B;;;;;OAKG;gBAEM,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,mBAAmB;IAOvC;;;;;;OAMG;IACH,OAAO,CAAC,IAAI;IAqCZ;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAkBtB;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,KAAK,CAAC;IAuC3C;;;;OAIG;IACG,oBAAoB,IAAI,OAAO,CAAC,KAAK,CAAC;IAK5C;;;;;OAKG;IACG,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,GAAE,KAAU,GAAG,OAAO,CAAC,KAAK,CAAC;CA8B5E"}
@@ -171,6 +171,7 @@ export class CustomDashboardController {
171
171
  const item = res.model[i];
172
172
  if (item.orignModel) {
173
173
  item.portletModel = (await ibiz.hub.translationModelToDsl(item.portletModel, 'CTRL'));
174
+ delete item.orignModel;
174
175
  }
175
176
  }
176
177
  this.customModelData = res.model;
@@ -1,6 +1,6 @@
1
- import { IDBReportPortlet } from '@ibiz/model-core';
1
+ import { IDBReportPortletPart } from '@ibiz/model-core';
2
2
  import { PortletPartController } from '../portlet-part/portlet-part.controller';
3
- export declare class ReportPortletController extends PortletPartController<IDBReportPortlet> {
3
+ export declare class ReportPortletController extends PortletPartController<IDBReportPortletPart> {
4
4
  /**
5
5
  * 刷新报表部件
6
6
  *
@@ -1 +1 @@
1
- {"version":3,"file":"report-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAGhF,qBAAa,uBAAwB,SAAQ,qBAAqB,CAAC,gBAAgB,CAAC;IAClF;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAKhB"}
1
+ {"version":3,"file":"report-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAGhF,qBAAa,uBAAwB,SAAQ,qBAAqB,CAAC,oBAAoB,CAAC;IACtF;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAKhB"}
@@ -109,7 +109,7 @@ export declare class DataViewControlController<T extends IDEDataView = IDEDataVi
109
109
  *
110
110
  * @memberof DataViewControlController
111
111
  */
112
- handleAutoGroup(): void;
112
+ handleAutoGroup(): Promise<void>;
113
113
  /**
114
114
  * 加载并初始化分组代码表项集合
115
115
  * @author lxm