@ibiz-template/runtime 0.1.29-dev.0 → 0.1.30

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 +866 -603
  2. package/dist/index.system.min.js +1 -1
  3. package/dist/index.system.min.js.map +1 -1
  4. package/out/command/app/open-app-view/open-app-view.d.ts +1 -1
  5. package/out/command/app/open-app-view/open-app-view.d.ts.map +1 -1
  6. package/out/command/app/open-app-view/open-app-view.js +16 -5
  7. package/out/config/global-config.js +1 -1
  8. package/out/controller/common/control/control.controller.d.ts +18 -0
  9. package/out/controller/common/control/control.controller.d.ts.map +1 -1
  10. package/out/controller/common/control/control.controller.js +29 -1
  11. package/out/controller/common/control/md-control.controller.d.ts.map +1 -1
  12. package/out/controller/common/control/md-control.controller.js +2 -1
  13. package/out/controller/control/dashboard/dashboard.controller.d.ts.map +1 -1
  14. package/out/controller/control/dashboard/dashboard.controller.js +2 -6
  15. package/out/controller/control/dashboard/portlet/index.d.ts +1 -0
  16. package/out/controller/control/dashboard/portlet/index.d.ts.map +1 -1
  17. package/out/controller/control/dashboard/portlet/index.js +1 -0
  18. package/out/controller/control/dashboard/portlet/menu-portlet/index.d.ts +2 -0
  19. package/out/controller/control/dashboard/portlet/menu-portlet/index.d.ts.map +1 -0
  20. package/out/controller/control/dashboard/portlet/menu-portlet/index.js +1 -0
  21. package/out/controller/control/dashboard/portlet/menu-portlet/menu-portlet.controller.d.ts +5 -0
  22. package/out/controller/control/dashboard/portlet/menu-portlet/menu-portlet.controller.d.ts.map +1 -0
  23. package/out/controller/control/dashboard/portlet/menu-portlet/menu-portlet.controller.js +3 -0
  24. package/out/controller/control/exp-bar/exp-bar.controller.d.ts +10 -0
  25. package/out/controller/control/exp-bar/exp-bar.controller.d.ts.map +1 -1
  26. package/out/controller/control/exp-bar/exp-bar.controller.js +29 -2
  27. package/out/controller/control/exp-bar/tree-exp-bar.controller.d.ts.map +1 -1
  28. package/out/controller/control/exp-bar/tree-exp-bar.controller.js +1 -1
  29. package/out/controller/control/form/edit-form/edit-form.controller.d.ts +11 -2
  30. package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map +1 -1
  31. package/out/controller/control/form/edit-form/edit-form.controller.js +56 -2
  32. package/out/controller/control/form/edit-form/edit-form.service.js +1 -1
  33. package/out/controller/control/form/form/form.controller.d.ts.map +1 -1
  34. package/out/controller/control/form/form/form.controller.js +2 -6
  35. package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
  36. package/out/controller/control/grid/grid/grid.controller.js +5 -10
  37. package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.d.ts +10 -0
  38. package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.d.ts.map +1 -1
  39. package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.js +19 -0
  40. package/out/controller/control/toolbar/toolbar.controllerr.d.ts.map +1 -1
  41. package/out/controller/control/toolbar/toolbar.controllerr.js +8 -8
  42. package/out/controller/control/tree/tree.service.d.ts.map +1 -1
  43. package/out/controller/control/tree/tree.service.js +6 -11
  44. package/out/engine/md-view.engine.d.ts.map +1 -1
  45. package/out/engine/md-view.engine.js +5 -4
  46. package/out/global/global-util/global-util.d.ts +8 -0
  47. package/out/global/global-util/global-util.d.ts.map +1 -1
  48. package/out/global/global-util/global-util.js +8 -0
  49. package/out/interface/common/i-error-handler/i-error-handler.d.ts +17 -0
  50. package/out/interface/common/i-error-handler/i-error-handler.d.ts.map +1 -0
  51. package/out/interface/common/i-error-handler/i-error-handler.js +1 -0
  52. package/out/interface/common/i-global-config/i-global-view-config.d.ts +5 -3
  53. package/out/interface/common/i-global-config/i-global-view-config.d.ts.map +1 -1
  54. package/out/interface/common/index.d.ts +1 -0
  55. package/out/interface/common/index.d.ts.map +1 -1
  56. package/out/interface/controller/common/i-nav-view-msg/i-nav-view-msg.d.ts +9 -0
  57. package/out/interface/controller/common/i-nav-view-msg/i-nav-view-msg.d.ts.map +1 -1
  58. package/out/interface/controller/state/view/i-edit-view.state.d.ts +8 -0
  59. package/out/interface/controller/state/view/i-edit-view.state.d.ts.map +1 -1
  60. package/out/logic-scheduler/executor/app-ui-logic-executor.d.ts.map +1 -1
  61. package/out/logic-scheduler/executor/app-ui-logic-executor.js +10 -4
  62. package/out/logic-scheduler/trigger/item-dyna-logic-trigger.d.ts.map +1 -1
  63. package/out/logic-scheduler/trigger/item-dyna-logic-trigger.js +1 -4
  64. package/out/model/data-entity/data-entity.js +2 -2
  65. package/out/register/helper/control-register.d.ts.map +1 -1
  66. package/out/register/helper/control-register.js +6 -1
  67. package/out/service/app-data-entity/app-data-entity.d.ts.map +1 -1
  68. package/out/service/app-data-entity/app-data-entity.js +4 -0
  69. package/out/service/service/entity/method/method-renturn.d.ts.map +1 -1
  70. package/out/service/service/entity/method/method-renturn.js +4 -0
  71. package/out/ui-action/provider/ui-action-provider-base.js +1 -1
  72. package/out/utils/error-handler/default-error-handler.d.ts +13 -0
  73. package/out/utils/error-handler/default-error-handler.d.ts.map +1 -0
  74. package/out/utils/error-handler/default-error-handler.js +36 -0
  75. package/out/utils/error-handler/error-handler-center.d.ts +41 -0
  76. package/out/utils/error-handler/error-handler-center.d.ts.map +1 -0
  77. package/out/utils/error-handler/error-handler-center.js +59 -0
  78. package/out/utils/error-handler/index.d.ts +3 -0
  79. package/out/utils/error-handler/index.d.ts.map +1 -0
  80. package/out/utils/error-handler/index.js +2 -0
  81. package/out/utils/index.d.ts +1 -0
  82. package/out/utils/index.d.ts.map +1 -1
  83. package/out/utils/index.js +1 -0
  84. package/out/utils/promise/promise.d.ts +15 -0
  85. package/out/utils/promise/promise.d.ts.map +1 -0
  86. package/out/utils/promise/promise.js +38 -0
  87. package/package.json +2 -2
  88. package/src/command/app/open-app-view/open-app-view.ts +18 -5
  89. package/src/config/global-config.ts +1 -1
  90. package/src/controller/common/control/control.controller.ts +31 -2
  91. package/src/controller/common/control/md-control.controller.ts +2 -1
  92. package/src/controller/control/dashboard/dashboard.controller.ts +2 -6
  93. package/src/controller/control/dashboard/portlet/index.ts +1 -0
  94. package/src/controller/control/dashboard/portlet/menu-portlet/index.ts +1 -0
  95. package/src/controller/control/dashboard/portlet/menu-portlet/menu-portlet.controller.ts +4 -0
  96. package/src/controller/control/exp-bar/exp-bar.controller.ts +30 -2
  97. package/src/controller/control/exp-bar/tree-exp-bar.controller.ts +1 -0
  98. package/src/controller/control/form/edit-form/edit-form.controller.ts +71 -3
  99. package/src/controller/control/form/edit-form/edit-form.service.ts +1 -1
  100. package/src/controller/control/form/form/form.controller.ts +2 -6
  101. package/src/controller/control/grid/grid/grid.controller.ts +5 -9
  102. package/src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts +20 -0
  103. package/src/controller/control/toolbar/toolbar.controllerr.ts +14 -8
  104. package/src/controller/control/tree/tree.service.ts +8 -9
  105. package/src/engine/md-view.engine.ts +6 -4
  106. package/src/global/global-util/global-util.ts +15 -0
  107. package/src/interface/common/i-error-handler/i-error-handler.ts +16 -0
  108. package/src/interface/common/i-global-config/i-global-view-config.ts +5 -3
  109. package/src/interface/common/index.ts +1 -0
  110. package/src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts +10 -0
  111. package/src/interface/controller/state/view/i-edit-view.state.ts +10 -1
  112. package/src/logic-scheduler/executor/app-ui-logic-executor.ts +13 -4
  113. package/src/logic-scheduler/trigger/item-dyna-logic-trigger.ts +1 -4
  114. package/src/model/data-entity/data-entity.ts +2 -2
  115. package/src/register/helper/control-register.ts +6 -1
  116. package/src/service/app-data-entity/app-data-entity.ts +5 -0
  117. package/src/service/service/entity/method/method-renturn.ts +4 -0
  118. package/src/ui-action/provider/ui-action-provider-base.ts +1 -1
  119. package/src/utils/error-handler/default-error-handler.ts +40 -0
  120. package/src/utils/error-handler/error-handler-center.ts +61 -0
  121. package/src/utils/error-handler/index.ts +2 -0
  122. package/src/utils/index.ts +1 -0
  123. package/src/utils/promise/promise.ts +41 -0
