@ibiz-template/runtime 0.7.34 → 0.7.37-alpha.3

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 (198) hide show
  1. package/dist/index.esm.js +10345 -8522
  2. package/dist/index.system.min.js +1 -1
  3. package/out/constant/view-call-tag.d.ts +5 -1
  4. package/out/constant/view-call-tag.d.ts.map +1 -1
  5. package/out/constant/view-call-tag.js +4 -0
  6. package/out/controller/common/control/md-control.controller.d.ts +8 -1
  7. package/out/controller/common/control/md-control.controller.d.ts.map +1 -1
  8. package/out/controller/common/control/md-control.controller.js +23 -0
  9. package/out/controller/common/editor/code-list-editor.controller.d.ts +45 -1
  10. package/out/controller/common/editor/code-list-editor.controller.d.ts.map +1 -1
  11. package/out/controller/common/editor/code-list-editor.controller.js +71 -0
  12. package/out/controller/common/view/view.controller.d.ts +2 -1
  13. package/out/controller/common/view/view.controller.d.ts.map +1 -1
  14. package/out/controller/common/view/view.controller.js +3 -0
  15. package/out/controller/control/app-menu/custom-app-menu.controller.d.ts +10 -2
  16. package/out/controller/control/app-menu/custom-app-menu.controller.d.ts.map +1 -1
  17. package/out/controller/control/app-menu/custom-app-menu.controller.js +10 -2
  18. package/out/controller/control/caption-bar/caption-bar.controller.d.ts.map +1 -1
  19. package/out/controller/control/caption-bar/caption-bar.controller.js +8 -0
  20. package/out/controller/control/chart/chart.controller.d.ts +1 -1
  21. package/out/controller/control/chart/chart.controller.d.ts.map +1 -1
  22. package/out/controller/control/chart/chart.controller.js +3 -3
  23. package/out/controller/control/chart/generator/base-series-generator.d.ts +16 -2
  24. package/out/controller/control/chart/generator/base-series-generator.d.ts.map +1 -1
  25. package/out/controller/control/chart/generator/base-series-generator.js +89 -12
  26. package/out/controller/control/chart/generator/chart-options-generator.d.ts +13 -4
  27. package/out/controller/control/chart/generator/chart-options-generator.d.ts.map +1 -1
  28. package/out/controller/control/chart/generator/chart-options-generator.js +147 -33
  29. package/out/controller/control/dashboard/custom-dashboard.controller.d.ts +15 -3
  30. package/out/controller/control/dashboard/custom-dashboard.controller.d.ts.map +1 -1
  31. package/out/controller/control/dashboard/custom-dashboard.controller.js +39 -4
  32. package/out/controller/control/dashboard/dashboard.controller.d.ts +72 -1
  33. package/out/controller/control/dashboard/dashboard.controller.d.ts.map +1 -1
  34. package/out/controller/control/dashboard/dashboard.controller.js +235 -1
  35. package/out/controller/control/dashboard/dashboard.util.d.ts +72 -0
  36. package/out/controller/control/dashboard/dashboard.util.d.ts.map +1 -0
  37. package/out/controller/control/dashboard/dashboard.util.js +191 -0
  38. package/out/controller/control/dashboard/index.d.ts +1 -0
  39. package/out/controller/control/dashboard/index.d.ts.map +1 -1
  40. package/out/controller/control/dashboard/index.js +1 -0
  41. package/out/controller/control/dashboard/portlet/chart-portlet/chart-portlet.controller.d.ts.map +1 -1
  42. package/out/controller/control/dashboard/portlet/chart-portlet/chart-portlet.controller.js +1 -0
  43. package/out/controller/control/dashboard/portlet/filter-portlet/filter-portlet.controller.d.ts +97 -0
  44. package/out/controller/control/dashboard/portlet/filter-portlet/filter-portlet.controller.d.ts.map +1 -0
  45. package/out/controller/control/dashboard/portlet/filter-portlet/filter-portlet.controller.js +155 -0
  46. package/out/controller/control/dashboard/portlet/filter-portlet/index.d.ts +2 -0
  47. package/out/controller/control/dashboard/portlet/filter-portlet/index.d.ts.map +1 -0
  48. package/out/controller/control/dashboard/portlet/filter-portlet/index.js +1 -0
  49. package/out/controller/control/dashboard/portlet/filter-portlet/portlet-part.state.d.ts +19 -0
  50. package/out/controller/control/dashboard/portlet/filter-portlet/portlet-part.state.d.ts.map +1 -0
  51. package/out/controller/control/dashboard/portlet/filter-portlet/portlet-part.state.js +24 -0
  52. package/out/controller/control/dashboard/portlet/index.d.ts +1 -0
  53. package/out/controller/control/dashboard/portlet/index.d.ts.map +1 -1
  54. package/out/controller/control/dashboard/portlet/index.js +1 -0
  55. package/out/controller/control/dashboard/portlet/list-portlet/list-portlet.controller.d.ts.map +1 -1
  56. package/out/controller/control/dashboard/portlet/list-portlet/list-portlet.controller.js +1 -0
  57. package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.d.ts +24 -0
  58. package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.d.ts.map +1 -1
  59. package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.js +50 -3
  60. package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.state.d.ts +6 -0
  61. package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.state.d.ts.map +1 -1
  62. package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.state.js +6 -0
  63. package/out/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.d.ts.map +1 -1
  64. package/out/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.js +4 -8
  65. package/out/controller/control/dashboard/portlet/view-portlet/view-portlet.controller.d.ts.map +1 -1
  66. package/out/controller/control/dashboard/portlet/view-portlet/view-portlet.controller.js +1 -0
  67. package/out/controller/control/exp-bar/chart-exp-bar.controller.d.ts.map +1 -1
  68. package/out/controller/control/exp-bar/chart-exp-bar.controller.js +3 -1
  69. package/out/controller/control/form/edit-form/edit-form.controller.d.ts +3 -2
  70. package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map +1 -1
  71. package/out/controller/control/form/edit-form/edit-form.controller.js +5 -2
  72. package/out/controller/control/form/form/form.controller.d.ts +14 -1
  73. package/out/controller/control/form/form/form.controller.d.ts.map +1 -1
  74. package/out/controller/control/form/form/form.controller.js +24 -1
  75. package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.d.ts +7 -1
  76. package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.d.ts.map +1 -1
  77. package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.js +19 -0
  78. package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts +6 -0
  79. package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts.map +1 -1
  80. package/out/controller/control/form/form-detail/form-item/form-item.controller.js +18 -0
  81. package/out/controller/control/grid/grid/entity-schema.d.ts.map +1 -1
  82. package/out/controller/control/grid/grid/entity-schema.js +4 -4
  83. package/out/controller/control/grid/grid/grid-column.controller.d.ts.map +1 -1
  84. package/out/controller/control/grid/grid/grid-column.controller.js +12 -0
  85. package/out/controller/control/grid/grid/grid.controller.d.ts +16 -1
  86. package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
  87. package/out/controller/control/grid/grid/grid.controller.js +40 -13
  88. package/out/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.d.ts.map +1 -1
  89. package/out/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.js +4 -2
  90. package/out/controller/control/list/list.controller.d.ts.map +1 -1
  91. package/out/controller/control/list/list.controller.js +1 -0
  92. package/out/controller/control/panel/panel/panel-item.controller.d.ts +1 -1
  93. package/out/controller/control/panel/panel/panel-item.controller.d.ts.map +1 -1
  94. package/out/controller/control/panel/panel/panel-item.controller.js +2 -1
  95. package/out/controller/control/search-bar/entity-schema.js +4 -4
  96. package/out/controller/control/search-bar/search-bar.controller.js +1 -1
  97. package/out/controller/control/tree/tree.controller.d.ts.map +1 -1
  98. package/out/controller/control/tree/tree.controller.js +40 -29
  99. package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.d.ts +7 -0
  100. package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.d.ts.map +1 -1
  101. package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.js +12 -0
  102. package/out/controller/utils/button-state/button-container.state.d.ts +1 -0
  103. package/out/controller/utils/button-state/button-container.state.d.ts.map +1 -1
  104. package/out/controller/utils/button-state/button-container.state.js +18 -4
  105. package/out/controller/utils/code-list/code-list.d.ts +66 -0
  106. package/out/controller/utils/code-list/code-list.d.ts.map +1 -1
  107. package/out/controller/utils/code-list/code-list.js +146 -0
  108. package/out/engine/view-base.engine.d.ts +8 -0
  109. package/out/engine/view-base.engine.d.ts.map +1 -1
  110. package/out/engine/view-base.engine.js +43 -0
  111. package/out/install.d.ts.map +1 -1
  112. package/out/install.js +4 -1
  113. package/out/interface/common/i-redraw-data/i-redraw-data.d.ts +37 -0
  114. package/out/interface/common/i-redraw-data/i-redraw-data.d.ts.map +1 -0
  115. package/out/interface/common/i-redraw-data/i-redraw-data.js +1 -0
  116. package/out/interface/common/index.d.ts +1 -0
  117. package/out/interface/common/index.d.ts.map +1 -1
  118. package/out/interface/controller/common/custom-design/i-custom-design.d.ts +12 -3
  119. package/out/interface/controller/common/custom-design/i-custom-design.d.ts.map +1 -1
  120. package/out/interface/controller/controller/control/i-dashboard.controller.d.ts +54 -0
  121. package/out/interface/controller/controller/control/i-dashboard.controller.d.ts.map +1 -1
  122. package/out/interface/controller/controller/control/i-form.controller.d.ts +7 -0
  123. package/out/interface/controller/controller/control/i-form.controller.d.ts.map +1 -1
  124. package/out/interface/controller/controller/control/panel-item/i-panel-item-coop-pos.controller.d.ts +7 -0
  125. package/out/interface/controller/controller/control/panel-item/i-panel-item-coop-pos.controller.d.ts.map +1 -1
  126. package/out/interface/controller/controller/control/portlet/i-portlet.controller.d.ts +16 -0
  127. package/out/interface/controller/controller/control/portlet/i-portlet.controller.d.ts.map +1 -1
  128. package/out/interface/controller/controller/view/i-view.controller.d.ts +8 -1
  129. package/out/interface/controller/controller/view/i-view.controller.d.ts.map +1 -1
  130. package/out/interface/controller/event/argument/base.event.d.ts +20 -0
  131. package/out/interface/controller/event/argument/base.event.d.ts.map +1 -1
  132. package/out/interface/controller/event/argument/index.d.ts +1 -0
  133. package/out/interface/controller/event/argument/index.d.ts.map +1 -1
  134. package/out/interface/controller/event/argument/redraw-view.event.d.ts +19 -0
  135. package/out/interface/controller/event/argument/redraw-view.event.d.ts.map +1 -0
  136. package/out/interface/controller/event/argument/redraw-view.event.js +1 -0
  137. package/out/interface/controller/event/control/i-dashboard.event.d.ts +12 -0
  138. package/out/interface/controller/event/control/i-dashboard.event.d.ts.map +1 -1
  139. package/out/interface/controller/event/view/i-view.event.d.ts +14 -1
  140. package/out/interface/controller/event/view/i-view.event.d.ts.map +1 -1
  141. package/out/interface/controller/state/control/i-caption-bar.state.d.ts +14 -0
  142. package/out/interface/controller/state/control/i-caption-bar.state.d.ts.map +1 -1
  143. package/out/interface/controller/state/control/i-md-control.state.d.ts +7 -0
  144. package/out/interface/controller/state/control/i-md-control.state.d.ts.map +1 -1
  145. package/out/interface/util/i-fullscreen-util/i-fullscreen-util.d.ts +7 -0
  146. package/out/interface/util/i-fullscreen-util/i-fullscreen-util.d.ts.map +1 -1
  147. package/out/locale/en/index.d.ts +7 -0
  148. package/out/locale/en/index.d.ts.map +1 -1
  149. package/out/locale/en/index.js +7 -0
  150. package/out/locale/zh-CN/index.d.ts +7 -0
  151. package/out/locale/zh-CN/index.d.ts.map +1 -1
  152. package/out/locale/zh-CN/index.js +7 -0
  153. package/out/service/index.d.ts +1 -0
  154. package/out/service/index.d.ts.map +1 -1
  155. package/out/service/index.js +1 -0
  156. package/out/service/mqtt/collaborate.service.d.ts +89 -0
  157. package/out/service/mqtt/collaborate.service.d.ts.map +1 -0
  158. package/out/service/mqtt/collaborate.service.js +121 -0
  159. package/out/service/service/control/md-control.service.d.ts.map +1 -1
  160. package/out/service/service/control/md-control.service.js +3 -0
  161. package/out/service/service/entity/method/de-action.d.ts +11 -0
  162. package/out/service/service/entity/method/de-action.d.ts.map +1 -1
  163. package/out/service/service/entity/method/de-action.js +36 -5
  164. package/out/service/utils/dynamic-code-list/dynamic-code-list.js +1 -1
  165. package/out/service/utils/search-filter/search-filter.d.ts.map +1 -1
  166. package/out/service/utils/search-filter/search-filter.js +1 -0
  167. package/out/service/vo/chart-data/chart-data.d.ts +2 -1
  168. package/out/service/vo/chart-data/chart-data.d.ts.map +1 -1
  169. package/out/service/vo/chart-data/chart-data.js +2 -1
  170. package/out/types.d.ts +9 -1
  171. package/out/types.d.ts.map +1 -1
  172. package/out/ui-action/provider/front-ui-action-provider.d.ts +11 -1
  173. package/out/ui-action/provider/front-ui-action-provider.d.ts.map +1 -1
  174. package/out/ui-action/provider/front-ui-action-provider.js +34 -4
  175. package/out/ui-logic/utils/handle-src-val.d.ts.map +1 -1
  176. package/out/ui-logic/utils/handle-src-val.js +9 -1
  177. package/out/utils/collaborate-manager/collaborate-manager.d.ts +65 -0
  178. package/out/utils/collaborate-manager/collaborate-manager.d.ts.map +1 -0
  179. package/out/utils/collaborate-manager/collaborate-manager.js +102 -0
  180. package/out/utils/collaborate-room/collaborate-room.d.ts +83 -0
  181. package/out/utils/collaborate-room/collaborate-room.d.ts.map +1 -0
  182. package/out/utils/collaborate-room/collaborate-room.js +62 -0
  183. package/out/utils/dr-ctrl-util/index.d.ts +10 -0
  184. package/out/utils/dr-ctrl-util/index.d.ts.map +1 -1
  185. package/out/utils/dr-ctrl-util/index.js +29 -1
  186. package/out/utils/index.d.ts +2 -0
  187. package/out/utils/index.d.ts.map +1 -1
  188. package/out/utils/index.js +2 -0
  189. package/out/utils/jsonschema-util/jsonschema-util.d.ts +10 -0
  190. package/out/utils/jsonschema-util/jsonschema-util.d.ts.map +1 -1
  191. package/out/utils/jsonschema-util/jsonschema-util.js +22 -1
  192. package/out/utils/record-nav-util/record-nav-util.d.ts.map +1 -1
  193. package/out/utils/record-nav-util/record-nav-util.js +10 -5
  194. package/out/utils/text-util/text-util.d.ts +40 -0
  195. package/out/utils/text-util/text-util.d.ts.map +1 -1
  196. package/out/utils/text-util/text-util.js +134 -0
  197. package/out/utils/theme-util/custom-theme-util.js +4 -4
  198. package/package.json +4 -4
