@ibiz-template/runtime 0.4.17-dev.0 → 0.4.17-dev.1

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 (112) hide show
  1. package/dist/index.esm.js +696 -267
  2. package/dist/index.system.min.js +2 -2
  3. package/out/controller/control/grid/grid/grid-column.controller.d.ts +2 -1
  4. package/out/controller/control/grid/grid/grid-column.controller.d.ts.map +1 -1
  5. package/out/controller/control/grid/grid/grid.controller.d.ts +17 -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 +32 -0
  8. package/out/controller/control/search-bar/search-bar.controller.d.ts +59 -2
  9. package/out/controller/control/search-bar/search-bar.controller.d.ts.map +1 -1
  10. package/out/controller/control/search-bar/search-bar.controller.js +142 -9
  11. package/out/controller/control/search-bar/search-bar.service.d.ts +78 -0
  12. package/out/controller/control/search-bar/search-bar.service.d.ts.map +1 -0
  13. package/out/controller/control/search-bar/search-bar.service.js +130 -0
  14. package/out/controller/control/tree/tree.controller.d.ts +27 -1
  15. package/out/controller/control/tree/tree.controller.d.ts.map +1 -1
  16. package/out/controller/control/tree/tree.controller.js +45 -7
  17. package/out/controller/control/tree/tree.service.d.ts +1 -1
  18. package/out/controller/control/tree/tree.service.d.ts.map +1 -1
  19. package/out/controller/control/tree-grid-ex/index.d.ts +2 -0
  20. package/out/controller/control/tree-grid-ex/index.d.ts.map +1 -1
  21. package/out/controller/control/tree-grid-ex/index.js +2 -0
  22. package/out/controller/control/tree-grid-ex/tree-grid-ex-column/index.d.ts +4 -0
  23. package/out/controller/control/tree-grid-ex/tree-grid-ex-column/index.d.ts.map +1 -0
  24. package/out/controller/control/tree-grid-ex/tree-grid-ex-column/index.js +3 -0
  25. package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-column/tree-grid-ex-column.controller.d.ts +93 -0
  26. package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-column/tree-grid-ex-column.controller.d.ts.map +1 -0
  27. package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-column/tree-grid-ex-column.controller.js +89 -0
  28. package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.controller.d.ts +13 -0
  29. package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.controller.d.ts.map +1 -0
  30. package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.controller.js +11 -0
  31. package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.d.ts +31 -0
  32. package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.d.ts.map +1 -0
  33. package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.js +61 -0
  34. package/out/controller/control/tree-grid-ex/tree-grid-ex-row.state.d.ts +26 -0
  35. package/out/controller/control/tree-grid-ex/tree-grid-ex-row.state.d.ts.map +1 -0
  36. package/out/controller/control/tree-grid-ex/tree-grid-ex-row.state.js +26 -0
  37. package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.d.ts +48 -46
  38. package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.d.ts.map +1 -1
  39. package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.js +85 -115
  40. package/out/controller/control/tree-grid-ex/tree-grid-ex.service.d.ts +8 -58
  41. package/out/controller/control/tree-grid-ex/tree-grid-ex.service.d.ts.map +1 -1
  42. package/out/controller/control/tree-grid-ex/tree-grid-ex.service.js +5 -135
  43. package/out/interface/controller/controller/control/i-grid.controller.d.ts +8 -0
  44. package/out/interface/controller/controller/control/i-grid.controller.d.ts.map +1 -1
  45. package/out/interface/controller/controller/control/i-tree-grid-ex.controller.d.ts +7 -7
  46. package/out/interface/controller/controller/control/i-tree-grid-ex.controller.d.ts.map +1 -1
  47. package/out/interface/controller/controller/control/i-tree.controller.d.ts +1 -1
  48. package/out/interface/controller/controller/control/i-tree.controller.d.ts.map +1 -1
  49. package/out/interface/controller/controller/control/index.d.ts +1 -0
  50. package/out/interface/controller/controller/control/index.d.ts.map +1 -1
  51. package/out/interface/controller/controller/control/index.js +1 -0
  52. package/out/interface/controller/controller/control/tree-grid-ex-column/i-tree-grid-ex-column.controller.d.ts +12 -0
  53. package/out/interface/controller/controller/control/tree-grid-ex-column/i-tree-grid-ex-column.controller.d.ts.map +1 -0
  54. package/out/interface/controller/controller/control/tree-grid-ex-column/i-tree-grid-ex-column.controller.js +1 -0
  55. package/out/interface/controller/controller/control/tree-grid-ex-column/index.d.ts +2 -0
  56. package/out/interface/controller/controller/control/tree-grid-ex-column/index.d.ts.map +1 -0
  57. package/out/interface/controller/controller/control/tree-grid-ex-column/index.js +1 -0
  58. package/out/interface/controller/event/control/i-tree-grid-ex.event.d.ts +2 -2
  59. package/out/interface/controller/event/control/i-tree-grid-ex.event.d.ts.map +1 -1
  60. package/out/interface/controller/state/control/i-search-bar.state.d.ts +64 -0
  61. package/out/interface/controller/state/control/i-search-bar.state.d.ts.map +1 -1
  62. package/out/interface/controller/state/control/i-tree-grid-ex.state.d.ts +31 -23
  63. package/out/interface/controller/state/control/i-tree-grid-ex.state.d.ts.map +1 -1
  64. package/out/interface/controller/state/control/i-tree.state.d.ts +8 -1
  65. package/out/interface/controller/state/control/i-tree.state.d.ts.map +1 -1
  66. package/out/interface/provider/i-tree-grid-ex-column.provider.d.ts +31 -0
  67. package/out/interface/provider/i-tree-grid-ex-column.provider.d.ts.map +1 -0
  68. package/out/interface/provider/i-tree-grid-ex-column.provider.js +1 -0
  69. package/out/interface/provider/index.d.ts +1 -0
  70. package/out/interface/provider/index.d.ts.map +1 -1
  71. package/out/register/helper/index.d.ts +1 -0
  72. package/out/register/helper/index.d.ts.map +1 -1
  73. package/out/register/helper/index.js +1 -0
  74. package/out/register/helper/tree-grid-ex-column-register.d.ts +23 -0
  75. package/out/register/helper/tree-grid-ex-column-register.d.ts.map +1 -0
  76. package/out/register/helper/tree-grid-ex-column-register.js +50 -0
  77. package/out/service/vo/tree-node-data/tree-data-set-node-data.d.ts.map +1 -1
  78. package/out/service/vo/tree-node-data/tree-data-set-node-data.js +51 -0
  79. package/out/service/vo/tree-node-data/tree-node-data.d.ts +2 -0
  80. package/out/service/vo/tree-node-data/tree-node-data.d.ts.map +1 -1
  81. package/out/service/vo/tree-node-data/tree-node-data.js +1 -0
  82. package/package.json +3 -3
  83. package/src/controller/control/grid/grid/grid-column.controller.ts +4 -1
  84. package/src/controller/control/grid/grid/grid.controller.ts +34 -0
  85. package/src/controller/control/search-bar/search-bar.controller.ts +178 -10
  86. package/src/controller/control/search-bar/search-bar.service.ts +161 -0
  87. package/src/controller/control/tree/tree.controller.ts +58 -11
  88. package/src/controller/control/tree/tree.service.ts +3 -1
  89. package/src/controller/control/tree-grid-ex/index.ts +2 -0
  90. package/src/controller/control/tree-grid-ex/tree-grid-ex-column/index.ts +3 -0
  91. package/src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-column/tree-grid-ex-column.controller.ts +121 -0
  92. package/src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.controller.ts +13 -0
  93. package/src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.ts +76 -0
  94. package/src/controller/control/tree-grid-ex/tree-grid-ex-row.state.ts +37 -0
  95. package/src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts +116 -140
  96. package/src/controller/control/tree-grid-ex/tree-grid-ex.service.ts +10 -165
  97. package/src/interface/controller/controller/control/i-grid.controller.ts +9 -0
  98. package/src/interface/controller/controller/control/i-tree-grid-ex.controller.ts +11 -12
  99. package/src/interface/controller/controller/control/i-tree.controller.ts +5 -2
  100. package/src/interface/controller/controller/control/index.ts +1 -0
  101. package/src/interface/controller/controller/control/tree-grid-ex-column/i-tree-grid-ex-column.controller.ts +12 -0
  102. package/src/interface/controller/controller/control/tree-grid-ex-column/index.ts +1 -0
  103. package/src/interface/controller/event/control/i-tree-grid-ex.event.ts +2 -2
  104. package/src/interface/controller/state/control/i-search-bar.state.ts +73 -0
  105. package/src/interface/controller/state/control/i-tree-grid-ex.state.ts +27 -24
  106. package/src/interface/controller/state/control/i-tree.state.ts +9 -1
  107. package/src/interface/provider/i-tree-grid-ex-column.provider.ts +39 -0
  108. package/src/interface/provider/index.ts +1 -0
  109. package/src/register/helper/index.ts +1 -0
  110. package/src/register/helper/tree-grid-ex-column-register.ts +67 -0
  111. package/src/service/vo/tree-node-data/tree-data-set-node-data.ts +53 -0
  112. package/src/service/vo/tree-node-data/tree-node-data.ts +6 -0
