@ibiz-template/runtime 0.2.12 → 0.2.15

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 (110) hide show
  1. package/dist/index.esm.js +280 -120
  2. package/dist/index.system.min.js +1 -1
  3. package/dist/index.system.min.js.map +1 -1
  4. package/out/controller/common/control/md-control.controller.js +1 -1
  5. package/out/controller/common/view/view.controller.d.ts.map +1 -1
  6. package/out/controller/common/view/view.controller.js +6 -0
  7. package/out/controller/control/calendar/calendar.controller.js +5 -5
  8. package/out/controller/control/chart/generator/base-series-generator.d.ts.map +1 -1
  9. package/out/controller/control/chart/generator/base-series-generator.js +2 -2
  10. package/out/controller/control/exp-bar/calendar-exp-bar.controller.d.ts +1 -1
  11. package/out/controller/control/exp-bar/calendar-exp-bar.controller.d.ts.map +1 -1
  12. package/out/controller/control/exp-bar/calendar-exp-bar.controller.js +2 -2
  13. package/out/controller/control/exp-bar/exp-bar.controller.d.ts +3 -3
  14. package/out/controller/control/exp-bar/exp-bar.controller.d.ts.map +1 -1
  15. package/out/controller/control/exp-bar/exp-bar.controller.js +22 -11
  16. package/out/controller/control/exp-bar/tree-exp-bar.controller.d.ts +13 -1
  17. package/out/controller/control/exp-bar/tree-exp-bar.controller.d.ts.map +1 -1
  18. package/out/controller/control/exp-bar/tree-exp-bar.controller.js +29 -12
  19. package/out/controller/control/form/edit-form/edit-form.controller.d.ts +1 -1
  20. package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map +1 -1
  21. package/out/controller/control/form/edit-form/edit-form.controller.js +14 -6
  22. package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
  23. package/out/controller/control/grid/grid/grid.controller.js +0 -4
  24. package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.js +3 -3
  25. package/out/controller/control/medit-view-panel/medit-view-panel.controller.d.ts +3 -8
  26. package/out/controller/control/medit-view-panel/medit-view-panel.controller.d.ts.map +1 -1
  27. package/out/controller/control/medit-view-panel/medit-view-panel.controller.js +28 -39
  28. package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.d.ts +11 -1
  29. package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.d.ts.map +1 -1
  30. package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.js +27 -14
  31. package/out/controller/control/tree/tree.controller.d.ts +1 -0
  32. package/out/controller/control/tree/tree.controller.d.ts.map +1 -1
  33. package/out/controller/control/tree/tree.controller.js +25 -0
  34. package/out/controller/control/wizard-panel/wizard-panel.controller.d.ts +8 -0
  35. package/out/controller/control/wizard-panel/wizard-panel.controller.d.ts.map +1 -1
  36. package/out/controller/control/wizard-panel/wizard-panel.controller.js +58 -15
  37. package/out/controller/utils/index.d.ts +1 -0
  38. package/out/controller/utils/index.d.ts.map +1 -1
  39. package/out/controller/utils/index.js +1 -0
  40. package/out/controller/utils/route/route.d.ts +10 -0
  41. package/out/controller/utils/route/route.d.ts.map +1 -0
  42. package/out/controller/utils/route/route.js +11 -0
  43. package/out/controller/utils/view-msg/view-msg-controller.d.ts.map +1 -1
  44. package/out/controller/utils/view-msg/view-msg-controller.js +10 -1
  45. package/out/interface/common/i-data-ability-params/i-data-ability-params.d.ts +7 -0
  46. package/out/interface/common/i-data-ability-params/i-data-ability-params.d.ts.map +1 -1
  47. package/out/interface/controller/common/i-nav-view-msg/i-nav-view-msg.d.ts +9 -0
  48. package/out/interface/controller/common/i-nav-view-msg/i-nav-view-msg.d.ts.map +1 -1
  49. package/out/interface/controller/common/view-message/i-view-message.d.ts +9 -0
  50. package/out/interface/controller/common/view-message/i-view-message.d.ts.map +1 -1
  51. package/out/interface/controller/controller/control/i-exp-bar-control.controller.d.ts +1 -1
  52. package/out/interface/controller/controller/control/i-exp-bar-control.controller.d.ts.map +1 -1
  53. package/out/interface/controller/controller/control/i-md-control.controller.d.ts +7 -0
  54. package/out/interface/controller/controller/control/i-md-control.controller.d.ts.map +1 -1
  55. package/out/interface/controller/controller/control/i-medit-view-panel.controller.d.ts +6 -0
  56. package/out/interface/controller/controller/control/i-medit-view-panel.controller.d.ts.map +1 -1
  57. package/out/interface/controller/controller/control/i-tree.controller.d.ts +8 -0
  58. package/out/interface/controller/controller/control/i-tree.controller.d.ts.map +1 -1
  59. package/out/interface/controller/state/control/i-medit-view-panel.state.d.ts +5 -0
  60. package/out/interface/controller/state/control/i-medit-view-panel.state.d.ts.map +1 -1
  61. package/out/interface/controller/state/control/i-tree.state.d.ts +7 -0
  62. package/out/interface/controller/state/control/i-tree.state.d.ts.map +1 -1
  63. package/out/logic-scheduler/executor/app-ui-action-executor.d.ts.map +1 -1
  64. package/out/logic-scheduler/executor/app-ui-action-executor.js +4 -0
  65. package/out/service/service/entity/util/util.d.ts +1 -0
  66. package/out/service/service/entity/util/util.d.ts.map +1 -1
  67. package/out/service/service/entity/util/util.js +1 -0
  68. package/out/service/service/work-flow/work-flow.service.d.ts +11 -0
  69. package/out/service/service/work-flow/work-flow.service.d.ts.map +1 -1
  70. package/out/service/service/work-flow/work-flow.service.js +15 -2
  71. package/out/service/vo/control.vo.d.ts.map +1 -1
  72. package/out/service/vo/control.vo.js +11 -0
  73. package/out/service/vo/tree-node-data/tree-code-list-node-data.d.ts +0 -1
  74. package/out/service/vo/tree-node-data/tree-code-list-node-data.d.ts.map +1 -1
  75. package/out/service/vo/tree-node-data/tree-code-list-node-data.js +0 -1
  76. package/out/ui-action/provider/backend-ui-action-provider.d.ts.map +1 -1
  77. package/out/ui-action/provider/backend-ui-action-provider.js +3 -1
  78. package/package.json +7 -8
  79. package/src/controller/common/control/md-control.controller.ts +1 -1
  80. package/src/controller/common/view/view.controller.ts +6 -0
  81. package/src/controller/control/calendar/calendar.controller.ts +5 -5
  82. package/src/controller/control/chart/generator/base-series-generator.ts +5 -2
  83. package/src/controller/control/exp-bar/calendar-exp-bar.controller.ts +2 -2
  84. package/src/controller/control/exp-bar/exp-bar.controller.ts +23 -14
  85. package/src/controller/control/exp-bar/tree-exp-bar.controller.ts +30 -11
  86. package/src/controller/control/form/edit-form/edit-form.controller.ts +16 -7
  87. package/src/controller/control/grid/grid/grid.controller.ts +0 -3
  88. package/src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts +3 -3
  89. package/src/controller/control/medit-view-panel/medit-view-panel.controller.ts +30 -46
  90. package/src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts +31 -11
  91. package/src/controller/control/tree/tree.controller.ts +36 -0
  92. package/src/controller/control/wizard-panel/wizard-panel.controller.ts +67 -18
  93. package/src/controller/utils/index.ts +1 -0
  94. package/src/controller/utils/route/route.ts +11 -0
  95. package/src/controller/utils/view-msg/view-msg-controller.ts +11 -1
  96. package/src/interface/common/i-data-ability-params/i-data-ability-params.ts +8 -0
  97. package/src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts +10 -0
  98. package/src/interface/controller/common/view-message/i-view-message.ts +10 -0
  99. package/src/interface/controller/controller/control/i-exp-bar-control.controller.ts +1 -1
  100. package/src/interface/controller/controller/control/i-md-control.controller.ts +8 -0
  101. package/src/interface/controller/controller/control/i-medit-view-panel.controller.ts +8 -1
  102. package/src/interface/controller/controller/control/i-tree.controller.ts +9 -0
  103. package/src/interface/controller/state/control/i-medit-view-panel.state.ts +6 -0
  104. package/src/interface/controller/state/control/i-tree.state.ts +8 -0
  105. package/src/logic-scheduler/executor/app-ui-action-executor.ts +8 -1
  106. package/src/service/service/entity/util/util.ts +1 -0
  107. package/src/service/service/work-flow/work-flow.service.ts +20 -2
  108. package/src/service/vo/control.vo.ts +12 -0
  109. package/src/service/vo/tree-node-data/tree-code-list-node-data.ts +0 -3
  110. package/src/ui-action/provider/backend-ui-action-provider.ts +5 -1
