@ibiz-template/runtime 0.1.18 → 0.1.20

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 (123) hide show
  1. package/dist/index.esm.js +407 -147
  2. package/dist/index.system.min.js +1 -1
  3. package/dist/index.system.min.js.map +1 -1
  4. package/out/app-hub.d.ts +9 -0
  5. package/out/app-hub.d.ts.map +1 -1
  6. package/out/app-hub.js +14 -0
  7. package/out/application.d.ts.map +1 -1
  8. package/out/application.js +5 -12
  9. package/out/controller/common/control/control.controller.d.ts +13 -0
  10. package/out/controller/common/control/control.controller.d.ts.map +1 -1
  11. package/out/controller/common/control/control.controller.js +58 -0
  12. package/out/controller/common/control/md-control.controller.d.ts +7 -0
  13. package/out/controller/common/control/md-control.controller.d.ts.map +1 -1
  14. package/out/controller/common/control/md-control.controller.js +27 -2
  15. package/out/controller/control/dashboard/dashboard.controller.d.ts.map +1 -1
  16. package/out/controller/control/dashboard/dashboard.controller.js +3 -3
  17. package/out/controller/control/data-view/data-view.controller.d.ts.map +1 -1
  18. package/out/controller/control/data-view/data-view.controller.js +2 -1
  19. package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map +1 -1
  20. package/out/controller/control/form/edit-form/edit-form.controller.js +54 -13
  21. package/out/controller/control/form/form/form.controller.d.ts +4 -0
  22. package/out/controller/control/form/form/form.controller.d.ts.map +1 -1
  23. package/out/controller/control/form/form/form.controller.js +7 -3
  24. package/out/controller/control/form/search-form/search-form.controller.d.ts.map +1 -1
  25. package/out/controller/control/form/search-form/search-form.controller.js +11 -1
  26. package/out/controller/control/grid/grid/grid.controller.d.ts +1 -1
  27. package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
  28. package/out/controller/control/grid/grid/grid.controller.js +43 -14
  29. package/out/controller/control/list/list.controller.d.ts.map +1 -1
  30. package/out/controller/control/list/list.controller.js +2 -1
  31. package/out/controller/control/tree/tree.controller.d.ts.map +1 -1
  32. package/out/controller/control/tree/tree.controller.js +4 -1
  33. package/out/interface/common/i-app-hub-service/i-app-hub-service.d.ts +9 -0
  34. package/out/interface/common/i-app-hub-service/i-app-hub-service.d.ts.map +1 -1
  35. package/out/interface/provider/model-loader.provider.d.ts +9 -0
  36. package/out/interface/provider/model-loader.provider.d.ts.map +1 -1
  37. package/out/logic-scheduler/executor/app-ui-logic-executor.d.ts +1 -0
  38. package/out/logic-scheduler/executor/app-ui-logic-executor.d.ts.map +1 -1
  39. package/out/logic-scheduler/executor/app-ui-logic-executor.js +33 -4
  40. package/out/logic-scheduler/trigger/control-event-trigger.js +1 -1
  41. package/out/logic-scheduler/trigger/view-event-trigger.js +1 -1
  42. package/out/model/data-entity/data-entity.d.ts +11 -0
  43. package/out/model/data-entity/data-entity.d.ts.map +1 -1
  44. package/out/model/data-entity/data-entity.js +14 -0
  45. package/out/model/index.d.ts +1 -0
  46. package/out/model/index.d.ts.map +1 -1
  47. package/out/model/index.js +1 -0
  48. package/out/model/panel/data-container.d.ts +11 -0
  49. package/out/model/panel/data-container.d.ts.map +1 -0
  50. package/out/model/panel/data-container.js +12 -0
  51. package/out/model/panel/index.d.ts +2 -0
  52. package/out/model/panel/index.d.ts.map +1 -0
  53. package/out/model/panel/index.js +1 -0
  54. package/out/service/app-data-entity/app-data-entity.d.ts +1 -0
  55. package/out/service/app-data-entity/app-data-entity.d.ts.map +1 -1
  56. package/out/service/app-data-entity/app-data-entity.js +11 -1
  57. package/out/service/dto/method.dto.d.ts +2 -1
  58. package/out/service/dto/method.dto.d.ts.map +1 -1
  59. package/out/service/dto/method.dto.js +9 -4
  60. package/out/service/service/authority/authority.service.js +1 -1
  61. package/out/service/service/entity/method/de-action.d.ts.map +1 -1
  62. package/out/service/service/entity/method/de-action.js +2 -1
  63. package/out/service/service/entity/method/fetch.d.ts.map +1 -1
  64. package/out/service/service/entity/method/fetch.js +2 -1
  65. package/out/service/service/entity/method/method-input.d.ts +6 -6
  66. package/out/service/service/entity/method/method-input.d.ts.map +1 -1
  67. package/out/service/service/entity/method/method-input.js +10 -6
  68. package/out/service/service/entity/method/method-renturn.d.ts +6 -5
  69. package/out/service/service/entity/method/method-renturn.d.ts.map +1 -1
  70. package/out/service/service/entity/method/method-renturn.js +10 -5
  71. package/out/service/service/entity/method/method.d.ts.map +1 -1
  72. package/out/service/service/entity/method/method.js +5 -2
  73. package/out/service/service/entity/util/util.d.ts +12 -0
  74. package/out/service/service/entity/util/util.d.ts.map +1 -0
  75. package/out/service/service/entity/util/util.js +13 -0
  76. package/out/service/vo/control.vo.js +2 -2
  77. package/out/ui-logic/ui-logic-node/msg-box-node/msg-box-node.d.ts.map +1 -1
  78. package/out/ui-logic/ui-logic-node/msg-box-node/msg-box-node.js +0 -1
  79. package/out/utils/handlebars/helpers/index.d.ts.map +1 -1
  80. package/out/utils/handlebars/helpers/index.js +4 -2
  81. package/out/utils/handlebars/helpers/json/json-parse.d.ts +16 -0
  82. package/out/utils/handlebars/helpers/json/json-parse.d.ts.map +1 -0
  83. package/out/utils/handlebars/helpers/json/json-parse.js +19 -0
  84. package/out/utils/handlebars/helpers/json/{json.d.ts → json-stringify.d.ts} +3 -3
  85. package/out/utils/handlebars/helpers/json/json-stringify.d.ts.map +1 -0
  86. package/out/utils/handlebars/helpers/json/{json.js → json-stringify.js} +2 -2
  87. package/package.json +3 -3
  88. package/src/app-hub.ts +15 -0
  89. package/src/application.ts +8 -17
  90. package/src/controller/common/control/control.controller.ts +67 -0
  91. package/src/controller/common/control/md-control.controller.ts +28 -2
  92. package/src/controller/control/dashboard/dashboard.controller.ts +3 -3
  93. package/src/controller/control/data-view/data-view.controller.ts +2 -1
  94. package/src/controller/control/form/edit-form/edit-form.controller.ts +64 -17
  95. package/src/controller/control/form/form/form.controller.ts +11 -3
  96. package/src/controller/control/form/search-form/search-form.controller.ts +10 -1
  97. package/src/controller/control/grid/grid/grid.controller.ts +54 -18
  98. package/src/controller/control/list/list.controller.ts +2 -1
  99. package/src/controller/control/tree/tree.controller.ts +7 -1
  100. package/src/interface/common/i-app-hub-service/i-app-hub-service.ts +10 -0
  101. package/src/interface/provider/model-loader.provider.ts +10 -0
  102. package/src/logic-scheduler/executor/app-ui-logic-executor.ts +44 -7
  103. package/src/logic-scheduler/trigger/control-event-trigger.ts +1 -1
  104. package/src/logic-scheduler/trigger/view-event-trigger.ts +1 -1
  105. package/src/model/data-entity/data-entity.ts +17 -0
  106. package/src/model/index.ts +1 -0
  107. package/src/model/panel/data-container.ts +18 -0
  108. package/src/model/panel/index.ts +1 -0
  109. package/src/service/app-data-entity/app-data-entity.ts +13 -1
  110. package/src/service/dto/method.dto.ts +8 -3
  111. package/src/service/service/authority/authority.service.ts +1 -1
  112. package/src/service/service/entity/method/de-action.ts +2 -1
  113. package/src/service/service/entity/method/fetch.ts +2 -1
  114. package/src/service/service/entity/method/method-input.ts +11 -6
  115. package/src/service/service/entity/method/method-renturn.ts +11 -5
  116. package/src/service/service/entity/method/method.ts +5 -2
  117. package/src/service/service/entity/util/util.ts +17 -0
  118. package/src/service/vo/control.vo.ts +2 -2
  119. package/src/ui-logic/ui-logic-node/msg-box-node/msg-box-node.ts +0 -1
  120. package/src/utils/handlebars/helpers/index.ts +4 -2
  121. package/src/utils/handlebars/helpers/json/json-parse.ts +21 -0
  122. package/src/utils/handlebars/helpers/json/{json.ts → json-stringify.ts} +2 -2
  123. package/out/utils/handlebars/helpers/json/json.d.ts.map +0 -1