@@ -1,5 +1,5 @@
1
1
  import { merge } from 'lodash-es';
2
- import { IBizContext, IBizParams, Namespace } from '@ibiz-template/core';
2
+ import { IBizContext, IBizParams, listenJSEvent, Namespace, } from '@ibiz-template/core';
3
3
  import { calcLayoutHeightWidth, calcDynaClass } from '../../../../../model';
4
4
  import { ControlVO } from '../../../../../service';
5
5
  import { UIActionUtil } from '../../../../../ui-action';
@@ -87,7 +87,24 @@ export class PortletPartController {
87
87
  this.parent = parent;
88
88
  this.state = this.createState();
89
89
  this.state.context = IBizContext.create({}, this.dashboard.context);
90
- this.params = new IBizParams({}, this.dashboard.params);
90
+ const tempParams = this.getExtendParams();
91
+ if (tempParams) {
92
+ this.params = new IBizParams({}, Object.assign({ srfsearchconds: tempParams }, this.dashboard.params));
93
+ }
94
+ else {
95
+ this.params = new IBizParams({}, this.dashboard.params);
96
+ }
97
+ }
98
+ /**
99
+ * 计算视图参数
100
+ *
101
+ * @author tony001
102
+ * @date 2024-07-28 11:07:16
103
+ * @return {*} {IBizParams}
104
+ */
105
+ getExtendParams() {
106
+ const data = this.dashboard.getExtendParamsById(this.model.id);
107
+ return data.params;
91
108
  }
