@ibiz-template/runtime 0.6.18 → 0.7.0

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 (97) hide show
  1. package/dist/index.esm.js +1006 -338
  2. package/dist/index.system.min.js +1 -1
  3. package/out/app-hub.d.ts +7 -0
  4. package/out/app-hub.d.ts.map +1 -1
  5. package/out/app-hub.js +11 -0
  6. package/out/application.d.ts +7 -0
  7. package/out/application.d.ts.map +1 -1
  8. package/out/application.js +9 -0
  9. package/out/controller/common/control/md-control.controller.d.ts.map +1 -1
  10. package/out/controller/common/control/md-control.controller.js +3 -0
  11. package/out/controller/control/chart/chart.controller.d.ts +38 -0
  12. package/out/controller/control/chart/chart.controller.d.ts.map +1 -1
  13. package/out/controller/control/chart/chart.controller.js +183 -0
  14. package/out/controller/control/chart/generator/base-series-generator.js +1 -1
  15. package/out/controller/control/form/form/form.controller.d.ts.map +1 -1
  16. package/out/controller/control/form/form/form.controller.js +4 -3
  17. package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.d.ts +2 -2
  18. package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.d.ts.map +1 -1
  19. package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.js +2 -2
  20. package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.d.ts +32 -1
  21. package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.d.ts.map +1 -1
  22. package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.js +63 -0
  23. package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.d.ts +12 -0
  24. package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.d.ts.map +1 -0
  25. package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.js +13 -0
  26. package/out/controller/control/search-bar/index.d.ts +3 -1
  27. package/out/controller/control/search-bar/index.d.ts.map +1 -1
  28. package/out/controller/control/search-bar/index.js +3 -1
  29. package/out/controller/control/search-bar/interface-util.d.ts +75 -0
  30. package/out/controller/control/search-bar/interface-util.d.ts.map +1 -0
  31. package/out/controller/control/search-bar/interface-util.js +274 -0
  32. package/out/controller/control/search-bar/search-bar-filter-items.controller.d.ts +1 -2
  33. package/out/controller/control/search-bar/search-bar-filter-items.controller.d.ts.map +1 -1
  34. package/out/controller/control/search-bar/search-bar-filter-items.controller.js +13 -10
  35. package/out/controller/control/search-bar/search-bar-filter-simple-items.controller.d.ts +37 -0
  36. package/out/controller/control/search-bar/search-bar-filter-simple-items.controller.d.ts.map +1 -0
  37. package/out/controller/control/search-bar/search-bar-filter-simple-items.controller.js +47 -0
  38. package/out/controller/control/search-bar/search-bar-filter.controller.d.ts +20 -5
  39. package/out/controller/control/search-bar/search-bar-filter.controller.d.ts.map +1 -1
  40. package/out/controller/control/search-bar/search-bar-filter.controller.js +13 -2
  41. package/out/controller/control/search-bar/search-bar.controller.d.ts +15 -2
  42. package/out/controller/control/search-bar/search-bar.controller.d.ts.map +1 -1
  43. package/out/controller/control/search-bar/search-bar.controller.js +80 -30
  44. package/out/controller/control/search-bar/util.d.ts +35 -0
  45. package/out/controller/control/search-bar/util.d.ts.map +1 -0
  46. package/out/controller/control/search-bar/util.js +45 -0
  47. package/out/interface/common/i-app-hub-service/i-app-hub-service.d.ts +7 -0
  48. package/out/interface/common/i-app-hub-service/i-app-hub-service.d.ts.map +1 -1
  49. package/out/interface/common/i-app-service/i-app-service.d.ts +7 -0
  50. package/out/interface/common/i-app-service/i-app-service.d.ts.map +1 -1
  51. package/out/interface/controller/controller/control/i-app-menu.controller.d.ts +8 -1
  52. package/out/interface/controller/controller/control/i-app-menu.controller.d.ts.map +1 -1
  53. package/out/interface/controller/state/control/i-chart.state.d.ts +28 -0
  54. package/out/interface/controller/state/control/i-chart.state.d.ts.map +1 -1
  55. package/out/interface/controller/state/control/i-md-control.state.d.ts +4 -0
  56. package/out/interface/controller/state/control/i-md-control.state.d.ts.map +1 -1
  57. package/out/interface/controller/state/control/index.d.ts +1 -1
  58. package/out/interface/controller/state/control/index.d.ts.map +1 -1
  59. package/out/interface/controller/state/control/index.js +1 -1
  60. package/out/interface/controller/state/control/search-bar/i-filter-node.d.ts +157 -0
  61. package/out/interface/controller/state/control/search-bar/i-filter-node.d.ts.map +1 -0
  62. package/out/interface/controller/state/control/search-bar/i-quick-search.d.ts +24 -0
  63. package/out/interface/controller/state/control/search-bar/i-quick-search.d.ts.map +1 -0
  64. package/out/interface/controller/state/control/search-bar/i-quick-search.js +1 -0
  65. package/out/interface/controller/state/control/search-bar/i-search-bar-group.d.ts +89 -0
  66. package/out/interface/controller/state/control/search-bar/i-search-bar-group.d.ts.map +1 -0
  67. package/out/interface/controller/state/control/search-bar/i-search-bar-group.js +1 -0
  68. package/out/interface/controller/state/control/search-bar/i-search-bar.state.d.ts +78 -0
  69. package/out/interface/controller/state/control/search-bar/i-search-bar.state.d.ts.map +1 -0
  70. package/out/interface/controller/state/control/search-bar/i-search-bar.state.js +1 -0
  71. package/out/interface/controller/state/control/search-bar/i-search-cond-ex.d.ts +65 -0
  72. package/out/interface/controller/state/control/search-bar/i-search-cond-ex.d.ts.map +1 -0
  73. package/out/interface/controller/state/control/search-bar/i-search-cond-ex.js +1 -0
  74. package/out/interface/controller/state/control/search-bar/i-search-cond.d.ts +43 -0
  75. package/out/interface/controller/state/control/search-bar/i-search-cond.d.ts.map +1 -0
  76. package/out/interface/controller/state/control/search-bar/i-search-cond.js +1 -0
  77. package/out/interface/controller/state/control/search-bar/index.d.ts +7 -0
  78. package/out/interface/controller/state/control/search-bar/index.d.ts.map +1 -0
  79. package/out/interface/controller/state/control/search-bar/index.js +1 -0
  80. package/out/service/service/code-list/code-list.service.d.ts +14 -0
  81. package/out/service/service/code-list/code-list.service.d.ts.map +1 -1
  82. package/out/service/service/code-list/code-list.service.js +39 -0
  83. package/out/service/service/control/md-control.service.d.ts.map +1 -1
  84. package/out/service/service/control/md-control.service.js +3 -0
  85. package/out/service/service/counter/counter.service.d.ts.map +1 -1
  86. package/out/service/service/counter/counter.service.js +5 -1
  87. package/out/service/utils/app-counter/app-counter.js +1 -1
  88. package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts +81 -0
  89. package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts.map +1 -1
  90. package/out/service/utils/dynamic-code-list/dynamic-code-list.js +127 -2
  91. package/package.json +2 -2
  92. package/out/controller/control/search-bar/use-searchcond.d.ts +0 -33
  93. package/out/controller/control/search-bar/use-searchcond.d.ts.map +0 -1
  94. package/out/controller/control/search-bar/use-searchcond.js +0 -117
  95. package/out/interface/controller/state/control/i-search-bar.state.d.ts +0 -224
  96. package/out/interface/controller/state/control/i-search-bar.state.d.ts.map +0 -1
  97. /package/out/interface/controller/state/control/{i-search-bar.state.js → search-bar/i-filter-node.js} +0 -0