@@ -1,13 +1,14 @@
1
1
  import { IDEGridColumn, IDEGridDataItem } from '@ibiz/model-core';
2
2
  import { GridRowState } from './grid-row.state';
3
3
  import { GridController } from './grid.controller';
4
+ import { IGridColumnController } from '../../../../interface';
4
5
  /**
5
6
  * 表格列控制器
6
7
  * @return {*}
7
8
  * @author: zhujiamin
8
9
  * @Date: 2022-09-01 18:25:20
9
10
  */
10
- export declare class GridColumnController<T extends IDEGridColumn = IDEGridColumn> {
11
+ export declare class GridColumnController<T extends IDEGridColumn = IDEGridColumn> implements IGridColumnController {
11
12
  /**
12
13
  * 表格列模型对象
13
14
  *
@@ -1 +1 @@
1
- {"version":3,"file":"grid-column.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid-column.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;GAKG;AACH,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa;IACvE;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;OAKG;IACH,gBAAgB,EAAE,OAAO,CAAS;IAElC;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,eAAe,GAAG,SAAS,CAIhD;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc;IAY1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;;OAMG;IACH,aAAa,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,GAAG,SAAS;CASrD"}
1
+ {"version":3,"file":"grid-column.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid-column.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;;;;GAKG;AACH,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;OAKG;IACH,gBAAgB,EAAE,OAAO,CAAS;IAElC;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,eAAe,GAAG,SAAS,CAIhD;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc;IAY1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;;OAMG;IACH,aAAa,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,GAAG,SAAS;CASrD"}
@@ -4,7 +4,7 @@ import { GridColumnController } from './grid-column.controller';
4
4
  import { GridRowState } from './grid-row.state';
5
5
  import { GridService } from './grid.service';
6
6
  import { GridFieldEditColumnController, GridUAColumnController } from '../grid-column';
7
- import { IGridState, IGridEvent, IGridController, IGridColumnProvider, CodeListItem, MDCtrlLoadParams, IGridRowState, IExportColumn } from '../../../../interface';
7
+ import { IGridState, IGridEvent, IGridController, IGridColumnProvider, CodeListItem, MDCtrlLoadParams, IGridRowState, IExportColumn, IColumnState, ISearchGroupData } from '../../../../interface';
8
8
  import { ControlVO } from '../../../../service';
9
9
  import { MDControlController } from '../../../common';
10
10
  import { GridNotifyState } from '../../../constant';
@@ -379,5 +379,21 @@ export declare class GridController extends MDControlController<IDEGrid, IGridSt
379
379
  * @protected
380
380
  */
381
381
  protected convertMultipleLanguages(): void;
382
+ /**
383
+ * 控制列显示
384
+ * @param {IColumnState} columnState
385
+ * @return {*}
386
+ * @author: zhujiamin
387
+ * @Date: 2023-12-19 16:02:14
388
+ */
389
+ setColumnVisible(columnState: IColumnState): void;
390
+ /**
391
+ * 设置点击分组后回显相关参数
392
+ * @param {IData} data
393
+ * @return {*}
394
+ * @author: zhujiamin
395
+ * @Date: 2023-12-21 10:54:45
396
+ */
397
+ setGroupParams(data: ISearchGroupData): void;
382
398
  }
383
399
  //# sourceMappingURL=grid.controller.d.ts.map
@@ -1 +1 @@
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
+ {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}
@@ -960,4 +960,36 @@ export class GridController extends MDControlController {
960
960
  convertColumnCaption(this.model.degridColumns);
961
961
  }
962
962
  }
