@ibiz-template/runtime 0.2.13 → 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 (33) hide show
  1. package/dist/index.esm.js +97 -67
  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/control/form/edit-form/edit-form.controller.d.ts +1 -1
  6. package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map +1 -1
  7. package/out/controller/control/form/edit-form/edit-form.controller.js +14 -6
  8. package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
  9. package/out/controller/control/grid/grid/grid.controller.js +0 -4
  10. package/out/controller/control/medit-view-panel/medit-view-panel.controller.d.ts +3 -8
  11. package/out/controller/control/medit-view-panel/medit-view-panel.controller.d.ts.map +1 -1
  12. package/out/controller/control/medit-view-panel/medit-view-panel.controller.js +28 -39
  13. package/out/controller/control/wizard-panel/wizard-panel.controller.d.ts +8 -0
  14. package/out/controller/control/wizard-panel/wizard-panel.controller.d.ts.map +1 -1
  15. package/out/controller/control/wizard-panel/wizard-panel.controller.js +58 -15
  16. package/out/interface/common/i-data-ability-params/i-data-ability-params.d.ts +7 -0
  17. package/out/interface/common/i-data-ability-params/i-data-ability-params.d.ts.map +1 -1
  18. package/out/interface/controller/controller/control/i-md-control.controller.d.ts +7 -0
  19. package/out/interface/controller/controller/control/i-md-control.controller.d.ts.map +1 -1
  20. package/out/interface/controller/controller/control/i-medit-view-panel.controller.d.ts +6 -0
  21. package/out/interface/controller/controller/control/i-medit-view-panel.controller.d.ts.map +1 -1
  22. package/out/interface/controller/state/control/i-medit-view-panel.state.d.ts +5 -0
  23. package/out/interface/controller/state/control/i-medit-view-panel.state.d.ts.map +1 -1
  24. package/package.json +6 -6
  25. package/src/controller/common/control/md-control.controller.ts +1 -1
  26. package/src/controller/control/form/edit-form/edit-form.controller.ts +16 -7
  27. package/src/controller/control/grid/grid/grid.controller.ts +0 -3
  28. package/src/controller/control/medit-view-panel/medit-view-panel.controller.ts +30 -46
  29. package/src/controller/control/wizard-panel/wizard-panel.controller.ts +67 -18
  30. package/src/interface/common/i-data-ability-params/i-data-ability-params.ts +8 -0
  31. package/src/interface/controller/controller/control/i-md-control.controller.ts +8 -0
  32. package/src/interface/controller/controller/control/i-medit-view-panel.controller.ts +8 -1
  33. package/src/interface/controller/state/control/i-medit-view-panel.state.ts +6 -0
package/out/controller/common/control/md-control.controller.js CHANGED
@@ -251,7 +251,7 @@ export class MDControlController extends ControlController {
251
251
  });
252
252
  }
253
253
  // 刷新数据，补全这一页缺少的数据
254
- if (needRefresh) {
254
+ if (needRefresh && !(args === null || args === void 0 ? void 0 : args.notRefresh)) {
255
255
  await this.refresh();
256
256
  }
257
257
  }
package/out/controller/control/form/edit-form/edit-form.controller.d.ts CHANGED
@@ -74,7 +74,7 @@ export declare class EditFormController extends FormController<IDEEditForm, IEdi
74
74
  * @date 2022-09-01 09:09:36
75
75
  * @returns {*}
76
76
  */
77
- goBack(): Promise<void>;
77
+ goBack(): Promise<IData>;
78
78
  /**
79
79
  * 表单项更新
80
80
  *
package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map CHANGED
@@ -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":"AAOA,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,EACnB,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;;;;;;;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;IAiC1D;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA8CtC;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA4CrD;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IAqDrD;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IA4CzD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C7D;;;;;;;OAOG;IACG,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBvD;;;;;;;OAOG;IACG,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}
1
+ {"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,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,EACnB,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;;;;;;;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;IAiC1D;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA8CtC;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA4CrD;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA6DrD;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IA4CzD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC;IAe9B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C7D;;;;;;;OAOG;IACG,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBvD;;;;;;;OAOG;IACG,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}
package/out/controller/control/form/edit-form/edit-form.controller.js CHANGED
@@ -179,6 +179,7 @@ export class EditFormController extends FormController {
179
179
  * @date 2022-08-31 22:08:40
180
180
  */