@@ -323,13 +323,23 @@ export class GridController extends MDControlController {
323
323
  if (editingRow) {
324
324
  throw new RuntimeError('请先完成当前行编辑中的行的操作');
325
325
  }
326
- const res = await this.service.getDraft(this.context, this.params);
326
+ let res;
327
+ try {
328
+ res = await this.service.getDraft(this.context, this.params);
329
+ }
330
+ catch (error) {
331
+ this.actionNotification('GETDRAFTERROR', {
332
+ error: error,
333
+ });
334
+ throw error;
335
+ }
327
336
  // 加载完后续处理
328
337
  this.state.items.unshift(res.data);
329
338
  const newRow = new GridRowState(res.data, this);
330
339
  this.state.rows.unshift(newRow);
331
340
  this.gridStateNotify(newRow, GridNotifyState.DRAFT);
332
341
  this.switchRowEdit(this.state.rows[0], true);
342
+ this.actionNotification('GETDRAFTSUCCESS', { data: res.data });
333
343
  }
334
344
  /**
335
345
  * 保存
@@ -371,6 +381,14 @@ export class GridController extends MDControlController {
371
381
  ? await this.service.create(tempContext, data)
372
382
  : await this.service.update(tempContext, data);
373
383
  }
384
+ catch (error) {
385
+ await this.evt.emit('onSaveError', undefined);
386
+ this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}ERROR`, {
387
+ error: error,
388
+ data: rowState.data,
389
+ });
390
+ throw error;
391
+ }
374
392
  finally {
375
393
  await this.endLoading();
376
394
  }
@@ -380,6 +398,10 @@ export class GridController extends MDControlController {
380
398
  rowState.data = res.data;
381
399
  rowState.modified = false;
382
400
  ibiz.message.success(`${res.data.srfmajortext || ''}保存成功`);
401
+ this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
402
+ default: `${res.data.srfmajortext || ''}保存成功`,
403
+ data: res.data,
404
+ });
383
405
  this.gridStateNotify(rowState, GridNotifyState.SAVE);
384
406
  await this.evt.emit('onSaveSuccess', undefined);
385
407
  }
@@ -530,9 +552,10 @@ export class GridController extends MDControlController {
530
552
  const values = await Promise.allSettled(Object.values(this.editColumns).map(async (column) => {
531
553
  return column.dataChangeNotify(row, names);
532
554
  }));
533
- if (values.find(item => item.status === 'rejected')) {
555
+ const rejectedValue = values.find(item => item.status === 'rejected');
556
+ if (rejectedValue) {
534
557
  ibiz.log.error('dataChangeNotify报错', values);
535
- throw new RuntimeError('数据变更后有错误');
558
+ throw rejectedValue.reason;
536
559
  }
537
560
  }
538
561
  /**
@@ -619,15 +642,17 @@ export class GridController extends MDControlController {
619
642
  * @param {string} key 排序字段
620
643
  * @param {string} order 排序顺序
621
644
  */