@@ -24,6 +24,16 @@ export declare class TabExpPanelController extends ControlController<ITabExpPane
24
24
  * @Date: 2023-09-20 10:36:46
25
25
  */
26
26
  isShowIcon: boolean;
27
+ /**
28
+ * 是否缓存
29
+ *
30
+ * @author zk
31
+ * @date 2023-09-27 09:09:59
32
+ * @readonly
33
+ * @type {boolean}
34
+ * @memberof ExpBarControlController
35
+ */
36
+ get isCache(): boolean;
27
37
  /**
28
38
  * 初始化state的属性
29
39
  *
@@ -1 +1 @@
1
- {"version":3,"file":"tab-exp-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EAEtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAC5E,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,aAAa,UAAQ;IAErB;;;;;OAKG;IACH,UAAU,UAAS;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAiBpB;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAoBvB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CACnB,GAAG,GAAE,eAA+C,GACnD,IAAI;IAKP;;;;;;;;OAQG;IACH,IAAI,uBAAuB,IAAI,eAAe,CAI7C;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtC;;;;;OAKG;IACH,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG;QAC5C,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IA6BD;;;;;;;;OAQG;IACI,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG,WAAW;CASjE"}
1
+ {"version":3,"file":"tab-exp-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EAEtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAC5E,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,aAAa,UAAQ;IAErB;;;;;OAKG;IACH,UAAU,UAAS;IAEnB;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAiBpB;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAoBvB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CACnB,GAAG,GAAE,eAA+C,GACnD,IAAI;IAKP;;;;;;;;OAQG;IACH,IAAI,uBAAuB,IAAI,eAAe,CAI7C;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtC;;;;;OAKG;IACH,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG;QAC5C,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IA6BD;;;;;;;;OAQG;IACI,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG,WAAW;CAUjE"}
@@ -27,6 +27,24 @@ export class TabExpPanelController extends ControlController {
27
27
  */