963
+ /**
964
+ * 控制列显示
965
+ * @param {IColumnState} columnState
966
+ * @return {*}
967
+ * @author: zhujiamin
968
+ * @Date: 2023-12-19 16:02:14
969
+ */
970
+ setColumnVisible(columnState) {
971
+ columnState.hidden = !columnState.hidden;
972
+ }
973
+ /**
974
+ * 设置点击分组后回显相关参数
975
+ * @param {IData} data
976
+ * @return {*}
977
+ * @author: zhujiamin
978
+ * @Date: 2023-12-21 10:54:45
979
+ */
980
+ setGroupParams(data) {
981
+ if (data.sort) {
982
+ this.state.sortQuery = data.sort;
983
+ }
984
+ else {
985
+ this.state.sortQuery = '';
986
+ }
987
+ if (data.columnstates) {
988
+ this.state.columnStates = data.columnstates;
989
+ }
990
+ else {
991
+ this.state.columnStates = [];
992
+ this.initColumnStates();
993
+ }
994
+ }
963
995
  }
@@ -1,7 +1,8 @@
1
1
  import { IAppDataEntity, ISearchBar } from '@ibiz/model-core';
2
- import { ISearchBarState, ISearchBarEvent, ISearchBarController, IFilterNode } from '../../../interface';
2
+ import { ISearchBarState, ISearchBarEvent, ISearchBarController, IFilterNode, IBackendSearchBarGroup, IGridController } from '../../../interface';
3
3
  import { ControlController } from '../../common';
