@ibiz-template/runtime 0.1.8 → 0.1.10

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 (182) hide show
  1. package/dist/index.esm.js +4313 -4022
  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 +8 -0
  5. package/out/app-hub.d.ts.map +1 -1
  6. package/out/app-hub.js +8 -0
  7. package/out/command/app/open-app-view/open-app-view.js +5 -5
  8. package/out/config/global-config.js +1 -1
  9. package/out/controller/common/control/control.controller.d.ts +9 -1
  10. package/out/controller/common/control/control.controller.d.ts.map +1 -1
  11. package/out/controller/common/control/control.controller.js +17 -7
  12. package/out/controller/common/view/view.controller.d.ts +1 -0
  13. package/out/controller/common/view/view.controller.d.ts.map +1 -1
  14. package/out/controller/common/view/view.controller.js +6 -3
  15. package/out/controller/hub.controller.d.ts +16 -0
  16. package/out/controller/hub.controller.d.ts.map +1 -0
  17. package/out/controller/hub.controller.js +20 -0
  18. package/out/controller/index.d.ts +1 -0
  19. package/out/controller/index.d.ts.map +1 -1
  20. package/out/controller/index.js +1 -0
  21. package/out/controller/utils/value-rule/value-rule.d.ts.map +1 -1
  22. package/out/controller/utils/value-rule/value-rule.js +1 -1
  23. package/out/interface/common/i-app-hub-service/i-app-hub-service.d.ts +9 -0
  24. package/out/interface/common/i-app-hub-service/i-app-hub-service.d.ts.map +1 -1
  25. package/out/interface/common/i-ui-action-result/i-ui-action-result.d.ts +7 -0
  26. package/out/interface/common/i-ui-action-result/i-ui-action-result.d.ts.map +1 -1
  27. package/out/interface/controller/app.d.ts +37 -0
  28. package/out/interface/controller/app.d.ts.map +1 -0
  29. package/out/interface/controller/app.js +1 -0
  30. package/out/interface/controller/controller/control/i-context-menu.controller.d.ts +15 -0
  31. package/out/interface/controller/controller/control/i-context-menu.controller.d.ts.map +1 -0
  32. package/out/interface/controller/controller/control/i-context-menu.controller.js +1 -0
  33. package/out/interface/controller/controller/control/i-form.controller.d.ts +7 -0
  34. package/out/interface/controller/controller/control/i-form.controller.d.ts.map +1 -1
  35. package/out/interface/controller/controller/control/i-grid.controller.d.ts +9 -1
  36. package/out/interface/controller/controller/control/i-grid.controller.d.ts.map +1 -1
  37. package/out/interface/controller/controller/control/i-toolbar.controller.d.ts +2 -2
  38. package/out/interface/controller/controller/control/i-toolbar.controller.d.ts.map +1 -1
  39. package/out/interface/controller/controller/control/i-tree.controller.d.ts +6 -4
  40. package/out/interface/controller/controller/control/i-tree.controller.d.ts.map +1 -1
  41. package/out/interface/controller/controller/control/index.d.ts +1 -0
  42. package/out/interface/controller/controller/control/index.d.ts.map +1 -1
  43. package/out/interface/controller/controller/control/index.js +1 -0
  44. package/out/interface/controller/controller/view/i-view.controller.d.ts +8 -0
  45. package/out/interface/controller/controller/view/i-view.controller.d.ts.map +1 -1
  46. package/out/interface/controller/event/control/i-context-menu.event.d.ts +11 -0
  47. package/out/interface/controller/event/control/i-context-menu.event.d.ts.map +1 -0
  48. package/out/interface/controller/event/control/i-context-menu.event.js +1 -0
  49. package/out/interface/controller/event/control/i-pickup-view-panel.event.d.ts +0 -15
  50. package/out/interface/controller/event/control/i-pickup-view-panel.event.d.ts.map +1 -1
  51. package/out/interface/controller/event/control/index.d.ts +1 -0
  52. package/out/interface/controller/event/control/index.d.ts.map +1 -1
  53. package/out/interface/controller/event/control/index.js +1 -0
  54. package/out/interface/controller/event/view/i-pickup-md-view.event.d.ts +31 -0
  55. package/out/interface/controller/event/view/i-pickup-md-view.event.d.ts.map +1 -0
  56. package/out/interface/controller/event/view/i-pickup-md-view.event.js +1 -0
  57. package/out/interface/controller/event/view/index.d.ts +1 -0
  58. package/out/interface/controller/event/view/index.d.ts.map +1 -1
  59. package/out/interface/controller/event/view/index.js +1 -0
  60. package/out/interface/controller/index.d.ts +1 -0
  61. package/out/interface/controller/index.d.ts.map +1 -1
  62. package/out/interface/controller/state/control/i-context-menu.state.d.ts +11 -0
  63. package/out/interface/controller/state/control/i-context-menu.state.d.ts.map +1 -0
  64. package/out/interface/controller/state/control/i-context-menu.state.js +1 -0
  65. package/out/interface/controller/state/control/i-tree-exp-bar.state.d.ts +8 -0
  66. package/out/interface/controller/state/control/i-tree-exp-bar.state.d.ts.map +1 -1
  67. package/out/interface/controller/state/control/i-tree.state.d.ts +1 -10
  68. package/out/interface/controller/state/control/i-tree.state.d.ts.map +1 -1
  69. package/out/interface/controller/state/control/index.d.ts +1 -0
  70. package/out/interface/controller/state/control/index.d.ts.map +1 -1
  71. package/out/interface/controller/state/control/index.js +1 -0
  72. package/out/interface/controller/state/view/i-pickup-md-view.state.d.ts +22 -0
  73. package/out/interface/controller/state/view/i-pickup-md-view.state.d.ts.map +1 -0
  74. package/out/interface/controller/state/view/i-pickup-md-view.state.js +1 -0
  75. package/out/interface/controller/state/view/index.d.ts +1 -0
  76. package/out/interface/controller/state/view/index.d.ts.map +1 -1
  77. package/out/interface/controller/state/view/index.js +1 -0
  78. package/out/interface/util/i-open-view-util/i-open-view-util.d.ts +11 -11
  79. package/out/interface/util/i-open-view-util/i-open-view-util.d.ts.map +1 -1
  80. package/out/interface/util/script/i-script-function.d.ts +8 -1
  81. package/out/interface/util/script/i-script-function.d.ts.map +1 -1
  82. package/out/logic-scheduler/executor/script-executor.d.ts +6 -6
  83. package/out/logic-scheduler/executor/script-executor.d.ts.map +1 -1
  84. package/out/logic-scheduler/executor/script-executor.js +10 -14
  85. package/out/logic-scheduler/trigger/item-dyna-logic-trigger.d.ts +1 -0
  86. package/out/logic-scheduler/trigger/item-dyna-logic-trigger.d.ts.map +1 -1
  87. package/out/logic-scheduler/trigger/item-dyna-logic-trigger.js +6 -2
  88. package/out/logic-scheduler/trigger/logic-trigger.d.ts +8 -0
  89. package/out/logic-scheduler/trigger/logic-trigger.d.ts.map +1 -1
  90. package/out/logic-scheduler/trigger/logic-trigger.js +17 -0
  91. package/out/model/layout/layout.d.ts.map +1 -1
  92. package/out/model/layout/layout.js +1 -0
  93. package/out/register/helper/common-register.d.ts +11 -0
  94. package/out/register/helper/common-register.d.ts.map +1 -0
  95. package/out/register/helper/common-register.js +20 -0
  96. package/out/register/helper/control-register.d.ts.map +1 -1
  97. package/out/register/helper/control-register.js +22 -5
  98. package/out/register/helper/editor-register.d.ts.map +1 -1
  99. package/out/register/helper/editor-register.js +25 -5
  100. package/out/register/helper/form-detail-register.d.ts.map +1 -1
  101. package/out/register/helper/form-detail-register.js +19 -5
  102. package/out/register/helper/grid-column-register.d.ts.map +1 -1
  103. package/out/register/helper/grid-column-register.js +19 -5
  104. package/out/register/helper/panel-item-register.d.ts.map +1 -1
  105. package/out/register/helper/panel-item-register.js +25 -5
  106. package/out/register/helper/portlet-register.d.ts.map +1 -1
  107. package/out/register/helper/portlet-register.js +19 -5
  108. package/out/register/helper/ui-action-register.d.ts.map +1 -1
  109. package/out/register/helper/ui-action-register.js +19 -5
  110. package/out/register/helper/view-register.d.ts.map +1 -1
  111. package/out/register/helper/view-register.js +18 -1
  112. package/out/service/app-data-entity/app-data-entity.d.ts.map +1 -1
  113. package/out/service/app-data-entity/app-data-entity.js +0 -1
  114. package/out/service/service/counter/counter.service.d.ts.map +1 -1
  115. package/out/service/service/counter/counter.service.js +4 -1
  116. package/out/service/vo/tree-node-data/tree-data-set-node-data.d.ts.map +1 -1
  117. package/out/service/vo/tree-node-data/tree-data-set-node-data.js +3 -1
  118. package/out/ui-action/provider/sys-ui-action-provider.d.ts +1 -0
  119. package/out/ui-action/provider/sys-ui-action-provider.d.ts.map +1 -1
  120. package/out/ui-action/provider/sys-ui-action-provider.js +42 -1
  121. package/out/ui-action/provider/ui-action-provider-base.d.ts.map +1 -1
  122. package/out/ui-action/provider/ui-action-provider-base.js +1 -0
  123. package/out/ui-action/uiaction-util.d.ts.map +1 -1
  124. package/out/ui-action/uiaction-util.js +13 -1
  125. package/out/utils/script/script-function.d.ts +9 -0
  126. package/out/utils/script/script-function.d.ts.map +1 -1
  127. package/out/utils/script/script-function.js +75 -1
  128. package/out/utils/verify/de-rule-verify.js +1 -1
  129. package/package.json +4 -4
  130. package/src/app-hub.ts +9 -0
  131. package/src/command/app/open-app-view/open-app-view.ts +5 -5
  132. package/src/config/global-config.ts +1 -1
  133. package/src/controller/common/control/control.controller.ts +19 -9
  134. package/src/controller/common/view/view.controller.ts +9 -3
  135. package/src/controller/hub.controller.ts +22 -0
  136. package/src/controller/index.ts +1 -0
  137. package/src/controller/utils/value-rule/value-rule.ts +1 -0
  138. package/src/interface/common/i-app-hub-service/i-app-hub-service.ts +10 -0
  139. package/src/interface/common/i-ui-action-result/i-ui-action-result.ts +8 -0
  140. package/src/interface/controller/app.ts +38 -0
  141. package/src/interface/controller/controller/control/i-context-menu.controller.ts +19 -0
  142. package/src/interface/controller/controller/control/i-form.controller.ts +8 -0
  143. package/src/interface/controller/controller/control/i-grid.controller.ts +10 -1
  144. package/src/interface/controller/controller/control/i-toolbar.controller.ts +6 -3
  145. package/src/interface/controller/controller/control/i-tree.controller.ts +9 -4
  146. package/src/interface/controller/controller/control/index.ts +1 -0
  147. package/src/interface/controller/controller/view/i-view.controller.ts +9 -0
  148. package/src/interface/controller/event/control/i-context-menu.event.ts +10 -0
  149. package/src/interface/controller/event/control/i-pickup-view-panel.event.ts +0 -16
  150. package/src/interface/controller/event/control/index.ts +1 -0
  151. package/src/interface/controller/event/view/i-pickup-md-view.event.ts +29 -0
  152. package/src/interface/controller/event/view/index.ts +1 -0
  153. package/src/interface/controller/index.ts +1 -0
  154. package/src/interface/controller/state/control/i-context-menu.state.ts +10 -0
  155. package/src/interface/controller/state/control/i-tree-exp-bar.state.ts +10 -1
  156. package/src/interface/controller/state/control/i-tree.state.ts +1 -9
  157. package/src/interface/controller/state/control/index.ts +1 -0
  158. package/src/interface/controller/state/view/i-pickup-md-view.state.ts +22 -0
  159. package/src/interface/controller/state/view/index.ts +1 -0
  160. package/src/interface/util/i-open-view-util/i-open-view-util.ts +11 -11
  161. package/src/interface/util/script/i-script-function.ts +9 -1
  162. package/src/logic-scheduler/executor/script-executor.ts +11 -14
  163. package/src/logic-scheduler/trigger/item-dyna-logic-trigger.ts +8 -2
  164. package/src/logic-scheduler/trigger/logic-trigger.ts +19 -0
  165. package/src/model/layout/layout.ts +1 -0
  166. package/src/register/helper/common-register.ts +28 -0
  167. package/src/register/helper/control-register.ts +21 -6
  168. package/src/register/helper/editor-register.ts +22 -7
  169. package/src/register/helper/form-detail-register.ts +18 -6
  170. package/src/register/helper/grid-column-register.ts +19 -6
  171. package/src/register/helper/panel-item-register.ts +22 -6
  172. package/src/register/helper/portlet-register.ts +19 -6
  173. package/src/register/helper/ui-action-register.ts +19 -6
  174. package/src/register/helper/view-register.ts +18 -1
  175. package/src/service/app-data-entity/app-data-entity.ts +0 -1
  176. package/src/service/service/counter/counter.service.ts +4 -1
  177. package/src/service/vo/tree-node-data/tree-data-set-node-data.ts +3 -0
  178. package/src/ui-action/provider/sys-ui-action-provider.ts +41 -1
  179. package/src/ui-action/provider/ui-action-provider-base.ts +1 -0
  180. package/src/ui-action/uiaction-util.ts +12 -1
  181. package/src/utils/script/script-function.ts +77 -2
  182. package/src/utils/verify/de-rule-verify.ts +1 -0