@@ -14,7 +14,7 @@ import { SearchBarService } from './search-bar.service';
14
14
  */
15
15
  export declare class SearchBarController extends ControlController<ISearchBar, ISearchBarState, ISearchBarEvent> implements ISearchBarController {
16
16
  /**
17
- * 快速搜索占位符
17
+ * 快速搜索占位符(根据属性计算出来的快速搜索占位符)
18
18
  * @return {*}
19
19
  * @author: zhujiamin
20
20
  * @Date: 2023-08-11 14:13:10
@@ -157,7 +157,7 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
157
157
  * @date 2023-10-13 05:53:35
158
158
  * @return {*} {IData}
159
159
  */
160
- calcFilters(valueFormat?: boolean): IData[] | undefined;
160
+ calcFilters(): IData[] | undefined;
161
161
  /**
162
162
  * 初始化搜索栏分组项(获取后台分组清单并合并模型)
163
163
  * @return {*}
@@ -186,5 +186,18 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
186
186
  * @Date: 2023-12-21 10:29:24
187
187
  */
188
188
  handleGroupClick(groupItem: IBackendSearchBarGroup): Promise<void>;
189
+ /**
190
+ * 初始化高级搜索
191
+ * @author lxm
192
+ * @date 2024-04-11 11:44:10
193
+ * @protected
194
+ */
195
+ protected initAdvancedQuickSearch(): void;
196
+ /**
197
+ * 计算快速搜索占位符
198
+ * @author lxm
199
+ * @date 2024-04-11 05:36:52
200
+ */
201
+ calcQuickSearchPlaceHolder(): void;
189
202
  }