@@ -1,8 +1,6 @@
1
1
  /* eslint-disable no-shadow */
2
2
  import { RuntimeError } from '@ibiz-template/core';
3
3
  import { createUUID } from 'qx-util';
4
- import { calcDeCodeNameById } from '../../../model';
5
- import { Srfuf } from '../../../service';
6
4
  import { MDControlController } from '../../common';
7
5
  import { MEditViewPanelService } from './medit-view-panel.service';
8
6
  /**
@@ -15,11 +13,6 @@ import { MEditViewPanelService } from './medit-view-panel.service';
15
13
  export class MEditViewPanelController extends MDControlController {
16
14
  constructor() {
17
15
  super(...arguments);
18
- /**
19
- * 是否显示底部按钮
20
- *
21
- */
22
- this.showButton = true;
23
16
  /**
24
17
  * 当前应用视图参数对象
25
18
  *
@@ -37,6 +30,7 @@ export class MEditViewPanelController extends MDControlController {
37
30
  this.state.panelUiItems = [];
38
31
  this.state.activeTab = '';
39
32
  this.state.size = 1000;
33
+ this.state.isNeedScroll = false;
40
34
  }
41
35
  /**
42
36
  * 初始化嵌入应用视图及实体参数对象
@@ -75,11 +69,16 @@ export class MEditViewPanelController extends MDControlController {
75
69
  */