@@ -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;AAEnD,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,CA0BvC"}
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,3 +1,4 @@
1
+ import { getPluginRegisterKey } from './common-register';
1
2
  /** 部件适配器前缀 */
2
3
  export const CONTROL_PROVIDER_PREFIX = 'CONTROL';
3
4
  /**
@@ -24,7 +25,20 @@ function getProvider(key) {
24
25
  */
25
26
  export async function getControlProvider(model) {
26
27
  let provider;
27
- const { controlType, controlStyle } = model;
28
+ const { controlType, controlStyle, sysPFPluginId, appId } = model;
29
+ // 找插件适配器
30
+ if (sysPFPluginId) {
31
+ const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
32
+ if (pluginKey) {
33
+ provider = getProvider(pluginKey);
34
+ }
35
+ if (!provider) {
36
+ ibiz.log.error(`找不到部件插件${pluginKey}对应的适配器`);
37
+ }
38
+ else {
39
+ return provider;
40
+ }
41
+ }
28
42
  // 再找部件类型和部件样式
29
43
  if (controlStyle && controlStyle !== 'DEFAULT') {
30
44
  const key = `${controlType}_${controlStyle}`;
@@ -32,13 +46,16 @@ export async function getControlProvider(model) {
32
46
  if (!provider) {
33
47
  ibiz.log.error(`找不到部件类型:[${controlType}]的部件样式:[${controlStyle}]对应的适配器`, model);
34
48
  }
49
+ else {
50
+ return provider;
51
+ }
35
52
  }
36
53
  // 找部件类型
37
- if (!provider) {
38
- provider = getProvider(controlType);
39
- }
54
+ provider = getProvider(controlType);
40
55
  if (!provider) {
41
56
  ibiz.log.error(`找不到部件类型${controlType}对应的适配器`);
42
57
  }
43
- return provider;
58
+ else {
59
+ return provider;
60
+ }
44
61
  }
@@ -1 +1 @@
1
- {"version":3,"file":"editor-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/editor-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,eAAe;AACf,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAE/C;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,eAAe,GAC9B,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CA0CtC"}
1
+ {"version":3,"file":"editor-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/editor-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlD,eAAe;AACf,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAE/C;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,eAAe,GAC9B,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAwDtC"}
@@ -1,3 +1,4 @@
1
+ import { getPluginRegisterKey } from './common-register';
1
2
  /** 编辑器适配器前缀 */
2
3
  export const EDITOR_PROVIDER_PREFIX = 'EDITOR';
3
4
  /**
@@ -24,7 +25,20 @@ function getProvider(key) {
24
25
  */
25
26
  export async function getEditorProvider(model) {
26
27
  let provider;
27
- const { editorType, editorStyle, predefinedType } = model;
28
+ const { editorType, editorStyle, predefinedType, sysPFPluginId, appId } = model;
29
+ // 找插件适配器
30
+ if (sysPFPluginId) {
31
+ const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
32
+ if (pluginKey) {
33
+ provider = getProvider(pluginKey);
34
+ }
35
+ if (!provider) {
36
+ ibiz.log.error(`找不到编辑器插件${pluginKey}对应的适配器`);
37
+ }
38
+ else {
39
+ return provider;
40
+ }
41
+ }
28
42
  // 再找编辑器类型和编辑器样式
29
43
  if (editorStyle && editorStyle !== 'DEFAULT') {
30
44
  const key = `${editorType}_${editorStyle}`;
@@ -32,6 +46,9 @@ export async function getEditorProvider(model) {
32
46
  if (!provider) {
33
47
  ibiz.log.error(`找不到编辑器类型:[${editorType}]的编辑器样式:[${editorStyle}]对应的适配器`, model);
34
48
  }
49
+ else {
50
+ return provider;
51
+ }
35
52
  }
36
53
  // 编辑器预置类型
37
54
  if (predefinedType) {
@@ -43,13 +60,16 @@ export async function getEditorProvider(model) {
43
60
  if (!provider) {
44
61
  ibiz.log.error(`找不到编辑器类型:[${editorType}]的预置类型:[${predefinedType}]对应的适配器`, model);
45
62
  }
63
+ else {
64
+ return provider;
65
+ }
46
66
  }
47
67
  // 找编辑器类型
48
- if (!provider) {
49
- provider = getProvider(editorType);
50
- }
68
+ provider = getProvider(editorType);
51
69
  if (!provider) {
52
70
  ibiz.log.error(`找不到编辑器类型${editorType}对应的适配器`);
53
71
  }
54
- return provider;
72
+ else {
73
+ return provider;
74
+ }
55
75
  }
@@ -1 +1 @@
1
- {"version":3,"file":"form-detail-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/form-detail-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,gBAAgB;AAChB,eAAO,MAAM,0BAA0B,eAAe,CAAC;AAEvD;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,mBAAmB,GAClC,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAa1C"}
1
+ {"version":3,"file":"form-detail-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/form-detail-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAGtD,gBAAgB;AAChB,eAAO,MAAM,0BAA0B,eAAe,CAAC;AAEvD;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,mBAAmB,GAClC,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAwB1C"}
@@ -1,3 +1,4 @@
1
+ import { getPluginRegisterKey } from './common-register';
1
2
  /** 表单成员适配器前缀 */
2
3
  export const FORMDETAIL_PROVIDER_PREFIX = 'FORMDETAIL';
3
4
  /**
@@ -24,13 +25,26 @@ function getProvider(key) {
24
25
  */
25
26
  export async function getFormDetailProvider(model) {
26
27
  let provider;
27
- const { detailType } = model;
28
- // 找表单成员类型
29
- if (!provider) {
30
- provider = getProvider(detailType);
28
+ const { detailType, sysPFPluginId, appId } = model;
29
+ // 找插件适配器
30
+ if (sysPFPluginId) {
31
+ const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
32
+ if (pluginKey) {
33
+ provider = getProvider(pluginKey);
34
+ }
35
+ if (!provider) {
36
+ ibiz.log.error(`找不到表单成员插件${pluginKey}对应的适配器`);
37
+ }
38
+ else {
39
+ return provider;
40
+ }
31
41
  }
42
+ // 找表单成员类型
43
+ provider = getProvider(detailType);
32
44
  if (!provider) {
33
45
  ibiz.log.error(`找不到表单成员类型${detailType}对应的适配器`);
34
46
  }
35
- return provider;
47
+ else {
48
+ return provider;
49
+ }
36
50
  }
@@ -1 +1 @@
1
- {"version":3,"file":"grid-column-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/grid-column-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,eAAe;AACf,eAAO,MAAM,0BAA0B,eAAe,CAAC;AAEvD;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,mBAAmB,GAClC,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAc1C"}
1
+ {"version":3,"file":"grid-column-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/grid-column-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAGtD,eAAe;AACf,eAAO,MAAM,0BAA0B,eAAe,CAAC;AAEvD;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,mBAAmB,GAClC,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CA0B1C"}
@@ -1,3 +1,4 @@
1
+ import { getPluginRegisterKey } from './common-register';
1
2
  /** 表格列适配器前缀 */
2
3
  export const GRIDCOLUMN_PROVIDER_PREFIX = 'GRIDCOLUMN';
3
4
  /**
@@ -24,14 +25,27 @@ function getProvider(key) {
24
25
  */
25
26
  export async function getGridColumnProvider(model) {
26
27
  let provider;
27
- const { columnType, enableRowEdit } = model;
28
+ const { columnType, enableRowEdit, sysPFPluginId, appId } = model;
29
+ // 找插件适配器
30
+ if (sysPFPluginId) {
31
+ const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
32
+ if (pluginKey) {
33
+ provider = getProvider(pluginKey);
34
+ }
35
+ if (!provider) {
36
+ ibiz.log.error(`找不到表格列插件${pluginKey}对应的适配器`);
37
+ }
38
+ else {
39
+ return provider;
40
+ }
41
+ }
28
42
  const key = enableRowEdit ? `${columnType}_EDIT` : columnType;
29
43
  // 找表格列类型
30
- if (!provider) {
31
- provider = getProvider(key);
32
- }
44
+ provider = getProvider(key);
33
45
  if (!provider) {
34
46
  ibiz.log.error(`找不到表格列类型${key}对应的适配器`);
35
47
  }
36
- return provider;
48
+ else {
49
+ return provider;
50
+ }
37
51
  }
@@ -1 +1 @@
1
- {"version":3,"file":"panel-item-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/panel-item-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,UAAU,EAAiB,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,gBAAgB;AAChB,eAAO,MAAM,yBAAyB,cAAc,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,kBAAkB,GACjC,IAAI,CAKN;AAQD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAqCzC"}
1
+ {"version":3,"file":"panel-item-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/panel-item-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,UAAU,EAAiB,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGrD,gBAAgB;AAChB,eAAO,MAAM,yBAAyB,cAAc,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,kBAAkB,GACjC,IAAI,CAKN;AAQD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAoDzC"}
@@ -1,3 +1,4 @@
1
+ import { getPluginRegisterKey } from './common-register';
1
2
  /** 面板成员适配器前缀 */
2
3
  export const PANELITEM_PROVIDER_PREFIX = 'PANELITEM';
3
4
  /**
@@ -25,7 +26,20 @@ function getProvider(key) {
25
26
  export async function getPanelItemProvider(model) {
26
27
  var _a;
27
28
  let provider;
28
- const { itemType } = model;
29
+ const { itemType, sysPFPluginId, appId } = model;
30
+ // 找插件适配器
31
+ if (sysPFPluginId) {
32
+ const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
33
+ if (pluginKey) {
34
+ provider = getProvider(pluginKey);
35
+ }
36
+ if (!provider) {
37
+ ibiz.log.error(`找不到面板成员插件${pluginKey}对应的适配器`);
38
+ }
39
+ else {
40
+ return provider;
41
+ }
42
+ }
29
43
  // 特殊容器类型
30
44
  if (itemType === 'CONTAINER') {
31
45
  const predefinedType = model.predefinedType || 'DEFAULT';
@@ -34,6 +48,9 @@ export async function getPanelItemProvider(model) {
34
48
  if (!provider) {
35
49
  ibiz.log.error(`找不到面板容器预置类型为${predefinedType}的适配器`);
36
50
  }
51
+ else {
52
+ return provider;
53
+ }
37
54
  }
38
55
  // 特殊直接内容类型
39
56
  if (itemType === 'RAWITEM') {
@@ -43,13 +60,16 @@ export async function getPanelItemProvider(model) {
43
60
  if (!provider) {
44
61
  ibiz.log.error(`找不到面板成员直接内容预置类型为${predefinedType}的适配器`);
45
62
  }
63
+ else {
64
+ return provider;
65
+ }
46
66
  }
47
67
  // 找面板成员类型
48
- if (!provider) {
49
- provider = getProvider(itemType);
50
- }
68
+ provider = getProvider(itemType);
51
69
  if (!provider) {
52
70
  ibiz.log.error(`找不到面板成员类型${itemType}对应的适配器`);
53
71
  }
54
- return provider;
72
+ else {
73
+ return provider;
74
+ }
55
75
  }
@@ -1 +1 @@
1
- {"version":3,"file":"portlet-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/portlet-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,kBAAkB;AAClB,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,cAAc,GACpB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAavC"}
1
+ {"version":3,"file":"portlet-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/portlet-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,kBAAkB;AAClB,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,cAAc,GACpB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAyBvC"}
@@ -1,3 +1,4 @@
1
+ import { getPluginRegisterKey } from './common-register';
1
2
  /** 门户部件成员适配器前缀 */
2
3
  export const PORTLET_PROVIDER_PREFIX = 'PORTLET';
3
4
  /**
@@ -24,13 +25,26 @@ function getProvider(key) {
24
25
  */
25
26
  export async function getPortletProvider(model) {
26
27
  let provider;
27
- const { portletType } = model;
28
- // 找门户部件成员类型
29
- if (!provider) {
30
- provider = getProvider(portletType);
28
+ const { portletType, sysPFPluginId, appId } = model;
29
+ // 找插件适配器
30
+ if (sysPFPluginId) {
31
+ const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
32
+ if (pluginKey) {
33
+ provider = getProvider(pluginKey);
34
+ }
35
+ if (!provider) {
36
+ ibiz.log.error(`找不到门户部件插件${pluginKey}对应的适配器`);
37
+ }
38
+ else {
39
+ return provider;
40
+ }
31
41
  }
42
+ // 找门户部件成员类型
43
+ provider = getProvider(portletType);
32
44
  if (!provider) {
33
45
  ibiz.log.error(`找不到门户部件成员类型${portletType}对应的适配器`);
34
46
  }
35
- return provider;
47
+ else {
48
+ return provider;
49
+ }
36
50
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ui-action-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/ui-action-register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,gBAAgB;AAChB,eAAO,MAAM,wBAAwB,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,iBAAiB,GAChC,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,iBAAiB,CAAC,CAa5B"}
1
+ {"version":3,"file":"ui-action-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/ui-action-register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGpD,gBAAgB;AAChB,eAAO,MAAM,wBAAwB,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,iBAAiB,GAChC,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,iBAAiB,CAAC,CAyB5B"}
@@ -1,4 +1,5 @@
1
1
  import { RuntimeError } from '@ibiz-template/core';
2
+ import { getPluginRegisterKey } from './common-register';
2
3
  /** 界面行为适配器前缀 */
3
4
  export const UIACTION_PROVIDER_PREFIX = 'UIACTION';
4
5
  /**
@@ -25,13 +26,26 @@ function getProvider(key) {
25
26
  */
26
27
  export async function getUIActionProvider(model) {
27
28
  let provider;
28
- const { uiactionMode } = model;
29
- // 找界面行为类型
30
- if (!provider) {
31
- provider = getProvider(uiactionMode);
29
+ const { uiactionMode, sysPFPluginId, appId } = model;
30
+ // 找插件适配器
31
+ if (sysPFPluginId) {
32
+ const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
33
+ if (pluginKey) {
34
+ provider = getProvider(pluginKey);
35
+ }
36
+ if (!provider) {
37
+ ibiz.log.error(`找不到界面行为插件${pluginKey}对应的适配器`);
38
+ }
39
+ else {
40
+ return provider;
41
+ }
32
42
  }
43
+ // 找界面行为类型
44
+ provider = getProvider(uiactionMode);
33
45
  if (!provider) {
34
46
  throw new RuntimeError(`找不界面行为模式${uiactionMode}对应的适配器`);
35
47
  }
36
- return provider;
48
+ else {
49
+ return provider;
50
+ }
37
51
  }
@@ -1 +1 @@
1
- {"version":3,"file":"view-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/view-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,cAAc;AACd,eAAO,MAAM,oBAAoB,SAAS,CAAC;AAE3C;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,aAAa,GAC5B,IAAI,CAEN;AAMD;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA0BpC"}
1
+ {"version":3,"file":"view-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/view-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,cAAc;AACd,eAAO,MAAM,oBAAoB,SAAS,CAAC;AAE3C;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,aAAa,GAC5B,IAAI,CAEN;AAMD;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA0CpC"}
@@ -1,3 +1,4 @@
1
+ import { getPluginRegisterKey } from './common-register';
1
2
  /** 视图适配器前缀 */
2
3
  export const VIEW_PROVIDER_PREFIX = 'VIEW';
3
4
  /**
@@ -24,7 +25,20 @@ function getProvider(key) {
24
25
  */
25
26
  export async function getViewProvider(model) {
26
27
  let provider;
27
- const { viewType, viewStyle } = model;
28
+ const { viewType, viewStyle, sysPFPluginId, appId } = model;
29
+ // 找插件适配器
30
+ if (sysPFPluginId) {
31
+ const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
32
+ if (pluginKey) {
33
+ provider = getProvider(pluginKey);
34
+ }
35
+ if (!provider) {
36
+ ibiz.log.error(`找不到视图插件${pluginKey}对应的适配器`);
37
+ }
38
+ else {
39
+ return provider;
40
+ }
41
+ }
28
42
  // 再找视图类型和视图样式
29
43
  if (viewStyle && viewStyle !== 'DEFAULT') {
30
44
  const key = `${viewType}_${viewStyle}`;
@@ -32,6 +46,9 @@ export async function getViewProvider(model) {
32
46
  if (!provider) {
33
47
  ibiz.log.error(`找不到视图类型:[${viewType}]的视图样式:[${viewStyle}]对应的适配器`, model);
34
48
  }
49
+ else {
50
+ return provider;
51
+ }
35
52
  }
36
53
  // 找视图类型
37
54
  if (!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;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;IAsE/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;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"}
@@ -54,7 +54,6 @@ export class AppDataEntity {
54
54
  Object.defineProperty(this, 'srfkey', {
55
55
  set(val) {
56
56
  _srfkey = val;
57
- this._data[key] = val;
58
57
  },
59
58
  get() {
60
59
  return this._data[key] || _srfkey;
@@ -1 +1 @@
1
- {"version":3,"file":"counter.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/counter/counter.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAEjE;;;;;;;OAOG;WACU,UAAU,CACrB,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;IAetB;;;;;;;;;;OAUG;WACU,eAAe,CAC1B,KAAK,EAAE,cAAc,EACrB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;CAOvB"}
1
+ {"version":3,"file":"counter.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/counter/counter.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAEjE;;;;;;;OAOG;WACU,UAAU,CACrB,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;IAetB;;;;;;;;;;OAUG;WACU,eAAe,CAC1B,KAAK,EAAE,cAAc,EACrB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;CAUvB"}
@@ -1,5 +1,5 @@
1
1
  /* eslint-disable @typescript-eslint/no-unused-vars */
2
- import { RuntimeModelError } from '@ibiz-template/core';
2
+ import { ModelError, RuntimeModelError } from '@ibiz-template/core';
3
3
  import { AppCounter } from '../../utils';
4
4
  /**
5
5
  * 计数器服务,用来获取计数器实例
@@ -48,6 +48,9 @@ export class CounterService {
48
48
  if (!appCounter) {
49
49
  throw new RuntimeModelError(model, `未配置应用计数器!`);
50
50
  }
51
+ if (appCounter.counterType === 'CUSTOM') {
52
+ throw new ModelError(appCounter, `未支持自定义计数器`);
53
+ }
51
54
  return this.getCounter(appCounter, context, params);
52
55
  }
53
56
  }
@@ -1 +1 @@
1
- {"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IAC5E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,KAAK,CAAC;gBAGZ,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IA4BH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAiBhE;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,CAC1B,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,GAAG,SAAS;IASrB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;CAStE"}
1
+ {"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IAC5E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,KAAK,CAAC;gBAGZ,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IA4BH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAiBhE;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,CAC1B,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,GAAG,SAAS;IAYrB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;CAStE"}
@@ -58,7 +58,9 @@ export class TreeDataSetNodeData extends TreeNodeData {
58
58
  */
59
59
  calcDataItemScript(dataItem) {
60
60
  if (dataItem.customCode && dataItem.scriptCode) {
61
- return ScriptFactory.execScriptFn({ data: this.deData }, dataItem.scriptCode);
61
+ return ScriptFactory.execScriptFn({ data: this.deData }, dataItem.scriptCode, {
62
+ isAsync: false,
63
+ });
62
64
  }
63
65
  }
64
66
  /**
@@ -11,6 +11,7 @@ import { UIActionProviderBase } from './ui-action-provider-base';
11
11
  * @implements {IUIActionProvider}
12
12
  */
13
13
  export declare class SysUIActionProvider extends UIActionProviderBase {
14
+ private predefinedActionMap;
14
15
  execAction(action: IAppDEUIAction, args: IUILogicParams): Promise<IUIActionResult>;
15
16
  }
16
17
  //# sourceMappingURL=sys-ui-action-provider.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"sys-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/sys-ui-action-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,SAAQ,oBAAoB;IACrD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAY5B"}
1
+ {"version":3,"file":"sys-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/sys-ui-action-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,SAAQ,oBAAoB;IAC3D,OAAO,CAAC,mBAAmB,CAoCxB;IAEG,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAc5B"}
@@ -10,9 +10,50 @@ import { UIActionProviderBase } from './ui-action-provider-base';
10
10
  * @implements {IUIActionProvider}
11
11
  */
12
12
  export class SysUIActionProvider extends UIActionProviderBase {
13
+ constructor() {
14
+ super(...arguments);
15
+ this.predefinedActionMap = new Map([
16
+ ['EDITVIEW_EXITACTION', 'Exit'],
17
+ ['EDITVIEW_SAVEANDEXITACTION', 'SaveAndExit'],
18
+ ['TREEVIEW_REFRESHPARENTACTION', 'RefreshParent'],
19
+ ['GRIDVIEW_EXPORTXMLACTION', 'ExportModel'],
20
+ ['GRIDVIEW_EXPORTACTION', 'ExportExcel'],
21
+ ['EDITVIEW_REMOVEANDEXITACTION', 'RemoveAndExit'],
22
+ ['GRIDVIEW_PRINTACTION', 'Print'],
23
+ ['EDITVIEW_NEXTRECORDACTION', 'NextRecord'],
24
+ ['GRIDVIEW_NEWROWACTION', 'NewRow'],
25
+ ['EDITVIEW_LASTRECORDACTION', 'LastRecord'],
26
+ ['EDITVIEW_PREVRECORDACTION', 'PrevRecord'],
27
+ ['GRIDVIEW_SEARCHBAR', 'ToggleFilter'],
28
+ ['EDITVIEW_SAVEANDSTARTWFACTION', 'SaveAndStart'],
29
+ ['EDITVIEW_NEWACTION', 'New'],
30
+ ['EDITVIEW_PRINTACTION', 'Print'],
31
+ ['EDITVIEW_COPYACTION', 'Copy'],
32
+ ['EDITVIEW_HELPACTION', 'Help'],
33
+ ['EDITVIEW_FIRSTRECORDACTION', 'FirstRecord'],
34
+ ['GRIDVIEW_REFRESHACTION', 'Refresh'],
35
+ ['EDITVIEW_SAVEANDNEWACTION', 'SaveAndNew'],
36
+ ['EDITVIEW_VIEWWFSTEPACTORACTION', 'ViewWFStep'],
37
+ ['EDITVIEW_SAVEACTION', 'Save'],
38
+ ['TREEVIEW_REFRESHALLACTION', 'RefreshAll'],
39
+ ['GRIDVIEW_IMPORTBAR', 'Import'],
40
+ ['GRIDVIEW_ROWEDITACTION', 'ToggleRowEdit'],
41
+ ['GRIDVIEW_NEWACTION', 'New'],
42
+ ['GRIDVIEW_EDITACTION', 'Edit'],
43
+ ['GRIDVIEW_HELPACTION', 'Help'],
44
+ ['EDITVIEW_REFRESHACTION', 'Refresh'],
45
+ ['GRIDVIEW_REMOVEACTION', 'Remove'],
46
+ ['GRIDVIEW_COPYACTION', 'Copy'],
47
+ ['GRIDVIEW_VIEWACTION', 'View'],
48
+ ['GRIDVIEW_SAVEROWACTION', 'SaveRow'],
49
+ ['APP_LOGIN', 'login'],
50
+ ['APP_LOGOUT', 'logout'],
51
+ ]);
52
+ }
13
53
  async execAction(action, args) {
14
54
  const { view } = args;
15
- const uIActionTag = action.uiactionTag;
55
+ const uIActionTag = this.predefinedActionMap.get(action.predefinedType) ||
56
+ action.uiactionTag;
16
57
  if (uIActionTag === SysUIActionTag.EXIT) {
17
58
  return { closeView: true };
18
59
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAkB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACf,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAuD3B;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe;IAO/D;;;;;;;OAOG;IACG,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAOzD;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,EACb,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;CAkFH"}
1
+ {"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAkB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACf,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAwD3B;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe;IAO/D;;;;;;;OAOG;IACG,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAOzD;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,EACb,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;CAkFH"}
@@ -24,6 +24,7 @@ export class UIActionProviderBase {
24
24
  const { context, params, data } = args;
25
25
  const result = {
26
26
  refresh: action.reloadData,
27
+ refreshMode: action.refreshMode,
27
28
  closeView: action.closeEditView,
28
29
  };
29
30
  // ** 界面逻辑替换执行界面行为
@@ -1 +1 @@
1
- {"version":3,"file":"uiaction-util.d.ts","sourceRoot":"","sources":["../../src/ui-action/uiaction-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/D;;;;;;;GAOG;AACH,qBAAa,YAAY;IACvB;;;;;;;;;OASG;WACU,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAS3B;;;;;;;OAOG;WACU,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;CAQjB"}
1
+ {"version":3,"file":"uiaction-util.d.ts","sourceRoot":"","sources":["../../src/ui-action/uiaction-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/D;;;;;;;GAOG;AACH,qBAAa,YAAY;IACvB;;;;;;;;;OASG;WACU,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAS3B;;;;;;;OAOG;WACU,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;CAmBjB"}
@@ -38,12 +38,24 @@ export class UIActionUtil {
38
38
  * @param {IUILogicParams} params 界面行为参数
39
39
  */
40
40
  static async execAndResolved(actionId, params) {
41
+ var _a, _b;
41
42
  const result = await this.exec(actionId, params);
42
43
  if (result.closeView) {
43
44
  params.view.closeView();
44
45
  }
45
46
  else if (result.refresh) {
46
- await params.view.callUIAction(SysUIActionTag.REFRESH);
47
+ switch (result.refreshMode) {
48
+ case 1:
49
+ await params.view.callUIAction(SysUIActionTag.REFRESH);
50
+ break;
51
+ case 2:
52
+ await ((_a = params.view.parentView) === null || _a === void 0 ? void 0 : _a.callUIAction(SysUIActionTag.REFRESH));
53
+ break;
54
+ case 3:
55
+ await ((_b = params.view.getTopView()) === null || _b === void 0 ? void 0 : _b.callUIAction(SysUIActionTag.REFRESH));
56
+ break;
57
+ default:
58
+ }
47
59
  }
48
60
  }
49
61
  }
@@ -32,6 +32,15 @@ export declare class ScriptFunction {
32
32
  * @return {*} {any[]}
33
33
  */
34
34
  protected convertArgs(params: IParams): any[];
35
+ /**
36
+ * 填充预置参数
37
+ * @author lxm
38
+ * @date 2023-08-21 04:07:50
39
+ * @protected
40
+ * @param {string} key
41
+ * @param {IParams} param
42
+ */
43
+ protected fillDefaultParams(key: string, param: IParams): void;
35
44
  /**
36
45
  * 执行脚本代码
37
46
  * @author lxm
@@ -1 +1 @@
1
- {"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAQtD,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAW/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAQT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAS5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAoB7C;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}
1
+ {"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AASvE,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAW/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAWT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IA4B5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAuB7C;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAyC9D;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}