190
203
  //# 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,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,sBAAsB,EACtB,eAAe,EAEhB,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;AAYxD;;;;;;;;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,UAA8C;IAElE;;;;;OAKG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAGtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAcX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;;;OAOG;IACH,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,yBAAyB,GAAG,SAAS;IAUxC;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IA4B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IA6CrD;;;;;OAKG;IACH,WAAW,CAAC,WAAW,UAAO,GAAG,KAAK,EAAE,GAAG,SAAS;IA+CpD;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoGlE;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAWxB;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CA2CzE"}
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,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,sBAAsB,EACtB,eAAe,EAIhB,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;AAgBxD;;;;;;;;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,UAA8C;IAElE;;;;;OAKG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAGtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAkBX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA4B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;;;OAOG;IACH,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,yBAAyB,GAAG,SAAS;IAUxC;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IAsC1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IA0DrD;;;;;OAKG;IACH,WAAW,IAAI,KAAK,EAAE,GAAG,SAAS;IAsBlC;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoGlE;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAWxB;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4CxE;;;;;OAKG;IACH,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAsBzC;;;;OAIG;IACH,0BAA0B,IAAI,IAAI;CAenC"}
@@ -1,5 +1,5 @@
1
1
  import { mergeInLeft, recursiveIterate } from '@ibiz-template/core';
2
- import { clone, isNil } from 'ramda';
2
+ import { clone } from 'ramda';
3
3
  import { isString } from 'lodash-es';
4
4
  import { convertNavData, ScriptFactory } from '../../../utils';
5
5
  import { ControlController } from '../../common';
@@ -7,8 +7,11 @@ import { SearchBarFilterController } from './search-bar-filter.controller';
7
7
  import { SearchBarService } from './search-bar.service';
8
8
  import { getEntitySchema } from '../../utils';
9
9
  import { calcFilterModelBySchema } from './entity-schema';
10
- import { calcSearchConds, getOriginFilterNodes, parseFilters, } from './use-searchcond';
11
10
  import { SearchBarFilterItemsController } from './search-bar-filter-items.controller';
11
+ import { getOriginFilterNodes, calcSearchCondExs, SearchCondEx2filterNode, calcSearchConds, } from './interface-util';
12
+ import { ItemsValueOPs, isSimpleItems } from './util';
13
+ import { SearchBarFilterSimpleItemsController } from './search-bar-filter-simple-items.controller';
14
+ import { findFieldById } from '../../../model';
12
15
  const ScriptValueRegex = /\$\{[^}]*\}/; // 匹配${xxx}格式字符串
13
16
  /**
14
17
  * 搜索栏控制器
@@ -23,7 +26,7 @@ export class SearchBarController extends ControlController {
23
26
  constructor() {
24
27
  super(...arguments);
25
28
  /**
26
- * 快速搜索占位符
29
+ * 快速搜索占位符(根据属性计算出来的快速搜索占位符)
27
30
  * @return {*}
28
31
  * @author: zhujiamin
29
32
  * @Date: 2023-08-11 14:13:10
@@ -98,6 +101,10 @@ export class SearchBarController extends ControlController {
98
101
  this.state.selectedGroupItem = null;
99
102
  this.state.searchBarGroups = [];
100
103
  this.state.selectedSearchGroupItem = null;
104
+ this.state.advancedQuickSearch = false;
105
+ this.state.quickSearchItems = [];
106
+ this.state.quickSearchFieldNames = [];
107
+ this.state.quickSearchPlaceHolder = '';
101
108
  this.resetFilter();
102
109
  this.state.visible = !!(this.model.enableQuickSearch ||
103
110
  this.model.enableGroup ||
@@ -110,8 +117,8 @@ export class SearchBarController extends ControlController {
110
117
  if (appDataEntity) {
111
118
  this.appDataEntity = appDataEntity;
112
119
  this.calcQuickSearchPlaceholder();
120
+ this.initAdvancedQuickSearch();
113
121
  }
114
- // 实例部件服务
115
122
  if (this.isBackendSearchGroup && this.view.model.codeName) {
116
123
  this.service = new SearchBarService(this.model, this.view.model.codeName.toLowerCase());
117
124
  await this.service.init(this.context);
@@ -182,6 +189,7 @@ export class SearchBarController extends ControlController {
182
189
  });
183
190
  if (placeHolders.length > 0) {
184
191
  this.placeHolder = placeHolders.join('、');
192
+ this.state.quickSearchPlaceHolder = this.placeHolder;
185
193
  }
186
194
  }
187
195
  }
@@ -233,6 +241,11 @@ export class SearchBarController extends ControlController {
233
241
  // 快速搜索
234
242
  if (this.state.query) {
235
243
  params.query = this.state.query;
244
+ // 快速搜索高级
245
+ if (this.state.advancedQuickSearch &&
246
+ this.state.quickSearchFieldNames.length) {
247
+ params.queryconds = this.state.quickSearchFieldNames.map(name => `n_${name}_like`);
248
+ }
236
249
  }
237
250
  // 快速分组
238
251
  if (((_a = this.state.selectedGroupItem) === null || _a === void 0 ? void 0 : _a.data) &&
@@ -273,7 +286,11 @@ export class SearchBarController extends ControlController {
273
286
  var _a;
274
287
  // 整理exists或者NOTEXISTS的模型
275
288
  if (((_a = item.defsearchMode) === null || _a === void 0 ? void 0 : _a.valueOP) &&
276
- ['EXISTS', 'NOTEXISTS'].includes(item.defsearchMode.valueOP)) {
289
+ ItemsValueOPs.includes(item.defsearchMode.valueOP)) {
290
+ if (isSimpleItems(item)) {
291
+ this.filterControllers.push(new SearchBarFilterSimpleItemsController(item, this.appDataEntity, this.context, this.params));
292
+ return;
293
+ }
277
294
  const key = `${item.appDEFieldId}_${item.defsearchMode.valueOP}`;
278
295
  if (!itemsMap.has(key)) {
279
296
  itemsMap.set(key, []);
@@ -281,6 +298,7 @@ export class SearchBarController extends ControlController {
281
298
  itemsMap.get(key).push(item);
282
299
  return;
283
300
  }
301
+ // 常规的属性过滤项
284
302
  const filterController = new SearchBarFilterController(item, this.appDataEntity, this.context, this.params);
285
303
  this.filterControllers.push(filterController);
286
304
  });
@@ -300,33 +318,19 @@ export class SearchBarController extends ControlController {
300
318
  * @date 2023-10-13 05:53:35
301
319
  * @return {*} {IData}
302
320
  */