76
70
  async afterLoad(args, items) {
77
71
  await super.afterLoad(args, items);
72
+ // 找出临时UI数据
73
+ const tempPanelUiItems = this.state.panelUiItems.filter(UiItem => {
74
+ return UiItem.id.startsWith('mockId:');
75
+ });
78
76
  this.state.panelUiItems = [];
79
- this.doItems(items);
77
+ this.doItems(items, tempPanelUiItems);
80
78
  // 设置默认激活
81
79
  if (this.model.panelStyle === 'TAB_TOP' &&
82
- this.state.panelUiItems.length > 0) {
80
+ this.state.panelUiItems.length > 0 &&
81
+ tempPanelUiItems.length === 0) {
83
82
  this.state.activeTab = this.state.panelUiItems[0].id;
84
83
  }
85
84
  return items;
@@ -128,11 +127,14 @@ export class MEditViewPanelController extends MDControlController {
128
127
  * @author: zhujiamin
129
128
  * @Date: 2023-10-16 15:00:02
130
129
  */
131
- doItems(datas) {
130
+ doItems(datas, tempPanelUiItems) {
132
131
  datas.forEach((arg) => {
133
132
  const item = this.handlePanelItemParams(arg);
134
133
  this.state.panelUiItems.push(item);
135
134
  });
135
+ if (tempPanelUiItems) {
136
+ this.state.panelUiItems.push(...tempPanelUiItems);
137
+ }
136
138
  }
137
139
  /**
138
140
  * 处理添加
@@ -141,6 +143,7 @@ export class MEditViewPanelController extends MDControlController {
141
143
  * @Date: 2023-10-16 15:18:01
142
144
  */
143
145
  async handleAdd() {
146
+ this.state.isNeedScroll = true;
144
147
  this.doItems([{ srfuf: 0 }]);
145
148
  if (this.model.panelStyle === 'TAB_TOP') {
146
149
  // 上分页添加后激活最后一个
@@ -156,6 +159,7 @@ export class MEditViewPanelController extends MDControlController {
156
159
  * @Date: 2023-10-16 15:23:59
157
160
  */
158
161
  async handleDelete(item) {
162
+ this.state.isNeedScroll = false;
159
163
  // 新建的界面上删除即可
160
164
  if (item.data.srfuf === 0) {
161
165
  // 删除items中已删除的项
@@ -165,7 +169,7 @@ export class MEditViewPanelController extends MDControlController {
165
169
  this.state.panelUiItems.splice(index, 1);
166
170
  }
167
171
  else {
168
- await this.remove({ data: [item.data] });
172
+ await this.remove({ data: [item.data], notRefresh: true });
169
173
  }
170
174
  }
171
175
  /**
@@ -215,46 +219,31 @@ export class MEditViewPanelController extends MDControlController {
215
219
  onViewDataChange(args, id) {
216
220
  // 新建的保存成功后该部件需要保存来更新数据
217
221
  if (args.eventName === 'onSaveSuccess') {
218
- this.save(args.data[0], id);
222
+ this.handleDataChange(args.data[0], id);
219
223
  }
220
224
  }
221
225
  /**
222
- * 保存
226
+ * 处理数据变化
223
227
  *
224
228
  * @param {ControlVO} data
225
229
  * @returns {*} {Promise<void>}
226
230
  */
227
- async save(data, id) {
231
+ async handleDataChange(data, id) {
228
232
  const panelUiItemIndex = this.state.panelUiItems.findIndex(item => item.id === id);
229
- if (!panelUiItemIndex) {
233
+ if (panelUiItemIndex < 0) {
230
234
  throw new RuntimeError('编辑视图面板部件UI数据不存在');
231
235
  }
232
- await this.startLoading();
233
- let res;
234
- const isCreate = data.srfuf === Srfuf.CREATE;
235
- const deName = calcDeCodeNameById(this.model.appDataEntityId);
236
- const tempContext = this.context.clone();
237
- tempContext[deName] = data.srfkey;
238
- try {
239
- res = isCreate
240
- ? await this.service.create(tempContext, data)
241
- : await this.service.update(tempContext, data);
236
+ const tempUiItem = this.state.panelUiItems[panelUiItemIndex];
237
+ if (tempUiItem.id.startsWith('mockId:')) {
238
+ this.state.panelUiItems[panelUiItemIndex] =
239
+ this.handlePanelItemParams(data);
242
240
  }
243
- catch (error) {
244
- await this.evt.emit('onSaveError', undefined);
245
- this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}ERROR`, {
246
- error: error,
247
- data: this.state.panelUiItems[panelUiItemIndex].data,
248
- });
249
- throw error;
241
+ else {
242
+ tempUiItem.srfmajortext = data.srfmajortext;
250
243
  }
251
- finally {
252
- await this.endLoading();
244
+ if (this.model.panelStyle === 'TAB_TOP') {
245
+ // 上分页保存后激活保存的这一个
246
+ this.state.activeTab = this.state.panelUiItems[panelUiItemIndex].id;
253
247
  }
254
- // 后续处理
255
- const index = this.state.items.findIndex(item => item.srfkey === data.srfkey);
256
- this.state.items.splice(index, 1, res.data);
257
- this.state.panelUiItems.splice(panelUiItemIndex, 1, this.handlePanelItemParams(res.data));
258
- await this.evt.emit('onSaveSuccess', undefined);
259
248
  }
260
249
  }
@@ -34,6 +34,16 @@ export declare class TabExpPanelController extends ControlController<ITabExpPane
34
34
  * @memberof ExpBarControlController
35
35
  */
36
36
  get isCache(): boolean;
37
+ /**
38
+ * 当前路由视图的层级
39
+ *
40
+ * @author zk
41
+ * @date 2023-07-11 10:07:20
42
+ * @readonly
43
+ * @type {(number | undefined)}
44
+ * @memberof ExpBarControlController
45
+ */
46
+ get routeDepth(): number | undefined;
37
47
  /**
38
48
  * 初始化state的属性
39
49
  *
@@ -76,7 +86,7 @@ export declare class TabExpPanelController extends ControlController<ITabExpPane
76
86
  * @protected
77
87
  * @param {IDETabViewPanel} [tab=this.activeTabViewPanelModel!]
78
88
  */
79
- protected changeToTab(tab?: IDETabViewPanel): void;
89
+ protected changeToTab(tab?: IDETabViewPanel, isRoutePushed?: boolean): void;
80
90
  /**
81
91
  * 当前激活tab模型
82
92
  *
@@ -1 +1 @@
1
- {"version":3,"file":"tab-exp-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EAEtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAC5E,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,aAAa,UAAQ;IAErB;;;;;OAKG;IACH,UAAU,UAAS;IAEnB;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAiBpB;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAoBvB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CACnB,GAAG,GAAE,eAA+C,GACnD,IAAI;IAKP;;;;;;;;OAQG;IACH,IAAI,uBAAuB,IAAI,eAAe,CAI7C;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtC;;;;;OAKG;IACH,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG;QAC5C,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IA6BD;;;;;;;;OAQG;IACI,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG,WAAW;CAUjE"}
1
+ {"version":3,"file":"tab-exp-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EAEtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAC5E,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,aAAa,UAAQ;IAErB;;;;;OAKG;IACH,UAAU,UAAS;IAEnB;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAiBpB;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CACnB,GAAG,GAAE,eAA+C,EACpD,aAAa,UAAQ,GACpB,IAAI;IAQP;;;;;;;;OAQG;IACH,IAAI,uBAAuB,IAAI,eAAe,CAI7C;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtC;;;;;OAKG;IACH,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG;QAC5C,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IA6BD;;;;;;;;OAQG;IACI,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG,WAAW;CAUjE"}
@@ -1,6 +1,7 @@
1
1
  import { calcDeCodeNameById } from '../../../model';
2
2
  import { calcNavParams } from '../../../utils';
3
3
  import { ControlController } from '../../common';
4
+ import { hasSubRoute } from '../../utils';
4
5
  /**
5
6
  * 分页导航面板
6
7
  *
@@ -45,6 +46,18 @@ export class TabExpPanelController extends ControlController {
45
46
  }
46
47
  return ibiz.config.view.expCacheMode.includes(this.model.controlType);
47
48
  }
49
+ /**
50
+ * 当前路由视图的层级
51
+ *
52
+ * @author zk
53
+ * @date 2023-07-11 10:07:20
54
+ * @readonly
55
+ * @type {(number | undefined)}
56
+ * @memberof ExpBarControlController
57
+ */
58
+ get routeDepth() {
59
+ return this.view.modal.routeDepth;
60
+ }
48
61
  /**
49
62
  * 初始化state的属性
50
63
  *
@@ -124,23 +137,20 @@ export class TabExpPanelController extends ControlController {
124
137
  * @memberof TabExpPanelController
125
138
  */
126
139
  initDefaultPage() {
127
- const initFirstPage = () => {
128
- this.state.activeName = this.state.tabPages[0].tabTag;
129
- this.handleTabChange();
130
- };
131
- if (!this.state.defaultTabName) {
132
- initFirstPage();
133
- }
134
- else {
140
+ // 跳转指定的默认分页
141
+ if (this.state.defaultTabName) {
135
142
  const activeTab = this.state.tabPages.find(item => item.tabTag === this.state.defaultTabName);
136
- if (!activeTab) {
137
- initFirstPage();
138
- }
139
- else {
143
+ if (activeTab) {
140
144
  this.state.activeName = activeTab.tabTag;
141
- this.changeToTab();
145
+ this.changeToTab(this.activeTabViewPanelModel,
146
+ // 路由模式下并且有子路由
147
+ this.routeDepth !== undefined && hasSubRoute(this.routeDepth));
148
+ return;
142
149
  }
143
150
  }
151
+ // 没有默认分页或者匹配不到时,跳转第一个分页
152
+ this.state.activeName = this.state.tabPages[0].tabTag;
153
+ this.handleTabChange();
144
154
  }
145
155
  /**
146
156
  * 切换分页
@@ -149,8 +159,11 @@ export class TabExpPanelController extends ControlController {
149
159
  * @protected
150
160
  * @param {IDETabViewPanel} [tab=this.activeTabViewPanelModel!]
151
161
  */
152
- changeToTab(tab = this.activeTabViewPanelModel) {
162
+ changeToTab(tab = this.activeTabViewPanelModel, isRoutePushed = false) {
153
163
  const navViewMsg = this.getNavViewMsg(tab);
164
+ if (isRoutePushed === true) {
165
+ navViewMsg.isRoutePushed = true;
166
+ }
154
167
  this.evt.emit('onNavViewChange', { navViewMsg });
155
168
  }
156
169
  /**
@@ -114,5 +114,6 @@ export declare class TreeController extends MDControlController<IDETree, ITreeSt
114
114
  * @return {*} {Promise<void>}
115
115
  */
116
116
  refreshNodeChildren(nodeData: ITreeNodeData | IData, refreshParent?: boolean): Promise<void>;
117
+ expandNodeByKey(expandKeys: string[]): Promise<void>;
117
118
  }
118
119
  //# sourceMappingURL=tree.controller.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cAQX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAsBjE;;;;;;OAMG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAyCrE;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7D;;;;;;OAMG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAYhE;;;;;;OAMG;IACG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIjD;;;;;;;;OAQG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG;QACpD,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IAQD;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;IAgBlD;;;;;;;OAOG;IACG,mBAAmB,CACvB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC;CA+BjB"}
1
+ {"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cASX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAsBjE;;;;;;OAMG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAyCrE;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAgC7D;;;;;;OAMG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAYhE;;;;;;OAMG;IACG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIjD;;;;;;;;OAQG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG;QACpD,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IAQD;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;IAgBlD;;;;;;;OAOG;IACG,mBAAmB,CACvB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC;IAgCV,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CA0B3D"}
@@ -29,6 +29,7 @@ export class TreeController extends MDControlController {
29
29
  // 根节点初始化
30
30
  this.state.defaultExpandedKeys = [];
31
31
  this.state.expandedKeys = [];
32
+ this.state.navigational = false;
32
33
  this.state.size = 0;
33
34
  }
34
35
  async onCreated() {
@@ -121,6 +122,13 @@ export class TreeController extends MDControlController {
121
122
  * @memberof TreeController
122
123
  */
123
124
  async onTreeNodeClick(nodeData) {
125
+ // 导航的时候,没有导航视图的时候,节点后续点击逻辑都不走,也不选中
126
+ if (this.state.navigational) {
127
+ const nodeModel = this.getNodeModel(nodeData.nodeId);
128
+ if (!(nodeModel === null || nodeModel === void 0 ? void 0 : nodeModel.navAppViewId)) {
129
+ return;
130
+ }
131
+ }
124
132
  // 单选时,单击才会触发选中逻辑
125
133
  if (this.state.singleSelect) {
126
134
  // 选中相关处理
@@ -296,4 +304,21 @@ export class TreeController extends MDControlController {
296
304
  children: nodes,
297
305
  });
298
306
  }
307
+ async expandNodeByKey(expandKeys) {
308
+ const noExpandKeys = expandKeys.filter(key => !this.state.expandedKeys.includes(key));
309
+ if (noExpandKeys.length === 0) {
310
+ return;
311
+ }
312
+ // 找到已存在的要展开的节点
313
+ const existNodes = this.state.items.filter(item => noExpandKeys.includes(item.id));
314
+ // 补充所有未展开的节点标识,查询过程中会自动加载后续展开
315
+ this.state.expandedKeys.push(...noExpandKeys);
316
+ if (existNodes.length === 0) {
317
+ return;
318
+ }
319
+ // 展开加载节点
320
+ await Promise.all(existNodes.map(node => {
321
+ return this.loadNodes(node);
322
+ }));
323
+ }
299
324
  }
@@ -103,6 +103,14 @@ export declare class WizardPanelController extends ControlController<IDEWizardPa
103
103
  * @Date: 2023-06-08 14:06:25
104
104
  */
105
105
  onFormSaved(event: EventBase): void;
106
+ /**
107
+ * 根据tag获取应该激活的向导表单
108
+ * @param {string} tag
109
+ * @return {*}
110
+ * @author: zhujiamin
111
+ * @Date: 2023-11-10 18:35:37
112
+ */
113
+ getWizardFormByTag(tag: string): IDEWizardForm | undefined;
106
114
  /**
107
115
  * 执行初始化操作,存在初始化实体行为的时候加载数据并把主键放入上下文
108
116
  *
@@ -1 +1 @@
1
- {"version":3,"file":"wizard-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/wizard-panel/wizard-panel.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,aAAa,EACb,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,gBAAgB,EAChB,SAAS,EACV,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;;GAQG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CACvB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,OAAO,EAAG,kBAAkB,CAAC;IAE7B;;;;;;;OAOG;IACH,UAAU,EAAE,MAAM,EAAE,CAAM;IAE1B;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;OAKG;IACH,SAAS,EAAE,aAAa,GAAG,SAAS,CAAa;IAEjD;;;;;OAKG;IACH,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAa;IAE7D;;;;;OAKG;IACH,KAAK,EAAE,MAAM,EAAE,CAAM;IAErB;;;;;OAKG;IACH,QAAQ,EAAE,KAAK,CAAM;IAErB,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2C1C;;;;;;;OAOG;IACH,IAAI,gBAAgB,IAAI,aAAa,GAAG,SAAS,CAWhD;IAED;;;;;;;OAOG;IACH,IAAI,oBAAoB,IAAI,kBAAkB,CAO7C;IAED;;;;;;OAMG;IACH,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI;IAO5D;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAQnC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAejC;;;;;;;OAOG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAYlC;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IA2ClC;;;;;;OAMG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CAKrC"}
1
+ {"version":3,"file":"wizard-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/wizard-panel/wizard-panel.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,aAAa,EACb,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,gBAAgB,EAChB,SAAS,EACV,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;;GAQG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CACvB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,OAAO,EAAG,kBAAkB,CAAC;IAE7B;;;;;;;OAOG;IACH,UAAU,EAAE,MAAM,EAAE,CAAM;IAE1B;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;OAKG;IACH,SAAS,EAAE,aAAa,GAAG,SAAS,CAAa;IAEjD;;;;;OAKG;IACH,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAa;IAE7D;;;;;OAKG;IACH,KAAK,EAAE,MAAM,EAAE,CAAM;IAErB;;;;;OAKG;IACH,QAAQ,EAAE,KAAK,CAAM;IAErB,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2C1C;;;;;;;OAOG;IACH,IAAI,gBAAgB,IAAI,aAAa,GAAG,SAAS,CAWhD;IAED;;;;;;;OAOG;IACH,IAAI,oBAAoB,IAAI,kBAAkB,CAO7C;IAED;;;;;;OAMG;IACH,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI;IAO5D;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAQnC;;;;;;OAMG;IACH,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAgB1D;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BjC;;;;;;;OAOG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBlC;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IA6ClC;;;;;;OAMG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CAKrC"}
@@ -163,6 +163,27 @@ export class WizardPanelController extends ControlController {
163
163
  this.context[deName] = data.srfkey;
164
164
  }
165
165
  }
166
+ /**
167
+ * 根据tag获取应该激活的向导表单
168
+ * @param {string} tag
169
+ * @return {*}
170
+ * @author: zhujiamin
171
+ * @Date: 2023-11-10 18:35:37
172
+ */
173
+ getWizardFormByTag(tag) {
174
+ var _a;
175
+ if (!((_a = this.model.dewizard) === null || _a === void 0 ? void 0 : _a.dewizardForms)) {
176
+ throw new RuntimeError(`没有配置向导表单集合`);
177
+ return;
178
+ }
179
+ const wizardForm = this.model.dewizard.dewizardForms.find((form) => {
180
+ return form.formTag === tag;
181
+ });
182
+ if (!wizardForm) {
183
+ throw new RuntimeError(`找不到标识为${tag}的向导表单`);
184
+ }
185
+ return wizardForm;
186
+ }
166
187
  /**
167
188
  * 执行初始化操作,存在初始化实体行为的时候加载数据并把主键放入上下文
168
189
  *
@@ -178,8 +199,18 @@ export class WizardPanelController extends ControlController {
178
199
  if (res.data && res.data.srfkey) {
179
200
  this.context[deName] = res.data.srfkey;
180
201
  }
202
+ // 初始化时状态向导面板根据状态属性去决定当前激活哪个表单
203
+ if (res.data &&
204
+ this.model.stateAppDEFieldId &&
205
+ res.data[this.model.stateAppDEFieldId]) {
206
+ const activeForm = this.getWizardFormByTag(res.data[this.model.stateAppDEFieldId]);
207
+ if (activeForm) {
208
+ this.state.activeFormTag = activeForm.formTag;
209
+ }
210
+ }
181
211
  }
182
- if (this.firstForm) {
212
+ // 没有激活的表单标识就选配置的首表单
213
+ if (!this.state.activeFormTag && this.firstForm) {
183
214
  this.state.activeFormTag = this.firstForm.formTag;
184
215
  this.tagHistory.push(this.firstForm.formTag);
185
216
  }
@@ -205,10 +236,19 @@ export class WizardPanelController extends ControlController {
205
236
  */
206
237
  async onPrevClick() {
207
238
  // 先执行表单返回行为
208
- await this.activeFormController.goBack();
209
- // 返回上一个表单
210
- this.tagHistory.pop();
211
- const prevTag = this.tagHistory[this.tagHistory.length - 1];
239
+ const data = await this.activeFormController.goBack();
240
+ let prevTag;
241
+ // 返回上一个表单优先级 stateAppDEFieldId > tagHistory
242
+ if (this.model.stateAppDEFieldId && data[this.model.stateAppDEFieldId]) {
243
+ const wizardForm = this.getWizardFormByTag(data[this.model.stateAppDEFieldId]);
244
+ if (wizardForm) {
245
+ prevTag = data[this.model.stateAppDEFieldId];
246
+ }
247
+ }
248
+ else {
249
+ prevTag = this.tagHistory[this.tagHistory.length - 1];
250
+ this.tagHistory.pop();
251
+ }
212
252
  if (!prevTag) {
213
253
  throw new RuntimeError('没有上一个表单');
214
254
  }
@@ -226,13 +266,18 @@ export class WizardPanelController extends ControlController {
226
266
  const data = await this.activeFormController.save();
227
267
  let nextTag;
228
268
  if (data.srfnextform) {
229
- const wizardForm = this.model.dewizard.dewizardForms.find((_wizardForm) => {
230
- return _wizardForm.formTag === data.srfnextform;
231
- });
232
- if (!wizardForm) {
233
- throw new RuntimeError(`找不到标识为${data.srfnextform}的向导表单`);
269
+ const wizardForm = this.getWizardFormByTag(data.srfnextform);
270
+ if (wizardForm) {
271
+ nextTag = data.srfnextform;
272
+ this.tagHistory.push(nextTag);
273
+ }
274
+ }
275
+ else if (this.model.stateAppDEFieldId &&
276
+ data[this.model.stateAppDEFieldId]) {
277
+ const wizardForm = this.getWizardFormByTag(data[this.model.stateAppDEFieldId]);
278
+ if (wizardForm) {
279
+ nextTag = data[this.model.stateAppDEFieldId];
234
280
  }
235
- nextTag = data.srfnextform;
236
281
  }
237
282
  else {
238
283
  // 通过步骤找,找到下一个步骤对应的第一个向导表单
@@ -246,10 +291,8 @@ export class WizardPanelController extends ControlController {
246
291
  if (!nextWizardStep) {
247
292
  throw new RuntimeError('找不到下一个向导步骤');
248
293
  }
249
- const nextWizardForm = this.model.dewizard.dewizardForms.find((wizardForm) => {
250
- return wizardForm.formTag === nextWizardStep.stepTag;
251
- });
252
- if (nextWizardForm) {
294
+ const nextWizardForm = this.getWizardFormByTag(nextWizardStep.stepTag);
295
+ if (nextWizardForm && nextWizardForm.formTag) {
253
296
  nextTag = nextWizardForm.formTag;
254
297
  }
255
298
  }
@@ -2,6 +2,7 @@ export * from './counter';
2
2
  export * from './loading/loading.state';
3
3
  export * from './button-state';
4
4
  export * from './event';
5
+ export * from './route/route';
5
6
  export * from './util/util';
6
7
  export * from './value-rule/value-rule';
7
8
  export * from './value-ex/value-ex';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC"}
@@ -2,6 +2,7 @@ export * from './counter';
2
2
  export * from './loading/loading.state';
3
3
  export * from './button-state';
4
4
  export * from './event';
5
+ export * from './route/route';
5
6
  export * from './util/util';
6
7
  export * from './value-rule/value-rule';
7
8
  export * from './value-ex/value-ex';
@@ -0,0 +1,10 @@
1
+ /**
2
+ * 是否有子路由路径
3
+ * @author lxm
4
+ * @date 2023-11-08 10:12:54
5
+ * @export
6
+ * @param {number} routeDepth
7
+ * @return {*} {boolean}
8
+ */
9
+ export declare function hasSubRoute(routeDepth: number): boolean;
10
+ //# sourceMappingURL=route.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/route/route.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAEvD"}
@@ -0,0 +1,11 @@
1
+ /**
2
+ * 是否有子路由路径
3
+ * @author lxm
4
+ * @date 2023-11-08 10:12:54
5
+ * @export
6
+ * @param {number} routeDepth
7
+ * @return {*} {boolean}
8
+ */
9
+ export function hasSubRoute(routeDepth) {
10
+ return window.location.hash.split('/').length > routeDepth * 2 + 2;
11
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"view-msg-controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/view-msg/view-msg-controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,WAAW,EACX,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,qBAAa,iBAAiB;IAgBhB,SAAS,CAAC,UAAU,EAAE,MAAM;IAfxC;;;;;OAKG;IACH,QAAQ,EAAG,gBAAgB,CAAC;IAE5B;;;;OAIG;IACH,UAAU,2BAAkC;gBAEtB,UAAU,EAAE,MAAM;IAExC;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B5C,cAAc,CACZ,aAAa,EAAE,cAAc,EAC7B,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,GAAG,SAAS;IAOrB;;;;;;;;;OASG;WACU,YAAY,CACvB,QAAQ,EAAE,oBAAoB,EAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBnB;;;;;;;OAOG;IACG,gBAAgB,CACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,EAAE,CAAC;IAsB1B;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,sBAAsB,GAAG,YAAY;IAoBrE;;;;;;;;;OASG;cACa,YAAY,CAC1B,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,EAAE,CAAC;CAqE3B"}
1
+ {"version":3,"file":"view-msg-controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/view-msg/view-msg-controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,WAAW,EACX,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,qBAAa,iBAAiB;IAgBhB,SAAS,CAAC,UAAU,EAAE,MAAM;IAfxC;;;;;OAKG;IACH,QAAQ,EAAG,gBAAgB,CAAC;IAE5B;;;;OAIG;IACH,UAAU,2BAAkC;gBAEtB,UAAU,EAAE,MAAM;IAExC;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B5C,cAAc,CACZ,aAAa,EAAE,cAAc,EAC7B,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,GAAG,SAAS;IAOrB;;;;;;;;;OASG;WACU,YAAY,CACvB,QAAQ,EAAE,oBAAoB,EAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBnB;;;;;;;OAOG;IACG,gBAAgB,CACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,EAAE,CAAC;IAsB1B;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,sBAAsB,GAAG,YAAY;IA8BrE;;;;;;;;;OASG;cACa,YAAY,CAC1B,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,EAAE,CAAC;CAqE3B"}
@@ -107,7 +107,9 @@ export class ViewMsgController {
107
107
  */
108
108
  calcStaticMsg(detail) {
109
109
  const { position: position1 } = detail;
110
- const { title, message, removeMode, position: position2, messageType, } = this.viewMsgMap.get(detail.appViewMsgId);
110
+ const viewMsg = this.viewMsgMap.get(detail.appViewMsgId);
111
+ const { title, message, removeMode, position: position2, messageType, } = viewMsg;
112
+ const { userTag, userTag2, userTag3, userTag4 } = viewMsg;
111
113
  // detail里的位置优先
112
114
  const position = position1 || position2;
113
115
  return {
@@ -116,6 +118,13 @@ export class ViewMsgController {
116
118
  position,
117
119
  messageType,
118
120
  removeMode,
121
+ // 额外参数
122
+ extraParams: {
123
+ userTag,
124
+ userTag2,
125
+ userTag3,
126
+ userTag4,
127
+ },
119
128
  };
120
129
  }
121
130
  /**
@@ -28,5 +28,12 @@ export interface IDataAbilityParams {
28
28
  * @type {IData[]}
29
29
  */
30
30
  data?: IData[] | IData;
31
+ /**
32
+ * 是否静默执行,不出loading效果,不弹成功提示
33
+ * @author lxm
34
+ * @date 2023-11-10 06:35:27
35
+ * @type {boolean}
36
+ */
37
+ silent?: boolean;
31
38
  }
32
39
  //# sourceMappingURL=i-data-ability-params.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-data-ability-params.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-data-ability-params/i-data-ability-params.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;CACxB"}
1
+ {"version":3,"file":"i-data-ability-params.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-data-ability-params/i-data-ability-params.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IAEvB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB"}
@@ -59,5 +59,14 @@ export interface INavViewMsg {
59
59
  * @memberof INavViewMsg
60
60
  */
61
61
  isCache?: boolean;
62
+ /**
63
+ * 是否404
64
+ *
65
+ * @author zk
66
+ * @date 2023-09-26 06:09:17
67
+ * @type {string}
68
+ * @memberof INavViewMsg
69
+ */
70
+ is404?: boolean;
62
71
  }
63
72
  //# sourceMappingURL=i-nav-view-msg.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-nav-view-msg.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}
1
+ {"version":3,"file":"i-nav-view-msg.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB"}
@@ -35,5 +35,14 @@ export interface IViewMessage {
35
35
  * @type {string}
36
36
  */
37
37
  message?: string;
38
+ /**
39
+ * 额外参数
40
+ *
41
+ * @author zk
42
+ * @date 2023-11-06 11:11:50
43
+ * @type {IData}
44
+ * @memberof IViewMessage
45
+ */
46
+ extraParams: IData;
38
47
  }
39
48
  //# sourceMappingURL=i-view-message.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-view-message.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/view-message/i-view-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAElC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IAEzC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;IAEvC;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}
1
+ {"version":3,"file":"i-view-message.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/view-message/i-view-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAElC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IAEzC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;IAEvC;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;;OAOG;IACH,WAAW,EAAE,KAAK,CAAC;CACpB"}
@@ -60,6 +60,6 @@ export interface IExpBarControlController<T extends IExpBar = IExpBar, S extends
60
60
  onRouterChange(info: {
61
61
  srfnav: string;
62
62
  path: string;
63
- }): void;
63
+ }): Promise<void>;
64
64
  }
65
65
  //# sourceMappingURL=i-exp-bar-control.controller.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-exp-bar-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-exp-bar-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,WAAW,wBAAwB,CACvC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACnD,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CACnD,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnC;;;;;;;OAOG;IACH,eAAe,EAAE,oBAAoB,CAAC;IACtC;;;;;;;OAOG;IACH,iBAAiB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAClD;;;;;;;OAOG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEzB;;;;;;;;OAQG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,WAAW,CAAC;IAE5E;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CAC9D"}
1
+ {"version":3,"file":"i-exp-bar-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-exp-bar-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,WAAW,wBAAwB,CACvC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACnD,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CACnD,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnC;;;;;;;OAOG;IACH,eAAe,EAAE,oBAAoB,CAAC;IACtC;;;;;;;OAOG;IACH,iBAAiB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAClD;;;;;;;OAOG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEzB;;;;;;;;OAQG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,WAAW,CAAC;IAE5E;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvE"}
@@ -25,6 +25,13 @@ export interface MDCtrlRemoveParams extends IDataAbilityParams {
25
25
  * @type {boolean}
26
26
  */
27
27
  silent?: boolean;
28
+ /**
29
+ * 是否不需要刷新(默认为否,如果不需要刷新传true)
30
+ * @author lxm
31
+ * @date 2023-08-17 06:04:23
32
+ * @type {boolean}
33
+ */
34
+ notRefresh?: boolean;
28
35
  }
29
36
  /**
30
37
  * 多数据部件控制器
@@ -1 +1 @@
1
- {"version":3,"file":"i-md-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-md-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,oBAAoB,CACnC,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnC;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;;;;OAKG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,CAAC;IAEnB;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAEvC;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC"}
1
+ {"version":3,"file":"i-md-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-md-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,oBAAoB,CACnC,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnC;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;;;;OAKG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,CAAC;IAEnB;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAEvC;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC"}