28
28
  this.isShowIcon = false;
29
29
  }
30
+ /**
31
+ * 是否缓存
32
+ *
33
+ * @author zk
34
+ * @date 2023-09-27 09:09:59
35
+ * @readonly
36
+ * @type {boolean}
37
+ * @memberof ExpBarControlController
38
+ */
39
+ get isCache() {
40
+ if (this.controlParams.expcache === 'CACHE') {
41
+ return true;
42
+ }
43
+ if (this.controlParams.expcache === 'NO_CACHE') {
44
+ return false;
45
+ }
46
+ return ibiz.config.view.expCacheMode.includes(this.model.controlType);
47
+ }
30
48
  /**
31
49
  * 初始化state的属性
32
50
  *
@@ -203,6 +221,7 @@ export class TabExpPanelController extends ControlController {
203
221
  context,
204
222
  params,
205
223
  viewId: tabViewPanel.embeddedAppDEViewId,
224
+ isCache: this.isCache,
206
225
  };
207
226
  }
208
227
  }
@@ -1 +1 @@
1
- {"version":3,"file":"toolbar.controllerr.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controllerr.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EAEd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;;;;;;OAWG;cACa,UAAU,CACxB,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,KAAK,GAAE,KAAU,GAChB,OAAO,CAAC,IAAI,CAAC;cAoCA,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;;;;;;OAUG;IACG,WAAW,CACf,IAAI,EAAE,cAAc,GAAG,YAAY,EACnC,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC;IAcV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCpE,eAAe,CACb,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,EACrC,OAAO,EAAE,YAAY,EAAE,GACtB,IAAI;IAOP,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI;IAS/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}
1
+ {"version":3,"file":"toolbar.controllerr.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controllerr.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EAEd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;;;;;;OAWG;cACa,UAAU,CACxB,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,KAAK,GAAE,KAAU,GAChB,OAAO,CAAC,IAAI,CAAC;cAoCA,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;;;;;;OAUG;IACG,WAAW,CACf,IAAI,EAAE,cAAc,GAAG,YAAY,EACnC,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC;IAcV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6CpE,eAAe,CACb,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,EACrC,OAAO,EAAE,YAAY,EAAE,GACtB,IAAI;IAOP,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI;IAS/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}
@@ -75,7 +75,7 @@ export class ToolbarController extends ControlController {
75
75
  this.state.buttonsState.addState(uiItem.id, buttonState);
76
76
  }
77
77
  }, { childrenFields: ['detoolbarItems'] });
78
- await this.state.buttonsState.update();
78
+ await this.calcButtonState();
79
79
  }
80
80
  /**
81
81
  * 工具栏按钮点击事件
@@ -107,24 +107,24 @@ export class ToolbarController extends ControlController {
107
107
  }
108
108
  await this.state.buttonsState.update(_data, appDeId);
109
109
  // 计算菜单项逻辑的预置逻辑
110
- if (this.scheduler && _data) {
110
+ if (this.scheduler) {
111
+ const logicParams = {};
112
+ if (_data) {
113
+ logicParams.data = [_data];
114
+ }
111
115
  // 遍历所有的项
112
116
  recursiveIterate(this.model, (item) => {
113
117
  const itemState = this.state.buttonsState[item.id];
114
118
  // 计算项显示逻辑
115
119
  if (itemState.visible) {
116
- const dynaVisible = this.scheduler.triggerItemVisible(item.id, {
117
- data: [_data],
118
- });
120
+ const dynaVisible = this.scheduler.triggerItemVisible(item.id, logicParams);
119
121
  if (dynaVisible !== undefined) {
120
122
  itemState.visible = dynaVisible;
121
123
  }
122
124
  }
123
125
  // 计算项启用逻辑
124
126
  if (!itemState.disabled) {
125
- const dynaEnable = this.scheduler.triggerItemEnable(item.id, {
126
- data: [_data],
127
- });
127
+ const dynaEnable = this.scheduler.triggerItemEnable(item.id, logicParams);
128
128
  if (dynaEnable !== undefined) {
129
129
  itemState.disabled = !dynaEnable;
130
130
  }
@@ -1 +1 @@
1
- {"version":3,"file":"tree.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAOnD,OAAO,EACL,gBAAgB,EAEhB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAG1B,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B;;;;;OAKG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;;;OAOG;IACG,eAAe,CACnB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;IAiDvC;;;;;;;;;;OAUG;cACa,oBAAoB,CAClC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,CAAC;IAwE3B;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;OAOG;IACH,qBAAqB,CACnB,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB;QACD,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,EAAE,OAAO,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;KACpB;IA+DD;;;;;;;;OAQG;cACa,cAAc,CAC5B,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,mBAAmB,EAAE,CAAC;IA2CjC;;;;;;;OAOG;cACa,oBAAoB,CAClC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,oBAAoB,EAAE,CAAC;CA8BnC"}
1
+ {"version":3,"file":"tree.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAOnD,OAAO,EACL,gBAAgB,EAEhB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAG1B,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B;;;;;OAKG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;;;OAOG;IACG,eAAe,CACnB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;IA8CvC;;;;;;;;;;OAUG;cACa,oBAAoB,CAClC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,CAAC;IAwE3B;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;OAOG;IACH,qBAAqB,CACnB,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB;QACD,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,EAAE,OAAO,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;KACpB;IA+DD;;;;;;;;OAQG;cACa,cAAc,CAC5B,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,mBAAmB,EAAE,CAAC;IA6CjC;;;;;;;OAOG;cACa,oBAAoB,CAClC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,oBAAoB,EAAE,CAAC;CA8BnC"}
@@ -1,7 +1,7 @@
1
1
  import { ModelError } from '@ibiz-template/core';
2
2
  import { getRootNode, getChildNodeRSs, getTreeNode, calcDeCodeNameById, } from '../../../model';
3
3
  import { MDControlService, TreeStaticNodeData, TreeDataSetNodeData, TreeCodeListNodeData, } from '../../../service';
4
- import { calcNavParams } from '../../../utils';
4
+ import { calcNavParams, handleAllSettled } from '../../../utils';
5
5
  /**
6
6
  * 树部件服务
7
7
  * @author lxm
@@ -36,17 +36,12 @@ export class TreeService extends MDControlService {
36
36
  if (childNodeRSs.length === 0) {
37
37
  return;
38
38
  }
39
- const results = await Promise.allSettled(childNodeRSs.map(async (childNodeRS) => {
39
+ const results = await handleAllSettled(childNodeRSs.map(async (childNodeRS) => {
40
40
  const childNode = getTreeNode(this.model, childNodeRS.childDETreeNodeId);
41
41
  return this.fetchNodeDatasByType(childNode, childNodeRS, parentNodeData, opts);
42
- }));
42
+ }), false);
43
43
  results.forEach(result => {
44
- if (result.status === 'fulfilled' && result.value) {
45
- childrenNodes.push(...result.value);
46
- }
47
- else if (result.status === 'rejected') {
48
- ibiz.log.error(result.reason);
49
- }
44
+ childrenNodes.push(...result);
50
45
  });
51
46
  }
52
47
  return childrenNodes;
@@ -193,9 +188,9 @@ export class TreeService extends MDControlService {
193
188
  // 设置查询长度
194
189
  params.size = nodeModel.maxSize || 1000;
195
190
  // 排序属性
196
- if (nodeModel.sortAppDEFieldId && nodeModel.sortDir) {
191
+ if (nodeModel.sortAppDEFieldId) {
197
192
  Object.assign(params, {
198
- sort: `${nodeModel.sortAppDEFieldId.toLowerCase()},${nodeModel.sortDir.toLowerCase()}`,
193
+ sort: `${nodeModel.sortAppDEFieldId.toLowerCase()},${nodeModel.sortDir ? nodeModel.sortDir.toLowerCase() : 'asc'}`,
199
194
  });
200
195
  }
201
196
  // 请求实体数据
@@ -1 +1 @@
1
- {"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsDhC;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAwCrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BjB;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BjB;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAsCpC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}
1
+ {"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsDhC;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAwCrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BjB;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BjB;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAsCpC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}
@@ -1,4 +1,5 @@
1
1
  import { RuntimeModelError } from '@ibiz-template/core';
2
+ import { clone } from 'ramda';
2
3
  import { SysUIActionTag, ViewCallTag } from '../constant';
3
4
  import { calcDeCodeNameById } from '../model';
4
5
  import { ViewEngineBase } from './view-base.engine';
@@ -209,13 +210,13 @@ export class MDViewEngine extends ViewEngineBase {
209
210
  if (!openAppViewLogic) {
210
211
  throw new RuntimeModelError(this.view.model, `缺少newdata的视图逻辑`);
211
212
  }
212
- const context = this.view.context.clone();
213
+ const params = clone(this.view.params);
213
214
  if (copyMode) {
214
- context.srfcopymode = true;
215
+ params.srfcopymode = copyMode;
215
216
  }
216
217
  const result = await ((_c = this.view.scheduler) === null || _c === void 0 ? void 0 : _c.triggerCustom('newdata', {
217
- context,
218
- params: this.view.params,
218
+ context: this.view.context,
219
+ params,
219
220
  data,
220
221
  event,
221
222
  view: this.view,
@@ -1,5 +1,6 @@
1
1
  import { IExportExcelUtil } from '../../interface';
2
2
  import { TextUtil, LayoutPanelUtil, HandlebarsUtil, RawValueUtil } from '../../utils';
3
+ import { ErrorHandlerCenter } from '../../utils/error-handler';
3
4
  /**
4
5
  * 全局工具方法或对象
5
6
  *
@@ -37,6 +38,13 @@ export declare class GlobalUtil {
37
38
  * @date 2023-08-24 11:08:28
38
39
  */