181
181
  async save(args) {
182
+ const silent = (args === null || args === void 0 ? void 0 : args.silent) === true;
182
183
  // 如果数据正在处理中，则延迟保存
183
184
  if (this.state.processing) {
184
185
  const data = await awaitTimeout(500, this.save.bind(this));
@@ -188,7 +189,9 @@ export class EditFormController extends FormController {
188
189
  if (!isValid) {
189
190
  throw new RuntimeError('请检查表单填写！');
190
191
  }
191
- await this.startLoading();
192
+ if (!silent) {
193
+ await this.startLoading();
194
+ }
192
195
  await this.evt.emit('onBeforeSave', undefined);
193
196
  const { context, data } = this.handlerAbilityParams(args);
194
197
  const saveData = data[0];
@@ -207,7 +210,9 @@ export class EditFormController extends FormController {
207
210
  throw error;
208
211
  }
209
212
  finally {
210
- await this.endLoading();
213
+ if (!silent) {
214
+ await this.endLoading();
215
+ }
211
216
  }
212
217
  // 保存结束后合并修改临时主键
213
218
  if (res.data) {
@@ -217,9 +222,11 @@ export class EditFormController extends FormController {
217
222
  this.state.modified = false;
218
223
  await this.evt.emit('onSaveSuccess', undefined);
219
224
  this.formStateNotify(FormNotifyState.SAVE);
220
- this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
221
- default: `${this.data.srfmajortext || ''}保存成功`,
222
- });
225
+ if (!silent) {
226
+ this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
227
+ default: `${this.data.srfmajortext || ''}保存成功`,
228
+ });
229
+ }
223
230
  if (this.view.modal.mode === 'ROUTE') {
224
231
  ibiz.mc.command.send(this.data.$origin, isCreate ? 'OBJECTCREATED' : 'OBJECTUPDATED');
225
232
  }
@@ -294,6 +301,7 @@ export class EditFormController extends FormController {
294
301
  if (res.data) {
295
302
  mergeInLeft(this.data, res.data);
296
303
  }
304
+ return this.data;
297
305
  }
298
306
  /**
299
307
  * 表单项更新
@@ -411,7 +419,7 @@ export class EditFormController extends FormController {
411
419
  if (this.model.enableAutoSave) {
412
420
  // 自动保存静默，报错直接控制台输出
413
421
  try {
414
- await this.save();
422
+ await this.save({ silent: true });
415
423
  }
416
424
  catch (error) {
417
425
  ibiz.log.error(error);
package/out/controller/control/grid/grid/grid.controller.d.ts.map CHANGED
@@ -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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"}
package/out/controller/control/grid/grid/grid.controller.js CHANGED
@@ -383,7 +383,6 @@ export class GridController extends MDControlController {
383
383
  if (!isValid) {
384
384
  throw new RuntimeError('行数据校验不通过，保存取消');
385
385
  }
386
- await this.startLoading();
387
386
  let res;
388
387
  const deName = calcDeCodeNameById(this.model.appDataEntityId);
389
388
  const tempContext = this.context.clone();
@@ -401,9 +400,6 @@ export class GridController extends MDControlController {
401
400
  });
402
401
  throw error;
403
402
  }
404
- finally {
405
- await this.endLoading();
406
- }
407
403
  // 后续处理
408
404
  const index = this.findRowStateIndex(data);
409
405
  this.state.items.splice(index, 1, res.data);
package/out/controller/control/medit-view-panel/medit-view-panel.controller.d.ts CHANGED
@@ -12,11 +12,6 @@ import { MEditViewPanelService } from './medit-view-panel.service';
12
12
  */
13
13
  export declare class MEditViewPanelController extends MDControlController<IDEMultiEditViewPanel, IMEditViewPanelState, IMEditViewPanelEvent> implements IMEditViewPanelController {
14
14
  service: MEditViewPanelService;
15
- /**
16
- * 是否显示底部按钮
17
- *
18
- */
19
- showButton: boolean;
20
15
  /**
21
16
  * 当前应用视图参数对象
22
17
  *
@@ -56,7 +51,7 @@ export declare class MEditViewPanelController extends MDControlController<IDEMul
56
51
  * @author: zhujiamin
57
52
  * @Date: 2023-10-16 15:00:02
58
53
  */
59
- doItems(datas: ControlVO[]): void;
54
+ doItems(datas: ControlVO[], tempPanelUiItems?: IPanelUiItem[]): void;
60
55
  /**
61
56
  * 处理添加
62
57
  * @return {*}
@@ -97,11 +92,11 @@ export declare class MEditViewPanelController extends MDControlController<IDEMul
97
92
  */
98
93
  onViewDataChange(args: DataChangeEvent, id: string): void;
99
94
  /**
100
- * 保存
95
+ * 处理数据变化
101
96
  *
102
97
  * @param {ControlVO} data
103
98
  * @returns {*} {Promise<void>}
104
99
  */
105
- save(data: ControlVO, id: string): Promise<void>;
100
+ handleDataChange(data: ControlVO, id: string): Promise<void>;
106
101
  }
107
102
  //# sourceMappingURL=medit-view-panel.controller.d.ts.map
package/out/controller/control/medit-view-panel/medit-view-panel.controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"medit-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/medit-view-panel/medit-view-panel.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,yBAAyB,EACzB,gBAAgB,EAChB,YAAY,EACZ,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,SAAS,EAAS,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE;;;;;;GAMG;AACH,qBAAa,wBACX,SAAQ,mBAAmB,CACzB,qBAAqB,EACrB,oBAAoB,EACpB,oBAAoB,CAEtB,YAAW,yBAAyB;IAE5B,OAAO,EAAE,qBAAqB,CAAC;IAEvC;;;OAGG;IACH,UAAU,EAAE,OAAO,CAAQ;IAE3B;;;OAGG;IACH,UAAU,EAAE,KAAK,EAAE,CAAM;cAET,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBrC;;;;;;;;OAQG;IACG,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IAcvB;;;;;;OAMG;IACH,qBAAqB,CAAC,GAAG,EAAE,SAAS,GAAG,YAAY;IAiCnD;;;;;;OAMG;IACH,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI;IAOjC;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAShC;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAarD;;;;;;OAMG;IACG,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBvE;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAW9B;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAOzD;;;;;OAKG;IACG,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAuCvD"}
1
+ {"version":3,"file":"medit-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/medit-view-panel/medit-view-panel.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,yBAAyB,EACzB,gBAAgB,EAChB,YAAY,EACZ,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE;;;;;;GAMG;AACH,qBAAa,wBACX,SAAQ,mBAAmB,CACzB,qBAAqB,EACrB,oBAAoB,EACpB,oBAAoB,CAEtB,YAAW,yBAAyB;IAE5B,OAAO,EAAE,qBAAqB,CAAC;IAEvC;;;OAGG;IACH,UAAU,EAAE,KAAK,EAAE,CAAM;cAET,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBrC;;;;;;;;OAQG;IACG,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IAmBvB;;;;;;OAMG;IACH,qBAAqB,CAAC,GAAG,EAAE,SAAS,GAAG,YAAY;IAiCnD;;;;;;OAMG;IACH,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,gBAAgB,CAAC,EAAE,YAAY,EAAE,GAAG,IAAI;IAUpE;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhC;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAcrD;;;;;;OAMG;IACG,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBvE;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAW9B;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAOzD;;;;;OAKG;IACG,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAmBnE"}
package/out/controller/control/medit-view-panel/medit-view-panel.controller.js CHANGED
@@ -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
  }