92
109
  /**
93
110
  * 子类不可覆盖或重写此方法,在 init 时需要重写的使用 onInit 方法。
@@ -99,6 +116,14 @@ export class PortletPartController {
99
116
  async init() {
100
117
  await this.onInit();
101
118
  }
119
+ /**
120
+ * 初始化
121
+ *
122
+ * @author tony001
123
+ * @date 2024-07-26 21:07:05
124
+ * @protected
125
+ * @return {*} {Promise<void>}
126
+ */
102
127
  async onInit() {
103
128
  this.onDataChange = this.onDataChange.bind(this);
104
129
  // 初始化布局参数
@@ -141,7 +166,29 @@ export class PortletPartController {
141
166
  * @return {*} {Promise<void>}
142
167
  */
143
168
  async refresh() {
144
- // 子类重写
169
+ const extendParams = this.getExtendParams();
170
+ if (!extendParams)
171
+ return;
172
+ if (!this.params.srfsearchconds) {
173
+ this.params.srfsearchconds = extendParams;
174
+ }
175
+ else {
176
+ Object.assign(this.params, { srfsearchconds: extendParams });
177
+ }
178
+ }
179
+ /**
180
+ * 高亮
181
+ *
182
+ * @author zzq
183
+ * @date 2024-07-29 18:07:02
184
+ * @return {*} {void}
185
+ */
186
+ hightLight() {
187
+ this.state.hightLight = true;
188
+ const cleanup = listenJSEvent(document.body, 'click', () => {
189
+ this.state.hightLight = false;
190
+ cleanup();
191
+ }, { capture: true, once: true });
145
192
  }
146
193
  /**
147
194
  * 设置配置数据
@@ -32,5 +32,11 @@ export declare class PortletPartState implements IPortletState {
32
32
  * @memberof PortletPartState
33
33
  */
34
34
  title: string | undefined;
35
+ /**
36
+ * @description 是否高亮
37
+ * @type {boolean}
38
+ * @memberof PortletPartState
39
+ */
40
+ hightLight: boolean;
35
41
  }
36
42
  //# sourceMappingURL=portlet-part.state.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"portlet-part.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/portlet-part/portlet-part.state.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,YAAY,EACZ,aAAa,EACb,qBAAqB,EACtB,MAAM,0BAA0B,CAAC;AAElC;;;;;GAKG;AACH,qBAAa,gBAAiB,YAAW,aAAa;IACpD,OAAO,EAAE,OAAO,CAAQ;IAExB,SAAS,EAAE,OAAO,CAAS;IAE3B,MAAM,EAAE,YAAY,CAMlB;IAEF,KAAK,EAAE,aAAa,CAGlB;IAEF;;;;;;OAMG;IACH,OAAO,EAAG,QAAQ,CAAC;IAEnB;;;;;OAKG;IACH,gBAAgB,EAAE,qBAAqB,GAAG,IAAI,CAAQ;IAEtD;;;;;OAKG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B"}
1
+ {"version":3,"file":"portlet-part.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/portlet-part/portlet-part.state.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,YAAY,EACZ,aAAa,EACb,qBAAqB,EACtB,MAAM,0BAA0B,CAAC;AAElC;;;;;GAKG;AACH,qBAAa,gBAAiB,YAAW,aAAa;IACpD,OAAO,EAAE,OAAO,CAAQ;IAExB,SAAS,EAAE,OAAO,CAAS;IAE3B,MAAM,EAAE,YAAY,CAMlB;IAEF,KAAK,EAAE,aAAa,CAGlB;IAEF;;;;;;OAMG;IACH,OAAO,EAAG,QAAQ,CAAC;IAEnB;;;;;OAKG;IACH,gBAAgB,EAAE,qBAAqB,GAAG,IAAI,CAAQ;IAEtD;;;;;OAKG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B;;;;OAIG;IACH,UAAU,EAAE,OAAO,CAAS;CAC7B"}
@@ -26,5 +26,11 @@ export class PortletPartState {
26
26
  * @memberof PortletPartState
27
27
  */
28
28
  this.actionGroupState = null;
29
+ /**
30
+ * @description 是否高亮
31
+ * @type {boolean}
32
+ * @memberof PortletPartState
33
+ */
34
+ this.hightLight = false;
29
35
  }
30
36
  }