39
40
  readonly rawValue: RawValueUtil;
41
+ /**
42
+ * 错误处理中心
43
+ * @author lxm
44
+ * @date 2023-09-26 05:04:26
45
+ */
46
+ readonly error: ErrorHandlerCenter;
47
+ constructor();
40
48
  /**
41
49
  * 获取导出Excel工具类对象
42
50
  * @author lxm
@@ -1 +1 @@
1
- {"version":3,"file":"global-util.d.ts","sourceRoot":"","sources":["../../../src/global/global-util/global-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EACL,QAAQ,EACR,eAAe,EACf,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,kBAAyB;IAE7C;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,iBAAwB;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,eAAsB;IAEvC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IAOtB;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;CAQzB"}
1
+ {"version":3,"file":"global-util.d.ts","sourceRoot":"","sources":["../../../src/global/global-util/global-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EACL,QAAQ,EACR,eAAe,EACf,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AACrB,OAAO,EAEL,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AAEnC;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,kBAAyB;IAE7C;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,iBAAwB;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,eAAsB;IAEvC;;;;OAIG;IACH,QAAQ,CAAC,KAAK,qBAA4B;;IAM1C;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IAOtB;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;CAQzB"}
@@ -1,4 +1,5 @@
1
1
  import { TextUtil, LayoutPanelUtil, HandlebarsUtil, RawValueUtil, } from '../../utils';
2
+ import { DefaultErrorHandler, ErrorHandlerCenter, } from '../../utils/error-handler';
2
3
  /**
3
4
  * 全局工具方法或对象
4
5
  *
@@ -37,6 +38,13 @@ export class GlobalUtil {
37
38
  * @date 2023-08-24 11:08:28
38
39
  */