622
- setSort(key, order) {
623
- if (key && order) {
624
- super.setSort(key, order);
645
+ setSort(fieldId, order) {
646
+ if (fieldId && order) {
647
+ const fieldName = this.fieldIdNameMap.get(fieldId).toLowerCase();
648
+ super.setSort(fieldName, order);
625
649
  }
626
650
  else {
627
651
  // 设置默认排序或者置空
628
652
  const { minorSortAppDEFieldId, minorSortDir } = this.model;
629
653
  if (minorSortAppDEFieldId && minorSortDir) {
630
- this.state.sortQuery = `${minorSortAppDEFieldId.toLowerCase()},${minorSortDir.toLowerCase()}`;
654
+ const fieldName = this.fieldIdNameMap.get(minorSortAppDEFieldId);
655
+ this.state.sortQuery = `${fieldName.toLowerCase()},${minorSortDir.toLowerCase()}`;
631
656
  }
632
657
  else {
633
658
  this.state.sortQuery = '';
@@ -650,20 +675,24 @@ export class GridController extends MDControlController {
650
675
  }
651
676
  const { appDEMethodId, degeiupdateDetails, customCode, scriptCode } = findUpdate;
652
677
  const updateItems = degeiupdateDetails.map(item => item.id);
678
+ let updateData; // 要修改的数据
653
679
  if (customCode && scriptCode) {
654
- ScriptFactory.execScriptFn({ data: row.data }, scriptCode, {
680
+ // 脚本模式获取修改数据
681
+ updateData = ScriptFactory.execScriptFn(Object.assign(Object.assign({}, this.getEventArgs()), { data: row.data }), scriptCode, {
655
682
  isAsync: false,
656
683
  });
657
684
  }
658
685
  else {
686
+ // 后台服务获取修改数据
659
687
  const params = Object.assign(Object.assign({}, this.params), row.data.getOrigin());
660
688
  const res = await this.service.updateGridEditItem(appDEMethodId, this.context, params);
661
- const result = res.data;
662
- if (result && (updateItems === null || updateItems === void 0 ? void 0 : updateItems.length)) {
663
- await Promise.all(updateItems.map(itemName => {
664
- return this.setRowValue(row, itemName, result[itemName]);
665
- }));
666
- }
689
+ updateData = res.data;
690
+ }
691
+ // 修改更新的值
692
+ if (updateData && (updateItems === null || updateItems === void 0 ? void 0 : updateItems.length)) {
693
+ await Promise.all(updateItems.map(itemName => {
694
+ return this.setRowValue(row, itemName, updateData[itemName]);
695
+ }));
667
696
  }
668
697
  }
669
698
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"list.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAcnD;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAatC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzE;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAI7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAqBjC;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAkCrD"}
1
+ {"version":3,"file":"list.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAenD;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAatC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzE;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAI7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAqBjC;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAkCrD"}
@@ -27,7 +27,8 @@ export class ListController extends MDControlController {
27
27
  // 设置默认排序或者置空
28
28
  const { minorSortAppDEFieldId, minorSortDir } = this.model;
29
29
  if (minorSortAppDEFieldId && minorSortDir) {
30
- this.state.sortQuery = `${minorSortAppDEFieldId.toLowerCase()},${minorSortDir.toLowerCase()}`;
30
+ const fieldName = this.fieldIdNameMap.get(minorSortAppDEFieldId);
31
+ this.state.sortQuery = `${fieldName.toLowerCase()},${minorSortDir.toLowerCase()}`;
31
32
  }
32
33
  else {
33
34
  this.state.sortQuery = '';
@@ -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;cAOX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAajE;;;;;;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;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;IAKtC;;;;;;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;IAclD;;;;;;;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;cAOX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAajE;;;;;;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;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;IAclD;;;;;;;OAOG;IACG,mBAAmB,CACvB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC;CA+BjB"}
@@ -149,7 +149,10 @@ export class TreeController extends MDControlController {
149
149
  }
150
150
  setSelection(selection) {
151
151
  // todo 当自己点选中时,父节点选不选中,如果选中需要在这边优化
152
- super.setSelection(selection);
152
+ // 通过id过滤出原始的树节点数据,避免外部使用的时候传入的选中数据有问题。
153
+ const selectionIds = selection.map(item => item.id);
154
+ const filterArr = this.state.items.filter(item => selectionIds.includes(item.id));
155
+ super.setSelection(filterArr);
153
156
  }
154
157
  /**
155
158
  * 获取节点模型
@@ -94,6 +94,15 @@ export interface IAppHubService {
94
94
  * @return {*} {boolean}
95
95
  */
96
96
  hasAppView(tag: string): boolean;
97
+ /**
98
+ * 获取应用模型样式内容
99
+ *
100
+ * @author chitanda
101
+ * @date 2023-09-06 10:09:07
102
+ * @param {string} appId
103
+ * @return {*} {(Promise<string | null>)}
104
+ */
105
+ getAppStyle(appId: string): Promise<string | null>;
97
106
  /**
98
107
  * 根据应用视图 codeName 或 id 获取应用视图模型
99
108
  *
@@ -1 +1 @@
1
- {"version":3,"file":"i-app-hub-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-app-hub-service/i-app-hub-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IAEpC;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAE1B;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAEjE;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IAEvC;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEvC;;;;;;;OAOG;IACH,qBAAqB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEnE;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE9C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAEjC;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3C;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAElD;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,CAAC;CAClD"}
1
+ {"version":3,"file":"i-app-hub-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-app-hub-service/i-app-hub-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IAEpC;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAE1B;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAEjE;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IAEvC;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEvC;;;;;;;OAOG;IACH,qBAAqB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEnE;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE9C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAEjC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEnD;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3C;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAElD;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,CAAC;CAClD"}
@@ -45,5 +45,14 @@ export interface ModelLoaderProvider {
45
45
  * @return {*} {Promise<IAppDataEntity>}
46
46
  */
47
47
  getAppDataEntityByCodeName(appId: string, codeName: string): Promise<IAppDataEntity>;
48
+ /**
49
+ * 获取应用样式表
50
+ *
51
+ * @author chitanda
52
+ * @date 2023-09-06 10:09:14
53
+ * @param {string} appId
54
+ * @return {*} {(Promise<string | null>)}
55
+ */
56
+ getAppStyle(appId: string): Promise<string | null>;
48
57
  }
49
58
  //# sourceMappingURL=model-loader.provider.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"model-loader.provider.d.ts","sourceRoot":"","sources":["../../../src/interface/provider/model-loader.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE1E;;;;;;;GAOG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAE3C;;;;;;;;OAQG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE/D;;;;;;;;OAQG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAErE;;;;;;;;OAQG;IACH,0BAA0B,CACxB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CAAC;CAC5B"}
1
+ {"version":3,"file":"model-loader.provider.d.ts","sourceRoot":"","sources":["../../../src/interface/provider/model-loader.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE1E;;;;;;;GAOG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAE3C;;;;;;;;OAQG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE/D;;;;;;;;OAQG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAErE;;;;;;;;OAQG;IACH,0BAA0B,CACxB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CAAC;IAE3B;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACpD"}
@@ -50,5 +50,6 @@ export declare class AppUILogicExecutor extends LogicExecutor {
50
50
  * @return {*} {(Promise<IAppUILogicRefViewBase | undefined>)}
51
51
  */
52
52
  protected getWizardNewViewRef(appUILogic: IAppUINewDataLogic, parameters: IUILogicParams): Promise<IAppUILogicRefViewBase | undefined>;
53
+ protected calcOpenViewRef(appUILogic: IAppUIOpenDataLogic, parameters: IUILogicParams): Promise<IAppUILogicRefViewBase>;
53
54
  }
54
55
  //# sourceMappingURL=app-ui-logic-executor.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"app-ui-logic-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-logic-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAG3B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;IAiB3C;;;;;;;;;;;OAWG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IA+CtB;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IA8DtB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;CAkC/C"}
1
+ {"version":3,"file":"app-ui-logic-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-logic-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAG3B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;IAiB3C;;;;;;;;;;;OAWG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IAqDtB;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IA8DtB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;cAmC9B,eAAe,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,CAAC;CA0BnC"}
@@ -12,6 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
12
12
  import { ModelError, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
13
13
  import { notNilEmpty } from 'qx-util';
14
14
  import { OpenAppViewCommand } from '../../command';
15
+ import { getFormTypeFieldName } from '../../model';
15
16
  import { convertNavData } from '../../utils';
16
17
  import { LogicExecutor } from './logic-executor';
17
18
  /**
@@ -52,10 +53,17 @@ export class AppUILogicExecutor extends LogicExecutor {
52
53
  if (!(data === null || data === void 0 ? void 0 : data[0])) {
53
54
  throw new RuntimeError('opendata没有可操作数据!');
54
55
  }
55
- // 准备需要的模型
56
- const openViewRef = appUILogic.openDataAppView;
57
- if (!openViewRef) {
58
- throw new RuntimeModelError(appUILogic, 'opendata视图逻辑没有配置默认打开视图');
56
+ const openViewRefs = appUILogic.openDataAppViews;
57
+ let openViewRef;
58
+ if (openViewRefs) {
59
+ openViewRef = await this.calcOpenViewRef(appUILogic, parameters);
60
+ }
61
+ else {
62
+ // 准备需要的模型
63
+ openViewRef = appUILogic.openDataAppView;
64
+ if (!openViewRef) {
65
+ throw new RuntimeModelError(appUILogic, 'opendata视图逻辑没有配置默认打开视图');
66
+ }
59
67
  }
60
68
  const openView = openViewRef.refAppViewId;
61
69
  if (!openView) {
@@ -171,4 +179,25 @@ export class AppUILogicExecutor extends LogicExecutor {
171
179
  }
172
180
  return findView;
173
181
  }
182
+ async calcOpenViewRef(appUILogic, parameters) {
183
+ const appDataEntityId = parameters.view.model.appDataEntityId;
184
+ // 表单类型属性
185
+ const formTypeName = await getFormTypeFieldName(appDataEntityId);
186
+ if (!formTypeName) {
187
+ throw new RuntimeModelError(appUILogic, `${appDataEntityId}实体缺少表单类型应用实体属性`);
188
+ }
189
+ const { data } = parameters;
190
+ // 表单类型值
191
+ const formTypeValue = data[0][formTypeName];
192
+ if (!formTypeValue) {
193
+ throw new RuntimeModelError(appUILogic, '数据源无表单类型应用实体属性值');
194
+ }
195
+ const openViewRefs = appUILogic.openDataAppViews;
196
+ // 根据表单类型值找到实际打开的视图
197
+ const findView = openViewRefs === null || openViewRefs === void 0 ? void 0 : openViewRefs.find(item => item.refMode === formTypeValue);
198
+ if (!findView) {
199
+ throw new RuntimeError(`没有找到与表单类型${formTypeValue}相关的实体的编辑视图`);
200
+ }
201
+ return findView;
202
+ }
174
203
  }
@@ -21,7 +21,7 @@ export class ControlEventTrigger extends LogicTrigger {
21
21
  * @type {string[]}
22
22
  */
23
23
  this.listenEventNames = [];
24
- const names = logic.eventNames.split(',');
24
+ const names = logic.eventNames.split(';');
25
25
  this.listenEventNames = names.map(name => StudioControlEvents[name] || name);
26
26
  }
27
27
  match(matchParams) {
@@ -21,7 +21,7 @@ export class ViewEventTrigger extends LogicTrigger {
21
21
  * @type {string[]}
22
22
  */
23
23
  this.listenEventNames = [];
24
- const names = logic.eventNames.split(',');
24
+ const names = logic.eventNames.split(';');
25
25
  this.listenEventNames = names.map(name => StudioViewEvents[name] || name);
26
26
  }
27
27
  match(matchParams) {
@@ -26,6 +26,17 @@ export declare function hasDeCodeName(params: IParams, entityId: string): boolea
26
26
  * @Date: 2023-05-31 10:26:24
27
27
  */
28
28
  export declare function getDeACMode(appDEACModeId: string, entityId: string, srfappid?: string): Promise<IAppDEACMode | undefined>;
29
+ /**
30
+ * 从实体里找到表单类型应用实体属性
31
+ *
32
+ * @author zk
33
+ * @date 2023-09-07 05:09:41
34
+ * @export
35
+ * @param {string} entityId
36
+ * @param {string} [srfappid]
37
+ * @return {*} {(Promise<string | undefined>)}
38
+ */
39
+ export declare function getFormTypeFieldName(entityId: string): Promise<string | undefined>;
29
40
  /**
30
41
  * 从实体里找到实体逻辑
31
42
  * @author lxm
@@ -1 +1 @@
1
- {"version":3,"file":"data-entity.d.ts","sourceRoot":"","sources":["../../../src/model/data-entity/data-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,WAAW,EACX,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAG1B;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAGxE;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnC;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,cAAc,GACrB,QAAQ,GAAG,SAAS,CAEtB;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GACrC,QAAQ,EAAE,CAYZ;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,GACd,WAAW,GAAG,SAAS,CAEzB"}
1
+ {"version":3,"file":"data-entity.d.ts","sourceRoot":"","sources":["../../../src/model/data-entity/data-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,WAAW,EACX,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAG1B;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAGxE;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnC;AAED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,cAAc,GACrB,QAAQ,GAAG,SAAS,CAEtB;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GACrC,QAAQ,EAAE,CAYZ;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,GACd,WAAW,GAAG,SAAS,CAEzB"}
@@ -39,6 +39,20 @@ export async function getDeACMode(appDEACModeId, entityId, srfappid) {
39
39
  });
40
40
  return deACMode;
41
41
  }
42
+ /**
43
+ * 从实体里找到表单类型应用实体属性
44
+ *
45
+ * @author zk
46
+ * @date 2023-09-07 05:09:41
47
+ * @export
48
+ * @param {string} entityId
49
+ * @param {string} [srfappid]
50
+ * @return {*} {(Promise<string | undefined>)}
51
+ */
52
+ export async function getFormTypeFieldName(entityId) {
53
+ const appDataEntity = await ibiz.hub.getAppDataEntity(entityId);
54
+ return appDataEntity.formTypeAppDEFieldId;
55
+ }
42
56
  /**
43
57
  * 从实体里找到实体逻辑
44
58
  * @author lxm
@@ -7,4 +7,5 @@ export * from './tree/index';
7
7
  export * from './grid/index';
8
8
  export * from './form/index';
9
9
  export * from './view/view';
10
+ export * from './panel/index';
10
11
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC"}
@@ -7,3 +7,4 @@ export * from './tree/index';
7
7
  export * from './grid/index';
8
8
  export * from './form/index';
9
9
  export * from './view/view';
10
+ export * from './panel/index';
@@ -0,0 +1,11 @@
1
+ import { IPanelItem } from '@ibiz/model-core';
2
+ /**
3
+ * 判断面板成员模型是否是数据容器
4
+ * @author lxm
5
+ * @date 2023-09-06 04:56:01
6
+ * @export
7
+ * @param {IPanelItem} panelItem
8
+ * @return {*} {boolean}
9
+ */
10
+ export declare function isDataContainer(panelItem: IPanelItem): boolean;
11
+ //# sourceMappingURL=data-container.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"data-container.d.ts","sourceRoot":"","sources":["../../../src/model/panel/data-container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE/D;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAO9D"}
@@ -0,0 +1,12 @@
1
+ /**
2
+ * 判断面板成员模型是否是数据容器
3
+ * @author lxm
4
+ * @date 2023-09-06 04:56:01
5
+ * @export
6
+ * @param {IPanelItem} panelItem
7
+ * @return {*} {boolean}
8
+ */
9
+ export function isDataContainer(panelItem) {
10
+ return (panelItem.itemType === 'CONTAINER' &&
11
+ ['CONTAINER_MULTIDATA', 'CONTAINER_SINGLEDATA'].includes(panelItem.predefinedType));
12
+ }
@@ -0,0 +1,2 @@
1
+ export * from './data-container';
2
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/model/panel/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC"}
@@ -0,0 +1 @@
1
+ export * from './data-container';
@@ -18,6 +18,7 @@ export declare class AppDataEntity implements IDataEntity {
18
18
  srfkeyfile: string;
19
19
  srfmajorfile: string;
20
20
  srfkey: string;
21
+ srfsourcekey: string;
21
22
  srfmajortext: string;
22
23
  get srfuf(): Srfuf;
23
24
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"app-data-entity.d.ts","sourceRoot":"","sources":["../../../src/service/app-data-entity/app-data-entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,WAAW;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,KAAK,EAAE,KAAK,CAAC;IAE/B,UAAkB,OAAO,EAAE,cAAc,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IAEtB,UAAU,EAAE,MAAM,CAAC;IAEnB,YAAY,EAAE,MAAM,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAE7B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,GAAG,aAAa;IAqE/D;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAgClC;;;;;;OAMG;IACH,KAAK,IAAI,aAAa;IAItB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;CAQnD"}
1
+ {"version":3,"file":"app-data-entity.d.ts","sourceRoot":"","sources":["../../../src/service/app-data-entity/app-data-entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,WAAW;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,KAAK,EAAE,KAAK,CAAC;IAE/B,UAAkB,OAAO,EAAE,cAAc,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IAEtB,UAAU,EAAE,MAAM,CAAC;IAEnB,YAAY,EAAE,MAAM,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,YAAY,EAAE,MAAM,CAAC;IAE7B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,GAAG,aAAa;IA6E/D;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAgClC;;;;;;OAMG;IACH,KAAK,IAAI,aAAa;IAMtB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;CAQnD"}
@@ -59,6 +59,14 @@ export class AppDataEntity {
59
59
  return this._data[key] || _srfkey;
60
60
  },
61
61
  });
62
+ Object.defineProperty(this, 'srfsourcekey', {
63
+ set(val) {
64
+ this._data[key] = val;
65
+ },
66
+ get() {
67
+ return this._data[key];
68
+ },
69
+ });
62
70
  }
63
71
  else {
64
72
  ibiz.log.warn(`实体[${entity.codeName}]未配置主键字段`);
@@ -132,7 +140,9 @@ export class AppDataEntity {
132
140
  * @return {*} {AppDataEntity}
133
141
  */
134
142
  clone() {
135
- return new AppDataEntity(this._entity, this._data);
143
+ const entity = new AppDataEntity(this._entity, this._data);
144
+ entity.srfkey = this.srfkey;
145
+ return entity;
136
146
  }
137
147
  /**
138
148
  * 合并参数
@@ -11,11 +11,12 @@ import { AppDataEntity } from '../app-data-entity/app-data-entity';
11
11
  */
12
12
  export declare class MethodDto {
13
13
  protected entity: IAppDataEntity;
14
+ protected isLocalMode?: boolean | undefined;
14
15
  protected dto?: IAppDEMethodDTO | undefined;
15
16
  protected app?: Application;
16
17
  protected fields: IAppDEMethodDTOField[];
17
18
  protected dtoMap: Map<string, MethodDto>;
18
- constructor(entity: IAppDataEntity, dto?: IAppDEMethodDTO | undefined);
19
+ constructor(entity: IAppDataEntity, isLocalMode?: boolean | undefined, dto?: IAppDEMethodDTO | undefined);
19
20
  /**
20
21
  * 请求参数组合 DTO
21
22
  *
@@ -1 +1 @@
1
- {"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAGnE;;;;;;;GAOG;AACH,qBAAa,SAAS;IAQlB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,GAAG,CAAC;IARhB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;gBAGzC,MAAM,EAAE,cAAc,EACtB,GAAG,CAAC,6BAAiB;IAUjC;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA6CxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA6BrE;;;;;;;;OAQG;cACa,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;CAgB7E"}
1
+ {"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAGnE;;;;;;;GAOG;AACH,qBAAa,SAAS;IAQlB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,WAAW,CAAC;IACtB,SAAS,CAAC,GAAG,CAAC;IAThB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;gBAGzC,MAAM,EAAE,cAAc,EACtB,WAAW,CAAC,qBAAS,EACrB,GAAG,CAAC,6BAAiB;IAUjC;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA6CxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAiCrE;;;;;;;;OAQG;cACa,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;CAgB7E"}
@@ -11,8 +11,9 @@ import { findModelChild } from '../../model';
11
11
  * @class MethodDto
12
12
  */
13
13
  export class MethodDto {
14
- constructor(entity, dto) {
14
+ constructor(entity, isLocalMode, dto) {
15
15
  this.entity = entity;
16
+ this.isLocalMode = isLocalMode;
16
17
  this.dto = dto;
17
18
  this.dtoMap = new Map();
18
19
  if (dto) {
@@ -82,7 +83,9 @@ export class MethodDto {
82
83
  */
83
84
  async sets(context, data) {
84
85
  const service = await this.app.deService.getService(this.entity.id);
85
- service.local.clear(context);
86
+ if (this.isLocalMode) {
87
+ service.local.clear(context);
88
+ }
86
89
  return Promise.all(data.map(async (datum) => {
87
90
  const all = this.fields
88
91
  .filter(field => field.type === 'DTOS')
@@ -102,7 +105,9 @@ export class MethodDto {
102
105
  await all[i];
103
106
  }
104
107
  const entityData = new AppDataEntity(this.entity, datum);
105
- await service.local.add(context, entityData);
108
+ if (this.isLocalMode) {
109
+ await service.local.add(context, entityData);
110
+ }
106
111
  return entityData;
107
112
  }));
108
113
  }
@@ -121,7 +126,7 @@ export class MethodDto {
121
126
  }
122
127
  const entity = await ibiz.hub.getAppDataEntity(field.refAppDataEntityId, this.entity.appId);
123
128
  const methodDto = findModelChild(entity.appDEMethodDTOs || [], field.refAppDEMethodDTOId);
124
- const dto = new MethodDto(entity, methodDto);
129
+ const dto = new MethodDto(entity, this.isLocalMode, methodDto);
125
130
  this.dtoMap.set(field.codeName, dto);
126
131
  return dto;
127
132
  }
@@ -98,7 +98,7 @@ export class AuthorityService {
98
98
  */
99
99
  async init(appData = ibiz.appData) {
100
100
  if (!appData) {
101
- throw new RuntimeError('没有appData数据');
101
+ return;
102
102
  }
103
103
  // 设置当前用户拥有的统一标识集合
104
104
  if (appData.unires) {
@@ -1 +1 @@
1
- {"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAwE/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,WAAW,EACzB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IActC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}
1
+ {"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAwE/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,WAAW,EACzB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IActC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}
@@ -2,6 +2,7 @@ import { HttpResponse, RuntimeModelError, } from '@ibiz-template/core';
2
2
  import { Method } from './method';
3
3
  import { findDELogic } from '../../../../model';
4
4
  import { execDELogicAction, execFieldLogics } from '../../../../de-logic';
5
+ import { isLocalMode } from '../util/util';
5
6
  /**
6
7
  * 实体行为方法
7
8
  *
@@ -22,7 +23,7 @@ export class DEActionMethod extends Method {
22
23
  * @type {boolean}
23
24
  */
24
25
  get isLocalMode() {
25
- return this.method.actionType === 'BUILTIN';
26
+ return isLocalMode(this.method);
26
27
  }
27
28
  async exec(context, data, params) {
28
29
  // 实体逻辑处理
@@ -1 +1 @@
1
- {"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAE9B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IA8CvC;;;;;;OAMG;cACa,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC;IA8DzB;;;;;;;;OAQG;cACa,WAAW,CACzB,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IA6CzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAkBlC"}
1
+ {"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAE9B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IA8CvC;;;;;;OAMG;cACa,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC;IA8DzB;;;;;;;;OAQG;cACa,WAAW,CACzB,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IA6CzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAkBlC"}
@@ -4,6 +4,7 @@ import { clone, equals, isEmpty, isNil, where } from 'ramda';
4
4
  import { SearchFilter } from '../../../utils';
5
5
  import { Method } from './method';
6
6
  import { execFieldLogics } from '../../../../de-logic';
7
+ import { isLocalMode } from '../util/util';
7
8
  /**
8
9
  * 数据集请求
9
10
  *
@@ -15,7 +16,7 @@ import { execFieldLogics } from '../../../../de-logic';
15
16
  */
16
17
  export class FetchMethod extends Method {
17
18
  get isLocalMode() {
18
- return this.method.dataSetType === 'DATAQUERY';
19
+ return isLocalMode(this.method);
19
20
  }
20
21
  async exec(context, data, params) {
21
22
  if (this.isLocalMode) {
@@ -1,4 +1,4 @@
1
- import { IAppDataEntity, IAppDEMethodInput } from '@ibiz/model-core';
1
+ import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
2
2
  import { MethodDto } from '../../../dto/method.dto';
3
3
  /**
4
4
  * 应用实体方法输入转换
@@ -10,17 +10,17 @@ import { MethodDto } from '../../../dto/method.dto';
10
10
  */
11
11
  export declare class MethodInput {
12
12
  protected entity: IAppDataEntity;
13
- protected input?: IAppDEMethodInput | undefined;
13
+ protected method: IAppDEMethod;
14
14
  protected dto?: MethodDto;
15
+ protected get isLocalMode(): boolean;
15
16
  /**
16
17
  * Creates an instance of MethodInput.
17
- *
18
18
  * @author chitanda
19
- * @date 2022-10-11 17:10:59
19
+ * @date 2023-09-06 16:09:26
20
20
  * @param {IAppDataEntity} entity
21
- * @param {IAppDEMethodInput} [input]
21
+ * @param {IAppDEMethod} method
22
22
  */
23
- constructor(entity: IAppDataEntity, input?: IAppDEMethodInput | undefined);
23
+ constructor(entity: IAppDataEntity, method: IAppDEMethod);
24
24
  /**
25
25
  * 处理请求发送参数
26
26
  *
@@ -1 +1 @@
1
- {"version":3,"file":"method-input.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD;;;;;;;GAOG;AACH,qBAAa,WAAW;IAYpB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,KAAK,CAAC;IAZlB,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;;;OAOG;gBAES,MAAM,EAAE,cAAc,EACtB,KAAK,CAAC,+BAAmB;IAarC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAM5D"}
1
+ {"version":3,"file":"method-input.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAIpD;;;;;;;GAOG;AACH,qBAAa,WAAW;IAepB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAfhC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAED;;;;;;OAMG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAchC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAM5D"}