@@ -1 +1 @@
1
- {"version":3,"file":"report-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,WAAW,EAA0B,MAAM,0BAA0B,CAAC;AAE/E,qBAAa,uBAAwB,SAAQ,qBAAqB,CAAC,oBAAoB,CAAC;IACtF;;;;;;;OAOG;IACH,IAAI,iBAAiB,IAAI,WAAW,GAAG,SAAS,CAM/C;IAED;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAW/B"}
1
+ {"version":3,"file":"report-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,qBAAa,uBAAwB,SAAQ,qBAAqB,CAAC,oBAAoB,CAAC;IACtF;;;;;;;OAOG;IACH,IAAI,iBAAiB,IAAI,WAAW,GAAG,SAAS,CAM/C;IAED;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ/B"}
@@ -23,15 +23,11 @@ export class ReportPortletController extends PortletPartController {
23
23
  * @return {*} {Promise<void>}
24
24
  */
25
25
  async refresh() {
26
+ await super.refresh();
26
27
  if (this.contentController) {
27
- if (this.dashboard.controlParams.multimode === 'true') {
28
- this.dashboard.evt.emit('onItemModelReset', {
29
- name: this.model.id,
30
- });
31
- }
32
- else {
33
- this.contentController.refresh();
34
- }
28
+ this.dashboard.evt.emit('onItemModelReset', {
29
+ name: this.model.id,
30
+ });
35
31
  }
36
32
  }
37
33
  }
