@ibiz-template/runtime 0.7.19-alpha.0 → 0.7.19

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 (50) hide show
  1. package/dist/index.esm.js +272 -93
  2. package/dist/index.system.min.js +1 -1
  3. package/out/controller/common/control/control.controller.d.ts +11 -1
  4. package/out/controller/common/control/control.controller.d.ts.map +1 -1
  5. package/out/controller/common/control/control.controller.js +32 -18
  6. package/out/controller/common/control/md-control.controller.d.ts.map +1 -1
  7. package/out/controller/common/control/md-control.controller.js +20 -11
  8. package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map +1 -1
  9. package/out/controller/control/form/edit-form/edit-form.controller.js +20 -10
  10. package/out/controller/control/gantt/gantt.controller.d.ts +9 -0
  11. package/out/controller/control/gantt/gantt.controller.d.ts.map +1 -1
  12. package/out/controller/control/gantt/gantt.controller.js +41 -16
  13. package/out/controller/control/gantt/gantt.service.js +1 -1
  14. package/out/controller/control/grid/grid/grid.controller.d.ts +7 -0
  15. package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
  16. package/out/controller/control/grid/grid/grid.controller.js +39 -3
  17. package/out/controller/control/search-bar/search-bar.controller.d.ts +23 -0
  18. package/out/controller/control/search-bar/search-bar.controller.d.ts.map +1 -1
  19. package/out/controller/control/search-bar/search-bar.controller.js +58 -0
  20. package/out/controller/control/tree/tree.service.js +1 -1
  21. package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.d.ts.map +1 -1
  22. package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.js +4 -4
  23. package/out/controller/utils/button-state/ui-action-button.state.d.ts +9 -0
  24. package/out/controller/utils/button-state/ui-action-button.state.d.ts.map +1 -1
  25. package/out/controller/utils/button-state/ui-action-button.state.js +5 -0
  26. package/out/interface/controller/state/control/i-drbar.state.d.ts +8 -0
  27. package/out/interface/controller/state/control/i-drbar.state.d.ts.map +1 -1
  28. package/out/interface/controller/state/control/i-drtab.state.d.ts +8 -0
  29. package/out/interface/controller/state/control/i-drtab.state.d.ts.map +1 -1
  30. package/out/interface/controller/state/control/i-gantt.state.d.ts +4 -0
  31. package/out/interface/controller/state/control/i-gantt.state.d.ts.map +1 -1
  32. package/out/interface/controller/state/control/i-grid.state.d.ts +21 -0
  33. package/out/interface/controller/state/control/i-grid.state.d.ts.map +1 -1
  34. package/out/interface/service/service/i-app-de-authority.service.d.ts +30 -0
  35. package/out/interface/service/service/i-app-de-authority.service.d.ts.map +1 -1
  36. package/out/locale/en/index.d.ts +1 -1
  37. package/out/locale/en/index.js +1 -1
  38. package/out/locale/zh-CN/index.d.ts +1 -1
  39. package/out/locale/zh-CN/index.js +1 -1
  40. package/out/service/service/authority/authority.service.d.ts +13 -1
  41. package/out/service/service/authority/authority.service.d.ts.map +1 -1
  42. package/out/service/service/authority/authority.service.js +42 -1
  43. package/out/service/service/authority/de-authority.service.d.ts +5 -5
  44. package/out/service/service/authority/de-authority.service.d.ts.map +1 -1
  45. package/out/service/service/authority/de-authority.service.js +5 -9
  46. package/out/service/utils/app-counter/app-counter.d.ts.map +1 -1
  47. package/out/service/utils/app-counter/app-counter.js +8 -6
  48. package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts.map +1 -1
  49. package/out/service/utils/dynamic-code-list/dynamic-code-list.js +1 -1
  50. package/package.json +4 -4
@@ -66,6 +66,14 @@ export class SearchBarController extends ControlController {
66
66
  * @date 2024-01-05 10:10:37
67
67
  */
68
68
  this.addSchemaFilters = false;
69
+ /**
70
+ * 是否启用存储
71
+ *
72
+ * @author zhanghengfeng
73
+ * @date 2024-05-29 20:05:47
74
+ * @type {boolean}
75
+ */
76
+ this.enableStorage = false;
69
77
  }