4
4
  import { SearchBarFilterController } from './search-bar-filter.controller';
5
+ import { SearchBarService } from './search-bar.service';
5
6
  /**
6
7
  * 搜索栏控制器
7
8
  *
@@ -26,6 +27,34 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
26
27
  * @type {SearchBarFilterController[]}
27
28
  */
28
29
  filterControllers: SearchBarFilterController[];
30
+ /**
31
+ * 搜索栏服务
32
+ * @author lxm
33
+ * @date 2023-05-15 11:03:34
34
+ * @type {EditFormService}
35
+ */
36
+ service: SearchBarService;
37
+ /**
38
+ * 当前编辑的分组
39
+ * @return {*}
40
+ * @author: zhujiamin
41
+ * @Date: 2023-12-20 18:06:37
42
+ */
43
+ currentEditGroup: IBackendSearchBarGroup | null;
44
+ /**
45
+ * 是否为后台分组
46
+ * @return {*}
47
+ * @author: zhujiamin
48
+ * @Date: 2023-12-21 10:17:43
49
+ */
50
+ isBackendSearchGroup: boolean;
51
+ /**
52
+ * 表格控制器
53
+ * @return {*}
54
+ * @author: zhujiamin
55
+ * @Date: 2023-12-22 13:50:16
56
+ */
57
+ get grid(): IGridController | undefined;
29
58
  /**
30
59
  * 实体模型
31
60
  * @author lxm
@@ -85,7 +114,7 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
85
114
  * @date 2023-10-13 05:53:35
86
115
  * @return {*} {IData}
87
116
  */
88
- calcFilters(): IData | undefined;
117
+ calcFilters(): IData[] | undefined;
89
118
  /**
90
119
  * 格式化过滤项
91
120
  * @author lxm
@@ -94,5 +123,33 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
94
123
  * @return {*} {IData}
95
124
  */
96
125
  formatFilters(node: IFilterNode): IData;
126
+ /**
127
+ * 获取初始过滤项树节点数据集合
128
+ * @return {*}
129
+ * @author: zhujiamin
130
+ * @Date: 2023-12-21 17:29:47
131
+ */
132
+ protected getOriginFilterNodes(): IFilterNode[];
133
+ /**
134
+ * 初始化搜索栏分组项(获取后台分组清单并合并模型)
135
+ * @return {*}
136
+ * @author: zhujiamin
137
+ * @Date: 2023-12-19 14:43:46
138
+ */
139
+ initSearBarGroups(): Promise<void>;
140
+ /**
141
+ * 处理保存
142
+ * @return {*}
143
+ * @author: zhujiamin
144
+ * @Date: 2023-12-19 16:17:15
145
+ */
146
+ handleSave(): Promise<void>;
147
+ /**
148
+ * 处理点击后台分组
149
+ * @return {*}
150
+ * @author: zhujiamin
151
+ * @Date: 2023-12-21 10:29:24
152
+ */
153
+ handleGroupClick(groupItem: IBackendSearchBarGroup): Promise<void>;
97
154
  }
98
155
  //# sourceMappingURL=search-bar.controller.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,yBAAyB,EAAE,CAAM;IAEpD;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAcX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IAwB1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAWnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrD;;;;;OAKG;IACH,WAAW,IAAI,KAAK,GAAG,SAAS;IAsBhC;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK;CAiBxC"}
1
+ {"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,WAAW,EACX,sBAAsB,EACtB,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,yBAAyB,EAAE,CAAM;IAEpD;;;;;OAKG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,gBAAgB,EAAE,sBAAsB,GAAG,IAAI,CAAQ;IAEvD;;;;;OAKG;IACH,oBAAoB,UAAQ;IAE5B;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAEtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAgBX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB1C;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IA2B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrD;;;;;OAKG;IACH,WAAW,IAAI,KAAK,EAAE,GAAG,SAAS;IAsBlC;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK;IAkBvC;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,IAAI,WAAW,EAAE;IAU/C;;;;;OAKG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoCxC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CAmBzE"}
@@ -1,8 +1,9 @@
1
- import { recursiveIterate } from '@ibiz-template/core';
1
+ import { mergeInLeft, recursiveIterate } from '@ibiz-template/core';
2
2
  import { isNil } from 'ramda';
3
3
  import { convertNavData, ScriptFactory } from '../../../utils';
4
4
  import { ControlController } from '../../common';
5
5
  import { SearchBarFilterController } from './search-bar-filter.controller';