@@ -1 +1 @@
1
- {"version":3,"file":"view-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/view-portlet/view-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAGhF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,qBAAa,qBAAsB,SAAQ,qBAAqB,CAAC,kBAAkB,CAAC;IAClF;;;;;;;OAOG;IACH,IAAI,iBAAiB,IAAI,WAAW,GAAG,SAAS,CAK/C;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,cAAc,GAAG,IAAI,CAS1C;IAED;;;;;OAKG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAO/B"}
1
+ {"version":3,"file":"view-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/view-portlet/view-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAGhF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,qBAAa,qBAAsB,SAAQ,qBAAqB,CAAC,kBAAkB,CAAC;IAClF;;;;;;;OAOG;IACH,IAAI,iBAAiB,IAAI,WAAW,GAAG,SAAS,CAK/C;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,cAAc,GAAG,IAAI,CAS1C;IAED;;;;;OAKG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ/B"}
@@ -39,6 +39,7 @@ export class ViewPortletController extends PortletPartController {
39
39
  * @date 2024-07-23 22:07:30
40
40
  */
41
41
  async refresh() {
42
+ await super.refresh();
42
43
  if (this.contentController) {
43
44
  this.contentController.callUIAction(SysUIActionTag.REFRESH);
44
45
  }
@@ -1 +1 @@
1
- {"version":3,"file":"chart-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/chart-exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAI/D;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,uBAAuB,CAC7B,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,IAAI,IAAI;IAwBhC;;;;;;;;OAQG;IACH,aAAa,CACX,UAAU,EAAE,YAAY,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,EACvD,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAsCzC;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;CAmBf"}
1
+ {"version":3,"file":"chart-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/chart-exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAI/D;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,uBAAuB,CAC7B,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,IAAI,IAAI;IA0BhC;;;;;;;;OAQG;IACH,aAAa,CACX,UAAU,EAAE,YAAY,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,EACvD,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAsCzC;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;CAmBf"}
@@ -35,7 +35,9 @@ export class ChartExpBarController extends ExpBarControlController {
35
35
  return generator.chartDataArr.length > 0 && generator.model.navAppViewId;
36
36
  });
37
37
  if (activeSeriesGenerator) {
38
- this.xDataController.setActive(activeSeriesGenerator.chartDataArr[0]);
38
+ const iterator = activeSeriesGenerator.groupData.$default_group.values();
39
+ const { chartData } = iterator.next().value;
40
+ this.xDataController.setActive(chartData);
39
41
  }
40
42
  }
41
43
  /**
@@ -1,6 +1,7 @@
1
1
  import { IPortalMessage } from '@ibiz-template/core';
2
2
  import { IAppDEEditView, IDEEditForm } from '@ibiz/model-core';
3
3
  import { IEditFormState, IEditFormEvent, IEditFormController, IViewController, IEditViewState, IEditViewEvent, IDataAbilityParams, FormSaveParams } from '../../../../interface';
4
+ import { ControlVO } from '../../../../service';
4
5
  import { FormController } from '../form';
5
6
  import { EditFormService } from './edit-form.service';
6
7
  /**
@@ -134,10 +135,10 @@ export declare class EditFormController extends FormController<IDEEditForm, IEdi
134
135
  * @author zk
135
136
  * @date 2023-12-20 10:12:06
136
137
  * @protected
137
- * @return {*} {IData}
138
+ * @return {*} {ControlVO}
138
139
  * @memberof EditFormController
139
140
  */