70
78
  /**
71
79
  * 启用自定义过滤项
@@ -95,6 +103,16 @@ export class SearchBarController extends ControlController {
95
103
  return (this.ctx.getController('grid') ||
96
104
  this.ctx.getController('treegrid'));
97
105
  }
106
+ /**
107
+ * 设置生成存储key的函数
108
+ *
109
+ * @author zhanghengfeng
110
+ * @date 2024-05-29 16:05:35
111
+ * @param {(() => string | undefined)} fn
112
+ */
113
+ setStorageKeyFn(fn) {
114
+ this.storageKeyFn = fn;
115
+ }
98
116
  initState() {
99
117
  super.initState();
100
118
  this.state.query = '';
@@ -113,6 +131,7 @@ export class SearchBarController extends ControlController {
113
131
  async onCreated() {
114
132
  await this.initByEntitySchema();
115
133
  await super.onCreated();
134
+ this.enableStorage = this.controlParams.storage === 'true';
116
135
  const appDataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId, this.context.srfappid);
117
136
  if (appDataEntity) {
118
137
  this.appDataEntity = appDataEntity;
@@ -340,6 +359,7 @@ export class SearchBarController extends ControlController {
340
359
  * @Date: 2023-12-19 14:43:46
341
360
  */
342
361
  async initSearBarGroups(firstInit = false) {
362
+ var _a;
343
363
  this.state.searchBarGroups = [];
344
364
  if (this.isBackendSearchGroup) {
345
365
  if (this.model.searchBarGroups && this.model.searchBarGroups.length > 0) {
@@ -414,6 +434,21 @@ export class SearchBarController extends ControlController {
414
434
  if (firstInit &&
415
435
  this.state.searchBarGroups &&
416
436
  this.state.searchBarGroups.length > 0) {
437
+ if (this.enableStorage) {
438
+ const key = (_a = this.storageKeyFn) === null || _a === void 0 ? void 0 : _a.call(this);
439
+ if (key) {
440
+ const name = localStorage.getItem(key);
441
+ if (name) {
442
+ const selectedGroup = this.state.searchBarGroups.find(group => {
443
+ return group.name === name;
444
+ });
445
+ if (selectedGroup) {
446
+ this.hasDefaultSelect = true;
447
+ return;
448
+ }
449
+ }
450
+ }
451
+ }
417
452
  const defaultSelectedGroup = this.state.searchBarGroups.find(group => {
418
453
  return group.defaultSelect;
419
454
  });
@@ -430,7 +465,23 @@ export class SearchBarController extends ControlController {
430
465
  * @Date: 2024-01-24 11:12:43
431
466
  */
432
467
  setDefaultSelect() {
468
+ var _a;
433
469
  if (this.state.searchBarGroups && this.state.searchBarGroups.length > 0) {
470
+ if (this.enableStorage) {
471
+ const key = (_a = this.storageKeyFn) === null || _a === void 0 ? void 0 : _a.call(this);
472
+ if (key) {
473
+ const name = localStorage.getItem(key);
474
+ if (name) {
475
+ const selectedGroup = this.state.searchBarGroups.find(group => {
476
+ return group.name === name;
477
+ });
478
+ if (selectedGroup) {
479
+ this.handleGroupClick(selectedGroup);
480
+ return;
481
+ }
482
+ }
483
+ }
484
+ }
434
485
  const defaultSelectedGroup = this.state.searchBarGroups.find(group => {
435
486
  return group.defaultSelect;
436
487
  });
@@ -486,6 +537,13 @@ export class SearchBarController extends ControlController {
486
537
  * @Date: 2023-12-21 10:29:24
487
538
  */
488
539
  async handleGroupClick(groupItem) {
540
+ var _a;
541
+ if (this.enableStorage) {
542
+ const key = (_a = this.storageKeyFn) === null || _a === void 0 ? void 0 : _a.call(this);
543
+ if (key && groupItem.name) {
544
+ localStorage.setItem(key, groupItem.name);
545
+ }
546
+ }
489
547
  this.state.selectedSearchGroupItem = groupItem;
490
548
  if (groupItem.saved) {
491
549
  // 请求获取到搜索分组数据
@@ -87,7 +87,7 @@ export class TreeService extends MDControlService {
87
87
  result = await this.getCodeListNodeDatas(nodeModel, nodeRS, parentNodeData, tempOpts);
88
88
  break;
89
89
  default:
90
- throw new ModelError(nodeModel, ibiz.i18n.t('runtime.controller.control.gantt.noSupport', {
90
+ throw new ModelError(nodeModel, ibiz.i18n.t('runtime.controller.control.md.noSupport', {
91
91
  treeNodeType: nodeModel.treeNodeType,
92
92
  }));
93
93
  }
@@ -1 +1 @@
1
- {"version":3,"file":"tree-grid-ex.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tree-grid-ex.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts"],"names":[],"mappings":"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"}
@@ -232,18 +232,18 @@ export class TreeGridExController extends TreeController {
232
232
  }
233
233
  async save(nodeData) {
234
234
  if (this.state.isSimple) {
235
- ibiz.log.debug(ibiz.i18n.t('runtime.controller.control.gantt.simpleMode'));
235
+ ibiz.log.debug(ibiz.i18n.t('runtime.controller.control.md.simpleMode'));
236
236
  return;
237
237
  }
238
238
  if (nodeData._nodeType !== 'DE') {
239
- throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.gantt.nonentity'));
239
+ throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.md.nonentity'));
240
240
  }
241
241
  const rowState = this.state.rows[nodeData._uuid];
242
242
  if (!rowState) {
243
- throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.gantt.rowData'));
243
+ throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.md.rowData'));
244
244
  }
245
245
  if (!rowState.modified) {
246
- ibiz.log.debug(ibiz.i18n.t('runtime.controller.control.gantt.noChange'));
246
+ ibiz.log.debug(ibiz.i18n.t('runtime.controller.control.md.noChange'));
247
247
  return;
248
248
  }
249
249
  // const isValid = await this.validate(rowState);
@@ -42,6 +42,15 @@ export declare class UIActionButtonState implements IButtonState {
42
42
  * 操作标识
43
43
  */
44
44
  protected dataAccessAction?: string;
45
+ /**
46
+ * 数据目标
47
+ *
48
+ * @author tony001
49
+ * @date 2024-05-29 16:05:44
50
+ * @protected
51
+ * @type {string}
52
+ */
53
+ protected actionTarget?: string;
45
54
  /**
46
55
  * 应用标识
47
56
  */
@@ -1 +1 @@
1
- {"version":3,"file":"ui-action-button.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/ui-action-button.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,YAAY;IACtD,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,OAAO,CAAS;IAE1B,OAAO,EAAE,OAAO,CAAQ;IAExB,OAAO,EAAE,OAAO,CAAS;IAEzB;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,OAAO,CAAQ;IAEpC;;OAEG;IACH,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAQ;IAE7C;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,EAAE,OAAO,CAAS;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAE,OAAO,CAAS;IAEzC;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAEpC;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAS;gBAEtB,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAM5D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqD3B;;;;;;;;OAQG;cACa,cAAc,CAC5B,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IA0BV,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
1
+ {"version":3,"file":"ui-action-button.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/ui-action-button.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,YAAY;IACtD,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,OAAO,CAAS;IAE1B,OAAO,EAAE,OAAO,CAAQ;IAExB,OAAO,EAAE,OAAO,CAAS;IAEzB;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,OAAO,CAAQ;IAEpC;;OAEG;IACH,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAQ;IAE7C;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,EAAE,OAAO,CAAS;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAE,OAAO,CAAS;IAEzC;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAEpC;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEhC;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAS;gBAEtB,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAM5D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAsD3B;;;;;;;;OAQG;cACa,cAAc,CAC5B,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAmCV,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
@@ -65,6 +65,7 @@ export class UIActionButtonState {
65
65
  }
66
66
  const { dataAccessAction, noPrivDisplayMode, actionTarget, uiactionMode, uiactionTag, } = uiAction;
67
67
  this.dataAccessAction = dataAccessAction;
68
+ this.actionTarget = actionTarget;
68
69
  // 设置无权限显示模式,1:禁用,2隐藏,6隐藏且默认隐藏
69
70
  if (noPrivDisplayMode === 1) {
70
71
  this.noPermissionHidden = false;
@@ -109,6 +110,10 @@ export class UIActionButtonState {
109
110
  return;
110
111
  }
111
112
  const app = await ibiz.hub.getApp(this.appId);
113
+ if (this.actionTarget && this.actionTarget === 'NONE') {
114
+ this.permitted = await app.authority.calcByNoDataAccessAction(this.dataAccessAction, context, appDeId);
115
+ return;
116
+ }
112
117
  // 界面行为实体和数据实体不一致时报警告
113
118
  if (this.appDeName && appDeId && !appDeId.includes(this.appDeName)) {
114
119
  ibiz.log.warn(ibiz.i18n.t('runtime.controller.utils.buttonState.isFinitenconsistency', {
@@ -146,5 +146,13 @@ export interface IDRBarItemsState {
146
146
  * @type {string}
147
147
  */
148
148
  testScriptCode?: string;
149
+ /**
150
+ * 计数器模式
151
+ *
152
+ * @author zhanghengfeng
153
+ * @date 2024-05-30 10:05:43
154
+ * @type {number}
155
+ */
156
+ counterMode?: number;
149
157
  }
150
158
  //# sourceMappingURL=i-drbar.state.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-drbar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-drbar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,WAAW,WAAY,SAAQ,aAAa;IAChD;;;;;OAKG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;OAKG;IACH,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAE/B;;;;;;OAMG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAE9B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB"}
1
+ {"version":3,"file":"i-drbar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-drbar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,WAAW,WAAY,SAAQ,aAAa;IAChD;;;;;OAKG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;OAKG;IACH,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAE/B;;;;;;OAMG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAE9B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB"}
@@ -126,5 +126,13 @@ export interface IDRTabPagesState {
126
126
  * @type {string}
127
127
  */
128
128
  testScriptCode?: string;
129
+ /**
130
+ * 计数器模式
131
+ *
132
+ * @author zhanghengfeng
133
+ * @date 2024-05-30 10:05:43
134
+ * @type {number}
135
+ */
136
+ counterMode?: number;
129
137
  }
130
138
  //# sourceMappingURL=i-drtab.state.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-drtab.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-drtab.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,WAAW,WAAY,SAAQ,aAAa;IAChD;;;;;OAKG;IACH,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAE/B;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB"}
1
+ {"version":3,"file":"i-drtab.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-drtab.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,WAAW,WAAY,SAAQ,aAAa;IAChD;;;;;OAKG;IACH,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAE/B;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB"}
@@ -17,6 +17,10 @@ export interface IGanttState extends ITreeGridExState {
17
17
  * @memberof IGanttState
18
18
  */
19
19
  ganttStyle: IGanttStyle;
20
+ /**
21
+ * 是否开启滑块拖拽
22
+ */
23
+ sliderDraggable: boolean;
20
24
  }
21
25
  export interface IGanttStyle {
22
26
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"i-gantt.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-gantt.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAY,SAAQ,gBAAgB;IACnD;;;;;OAKG;IACH,UAAU,EAAE,WAAW,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAe,SAAQ,aAAa;IACnD;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAE1B;;;;;;OAMG;IACH,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC;;;;;;OAMG;IACH,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEtC;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAEzC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B"}
1
+ {"version":3,"file":"i-gantt.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-gantt.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAY,SAAQ,gBAAgB;IACnD;;;;;OAKG;IACH,UAAU,EAAE,WAAW,CAAC;IAExB;;OAEG;IACH,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAe,SAAQ,aAAa;IACnD;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAE1B;;;;;;OAMG;IACH,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC;;;;;;OAMG;IACH,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEtC;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAEzC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B"}
@@ -46,6 +46,27 @@ export interface IGridState extends IMDControlState {
46
46
  * @type {number}
47
47
  */
48
48
  zIndex?: number;
49
+ /**
50
+ * 隐藏表格头部
51
+ * @author fzh
52
+ * @date 2024-02-04 18:57:18
53
+ * @type {boolean}
54
+ */
55
+ hideHeader?: boolean;
56
+ /**
57
+ * 支持分页栏
58
+ * @author fzh
59
+ * @date 2024-02-04 18:57:18
60
+ * @type {boolean}
61
+ */
62
+ enablePagingBar?: boolean;
63
+ /**
64
+ * 隐藏无数据图片
65
+ * @author fzh
66
+ * @date 2024-05-31 09:43:26
67
+ * @type {boolean}
68
+ */
69
+ hideNoDataImage: boolean;
49
70
  }
50
71
  export interface IGridRowState {
51
72
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"i-grid.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-grid.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD;;;;;;OAMG;IACH,IAAI,EAAE,aAAa,EAAE,CAAC;IAEtB;;;;;;OAMG;IACH,YAAY,EAAE,YAAY,EAAE,CAAC;IAE7B;;;;;OAKG;IACH,SAAS,EAAE,KAAK,CAAC;IAEjB;;;;;OAKG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC;IAExB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,IAAI,EAAE,SAAS,CAAC;IAEhB;;;;;OAKG;IACH,OAAO,EAAE,SAAS,CAAC;IAEnB;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAEvC;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;IAEpD;;;;;;;OAOG;IACH,mBAAmB,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;IAE5D;;;;;;OAMG;IACH,aAAa,EAAE;QACb,CAAC,CAAC,EAAE,MAAM,GAAG;YACX,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;SACnB,CAAC;KACH,CAAC;IAEF;;;;;;OAMG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,WAAW,IAAI,SAAS,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAEzB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,YAAY,EAAE,CAAC;IAEpC;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,YAAY,EAAE,CAAC;CACtC"}
1
+ {"version":3,"file":"i-grid.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-grid.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD;;;;;;OAMG;IACH,IAAI,EAAE,aAAa,EAAE,CAAC;IAEtB;;;;;;OAMG;IACH,YAAY,EAAE,YAAY,EAAE,CAAC;IAE7B;;;;;OAKG;IACH,SAAS,EAAE,KAAK,CAAC;IAEjB;;;;;OAKG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC;IAExB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,IAAI,EAAE,SAAS,CAAC;IAEhB;;;;;OAKG;IACH,OAAO,EAAE,SAAS,CAAC;IAEnB;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAEvC;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;IAEpD;;;;;;;OAOG;IACH,mBAAmB,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;IAE5D;;;;;;OAMG;IACH,aAAa,EAAE;QACb,CAAC,CAAC,EAAE,MAAM,GAAG;YACX,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;SACnB,CAAC;KACH,CAAC;IAEF;;;;;;OAMG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,WAAW,IAAI,SAAS,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAEzB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,YAAY,EAAE,CAAC;IAEpC;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,YAAY,EAAE,CAAC;CACtC"}
@@ -33,5 +33,35 @@ export interface IAppDeAuthorityService {
33
33
  * @memberof IAppDeAuthorityService
34
34
  */
35
35
  getDataAccAction(key: string): string | undefined;
36
+ /**
37
+ * 计算实体附属主实体控制操作标识
38
+ *
39
+ * @author tony001
40
+ * @date 2024-05-30 10:05:24
41
+ * @param {IContext} context
42
+ * @return {*} {(Promise<string | undefined>)}
43
+ */
44
+ calcMajorDataAccAction(context: IContext): Promise<string | undefined>;
45
+ /**
46
+ * 计算实体数据权限,根据实体数据访问控制方式计算权限
47
+ *
48
+ * @author tony001
49
+ * @date 2024-05-30 10:05:13
50
+ * @param {string} dataAccessAction
51
+ * @param {(IData | undefined)} data
52
+ * @param {IContext} context
53
+ * @return {*} {Promise<boolean>}
54
+ */
55
+ calcDeDataAccAction(dataAccessAction: string, data: IData | undefined, context: IContext): Promise<boolean>;
56
+ /**
57
+ * 通过实体主状态计算权限
58
+ *
59
+ * @author tony001
60
+ * @date 2024-05-30 10:05:56
61
+ * @param {string} dataAccessAction
62
+ * @param {IData} data
63
+ * @return {*} {Promise<boolean>}
64
+ */
65
+ calcByDeMainState(dataAccessAction: string, data: IData): Promise<boolean>;
36
66
  }
37
67
  //# sourceMappingURL=i-app-de-authority.service.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-app-de-authority.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-app-de-authority.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;;;;;;OASG;IACH,sBAAsB,CACpB,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,OAAO,EAAE,QAAQ,EACjB,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAE/D;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACnD"}
1
+ {"version":3,"file":"i-app-de-authority.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-app-de-authority.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;;;;;;OASG;IACH,sBAAsB,CACpB,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,OAAO,EAAE,QAAQ,EACjB,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAE/D;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAElD;;;;;;;OAOG;IACH,sBAAsB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEvE;;;;;;;;;OASG;IACH,mBAAmB,CACjB,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;;;OAQG;IACH,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC5E"}
@@ -86,7 +86,7 @@ export declare const en: {
86
86
  searchTerms: string;
87
87
  saveSearch: string;
88
88
  };
89
- gantt: {
89
+ md: {
90
90
  noNode: string;
91
91
  rowData: string;
92
92
  simpleMode: string;
@@ -87,7 +87,7 @@ export const en = {
87
87
  searchTerms: 'No search terms found to apply',
88
88
  saveSearch: 'No saved search criteria found',
89
89
  },
90
- gantt: {
90
+ md: {
91
91
  noNode: 'Not entity gantt node data',
92
92
  rowData: 'Row data does not exist',
93
93
  simpleMode: 'Simple mode, no saving',
@@ -86,7 +86,7 @@ export declare const zhCn: {
86
86
  searchTerms: string;
87
87
  saveSearch: string;
88
88
  };
89
- gantt: {
89
+ md: {
90
90
  noNode: string;
91
91
  rowData: string;
92
92
  simpleMode: string;
@@ -87,7 +87,7 @@ export const zhCn = {
87
87
  searchTerms: '没有找到可以应用的搜索条件',
88
88
  saveSearch: '没有找到保存的搜索条件',
89
89
  },
90
- gantt: {
90
+ md: {
91
91
  noNode: '不是实体甘特节点数据',
92
92
  rowData: '行数据不存在',
93
93
  simpleMode: '简单模式,不保存',
@@ -84,7 +84,19 @@ export declare class AuthorityService {
84
84
  */
85
85
  calcByResCode(resCode: string): boolean;
86
86
  /**
87
- * 通过操作标识计算权限
87
+ * 通过操作标识计算权限(无数据)
88
+ *
89
+ * @author tony001
90
+ * @date 2024-05-29 16:05:33
91
+ * @param {string} dataAccessAction
92
+ * @param {IContext} context
93
+ * @param {IData} [data]
94
+ * @param {string} [appDeId]
95
+ * @return {*} {Promise<boolean>}
96
+ */
97
+ calcByNoDataAccessAction(dataAccessAction: string, context: IContext, appDeId?: string): Promise<boolean>;
98
+ /**
99
+ * 通过操作标识计算权限(非无数据)
88
100
  * @author lxm
89
101
  * @date 2023-05-10 12:33:10
90
102
  * @param {string} dataAccessAction 操作标识
@@ -1 +1 @@
1
- {"version":3,"file":"authority.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/authority/authority.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAG5D;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IA2Cf,SAAS,CAAC,QAAQ,EAAE,YAAY;IA1C5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAa;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAC7B,MAAM,EACN,CAAC,WAAW,EAAE,cAAc,KAAK,OAAO,CAAC,sBAAsB,CAAC,CACjE,CAAa;IAEd;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAElC;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAS;gBAEtB,QAAQ,EAAE,YAAY;IAE5C;;;;;;;;;OASG;IACH,QAAQ,CACN,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,CACX,WAAW,EAAE,cAAc,KACxB,OAAO,CAAC,sBAAsB,CAAC,GACnC,IAAI;IAIP;;;;;;;;OAQG;IACG,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAsB7D;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,oBAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAejD;;;;;OAKG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIvC;;;;;;;;;OASG;IACG,sBAAsB,CAC1B,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC;CA+BpB"}
1
+ {"version":3,"file":"authority.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/authority/authority.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAI5D;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IA2Cf,SAAS,CAAC,QAAQ,EAAE,YAAY;IA1C5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAa;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAC7B,MAAM,EACN,CAAC,WAAW,EAAE,cAAc,KAAK,OAAO,CAAC,sBAAsB,CAAC,CACjE,CAAa;IAEd;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAElC;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAS;gBAEtB,QAAQ,EAAE,YAAY;IAE5C;;;;;;;;;OASG;IACH,QAAQ,CACN,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,CACX,WAAW,EAAE,cAAc,KACxB,OAAO,CAAC,sBAAsB,CAAC,GACnC,IAAI;IAIP;;;;;;;;OAQG;IACG,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAsB7D;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,oBAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAejD;;;;;OAKG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIvC;;;;;;;;;;OAUG;IACG,wBAAwB,CAC5B,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC;IAmCnB;;;;;;;;;OASG;IACG,sBAAsB,CAC1B,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC;CA+BpB"}
@@ -1,6 +1,7 @@
1
1
  /* eslint-disable @typescript-eslint/no-unused-vars */
2
2
  import { RuntimeError } from '@ibiz-template/core';
3
3
  import { DeAuthorityService } from './de-authority.service';
4
+ import { convertToObject } from '../../utils/util/util';
4
5
  /**
5
6
  * 权限服务
6
7
  *
@@ -119,7 +120,47 @@ export class AuthorityService {
119
120
  return !this.enablePermission || this.resCodes.includes(resCode);
120
121
  }
121
122
  /**
122
- * 通过操作标识计算权限
123
+ * 通过操作标识计算权限(无数据)
124
+ *
125
+ * @author tony001
126
+ * @date 2024-05-29 16:05:33
127
+ * @param {string} dataAccessAction
128
+ * @param {IContext} context
129
+ * @param {IData} [data]
130
+ * @param {string} [appDeId]
131
+ * @return {*} {Promise<boolean>}
132
+ */
133
+ async calcByNoDataAccessAction(dataAccessAction, context, appDeId) {
134
+ // 默认为true
135
+ const result = true;
136
+ // 启用权限校验的通过操作标识去找它映射的统一资源校验
137
+ if (this.enablePermission) {
138
+ const app = await ibiz.hub.getApp(this.appModel.appId);
139
+ const opPriv = await app.getOPPriv(dataAccessAction, appDeId);
140
+ // 存在映射统一资源并且校验统一资源不通过时,返回false
141
+ if (this.enablePermission && (opPriv === null || opPriv === void 0 ? void 0 : opPriv.mapSysUniResCode)) {
142
+ if (!this.calcByResCode(opPriv.mapSysUniResCode)) {
143
+ return false;
144
+ }
145
+ }
146
+ else {
147
+ // 无数据还需校验父数据权限
148
+ // eslint-disable-next-line no-lonely-if
149
+ if (appDeId) {
150
+ const service = await this.getService(appDeId);
151
+ const majorAccObject = convertToObject(await service.calcMajorDataAccAction(context));
152
+ if (majorAccObject &&
153
+ dataAccessAction &&
154
+ !majorAccObject[dataAccessAction]) {
155
+ return false;
156
+ }
157
+ }
158
+ }
159
+ }
160
+ return result;
161
+ }
162
+ /**
163
+ * 通过操作标识计算权限(非无数据)
123
164
  * @author lxm
124
165
  * @date 2023-05-10 12:33:10
125
166
  * @param {string} dataAccessAction 操作标识
@@ -41,20 +41,20 @@ export declare class DeAuthorityService implements IAppDeAuthorityService {
41
41
  /**
42
42
  * 计算实体附属主实体控制操作标识
43
43
  */
44
- protected calcMajorDataAccAction(context: IContext): Promise<string | undefined>;
44
+ calcMajorDataAccAction(context: IContext): Promise<string | undefined>;
45
45
  /**
46
46
  * 计算实体数据权限,根据实体数据访问控制方式计算权限
47
47
  *
48
48
  * 0:无控制 不计算实体数据权限
49
49
  * 1:自控制 根据实体数据中的权限标识计算
50
- * 2:附属主实体控制 根据主实体的数据权限标识计算
51
- * 3:附属主实体控制(未映射自控)根据主实体的数据权限标识计算,主实体没有权限标识时使用实体数据中的权限标识计算
50
+ * 2:附属主实体控制 先从自身权限标识数据查找,若未找到,再从父权限标识数据查找
51
+ * 3:附属主实体控制(未映射自控)先从自身权限标识数据查找,若未找到,再从父权限标识数据查找
52
52
  * @param {string} dataAccessAction 操作标识
53
53
  * @param {IData} data 实体数据
54
54
  * @param {IContext} context 上下文
55
55
  * @memberof DeAuthorityService
56
56
  */
57
- protected calcDeDataAccAction(dataAccessAction: string, data: IData | undefined, context: IContext): Promise<boolean>;
57
+ calcDeDataAccAction(dataAccessAction: string, data: IData | undefined, context: IContext): Promise<boolean>;
58
58
  /**
59
59
  * 通过实体主状态计算权限
60
60
  * @author lxm
@@ -64,6 +64,6 @@ export declare class DeAuthorityService implements IAppDeAuthorityService {
64
64
  * @param {string} appDeId 应用实体id
65
65
  * @return {*} {Promise<boolean>}
66
66
  */
67
- protected calcByDeMainState(dataAccessAction: string, data?: IData): Promise<boolean>;
67
+ calcByDeMainState(dataAccessAction: string, data?: IData): Promise<boolean>;
68
68
  }
69
69
  //# sourceMappingURL=de-authority.service.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"de-authority.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/authority/de-authority.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAQ5D,qBAAa,kBAAmB,YAAW,sBAAsB;IACnD,SAAS,CAAC,WAAW,EAAE,cAAc;gBAA3B,WAAW,EAAE,cAAc;IAEjD;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE5D;;;;;;OAMG;IACH,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IAU9D;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIjD;;;;;;;;;OASG;IACG,sBAAsB,CAC1B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,OAAO,EAAE,QAAQ,EACjB,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,OAAO,CAAC;IAyBnB;;OAEG;cACa,sBAAsB,CACpC,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA2B9B;;;;;;;;;;;OAWG;cACa,mBAAmB,CACjC,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;IAkDnB;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,gBAAgB,EAAE,MAAM,EACxB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,OAAO,CAAC;CAiDpB"}
1
+ {"version":3,"file":"de-authority.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/authority/de-authority.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAQ5D,qBAAa,kBAAmB,YAAW,sBAAsB;IACnD,SAAS,CAAC,WAAW,EAAE,cAAc;gBAA3B,WAAW,EAAE,cAAc;IAEjD;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE5D;;;;;;OAMG;IACH,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IAU9D;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIjD;;;;;;;;;OASG;IACG,sBAAsB,CAC1B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,OAAO,EAAE,QAAQ,EACjB,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,OAAO,CAAC;IAyBnB;;OAEG;IACG,sBAAsB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA2B5E;;;;;;;;;;;OAWG;IACG,mBAAmB,CACvB,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;IAsCnB;;;;;;;;OAQG;IACG,iBAAiB,CACrB,gBAAgB,EAAE,MAAM,EACxB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,OAAO,CAAC;CAiDpB"}
@@ -87,8 +87,8 @@ export class DeAuthorityService {
87
87
  *
88
88
  * 0:无控制 不计算实体数据权限
89
89
  * 1:自控制 根据实体数据中的权限标识计算
90
- * 2:附属主实体控制 根据主实体的数据权限标识计算
91
- * 3:附属主实体控制(未映射自控)根据主实体的数据权限标识计算,主实体没有权限标识时使用实体数据中的权限标识计算
90
+ * 2:附属主实体控制 先从自身权限标识数据查找,若未找到,再从父权限标识数据查找
91
+ * 3:附属主实体控制(未映射自控)先从自身权限标识数据查找,若未找到,再从父权限标识数据查找
92
92
  * @param {string} dataAccessAction 操作标识
93
93
  * @param {IData} data 实体数据
94
94
  * @param {IContext} context 上下文
@@ -105,15 +105,11 @@ export class DeAuthorityService {
105
105
  : undefined;
106
106
  break;
107
107
  case 2:
108
- tempDataAccObject = convertToObject(await this.calcMajorDataAccAction(context));
109
- break;
110
108
  case 3:
111
109
  tempDataAccObject = convertToObject(await this.calcMajorDataAccAction(context));
112
- // 父没有当前操作标识
113
- if (!Object.prototype.hasOwnProperty.call(tempDataAccObject, dataAccessAction) &&
114
- data &&
115
- data.srfdataaccaction) {
116
- tempDataAccObject = convertToObject(data.srfdataaccaction);
110
+ if (data && data.srfdataaccaction) {
111
+ const curDataAccObject = convertToObject(data.srfdataaccaction);
112
+ Object.assign(tempDataAccObject, curDataAccObject);
117
113
  }
118
114
  break;
119
115
  default:
@@ -1 +1 @@
1
- {"version":3,"file":"app-counter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-counter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,cAAc,EAAgB,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAe,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD;;;;;;;GAOG;AACH,qBAAa,UAAU;IA0CF,KAAK,EAAE,WAAW;IAzCrC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC;IAEjC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;IAErC;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAwB;IAEnD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAAC,CAAiB;IAE1E;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;gBACgB,KAAK,EAAE,WAAW;IAIrC;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/D;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAchD;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS/D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,IAAI,IAAI;IAU1B;;;;;;OAMG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAOjC;;;;;;;OAOG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAItC;;;;;;;;OAQG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAK7D;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,SAAS,GAAE,OAAc,GAAG,IAAI;IAOpE;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAOhB"}
1
+ {"version":3,"file":"app-counter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-counter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,cAAc,EAAgB,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAe,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD;;;;;;;GAOG;AACH,qBAAa,UAAU;IA0CF,KAAK,EAAE,WAAW;IAzCrC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC;IAEjC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;IAErC;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAwB;IAEnD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAAC,CAAiB;IAE1E;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;gBACgB,KAAK,EAAE,WAAW;IAIrC;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/D;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAchD;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS/D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,IAAI,IAAI;IAY1B;;;;;;OAMG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAOjC;;;;;;;OAOG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAItC;;;;;;;;OAQG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAK7D;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,SAAS,GAAE,OAAc,GAAG,IAAI;IAOpE;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAOhB"}
@@ -107,12 +107,14 @@ export class AppCounter {
107
107
  */
108
108
  interval() {
109
109
  this.destroyInterval();
110
- this.intervalTimer = setInterval(() => {
111
- // 当无人订阅计数器时,跳过刷新
112
- if (this.evt.getSize('change') > 0) {
113
- this.load();
114
- }
115
- }, this.model.timer || 6000);
110
+ if (this.model.timer) {
111
+ this.intervalTimer = setInterval(() => {
112
+ // 当无人订阅计数器时,跳过刷新
113
+ if (this.evt.getSize('change') > 0) {
114
+ this.load();
115
+ }
116
+ }, this.model.timer);
117
+ }
116
118
  }
117
119
  /**
118
120
  * 销毁定时器自动刷新
@@ -1 +1 @@
1
- {"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAEL,cAAc,EAGf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,OAAO,EAAe,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAC;AAK/D;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAwB;IAEnD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,CAAA;KAAE,CAAC,CAClD;IAEhB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtC;;;;;;OAMG;IACH,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,CAA2B;gBAE7C,QAAQ,EAAE,YAAY;IAYlC;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS/D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAuEhD,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAetD,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAS9C;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAgG1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,SAAS;IAmBrE;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IA0C3E;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAenD;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;;;;;;OAOG;IACH,QAAQ,CACN,EAAE,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,EAClC,SAAS,GAAE,OAAc,GACxB,IAAI;IASP;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,GAAG,IAAI;IAInD;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAMhB"}
1
+ {"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAEL,cAAc,EAGf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,OAAO,EAAe,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAC;AAK/D;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAwB;IAEnD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,CAAA;KAAE,CAAC,CAClD;IAEhB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtC;;;;;;OAMG;IACH,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,CAA0C;gBAE5D,QAAQ,EAAE,YAAY;IAYlC;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS/D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAuEhD,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAetD,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAS9C;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAgG1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,SAAS;IAmBrE;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IA0C3E;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAenD;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;;;;;;OAOG;IACH,QAAQ,CACN,EAAE,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,EAClC,SAAS,GAAE,OAAc,GACxB,IAAI;IASP;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,GAAG,IAAI;IAInD;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAMhB"}
@@ -64,7 +64,7 @@ export class DynamicCodeListCache {
64
64
  * @date 2024-04-15 17:08:06
65
65
  * @type {Promise<void>}
66
66
  */
67
- this.commonKeys = ['query', 'queryconds'];
67
+ this.commonKeys = ['query', 'queryconds', 'searchconds'];
68
68
  this.codeList = codeList;
69
69
  // 动态代码表监听数据变化
70
70
  if (this.codeList.enableCache) {