6
+ import { SearchBarService } from './search-bar.service';
6
7
  /**
7
8
  * 搜索栏控制器
8
9
  *
@@ -29,6 +30,29 @@ export class SearchBarController extends ControlController {
29
30
  * @type {SearchBarFilterController[]}
30
31
  */
31
32
  this.filterControllers = [];
33
+ /**
34
+ * 当前编辑的分组
35
+ * @return {*}
36
+ * @author: zhujiamin
37
+ * @Date: 2023-12-20 18:06:37
38
+ */
39
+ this.currentEditGroup = null;
40
+ /**
41
+ * 是否为后台分组
42
+ * @return {*}
43
+ * @author: zhujiamin
44
+ * @Date: 2023-12-21 10:17:43
45
+ */
46
+ this.isBackendSearchGroup = true;
47
+ }
48
+ /**
49
+ * 表格控制器
50
+ * @return {*}
51
+ * @author: zhujiamin
52
+ * @Date: 2023-12-22 13:50:16
53
+ */
54
+ get grid() {
55
+ return this.ctx.getController('grid');
32
56
  }
33
57
  initState() {
34
58
  super.initState();
@@ -40,6 +64,8 @@ export class SearchBarController extends ControlController {
40
64
  if (this.model.enableFilter) {
41
65
  this.resetFilter();
42
66
  }
67
+ this.state.searchBarGroups = [];
68
+ this.state.selectedSearchGroupItem = null;
43
69
  }
44
70
  async onCreated() {
45
71
  await super.onCreated();
@@ -48,7 +74,13 @@ export class SearchBarController extends ControlController {
48
74
  this.appDataEntity = appDataEntity;
49
75
  this.calcQuickSearchPlaceholder();
50
76
  }
77
+ // 实例部件服务
78
+ if (this.isBackendSearchGroup && this.view.model.codeName) {
79
+ this.service = new SearchBarService(this.model, this.view.model.codeName);
80
+ await this.service.init(this.context);
81
+ }
51
82
  await this.initSearchBarFilters();
83
+ await this.initSearBarGroups();
52
84
  }
53
85
  /**
54
86
  * 计算快速搜索的占位
@@ -112,7 +144,8 @@ export class SearchBarController extends ControlController {
112
144
  params.query = this.state.query;
113
145
  }
114
146
  // 快速分组
115
- if ((_a = this.state.selectedGroupItem) === null || _a === void 0 ? void 0 : _a.data) {
147
+ if (((_a = this.state.selectedGroupItem) === null || _a === void 0 ? void 0 : _a.data) &&
148
+ typeof this.state.selectedGroupItem.data === 'string') {
116
149
  const navParams = ScriptFactory.execSingleLine(this.state.selectedGroupItem.data);
117
150
  const addParams = convertNavData(navParams, this.params, this.context);
118
151
  Object.assign(params, addParams);
@@ -130,13 +163,7 @@ export class SearchBarController extends ControlController {
130
163
  * @date 2023-10-16 03:52:44
131
164
  */
132
165
  resetFilter() {
133
- this.state.filterNodes = [
134
- {
135
- leaf: false,
136
- logicType: 'AND',
137
- children: [{ leaf: true, field: null, valueOP: null, value: null }],
138
- },
139
- ];
166
+ this.state.filterNodes = this.getOriginFilterNodes();
140
167
  this.evt.emit('onSearch', undefined);
141
168
  }
142
169
  /**
@@ -207,4 +234,110 @@ export class SearchBarController extends ControlController {
207
234
  value: node.value,
208
235
  };
209
236
  }
237
+ /**
238
+ * 获取初始过滤项树节点数据集合
239
+ * @return {*}
240
+ * @author: zhujiamin
241
+ * @Date: 2023-12-21 17:29:47
242
+ */
243
+ getOriginFilterNodes() {
244
+ return [
245
+ {
246
+ leaf: false,
247
+ logicType: 'AND',
248
+ children: [{ leaf: true, field: null, valueOP: null, value: null }],
249
+ },
250
+ ];
251
+ }
252
+ /**
253
+ * 初始化搜索栏分组项(获取后台分组清单并合并模型)
254
+ * @return {*}
255
+ * @author: zhujiamin
256
+ * @Date: 2023-12-19 14:43:46
257
+ */
258
+ async initSearBarGroups() {
259
+ this.state.searchBarGroups = [];
260
+ if (this.isBackendSearchGroup) {
261
+ if (this.model.searchBarGroups && this.model.searchBarGroups.length > 0) {
262
+ this.state.searchBarGroups = this.model.searchBarGroups.map(item => (Object.assign(Object.assign({}, item), { show: true, saved: false, searchGroupData: {} })));
263
+ }
264
+ // 请求并合并searchBarGroups ,这里只能拿到清单
265
+ const res = await this.service.fetch();
266
+ if (res.ok) {
267
+ res.data.forEach((group) => {
268
+ // 已经存在的覆盖,否则新增
269
+ const existGroup = this.state.searchBarGroups.find(item => item.id === group.id);
270
+ if (existGroup) {
271
+ mergeInLeft(existGroup, group);
272
+ existGroup.saved = true;
273
+ }
274
+ else {
275
+ this.state.searchBarGroups.push(Object.assign(Object.assign({}, group), { appId: this.context.srfappid, show: true, saved: true, searchGroupData: {} }));
276
+ }
277
+ });
278
+ }
279
+ }
280
+ }
281
+ /**
282
+ * 处理保存
283
+ * @return {*}
284
+ * @author: zhujiamin
285
+ * @Date: 2023-12-19 16:17:15
286
+ */
287
+ async handleSave() {
288
+ if (this.grid && this.state.selectedSearchGroupItem) {
289
+ const filters = this.calcFilters();
290
+ const saveParams = {
291
+ filternodes: this.state.filterNodes,
292
+ searchconds: filters,
293
+ sort: this.grid.state.sortQuery,
294
+ columnstates: this.grid.state.columnStates,
295
+ show: this.state.selectedSearchGroupItem.show,
296
+ };
297
+ // 根据是否保存过决定是更新还是新建
298
+ if (this.state.selectedSearchGroupItem.saved) {
299
+ await this.service.update(this.state.selectedSearchGroupItem.id, {
300
+ theme_model: saveParams,
301
+ show: this.state.selectedSearchGroupItem.show,
302
+ });
303
+ ibiz.message.success('保存成功');
304
+ }
305
+ else {
306
+ const res = await this.service.createWithParams(this.state.selectedSearchGroupItem.id, saveParams);
307
+ if (res.ok) {
308
+ const savedGroup = this.state.searchBarGroups.find(group => group.id === res.data.id);
309
+ if (savedGroup) {
310
+ savedGroup.saved = true;
311
+ }
312
+ ibiz.message.success('保存成功');
313
+ }
314
+ }
315
+ }
316
+ }
317
+ /**
318
+ * 处理点击后台分组
319
+ * @return {*}
320
+ * @author: zhujiamin
321
+ * @Date: 2023-12-21 10:29:24
322
+ */
323
+ async handleGroupClick(groupItem) {
324
+ this.state.selectedSearchGroupItem = groupItem;
325
+ if (groupItem.saved) {
326
+ // 请求获取到搜索分组数据
327
+ const res = await this.service.get(groupItem.id);
328
+ if (res.ok) {
329
+ mergeInLeft(groupItem, res.data);
330
+ }
331
+ }
332
+ if (groupItem.searchGroupData && groupItem.searchGroupData.filternodes) {
333
+ this.state.filterNodes = groupItem.searchGroupData.filternodes;
334
+ }
335
+ else {
336
+ this.state.filterNodes = this.getOriginFilterNodes();
337
+ }
338
+ if (this.grid && groupItem && groupItem.searchGroupData) {
339
+ this.grid.setGroupParams(groupItem.searchGroupData);
340
+ await this.grid.load({ isInitialLoad: true });
341
+ }
342
+ }
210
343
  }