140
- protected getDiffData(): IData;
141
+ protected getDiffData(): ControlVO;
141
142
  /**
142
143
  * 设置simple模式的数据
143
144
  * @author lxm
@@ -1 +1 @@
1
- {"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,cAAc,EAIf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/D,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B,IAAI,IAAI,IAAI,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAM1E;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,KAAK,CAAmB;IAE3C;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAY1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACG,SAAS,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA2B1D;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA+CtC;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA8CrD;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IA0EjD;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmDzD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC;IAe9B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiE7D;;;;;;;OAOG;IACG,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BvD;;;;;;;OAOG;IACG,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB/B;;;;;OAKG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBxC;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,IAAI,KAAK;IAiB9B;;;;;OAKG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBhC;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAyBpD"}
1
+ {"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,cAAc,EAIf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/D,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAS,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B,IAAI,IAAI,IAAI,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAM1E;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,KAAK,CAAmB;IAE3C;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAY1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACG,SAAS,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA2B1D;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA+CtC;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA8CrD;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IA0EjD;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmDzD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC;IAe9B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiE7D;;;;;;;OAOG;IACG,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BvD;;;;;;;OAOG;IACG,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB/B;;;;;OAKG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBxC;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,IAAI,SAAS;IAiBlC;;;;;OAKG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAyBhC;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAyBpD"}
@@ -513,7 +513,7 @@ export class EditFormController extends FormController {
513
513
  * @author zk
514
514
  * @date 2023-12-20 10:12:06
515
515
  * @protected
516
- * @return {*} {IData}
516
+ * @return {*} {ControlVO}
517
517
  * @memberof EditFormController
518
518
  */
519
519
  getDiffData() {
@@ -543,6 +543,7 @@ export class EditFormController extends FormController {
543
543
  // data由外部直接修改,先克隆一份隔离跟外部的对象。补全对应表单项字段不存在的时候设置为null,避免响应式问题。
544
544
  const UIData = this.service.toUIData(data);
545
545
  const cloneData = UIData.clone();
546
+ this.oldData = this.state.data.clone();
546
547
  this.formItems.forEach(item => {
547
548
  if (!Object.prototype.hasOwnProperty.call(cloneData, item.name)) {
548
549
  cloneData[item.name] = null;
@@ -557,7 +558,9 @@ export class EditFormController extends FormController {
557
558
  }
558
559
  else {
559
560
  // 后续的变更都只走值变更触发
560
- this.dataChangeNotify(Object.keys(this.state.data));
561
+ const diffData = this.getDiffData().getOrigin();
562
+ // 只传递变化项名称
563
+ this.dataChangeNotify(Object.keys(diffData));
561
564
  }
562
565
  }
563
566
  /**
@@ -4,7 +4,7 @@ import { AppCounter } from '../../../../service';
4
4
  import { ControlController } from '../../../common';
5
5
  import { FormNotifyState } from '../../../constant';
6
6
  import { ControllerEvent } from '../../../utils';
7
- import type { FormGroupPanelController, FormItemController, FormMDCtrlController } from '../form-detail';
7
+ import type { FormDRUIPartController, FormGroupPanelController, FormItemController, FormMDCtrlController } from '../form-detail';
8
8
  /**
9
9
  * 表单控制器
10
10
  *
@@ -53,6 +53,12 @@ export declare abstract class FormController<T extends IDEForm = IDEForm, S exte
53
53
  * @type {FormMDCtrlController[]}
54
54
  */
55
55
  formMDCtrls: FormMDCtrlController[];
56
+ /**
57
+ * @description 表单关系界面
58
+ * @type {FormDRUIPartController[]}
59
+ * @memberof FormController
60
+ */
61
+ formDruipart: FormDRUIPartController[];
56
62
  /**
57
63
  * 计数器对象
58
64
  * @author lxm
@@ -175,5 +181,12 @@ export declare abstract class FormController<T extends IDEForm = IDEForm, S exte
175
181
  * @return {*} {void}
176
182
  */
177
183
  protected setDetailError(name: string, message: string): void;
184
+ /**
185
+ * 刷新
186
+ * - 表单刷新时刷新所有数据(表单数据,计数器数据)
187
+ * @return {*} {Promise<void>}
188
+ * @memberof FormController
189
+ */
190
+ refresh(): Promise<void>;
178
191
  }
179
192
  //# sourceMappingURL=form.controller.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"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"}
@@ -51,6 +51,12 @@ export class FormController extends ControlController {
51
51
  * @type {FormMDCtrlController[]}
52
52
  */
53
53
  this.formMDCtrls = [];
54
+ /**
55
+ * @description 表单关系界面
56
+ * @type {FormDRUIPartController[]}
57
+ * @memberof FormController
58
+ */
59
+ this.formDruipart = [];
54
60
  /**
55
61
  * 计数器对象
56
62
  * @author lxm
@@ -156,6 +162,9 @@ export class FormController extends ControlController {
156
162
  if (detail.detailType === 'MDCTRL') {
157
163
  form.formMDCtrls.push(detailController);
158
164
  }
165
+ if (detail.detailType === 'DRUIPART') {
166
+ form.formDruipart.push(detailController);
167
+ }
159
168
  // 数据容器的子不递归了
160
169
  if (isFormDataContainer(detail)) {
161
170
  return;
@@ -215,7 +224,7 @@ export class FormController extends ControlController {
215
224
  * @returns {*} {Promise<boolean>}
216
225
  */
217
226
  async validate() {
218
- const values = await Promise.all([...this.formItems, ...this.formMDCtrls].map(formItem => formItem.validate()));
227
+ const values = await Promise.all([...this.formItems, ...this.formMDCtrls, ...this.formDruipart].map(formItem => formItem.validate()));
219
228
  // 找不到value为false即全部是true
220
229
  return values.findIndex(value => !value) === -1;
221
230
  }
@@ -298,4 +307,18 @@ export class FormController extends ControlController {
298
307
  state.error = message;
299
308
  }
300
309
  }
310
+ /**
311
+ * 刷新
312
+ * - 表单刷新时刷新所有数据(表单数据,计数器数据)
313
+ * @return {*} {Promise<void>}
314
+ * @memberof FormController
315
+ */
316
+ async refresh() {
317
+ this.doNextActive(async () => {
318
+ await Promise.all(Object.values(this.counters).map(counter => counter.refresh(this.context, this.params)));
319
+ await this.load();
320
+ }, {
321
+ key: 'refresh',
322
+ });
323
+ }
301
324
  }
@@ -54,7 +54,7 @@ export declare class FormDRUIPartController extends FormDetailController<IDEForm
54
54
  * @date 2023-05-16 11:03:24
55
55
  * @type {IViewController}
56
56
  */
57
- embedView: IViewController;
57
+ embedView: IViewController | undefined;
58
58
  /**
59
59
  * 是否是新建数据(即无主键)
60
60
  * @author lxm
@@ -88,5 +88,11 @@ export declare class FormDRUIPartController extends FormDetailController<IDEForm
88
88
  * @param {ViewNeuron} neuron
89
89
  */
90
90
  setEmbedView(view: IViewController): void;
91
+ /**
92
+ * @description 关系界面校验
93
+ * @return {*} {Promise<boolean>}
94
+ * @memberof FormDRUIPartController
95
+ */
96
+ validate(): Promise<boolean>;
91
97
  }
92
98
  //# sourceMappingURL=form-druipart.controller.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"form-druipart.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGnD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,oBAAoB,CAAC,eAAe,CAAC;IACvE,KAAK,EAAE,iBAAiB,CAAC;IAEjC,SAAS,CAAC,WAAW,IAAI,iBAAiB;IAI1C;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,QAAQ,CAAC;IAEtB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;;;OAMG;IACH,YAAY,EAAE,MAAM,EAAE,CAAc;IAEpC;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAY;IAE7B;;;;;;OAMG;IACH,SAAS,EAAG,eAAe,CAAC;IAE5B;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAS;cAEX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBvC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAShD,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB5D;;;;;;OAMG;IACH,cAAc,IAAI,IAAI;IA+CtB;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;CAuB1C"}
1
+ {"version":3,"file":"form-druipart.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGxE,OAAO,EAEL,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,oBAAoB,CAAC,eAAe,CAAC;IACvE,KAAK,EAAE,iBAAiB,CAAC;IAEjC,SAAS,CAAC,WAAW,IAAI,iBAAiB;IAI1C;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,QAAQ,CAAC;IAEtB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;;;OAMG;IACH,YAAY,EAAE,MAAM,EAAE,CAAc;IAEpC;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAY;IAE7B;;;;;;OAMG;IACH,SAAS,EAAE,eAAe,GAAG,SAAS,CAAC;IAEvC;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAS;cAEX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBvC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAShD,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB5D;;;;;;OAMG;IACH,cAAc,IAAI,IAAI;IAgDtB;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAwBzC;;;;OAIG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;CAenC"}
@@ -115,6 +115,7 @@ export class FormDRUIPartController extends FormDetailController {
115
115
  // 后续算出来不一致的情况下,修改,force走render,下层视图自己刷新
116
116
  this.navContext = newContext;
117
117
  this.navParams = newParams;
118
+ // 强制刷新
118
119
  this.force();
119
120
  }
120
121
  else if (this.embedView) {
@@ -151,4 +152,22 @@ export class FormDRUIPartController extends FormDetailController {
151
152
  }
152
153
  });