package/out/controller/control/wizard-panel/wizard-panel.controller.d.ts CHANGED
@@ -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
  *
package/out/controller/control/wizard-panel/wizard-panel.controller.d.ts.map CHANGED
@@ -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"}
package/out/controller/control/wizard-panel/wizard-panel.controller.js CHANGED
@@ -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
  }
package/out/interface/common/i-data-ability-params/i-data-ability-params.d.ts CHANGED
@@ -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
package/out/interface/common/i-data-ability-params/i-data-ability-params.d.ts.map CHANGED
@@ -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"}
package/out/interface/controller/controller/control/i-md-control.controller.d.ts CHANGED
@@ -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
  * 多数据部件控制器
package/out/interface/controller/controller/control/i-md-control.controller.d.ts.map CHANGED
@@ -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"}
package/out/interface/controller/controller/control/i-medit-view-panel.controller.d.ts CHANGED
@@ -10,5 +10,11 @@ import { IMDControlController } from './i-md-control.controller';
10
10
  * @extends {IMDControlController<IDEMultiEditViewPanel, IMEditViewPanelState, IMEditViewPanelEvent>}
11
11
  */
12
12
  export interface IMEditViewPanelController<T extends IDEMultiEditViewPanel = IDEMultiEditViewPanel, S extends IMEditViewPanelState = IMEditViewPanelState, E extends IMEditViewPanelEvent = IMEditViewPanelEvent> extends IMDControlController<T, S, E> {
13
+ /**
14
+ * 处理添加
15
+ *
16
+ * @memberof IMEditViewPanelController
17
+ */
18
+ handleAdd(): Promise<void>;
13
19
  }