@@ -0,0 +1,78 @@
1
+ import { IHttpResponse } from '@ibiz-template/core';
2
+ import { ISearchBar } from '@ibiz/model-core';
3
+ import { IAppService } from '../../../interface';
4
+ /**
5
+ * 搜索栏服务
6
+ * @return {*}
7
+ * @author: zhujiamin
8
+ * @Date: 2023-12-22 10:28:32
9
+ */
10
+ export declare class SearchBarService {
11
+ /**
12
+ * 应用
13
+ *
14
+ */
15
+ app: IAppService;
16
+ /**
17
+ * 视图标识
18
+ *
19
+ */
20
+ viewTag: string;
21
+ /**
22
+ * 部件模型
23
+ *
24
+ */
25
+ readonly model: ISearchBar;
26
+ /**
27
+ * Creates an instance of ControlService.
28
+ *
29
+ */
30
+ constructor(model: ISearchBar, viewTag: string);
31
+ init(_context?: IContext): Promise<void>;
32
+ /**
33
+ * 主题管理URL
34
+ * @return {*}
35
+ * @author: zhujiamin
36
+ * @Date: 2023-12-22 10:51:49
37
+ */
38
+ themeUrl: string;
39
+ /**
40
+ * 执行查询多条数据的方法
41
+ *
42
+ */
43
+ fetch(): Promise<IHttpResponse>;
44
+ /**
45
+ * 执行获取单条数据方法
46
+ *
47
+ */
48
+ get(id: string): Promise<IHttpResponse>;
49
+ /**
50
+ * 删除单条数据
51
+ *
52
+ */
53
+ remove(id: string): Promise<IHttpResponse>;
54
+ /**
55
+ * 新建数据
56
+ *
57
+ */
58
+ create(caption: string): Promise<IHttpResponse>;
59
+ /**
60
+ * 新建数据(带参数,给平台配置建立的分组用)
61
+ *
62
+ */
63
+ createWithParams(id: string, data: IData): Promise<IHttpResponse>;
64
+ /**
65
+ * 更新数据
66
+ *
67
+ */
68
+ update(id: string, data: IData): Promise<IHttpResponse>;
69
+ /**
70
+ * 转换后台数据成前端需要的格式
71
+ * @param {IData} data
72
+ * @return {*}
73
+ * @author: zhujiamin
74
+ * @Date: 2023-12-22 11:19:50
75
+ */
76
+ convertBackDataToFront(data: IData[]): IData[];
77
+ }
78
+ //# sourceMappingURL=search-bar.service.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"search-bar.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;;;;GAKG;AACH,qBAAa,gBAAgB;IAC3B;;;OAGG;IACH,GAAG,EAAG,WAAW,CAAC;IAElB;;;OAGG;IACH,OAAO,EAAG,MAAM,CAAC;IAEjB;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAE3B;;;OAGG;gBACS,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM;IAKxC,IAAI,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C;;;;;OAKG;IACH,QAAQ,SAAgC;IAExC;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,aAAa,CAAC;IAWrC;;;OAGG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAU7C;;;OAGG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAOhD;;;OAGG;IACG,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAQrD;;;OAGG;IACG,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAUvE;;;OAGG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAqB7D;;;;;;OAMG;IACH,sBAAsB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;CAY/C"}
@@ -0,0 +1,130 @@
1
+ /**
2
+ * 搜索栏服务
3
+ * @return {*}
4
+ * @author: zhujiamin
5
+ * @Date: 2023-12-22 10:28:32
6
+ */
7
+ export class SearchBarService {
8
+ /**
9
+ * Creates an instance of ControlService.
10
+ *
11
+ */
12
+ constructor(model, viewTag) {
13
+ /**
14
+ * 主题管理URL
15
+ * @return {*}
16
+ * @author: zhujiamin
17
+ * @Date: 2023-12-22 10:51:49
18
+ */
19
+ this.themeUrl = '/extension/app_view_themes';
20
+ this.model = model;
21
+ this.viewTag = viewTag;
22
+ }
23
+ async init(_context) {
24
+ this.app = ibiz.hub.getApp(this.model.appId);
25
+ }
26
+ /**
27
+ * 执行查询多条数据的方法
28
+ *
29
+ */
30
+ async fetch() {
31
+ const res = await this.app.net.post(`${this.themeUrl}/fetch_default`, {
32
+ app_view_tag: this.viewTag,
33
+ sort: 'create_time,asc',
34
+ });
35
+ if (res.ok) {
36
+ res.data = this.convertBackDataToFront(res.data);
37
+ }
38
+ return res;
39
+ }
40
+ /**
41
+ * 执行获取单条数据方法
42
+ *
43
+ */
44
+ async get(id) {
45
+ const res = await this.app.net.get(`${this.themeUrl}/${id}`, {
46
+ app_view_tag: this.viewTag,
47
+ });
48
+ if (res.ok) {
49
+ [res.data] = this.convertBackDataToFront([res.data]);
50
+ }
51
+ return res;
52
+ }
53
+ /**
54
+ * 删除单条数据
55
+ *
56
+ */
57
+ async remove(id) {
58
+ const res = await this.app.net.delete(`${this.themeUrl}/${id}`, {
59
+ app_view_tag: this.viewTag,
60
+ });
61
+ return res;
62
+ }
63
+ /**
64
+ * 新建数据
65
+ *
66
+ */
67
+ async create(caption) {
68
+ const res = await this.app.net.post(`${this.themeUrl}`, {
69
+ name: caption,
70
+ app_view_tag: this.viewTag,
71
+ });
72
+ return res;
73
+ }
74
+ /**
75
+ * 新建数据(带参数,给平台配置建立的分组用)
76
+ *
77
+ */
78
+ async createWithParams(id, data) {
79
+ const res = await this.app.net.post(`${this.themeUrl}`, {
80
+ id,
81
+ theme_model: JSON.stringify(data),
82
+ app_view_tag: this.viewTag,
83
+ show: data.show,
84
+ });
85
+ return res;
86
+ }
87
+ /**
88
+ * 更新数据
89
+ *
90
+ */
91
+ async update(id, data) {
92
+ const updateParams = { app_view_tag: this.viewTag };
93
+ if (data.theme_model) {
94
+ Object.assign(updateParams, {
95
+ theme_model: JSON.stringify(data.theme_model),
96
+ });
97
+ }
98
+ if (data.caption) {
99
+ Object.assign(updateParams, {
100
+ name: data.caption,
101
+ });
102
+ }
103
+ if (typeof data.show === 'boolean') {
104
+ Object.assign(updateParams, {
105
+ show: data.show,
106
+ });
107
+ }
108
+ const res = await this.app.net.put(`${this.themeUrl}/${id}`, updateParams);
109
+ return res;
110
+ }
111
+ /**
112
+ * 转换后台数据成前端需要的格式
113
+ * @param {IData} data
114
+ * @return {*}
115
+ * @author: zhujiamin
116
+ * @Date: 2023-12-22 11:19:50
117
+ */
118
+ convertBackDataToFront(data) {
119
+ return data.map(item => {
120
+ const tempItem = Object.assign({}, item);
121
+ if (item.name) {
122
+ tempItem.caption = item.name;
123
+ }
124
+ if (item.theme_model) {
125
+ tempItem.searchGroupData = JSON.parse(item.theme_model);
126
+ }
127
+ return tempItem;
128
+ });
129
+ }
130
+ }
@@ -3,6 +3,7 @@ import { ITreeState, ITreeEvent, ITreeController, MDCtrlLoadParams, ITreeNodeDat
3
3
  import { MDControlController } from '../../common';
4
4
  import { ContextMenuController } from '../context-menu';
5
5
  import { TreeService } from './tree.service';
6
+ import { ControllerEvent } from '../../utils';
6
7
  export type DropNodeRS = {
7
8
  minorEntityId: string;
8
9
  pickupDEFName: string;
@@ -17,8 +18,9 @@ export type DropNodeRS = {
17
18
  * @extends {MDControlController<IDETree, ITreeState, ITreeEvent>}
18
19
  * @implements {ITreeController}
19
20
  */
20
- export declare class TreeController extends MDControlController<IDETree, ITreeState, ITreeEvent> implements ITreeController {
21
+ export declare class TreeController<T extends IDETree = IDETree, S extends ITreeState = ITreeState, E extends ITreeEvent = ITreeEvent> extends MDControlController<T, S, E> implements ITreeController<T, S, E> {
21
22
  service: TreeService;
23
+ protected get _evt(): ControllerEvent<ITreeEvent>;
22
24
  /**
23
25
  * 上下文菜单控制器
24
26
  * @author lxm
@@ -49,6 +51,14 @@ export declare class TreeController extends MDControlController<IDETree, ITreeSt
49
51
  nodeClickTBUIActionItem: Map<string, IDETBUIActionItem>;
50
52
  protected initState(): void;
51
53
  protected onCreated(): Promise<void>;
54
+ /**
55
+ * 初始化对应类型的部件服务
56
+ * @author lxm
57
+ * @date 2023-12-21 11:25:33
58
+ * @protected
59
+ * @return {*} {Promise<void>}
60
+ */
61
+ protected initService(): Promise<void>;
52
62
  /**
53
63
  * 初始化节点拖入关系处理
54
64
  * @author lxm
@@ -79,6 +89,14 @@ export declare class TreeController extends MDControlController<IDETree, ITreeSt
79
89
  * @memberof TreeController
80
90
  */
81
91
  loadNodes(parentNode?: ITreeNodeData): Promise<ITreeNodeData[]>;
92
+ /**
93
+ * loadNodes加载完子数据之后的处理
94
+ * @author lxm
95
+ * @date 2023-12-22 02:37:50
96
+ * @param {ITreeNodeData[]} nodes 加载回来的子数据
97
+ * @return {*} {Promise<void>}
98
+ */
99
+ afterLoadNodes(nodes: ITreeNodeData[]): Promise<void>;
82
100
  /**
83
101
  * 树节点点击事件
84
102
  *
@@ -113,6 +131,14 @@ export declare class TreeController extends MDControlController<IDETree, ITreeSt
113
131
  * @return {*} {(IDETreeNode | undefined)}
114
132
  */
115
133
  getNodeModel(id: string): IDETreeNode | undefined;
134
+ /**
135
+ * 通过标识获取节点数据
136
+ * @author lxm
137
+ * @date 2023-12-22 02:21:38
138
+ * @param {string} id 可以是节点id也可以是_uuid
139
+ * @return {*} {(ITreeNodeData | undefined)}
140
+ */
141
+ getNodeData(key: string): ITreeNodeData | undefined;
116
142
  /**
117
143
  * 执行界面行为
118
144
  *