39
40
  this.rawValue = new RawValueUtil();
41
+ /**
42
+ * 错误处理中心
43
+ * @author lxm
44
+ * @date 2023-09-26 05:04:26
45
+ */
46
+ this.error = new ErrorHandlerCenter();
47
+ this.error.register(new DefaultErrorHandler());
40
48
  }
41
49
  /**
42
50
  * 显示应用级别的加载提示
@@ -0,0 +1,17 @@
1
+ /**
2
+ * 错误处理器接口
3
+ * @author lxm
4
+ * @date 2023-09-26 04:51:18
5
+ * @export
6
+ * @interface IErrorHandler
7
+ */
8
+ export interface IErrorHandler {
9
+ /**
10
+ * 处理错误,如果处理了该异常则返回true,后续处理器的就不会处理该异常
11
+ * @author lxm
12
+ * @date 2023-09-26 04:48:57
13
+ * @param {unknown} error
14
+ */
15
+ handle(error: unknown): boolean | undefined;
16
+ }
17
+ //# sourceMappingURL=i-error-handler.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"i-error-handler.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-error-handler/i-error-handler.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;CAC7C"}
@@ -19,12 +19,14 @@ export interface IGlobalViewConfig {
19
19
  */
20
20
  enableDataInfoBar: boolean;
21
21
  /**
22
- * 全局导航是否启用缓存
22
+ * 用于控制全局哪些导航部件启用缓存,全大写。TABEXPPANEL:GRIDEXPBAR: - :分隔每个导航部件的缓存开关,必须用:结尾,如:TABEXPPANEL:开启表格导航部件缓存,GRIDEXPBAR:开启分页导航部件缓存
23
23
  *
24
+ * @default 'TABEXPPANEL:'
25
+ * @description 判断时将使用 `部件类型:` 的方式进行判断,如:TABEXPPANEL:,表示开启表格导航视图的缓存
24
26
  * @author chitanda
25
27
  * @date 2023-09-15 12:09:09
26
- * @type {boolean}
28
+ * @type {string}
27
29
  */
28
- enableExpCache: boolean;
30
+ expCacheMode: string;
29
31
  }