153
154
  }
155
+ /**
156
+ * @description 关系界面校验
157
+ * @return {*} {Promise<boolean>}
158
+ * @memberof FormDRUIPartController
159
+ */
160
+ async validate() {
161
+ if (this.embedView) {
162
+ const { xdataControlName } = this.embedView.model;
163
+ if (xdataControlName) {
164
+ const xdataControl = this.embedView.getController(xdataControlName);
165
+ // 目前只有表格
166
+ if (xdataControl && xdataControl.validateAll) {
167
+ return xdataControl.validateAll();
168
+ }
169
+ }
170
+ }
171
+ return true;
172
+ }
154
173
  }
@@ -172,5 +172,11 @@ export declare class FormItemController extends FormDetailController<IDEFormItem
172
172
  * @date 2023-10-11 05:03:26
173
173
  */
174
174
  onEnter(event: MouseEvent): void;
175
+ /**
176
+ * 点击事件
177
+ * @author ljx
178
+ * @date 2024-08-06 10:03:26
179
+ */
180
+ onClick(event?: MouseEvent, params?: IParams): Promise<void>;
175
181
  }
176
182
  //# sourceMappingURL=form-item.controller.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAEL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,SAAS,CAMrC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAOzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;OAOG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAQhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5D,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAO5E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAgClC;;;;;;;OAOG;IACG,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQhC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQ/B;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAOjC"}
1
+ {"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAEL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,SAAS,CAMrC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAOzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;OAOG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAQhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5D,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAO5E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAgClC;;;;;;;OAOG;IACG,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQhC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQ/B;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQhC;;;;OAIG;IACG,OAAO,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;CAavE"}
@@ -305,4 +305,22 @@ export class FormItemController extends FormDetailController {
305
305
  event,
306
306
  });