303
- calcFilters(valueFormat = true) {
321
+ calcFilters() {
304
322
  if (!this.enableFilter) {
305
323
  return;
306
324
  }
307
- const searchconds = calcSearchConds(this.state.filterNodes);
308
- if (valueFormat && searchconds) {
309
- // 给多数据加载之前进行脚本值转换
310
- recursiveIterate(searchconds[0], (node, parent) => {
311
- if (node.condtype === 'DEFIELD' && !isNil(node.value)) {
312
- let controller = this.findFilterController(node.fieldname, node.condop);
313
- if (!controller && parent.condtype === 'ITEMS') {
314
- const itemC = this.findFilterController(parent.fieldname, parent.condop);
315
- controller = itemC.getSubFilterController(node.fieldname, node.condop);
316
- }
317
- if (controller) {
318
- if (controller.valueItem && node.valueItem) {
319
- node.value = node.valueItem;
320
- delete node.valueItem;
321
- }
322
- else if (ScriptValueRegex.test(node.value)) {
323
- // 脚本转换
324
- node.value = ScriptFactory.execSingleLine(`\`${node.value}\``, Object.assign({}, this.getEventArgs()));
325
- }
325
+ const searchconds = calcSearchConds(this.state.filterNodes, {
326
+ after: (node, cond) => {
327
+ if (node.nodeType === 'FIELD' && isString(node.value)) {
328
+ if (ScriptValueRegex.test(node.value)) {
329
+ cond.value = ScriptFactory.execSingleLine(`\`${node.value}\``, Object.assign({}, this.getEventArgs()));
326
330
  }
327
331
  }
328
- }, { childrenFields: ['searchconds'] });
329
- }
332
+ },
333
+ });
330
334
  return searchconds;
331
335
  }
332
336
  /**
@@ -443,7 +447,7 @@ export class SearchBarController extends ControlController {
443
447
  */
444
448
  async handleSave() {
445
449
  if (this.grid && this.state.selectedSearchGroupItem) {
446
- const filters = this.calcFilters(false);
450
+ const filters = calcSearchCondExs(this.state.filterNodes);
447
451
  const saveParams = {
448
452
  searchconds: filters,
449
453
  sort: this.grid.state.sortQuery,
@@ -491,7 +495,7 @@ export class SearchBarController extends ControlController {
491
495
  groupItem.searchGroupData.searchconds &&
492
496
  groupItem.searchGroupData.searchconds.length > 0) {
493
497
  // 根据后台标准的searchconds计算出 前端回显的树形结构FilterNodes
494
- const filterNodes = groupItem.searchGroupData.searchconds.map(item => parseFilters(item));
498
+ const filterNodes = groupItem.searchGroupData.searchconds.map(item => SearchCondEx2filterNode(item));
495
499
  this.state.filterNodes = filterNodes;
496
500
  }
497
501
  else {
@@ -499,7 +503,7 @@ export class SearchBarController extends ControlController {
499
503
  }
500
504
  // 把带有${}的条件禁用,不能修改
501
505
  recursiveIterate(this.state.filterNodes[0], (node) => {
502
- if (node.leaf) {
506
+ if (node.nodeType === 'FIELD') {
503
507
  if (node.field &&
504
508
  node.valueOP &&
505
509
  isString(node.value) &&
@@ -513,4 +517,50 @@ export class SearchBarController extends ControlController {
513
517
  await this.grid.load({ isInitialLoad: true });
514
518
  }
515
519
  }
520
+ /**
521
+ * 初始化高级搜索
522
+ * @author lxm
523
+ * @date 2024-04-11 11:44:10
524
+ * @protected
525
+ */
526
+ initAdvancedQuickSearch() {
527
+ var _a;
528
+ if (this.model.quickSearchMode === 2 &&
529
+ ((_a = this.model.searchBarQuickSearchs) === null || _a === void 0 ? void 0 : _a.length)) {
530
+ this.state.advancedQuickSearch = true;
531
+ this.state.quickSearchItems = [];
532
+ this.state.quickSearchFieldNames = [];
533
+ this.model.searchBarQuickSearchs.forEach(item => {
534
+ const filed = findFieldById(this.appDataEntity, item.appDEFieldId);
535
+ const fieldName = filed.codeName.toLowerCase();
536
+ this.state.quickSearchItems.push({
537
+ fieldName,
538
+ label: filed.logicName,
539
+ });
540
+ this.state.quickSearchFieldNames.push(fieldName);
541
+ });
542
+ this.calcQuickSearchPlaceHolder();
543
+ }
544
+ }
545
+ /**
546
+ * 计算快速搜索占位符
547
+ * @author lxm
548
+ * @date 2024-04-11 05:36:52
549
+ */
550
+ calcQuickSearchPlaceHolder() {
551
+ if (this.state.advancedQuickSearch) {
552
+ if (this.state.quickSearchFieldNames.length) {
553
+ const labels = [];
554
+ this.state.quickSearchItems.forEach(item => {
555
+ if (this.state.quickSearchFieldNames.includes(item.fieldName)) {
556
+ labels.push(item.label);
557
+ }
558
+ });
559
+ this.state.quickSearchPlaceHolder = labels.join('、');
560
+ }
561
+ else {
562
+ this.state.quickSearchPlaceHolder = this.placeHolder;
563
+ }
564
+ }
565
+ }
516
566
  }
@@ -0,0 +1,35 @@
1
+ import { ISearchBarFilter } from '@ibiz/model-core';
2
+ export declare const ItemsValueOPs: string[];
3
+ /**
4
+ * 是否是简单ITEMS模式
5
+ * @author lxm
6
+ * @date 2024-04-10 01:46:24
7
+ * @export
8
+ * @param {ISearchBarFilter} model
9
+ * @return {*} {boolean}
10
+ */
11
+ export declare function isSimpleItems(model: ISearchBarFilter): boolean;
12
+ /**
13
+ * 是否是隐藏的过滤项
14
+ * @author lxm
15
+ * @date 2024-04-10 01:47:43
16
+ * @export
17
+ * @param {ISearchBarFilter} model
18
+ * @return {*} {boolean}
19
+ */
20
+ export declare function isHiddenFilter(model: ISearchBarFilter): boolean;
21
+ /**
22
+ * 解析出子属性的字段名和操作符
23
+ * @example
24
+ * parseSubFieldInfo('N_ATTENTIONS_EXISTS__N_USER_ID_EQ') => { field: 'USER_ID', op: 'EQ' }
25
+ * @author lxm
26
+ * @date 2024-04-10 02:03:57
27
+ * @export
28
+ * @param {string} str
29
+ * @return {*} {{ field: string; op: string }}
30
+ */
31
+ export declare function parseSubFieldInfo(str: string): {
32
+ field: string;
33
+ op: string;
34
+ };
35
+ //# sourceMappingURL=util.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGpD,eAAO,MAAM,aAAa,EAAE,MAAM,EAGxB,CAAC;AAIX;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAE9D;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAE/D;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAI5E"}
@@ -0,0 +1,45 @@
1
+ import { ValueOP } from '../../../constant';
2
+ export const ItemsValueOPs = [
3
+ ValueOP.EXISTS,
4
+ ValueOP.NOT_EXISTS,
5
+ ];
6
+ const SubFieldRegex = /^N_(.\w+)_(.\w+)$/; // N_USER_ID_EQ格式字符串中的USER_ID和EQ
7
+ /**
8
+ * 是否是简单ITEMS模式
9
+ * @author lxm
10
+ * @date 2024-04-10 01:46:24
11
+ * @export
12
+ * @param {ISearchBarFilter} model
13
+ * @return {*} {boolean}
14
+ */
15
+ export function isSimpleItems(model) {
16
+ var _a;
17
+ return ((_a = model.userParam) === null || _a === void 0 ? void 0 : _a.ITEMTYPE) === 'SIMPLE';
18
+ }
19
+ /**
20
+ * 是否是隐藏的过滤项
21
+ * @author lxm
22
+ * @date 2024-04-10 01:47:43
23
+ * @export
24
+ * @param {ISearchBarFilter} model
25
+ * @return {*} {boolean}
26
+ */
27
+ export function isHiddenFilter(model) {
28
+ var _a;
29
+ return ((_a = model.userParam) === null || _a === void 0 ? void 0 : _a.ITEMTYPE) === 'HIDDEN';
30
+ }
31
+ /**
32
+ * 解析出子属性的字段名和操作符
33
+ * @example
34
+ * parseSubFieldInfo('N_ATTENTIONS_EXISTS__N_USER_ID_EQ') => { field: 'USER_ID', op: 'EQ' }
35
+ * @author lxm
36
+ * @date 2024-04-10 02:03:57
37
+ * @export
38
+ * @param {string} str
39
+ * @return {*} {{ field: string; op: string }}
40
+ */
41
+ export function parseSubFieldInfo(str) {
42
+ const subStr = str.split('__')[1];
43
+ const matches = subStr.match(SubFieldRegex);
44
+ return { field: matches[1], op: matches[2] };
45
+ }
@@ -185,5 +185,12 @@ export interface IAppHubService {
185
185
  * @date 2024-01-03 06:46:57
186
186
  */
187
187
  reset(): void;
188
+ /**
189
+ * 销毁基座
190
+ *
191
+ * @author tony001
192
+ * @date 2024-04-10 15:04:21
193
+ */
194
+ destroy(): void;
188
195
  }
189
196
  //# sourceMappingURL=i-app-hub-service.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-app-hub-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-app-hub-service/i-app-hub-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IAEpC;;;;;;OAMG;IACH,WAAW,EAAE,cAAc,CAAC;IAE5B;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAE1B;;;;;OAKG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAE1B;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAEjE;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEvC;;;;;;;OAOG;IACH,qBAAqB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAElE;;;;;;;;OAQG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEjE;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAEjC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEnD;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3C;;;;;;;;;OASG;IACH,WAAW,CACT,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,CAAC,CAAC;IAErB;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAElD;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,CAAC;IAEjD;;;;;;OAMG;IACH,UAAU,IAAI,WAAW,EAAE,CAAC;IAE5B;;;;;;;;;OASG;IACH,eAAe,CACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC;IAE1B;;;;OAIG;IACH,KAAK,IAAI,IAAI,CAAC;CACf"}
1
+ {"version":3,"file":"i-app-hub-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-app-hub-service/i-app-hub-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IAEpC;;;;;;OAMG;IACH,WAAW,EAAE,cAAc,CAAC;IAE5B;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAE1B;;;;;OAKG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAE1B;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAEjE;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEvC;;;;;;;OAOG;IACH,qBAAqB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAElE;;;;;;;;OAQG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEjE;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAEjC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEnD;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3C;;;;;;;;;OASG;IACH,WAAW,CACT,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,CAAC,CAAC;IAErB;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAElD;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,CAAC;IAEjD;;;;;;OAMG;IACH,UAAU,IAAI,WAAW,EAAE,CAAC;IAE5B;;;;;;;;;OASG;IACH,eAAe,CACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC;IAE1B;;;;OAIG;IACH,KAAK,IAAI,IAAI,CAAC;IAEd;;;;;OAKG;IACH,OAAO,IAAI,IAAI,CAAC;CACjB"}
@@ -126,5 +126,12 @@ export interface IAppService {
126
126
  * @return {*} {Promise<void>}
127
127
  */
128
128
  initMqtt(): Promise<void>;
129
+ /**
130
+ * 销毁应用
131
+ *
132
+ * @author tony001
133
+ * @date 2024-04-10 15:04:12
134
+ */
135
+ destroy(): void;
129
136
  }
130
137
  //# sourceMappingURL=i-app-service.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-app-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-app-service/i-app-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EACL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C;;;;;;;GAOG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC;IAExC;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;IAEnE;;;;;;;OAOG;IACH,SAAS,CACP,EAAE,EAAE,MAAM,EACV,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAElC;;;;;;;OAOG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IAEnC;;;;;OAKG;IACH,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B"}
1
+ {"version":3,"file":"i-app-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-app-service/i-app-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EACL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C;;;;;;;GAOG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC;IAExC;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;IAEnE;;;;;;;OAOG;IACH,SAAS,CACP,EAAE,EAAE,MAAM,EACV,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAElC;;;;;;;OAOG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IAEnC;;;;;OAKG;IACH,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B;;;;;OAKG;IACH,OAAO,IAAI,IAAI,CAAC;CACjB"}
@@ -1,4 +1,4 @@
1
- import { IAppMenu } from '@ibiz/model-core';
1
+ import { IAppMenu, IAppMenuItem } from '@ibiz/model-core';
2
2
  import { IAppMenuEvent } from '../../event';
3
3
  import { IAppMenuState } from '../../state';
4
4
  import { IControlController } from './i-control.controller';
@@ -11,5 +11,12 @@ import { IControlController } from './i-control.controller';
11
11
  * @extends {IControlController}
12
12
  */
13
13
  export interface IAppMenuController extends IControlController<IAppMenu, IAppMenuState, IAppMenuEvent> {
14
+ /**
15
+ * 所有菜单项
16
+ *
17
+ * @type {[]}
18
+ * @memberof IAppMenuController
19
+ */
20
+ allAppMenuItems: IAppMenuItem[];
14
21
  }
15
22
  //# sourceMappingURL=i-app-menu.controller.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-app-menu.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,WAAW,kBACf,SAAQ,kBAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,aAAa,CAAC;CAAG"}
1
+ {"version":3,"file":"i-app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-app-menu.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,WAAW,kBACf,SAAQ,kBAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,aAAa,CAAC;IAClE;;;;;OAKG;IACH,eAAe,EAAE,YAAY,EAAE,CAAC;CACjC"}
@@ -8,6 +8,34 @@ import { IMDControlState } from './i-md-control.state';
8
8
  * @extends {IMDControlState}
9
9
  */
10
10
  export interface IChartState extends IMDControlState {
11
+ /**
12
+ * 开启图表表格时的表格头
13
+ *
14
+ * @type {IData[]}
15
+ * @memberof IChartState
16
+ */
17
+ gridHeaders: IData[];
18
+ /**
19
+ * 开启图表表格时表格的数据
20
+ *
21
+ * @type {IData[]}
22
+ * @memberof IChartState
23
+ */
24
+ gridData: IData[];
25
+ /**
26
+ * 是否开启图表表格
27
+ *
28
+ * @type {boolean}
29
+ * @memberof IChartState
30
+ */
31
+ showGrid: boolean;
32
+ /**
33
+ *表格所在方位
34
+ *
35
+ * @type {string}
36
+ * @memberof IChartState
37
+ */
38
+ gridPosition: string;
11
39
  }
12
40
  /**
13
41
  * 图表数据格式
@@ -1 +1 @@
1
- {"version":3,"file":"i-chart.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-chart.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,WAAY,SAAQ,eAAe;CAAG;AAEvD;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}
1
+ {"version":3,"file":"i-chart.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-chart.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD;;;;;OAKG;IACH,WAAW,EAAE,KAAK,EAAE,CAAC;IAErB;;;;;OAKG;IACH,QAAQ,EAAE,KAAK,EAAE,CAAC;IAElB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}
@@ -44,6 +44,10 @@ export interface IMDControlState extends IControlState {
44
44
  * 总条数
45
45
  */
46
46
  total: number;
47
+ /**
48
+ * 总页数
49
+ */
50
+ totalPages: number;
47
51
  /**
48
52
  * 是否加载过数据
49
53
  * 用于某些需要等待数据加载回来之后的场景。
@@ -1 +1 @@
1
- {"version":3,"file":"i-md-control.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-md-control.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD;;;;;OAKG;IACH,KAAK,EAAE,KAAK,EAAE,CAAC;IAEf;;;;;;OAMG;IACH,YAAY,EAAE,KAAK,EAAE,CAAC;IAEtB;;;;;;OAMG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAErC;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,MAAM,EAAE,oBAAoB,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,QAAQ,EAAE,KAAK,EAAE,CAAC;IAElB;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IAErB;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAE9C;;;;OAIG;IACH,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC;CACxB"}
1
+ {"version":3,"file":"i-md-control.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-md-control.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD;;;;;OAKG;IACH,KAAK,EAAE,KAAK,EAAE,CAAC;IAEf;;;;;;OAMG;IACH,YAAY,EAAE,KAAK,EAAE,CAAC;IAEtB;;;;;;OAMG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAErC;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,MAAM,EAAE,oBAAoB,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,QAAQ,EAAE,KAAK,EAAE,CAAC;IAElB;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IAErB;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAE9C;;;;OAIG;IACH,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC;CACxB"}
@@ -20,7 +20,7 @@ export * from './i-pickup-view-panel.state';
20
20
  export * from './i-tab-exp-panel.state';
21
21
  export * from './i-exp-bar-control.state';
22
22
  export * from './i-tree-exp-bar.state';
23
- export * from './i-search-bar.state';
23
+ export * from './search-bar';
24
24
  export * from './i-wizard-panel.state';
25
25
  export * from './i-chart.state';
26
26
  export * from './i-drbar.state';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,YAAY,EACV,eAAe,EACf,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,YAAY,EACV,eAAe,EACf,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC"}
@@ -19,7 +19,7 @@ export * from './i-pickup-view-panel.state';
19
19
  export * from './i-tab-exp-panel.state';
20
20
  export * from './i-exp-bar-control.state';
21
21
  export * from './i-tree-exp-bar.state';
22
- export * from './i-search-bar.state';
22
+ export * from './search-bar';
23
23
  export * from './i-wizard-panel.state';
24
24
  export * from './i-chart.state';
25
25
  export * from './i-drbar.state';
@@ -0,0 +1,157 @@
1
+ import { ValueOP } from '../../../../../constant';
2
+ import { ITEMS_COND_OP } from './i-search-cond';
3
+ export type IFilterNode = IFilterNodeGroup | IFilterNodeField | IFilterNodeItems;
4
+ /**
5
+ * 过滤节点(分组)
6
+ * @author lxm
7
+ * @date 2024-04-09 01:58:48
8
+ * @export
9
+ * @interface IFilterNodeGroup
10
+ */
11
+ export interface IFilterNodeGroup {
12
+ /**
13
+ * 节点类型
14
+ * @author lxm
15
+ * @date 2024-04-09 02:04:31
16
+ * @type {'GROUP'}
17
+ */
18
+ nodeType: 'GROUP';
19
+ /**
20
+ * 分组的逻辑类型
21
+ * @author lxm
22
+ * @date 2023-10-12 05:21:18
23
+ * @type {('AND' | 'OR')}
24
+ */
25
+ logicType: 'AND' | 'OR';
26
+ /**
27
+ * 是否取反
28
+ * @author lxm
29
+ * @date 2024-04-09 01:56:40
30
+ * @type {boolean}
31
+ */
32
+ notMode?: boolean;
33
+ /**
34
+ * 隐藏,不显示
35
+ * @author lxm
36
+ * @date 2024-02-01 02:51:40
37
+ * @type {boolean}
38
+ */
39
+ hidden?: boolean;
40
+ /**
41
+ * 子节点数据集合
42
+ * @author lxm
43
+ * @date 2023-10-12 05:18:19
44
+ * @type {IFilterTreeNode[]}
45
+ */
46
+ children: IFilterNode[];
47
+ }
48
+ /**
49
+ * 过滤节点(属性)
50
+ * @author lxm
51
+ * @date 2024-04-09 01:59:00
52
+ * @export
53
+ * @interface IFilterNodeField
54
+ */
55
+ export interface IFilterNodeField {
56
+ /**
57
+ * 节点类型
58
+ * @author lxm
59
+ * @date 2024-04-09 02:04:31
60
+ * @type {'GROUP'}
61
+ */
62
+ nodeType: 'FIELD';
63
+ /**
64
+ * 实体属性名称
65
+ * @author lxm
66
+ * @date 2023-10-13 02:35:42
67
+ * @type {string}
68
+ */
69
+ field: string | null;
70
+ /**
71
+ * 过滤项值
72
+ * @author lxm
73
+ * @date 2023-10-12 05:16:52
74
+ * @type {unknown}
75
+ */
76
+ value: unknown | null;
77
+ /**
78
+ * 值操作类型
79
+ * @author lxm
80
+ * @date 2024-04-09 01:54:45
81
+ * @type {ValueOP}
82
+ */
83
+ valueOP: ValueOP | null;
84
+ /**
85
+ * 禁用,禁止修改
86
+ * @author lxm
87
+ * @date 2024-02-01 02:51:40
88
+ * @type {boolean}
89
+ */
90
+ disabled?: boolean;
91
+ /**
92
+ * 隐藏,不显示
93
+ * @author lxm
94
+ * @date 2024-02-01 02:51:40
95
+ * @type {boolean}
96
+ */
97
+ hidden?: boolean;
98
+ /**
99
+ * 值项的值
100
+ * @author lxm
101
+ * @date 2024-02-04 06:40:17
102
+ * @type {unknown}
103
+ */
104
+ valueItem?: unknown;
105
+ }
106
+ /**
107
+ * 过滤节点(ITEMS)
108
+ * @author lxm
109
+ * @date 2024-04-09 01:59:12
110
+ * @export
111
+ * @interface IFilterNodeItems
112
+ */
113
+ export interface IFilterNodeItems {
114
+ /**
115
+ * 节点类型
116
+ * @author lxm
117
+ * @date 2024-04-09 02:05:06
118
+ * @type {'ITEMS'}
119
+ */
120
+ nodeType: 'ITEMS';
121
+ /**
122
+ * 实体属性名称
123
+ * @author lxm
124
+ * @date 2023-10-13 02:35:42
125
+ * @type {string}
126
+ */
127
+ field: string | null;
128
+ /**
129
+ * 值操作类型
130
+ * @author lxm
131
+ * @date 2023-10-12 05:27:07
132
+ * @type {string}
133
+ */
134
+ valueOP: ITEMS_COND_OP | null;
135
+ /**
136
+ * 隐藏,不显示
137
+ * @author lxm
138
+ * @date 2024-02-01 02:51:40
139
+ * @type {boolean}
140
+ */
141
+ hidden?: boolean;
142
+ /**
143
+ * 是否是简单模式
144
+ * @author lxm
145
+ * @date 2024-02-01 02:51:40
146
+ * @type {boolean}
147
+ */
148
+ simple?: boolean;
149
+ /**
150
+ * 子节点数据集合
151
+ * @author lxm
152
+ * @date 2023-10-12 05:18:19
153
+ * @type {IFilterTreeNode[]}
154
+ */
155
+ children: IFilterNode[];
156
+ }
157
+ //# sourceMappingURL=i-filter-node.d.ts.map