14
20
  //# sourceMappingURL=i-medit-view-panel.controller.d.ts.map
package/out/interface/controller/controller/control/i-medit-view-panel.controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"i-medit-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-medit-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;GAMG;AACH,MAAM,WAAW,yBAAyB,CACxC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EACvD,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EACrD,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,CACrD,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;CAAG"}
1
+ {"version":3,"file":"i-medit-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-medit-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;GAMG;AACH,MAAM,WAAW,yBAAyB,CACxC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EACvD,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EACrD,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,CACrD,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACrC;;;;OAIG;IACH,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B"}
package/out/interface/controller/state/control/i-medit-view-panel.state.d.ts CHANGED
@@ -25,5 +25,10 @@ export interface IMEditViewPanelState extends IMDControlState {
25
25
  *
26
26
  */
27
27
  activeTab: string;
28
+ /**
29
+ * 是否需要滚动
30
+ *
31
+ */
32
+ isNeedScroll: boolean;
28
33
  }
29
34
  //# sourceMappingURL=i-medit-view-panel.state.d.ts.map
package/out/interface/controller/state/control/i-medit-view-panel.state.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"i-medit-view-panel.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-medit-view-panel.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,YAAY;IAE3B,EAAE,EAAE,MAAM,CAAC;IAEX,OAAO,EAAE,KAAK,CAAC;IAEf,MAAM,EAAE,KAAK,CAAC;IAEd,IAAI,EAAE,SAAS,CAAC;IAEhB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D;;;OAGG;IACH,YAAY,EAAE,YAAY,EAAE,CAAC;IAE7B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB"}
1
+ {"version":3,"file":"i-medit-view-panel.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-medit-view-panel.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,YAAY;IAE3B,EAAE,EAAE,MAAM,CAAC;IAEX,OAAO,EAAE,KAAK,CAAC;IAEf,MAAM,EAAE,KAAK,CAAC;IAEd,IAAI,EAAE,SAAS,CAAC;IAEhB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D;;;OAGG;IACH,YAAY,EAAE,YAAY,EAAE,CAAC;IAE7B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,YAAY,EAAE,OAAO,CAAC;CACvB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ibiz-template/runtime",
3
- "version": "0.2.13",
3
+ "version": "0.2.15",
4
4
  "description": "控制器包",
5
5
  "type": "module",
6
6
  "main": "out/index.js",
@@ -29,11 +29,11 @@
29
29
  "author": "chitanda",
30
30
  "license": "MIT",
31
31
  "devDependencies": {
32
- "@ibiz-template/core": "^0.2.13",
32
+ "@ibiz-template/core": "^0.2.15",
33
33
  "@ibiz/model-core": "^0.0.20",
34
- "@types/path-browserify": "^1.0.0",
35
- "@types/qs": "^6.9.8",
36
- "@types/systemjs": "^6.13.3",
34
+ "@types/path-browserify": "^1.0.2",
35
+ "@types/qs": "^6.9.10",
36
+ "@types/systemjs": "^6.13.5",
37
37
  "async-validator": "^4.2.5",
38
38
  "dayjs": "^1.11.10",
39
39
  "echarts": "^5.4.3",
@@ -46,7 +46,7 @@
46
46
  "ramda": "^0.29.1"
47
47
  },
48
48
  "peerDependencies": {
49
- "@ibiz-template/core": "^0.1.0",
49
+ "@ibiz-template/core": "^0.2.13",
50
50
  "@ibiz/model-core": "^0.0.20",
51
51
  "async-validator": "^4.2.5",
52
52
  "dayjs": "^1.11.7",
package/src/controller/common/control/md-control.controller.ts CHANGED
@@ -318,7 +318,7 @@ export class MDControlController<
318
318
  }
319
319
 
320
320
  // 刷新数据，补全这一页缺少的数据
321
- if (needRefresh) {
321
+ if (needRefresh && !args?.notRefresh) {
322
322
  await this.refresh();
323
323
  }
324
324
  } catch (error) {