30
32
  //# sourceMappingURL=i-global-view-config.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-global-view-config.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-global-config/i-global-view-config.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;;;;;OASG;IACH,iBAAiB,EAAE,OAAO,CAAC;IAE3B;;;;;;OAMG;IACH,cAAc,EAAE,OAAO,CAAC;CACzB"}
1
+ {"version":3,"file":"i-global-view-config.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-global-config/i-global-view-config.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;;;;;OASG;IACH,iBAAiB,EAAE,OAAO,CAAC;IAE3B;;;;;;;;OAQG;IACH,YAAY,EAAE,MAAM,CAAC;CACtB"}
@@ -17,4 +17,5 @@ export { IDataAbilityParams } from './i-data-ability-params/i-data-ability-param
17
17
  export type { IAppConfigService } from './i-app-config-service/i-app-config-service';
18
18
  export type { IAppViewConfigService, IViewConfig, } from './i-app-view-config-service/i-app-view-config-service';
19
19
  export type { IOpenViewOptions } from './i-open-view-options/i-open-view-options';
20
+ export type { IErrorHandler } from './i-error-handler/i-error-handler';
20
21
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/interface/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EACL,eAAe,EACf,SAAS,GACV,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,YAAY,EACV,aAAa,EACb,qBAAqB,EACrB,iBAAiB,EACjB,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,YAAY,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AACrF,YAAY,EACV,qBAAqB,EACrB,WAAW,GACZ,MAAM,uDAAuD,CAAC;AAC/D,YAAY,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/interface/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EACL,eAAe,EACf,SAAS,GACV,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,YAAY,EACV,aAAa,EACb,qBAAqB,EACrB,iBAAiB,EACjB,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,YAAY,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AACrF,YAAY,EACV,qBAAqB,EACrB,WAAW,GACZ,MAAM,uDAAuD,CAAC;AAC/D,YAAY,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAClF,YAAY,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC"}
@@ -41,5 +41,14 @@ export interface INavViewMsg {
41
41
  * @type {IAppView}
42
42
  */
43
43
  viewId?: string;
44
+ /**
45
+ * 是否缓存
46
+ *
47
+ * @author zk
48
+ * @date 2023-09-26 06:09:17
49
+ * @type {string}
50
+ * @memberof INavViewMsg
51
+ */
52
+ isCache?: boolean;
44
53
  }
45
54
  //# sourceMappingURL=i-nav-view-msg.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-nav-view-msg.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}