307
307
  }
308
+ /**
309
+ * 点击事件
310
+ * @author ljx
311
+ * @date 2024-08-06 10:03:26
312
+ */
313
+ async onClick(event, params = {}) {
314
+ const { data } = params;
315
+ if (event) {
316
+ // 阻止冒泡
317
+ event.stopPropagation();
318
+ }
319
+ this.form.evt.emit('onFormDetailEvent', {
320
+ formDetailName: this.model.id,
321
+ formDetailEventName: FormDetailEventName.CLICK,
322
+ event,
323
+ data: data ? [data] : undefined,
324
+ });
325
+ }
308
326
  }
@@ -1 +1 @@
1
- {"version":3,"file":"entity-schema.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/entity-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AASnD;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,KAAK,EACX,CAAC,EAAE,cAAc,GAChB,OAAO,CACN;IAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;IAAC,eAAe,EAAE,eAAe,EAAE,CAAA;CAAE,GAC3E,SAAS,CACZ,CA0FA"}
1
+ {"version":3,"file":"entity-schema.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/entity-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AASnD;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,KAAK,EACX,CAAC,EAAE,cAAc,GAChB,OAAO,CACN;IAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;IAAC,eAAe,EAAE,eAAe,EAAE,CAAA;CAAE,GAC3E,SAAS,CACZ,CA2FA"}
@@ -29,7 +29,10 @@ export async function calcColumnModelBySchema(json, c) {
29
29
  codeNameToId[field.codeName.toLowerCase()] = field.id;
30
30
  });
31
31
  const addFields = [];
32
- Object.keys(properties).forEach((key) => {
32
+ const items = ibiz.util.jsonSchema
33
+ .sortProperties(Object.entries(properties))
34
+ .map(item => item[0]);
35
+ items.forEach((key) => {
33
36
  if (!codeNameToId[key]) {
34
37
  let type;
35
38
  switch (properties[key].type) {
@@ -60,9 +63,6 @@ export async function calcColumnModelBySchema(json, c) {
60
63
  });
61
64
  const addColumns = [];
62
65
  const addDataItems = [];
63
- addFields.sort((a, b) => {
64
- return (a.description || '').localeCompare(b.description || '');
65
- });
66
66
  addFields.forEach(item => {
67
67
  addColumns.push({
68
68
  appId: c.model.appId,
@@ -1 +1 @@
1
- {"version":3,"file":"grid-column.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid-column.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;;;;GAKG;AACH,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;OAKG;IACH,gBAAgB,EAAE,OAAO,CAAS;IAElC;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,eAAe,GAAG,SAAS,CAIhD;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc;IAY1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;;OAMG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAoBpE"}
1
+ {"version":3,"file":"grid-column.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid-column.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;;;;GAKG;AACH,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;OAKG;IACH,gBAAgB,EAAE,OAAO,CAAS;IAElC;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,eAAe,GAAG,SAAS,CAIhD;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc;IAY1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;;OAMG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAoCpE"}
@@ -140,6 +140,18 @@ export class GridColumnController {
140
140
  if (!scriptCode.includes('return')) {
141
141
  scriptCode = `return (${scriptCode})`;
142
142
  }
143
+ // 默认同步执行,设置自定义参数isAsync=false定义非同步执行
144
+ const { userParam } = this.model;
145
+ if (userParam && userParam.isAsync === 'false') {
146
+ return ScriptFactory.execScriptFn({
147
+ data: row.data,
148
+ context: this.context,
149
+ params: this.params,
150
+ controller: this,
151
+ ctrl: this.grid,
152
+ view: this.grid.view,
153
+ }, scriptCode, { isAsync: false });
154
+ }
143
155
  return (await ScriptFactory.asyncExecScriptFn({
144
156
  data: row.data,
145
157
  context: this.context,
@@ -28,6 +28,13 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
28
28
  */
29
29
  service: GridService;
30
30
  protected get _evt(): ControllerEvent<IGridEvent>;
31
+ /**
32
+ * @description 行编辑模式
33
+ * @readonly
34
+ * @type {('cell' | 'row' | 'all')}
35
+ * @memberof GridController
36
+ */
37
+ get editShowMode(): 'cell' | 'row' | 'all';
31
38
  /**
32
39
  * 是否有配置宽度自适应列
33
40
  *
@@ -379,6 +386,14 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
379
386
  * @returns {*}
380
387
  */
381
388
  validate(row: GridRowState): Promise<boolean>;
389
+ /**
390
+ * 校验所有编辑项
391
+ *
392
+ * @author zzq
393
+ * @date 2024-07-22 21:09:05
394
+ * @returns {Promise<boolean>}
395
+ */
396
+ validateAll(): Promise<boolean>;
382
397
  toggleRowEdit(): Promise<void>;
383
398
  /**
384
399
  * 切换单行的编辑状态
@@ -439,7 +454,7 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
439
454
  * @author: zzq
440
455
  * @Date: 2024-03-20 17:54:16
441
456
  */
442
- formatValue: (valueFormat?: string, value?: unknown) => string;
457
+ formatValue: (isDate: boolean, valueFormat?: string, value?: unknown) => string;
443
458
  /**
444
459
  * 格式化导出数据
445
460
  * @return {string}
@@ -1 +1 @@
1
- {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}