1
+ {"version":3,"file":"i-nav-view-msg.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}
@@ -7,5 +7,13 @@ import { IViewState } from './i-view.state';
7
7
  * @extends {IViewState}
8
8
  */
9
9
  export interface IEditViewState extends IViewState {
10
+ /**
11
+ * 是否为复制模式
12
+ *
13
+ * @author chitanda
14
+ * @date 2023-09-26 17:09:21
15
+ * @type {boolean}
16
+ */
17
+ copyMode?: boolean;
10
18
  }
11
19
  //# sourceMappingURL=i-edit-view.state.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-edit-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-edit-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;GAMG;AACH,MAAM,WAAW,cAAe,SAAQ,UAAU;CAAG"}
1
+ {"version":3,"file":"i-edit-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-edit-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;GAMG;AACH,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB"}
@@ -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;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;cAqDN,eAAe,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,CAAC;IA2BlC;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IAiFtB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAmC9C;;;;;;;;;;OAUG;cACa,UAAU,CACxB,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,KAAK,EAAE,EACnB,OAAO,EAAE,QAAQ,EACjB,UAAU,EAAE,sBAAsB,GACjC,OAAO,CAAC,IAAI,CAAC;CA+DjB"}
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;AAGjD;;;;;;;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;cAqDN,eAAe,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,CAAC;IA2BlC;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IAyFtB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAmC9C;;;;;;;;;;OAUG;cACa,UAAU,CACxB,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,KAAK,EAAE,EACnB,OAAO,EAAE,QAAQ,EACjB,UAAU,EAAE,sBAAsB,GACjC,OAAO,CAAC,IAAI,CAAC;CA+DjB"}
@@ -15,6 +15,7 @@ import { OpenAppViewCommand } from '../../command';
15
15
  import { calcDeCodeNameById, getFormTypeFieldName } from '../../model';
16
16
  import { convertNavData } from '../../utils';
17
17
  import { LogicExecutor } from './logic-executor';
18
+ import { Srfuf } from '../../service';
18
19
  /**
19
20
  * 应用预置界面逻辑
20
21
  * @author lxm
@@ -163,11 +164,16 @@ export class AppUILogicExecutor extends LogicExecutor {
163
164
  tempParams = convertNavData(navParams, _data, params, context);
164
165
  }
165
166
  // 拷贝数据处理
166
- if (context.srfcopymode) {
167
- // 置空主键
168
- _data.srfkey = undefined;
169
- tempParams = Object.assign(tempParams, _data.$origin);
167
+ if (params.srfcopymode) {
168
+ const entity = await ibiz.hub.getAppDataEntity(view.model.appDataEntityId);
169
+ const key = entity.keyAppDEFieldId;
170
+ if (key && _data) {
171
+ tempParams[key] = _data.srfkey;
172
+ tempParams.srfcopymode = true;
173
+ }
170
174
  }
175
+ // 特殊处理标记,标记当前是新建数据。在打开视图前会被删除,具体在 open-app-view.ts 中处理
176
+ tempParams.srfuf = Srfuf.CREATE;
171
177
  // 打开视图
172
178
  const result = await ibiz.commands.execute(OpenAppViewCommand.TAG, newViewRef.refAppViewId, tempContext, tempParams, rest);
173
179
  // 执行批添加新建逻辑
@@ -1 +1 @@
1
- {"version":3,"file":"item-dyna-logic-trigger.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/trigger/item-dyna-logic-trigger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,qBAAa,oBAAqB,SAAQ,YAAY;IAC5C,IAAI,EAAE,aAAa,GAAG,YAAY,GAAG,WAAW,CAAC;IAEjD,QAAQ,EAAE,cAAc,CAAC;IAEjC,YAAY,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAS3C,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAmBlD,KAAK,CAAC,WAAW,EAAE,mBAAmB,GAAG,OAAO;IAShD,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,OAAO;CAOhD"}
1
+ {"version":3,"file":"item-dyna-logic-trigger.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/trigger/item-dyna-logic-trigger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,qBAAa,oBAAqB,SAAQ,YAAY;IAC5C,IAAI,EAAE,aAAa,GAAG,YAAY,GAAG,WAAW,CAAC;IAEjD,QAAQ,EAAE,cAAc,CAAC;IAEjC,YAAY,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAS3C,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAmBlD,KAAK,CAAC,WAAW,EAAE,mBAAmB,GAAG,OAAO;IAShD,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,OAAO;CAIhD"}
@@ -30,9 +30,6 @@ export class ItemDynaLogicTrigger extends LogicTrigger {
30
30
  }
31
31
  execute(executeParams) {
32
32
  const result = this.executor.execute(executeParams);
33
- if (typeof result === 'boolean') {
34
- return result;
35
- }
36
- throw new RuntimeError(`${this.logic.id}逻辑返回值不是布尔值`);
33
+ return !!result;
37
34
  }
38
35
  }
@@ -1,4 +1,4 @@
1
- import { isNotNil } from 'ramda';
1
+ import { notNilEmpty } from 'qx-util';
2
2
  /**
3
3
  * 从实体id计算实体codeName(小写)
4
4
  * @author lxm
@@ -23,7 +23,7 @@ export function calcDeCodeNameById(id) {
23
23
  */
24
24
  export function hasDeCodeName(params, entityId) {
25
25
  const codeName = calcDeCodeNameById(entityId);
26
- return isNotNil(params[codeName]);
26
+ return notNilEmpty(params[codeName]);
27
27
  }
28
28
  /**
29
29
  * 通过appDEACModeId从实体中找出对应自填模式模型
@@ -1 +1 @@
1
- {"version":3,"file":"control-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/control-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,cAAc;AACd,eAAO,MAAM,uBAAuB,YAAY,CAAC;AAEjD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,gBAAgB,GAC/B,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAwCvC"}
1
+ {"version":3,"file":"control-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/control-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,cAAc;AACd,eAAO,MAAM,uBAAuB,YAAY,CAAC;AAEjD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,gBAAgB,GAC/B,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CA6CvC"}
@@ -53,7 +53,12 @@ export async function getControlProvider(model) {
53
53
  // 找部件类型
54
54
  provider = getProvider(controlType);
55
55
  if (!provider) {
56
- ibiz.log.error(`找不到部件类型${controlType}对应的适配器`);
56
+ switch (controlType) {
57
+ case 'DATAINFOBAR':
58
+ return;
59
+ default:
60
+ ibiz.log.error(`找不到部件类型${controlType}对应的适配器`);
61
+ }
57
62
  }
58
63
  else {
59
64
  return provider;
@@ -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;AAGlD,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;IASlD;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;CAoB5E"}
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;AAGlD,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;IASlD;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;CAyB5E"}
@@ -172,6 +172,10 @@ export class AppDataEntity {
172
172
  * @return {*} {unknown}
173
173
  */
174
174
  convertVal(value, dataType) {
175
+ // 空值不转换
176
+ if (value == null) {
177
+ return value;
178
+ }
175
179
  // 没有数据类型的给原值
176
180
  if (isNil(dataType)) {
177
181
  return value;
@@ -1 +1 @@
1
- {"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAgBrB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAhBhC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAED;;;;;;;OAOG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAchC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;CAOlE"}
1
+ {"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAgBrB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAhBhC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAED;;;;;;;OAOG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAchC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;CAUlE"}
@@ -1,3 +1,4 @@
1
+ import { isNilOrEmpty } from 'qx-util';
1
2
  import { MethodDto } from '../../../dto/method.dto';
2
3
  import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
3
4
  import { findModelChild } from '../../../../model';
@@ -47,6 +48,9 @@ export class MethodReturn {
47
48
  const items = await this.dto.sets(context, [data]);
48
49
  return items[0];
49
50
  }
51
+ if (isNilOrEmpty(data)) {
52
+ data = {};
53
+ }
50
54
  return new AppDataEntity(this.entity, data);
51
55
  }
52
56
  }
@@ -90,7 +90,7 @@ export class UIActionProviderBase {
90
90
  async isConfirm(action, args) {
91
91
  const confirmMsg = this.calcMessage('confirm', action, args);
92
92
  if (action.enableConfirm && confirmMsg) {
93
- return ibiz.modal.confirm({ title: confirmMsg });
93
+ return ibiz.confirm.warning({ title: '操作确认', desc: confirmMsg });
94
94
  }
95
95
  return true;
96
96
  }
@@ -0,0 +1,13 @@
1
+ import { IErrorHandler } from '../../interface';
2
+ /**
3
+ * 默认处理器
4
+ * @author lxm
5
+ * @date 2023-09-26 04:52:18
6
+ * @export
7
+ * @class DefaultErrorHandler
8
+ * @implements {IErrorHandler}
9
+ */
10
+ export declare class DefaultErrorHandler implements IErrorHandler {
11
+ handle(error: unknown): boolean | undefined;
12
+ }
13
+ //# sourceMappingURL=default-error-handler.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"default-error-handler.d.ts","sourceRoot":"","sources":["../../../src/utils/error-handler/default-error-handler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,aAAa;IACvD,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS;CAqB5C"}
@@ -0,0 +1,36 @@
1
+ import { RuntimeModelError, ModelError, HttpError, NoticeError, RuntimeError, } from '@ibiz-template/core';
2
+ /**
3
+ * 默认处理器
4
+ * @author lxm
5
+ * @date 2023-09-26 04:52:18
6
+ * @export
7
+ * @class DefaultErrorHandler
8
+ * @implements {IErrorHandler}
9
+ */
10
+ export class DefaultErrorHandler {
11
+ handle(error) {
12
+ if (error instanceof RuntimeModelError || error instanceof ModelError) {
13
+ ibiz.message.error(error.message, 10, true);
14
+ }
15
+ else if (error instanceof HttpError) {
16
+ if (error.status === 401) {
17
+ ibiz.message.error('没有注册无权限错误处理器');
18
+ }
19
+ else {
20
+ ibiz.notification.error({
21
+ title: '',
22
+ desc: error.message,
23
+ duration: 10,
24
+ });
25
+ }
26
+ }
27
+ else if (error instanceof NoticeError) {
28
+ ibiz.message.error(error.message, error.duration, error.duration === 0);
29
+ }
30
+ else if (error instanceof RuntimeError) {
31
+ ibiz.message.error(error.message, 10, true);
32
+ }
33
+ ibiz.log.error(error);
34
+ return true;
35
+ }
36
+ }
@@ -0,0 +1,41 @@
1
+ import { IErrorHandler } from '../../interface';
2
+ /**
3
+ * 事件处理工具
4
+ *
5
+ * @author lxm
6
+ * @date 2022-09-21 18:09:31
7
+ * @export
8
+ * @class ErrorHandler
9
+ */
10
+ export declare class ErrorHandlerCenter {
11
+ /**
12
+ * 处理器集合
13
+ * @author lxm
14
+ * @date 2023-09-26 04:56:29
15
+ * @type {IErrorHandler[]}
16
+ */
17
+ protected handlers: IErrorHandler[];
18
+ /**
19
+ * 注册处理器(后注册的优先级更高)
20
+ * @author lxm
21
+ * @date 2023-09-26 04:59:06
22
+ * @param {IErrorHandler} handler
23
+ */
24
+ register(handler: IErrorHandler): void;
25
+ /**
26
+ * 处理单个报错
27
+ * @author lxm
28
+ * @date 2023-09-26 05:18:18
29
+ * @protected
30
+ * @param {unknown} error
31
+ */
32
+ protected handleSingle(error: unknown): void;
33
+ /**
34
+ * 按顺序检测处理器,最先满足条件的处理该异常
35
+ * @author lxm
36
+ * @date 2023-09-26 05:01:08
37
+ * @param {unknown} error
38
+ */
39
+ handle(error: unknown): void;
40
+ }
41
+ //# sourceMappingURL=error-handler-center.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"error-handler-center.d.ts","sourceRoot":"","sources":["../../../src/utils/error-handler/error-handler-center.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,kBAAkB;IAC7B;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAM;IAEzC;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAItC;;;;;;OAMG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAS5C;;;;;OAKG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;CAS7B"}