amis-core 6.9.0 → 6.10.0-beta.0

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 (307) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.js +4 -2
  3. package/esm/SchemaRenderer.d.ts +1 -0
  4. package/esm/SchemaRenderer.js +8 -4
  5. package/esm/Scoped.d.ts +1 -1
  6. package/esm/Scoped.js +1 -1
  7. package/esm/StatusScoped.js +1 -1
  8. package/esm/StyleManager.js +1 -1
  9. package/esm/WithRootStore.js +1 -1
  10. package/esm/WithStore.js +1 -1
  11. package/esm/actions/Action.js +4 -1
  12. package/esm/actions/AjaxAction.js +1 -1
  13. package/esm/actions/BreakAction.js +1 -1
  14. package/esm/actions/BroadcastAction.d.ts +1 -1
  15. package/esm/actions/BroadcastAction.js +6 -6
  16. package/esm/actions/CmptAction.d.ts +1 -0
  17. package/esm/actions/CmptAction.js +51 -51
  18. package/esm/actions/ContinueAction.js +1 -1
  19. package/esm/actions/CopyAction.js +1 -1
  20. package/esm/actions/CustomAction.js +1 -1
  21. package/esm/actions/DialogAction.js +1 -1
  22. package/esm/actions/DrawerAction.js +1 -1
  23. package/esm/actions/EmailAction.js +1 -1
  24. package/esm/actions/EventAction.js +1 -1
  25. package/esm/actions/LinkAction.js +1 -1
  26. package/esm/actions/LoopAction.js +1 -1
  27. package/esm/actions/PageAction.js +1 -1
  28. package/esm/actions/ParallelAction.js +1 -1
  29. package/esm/actions/PrintAction.js +1 -1
  30. package/esm/actions/StatusAction.js +1 -1
  31. package/esm/actions/SwitchAction.js +1 -1
  32. package/esm/actions/ToastAction.js +1 -1
  33. package/esm/actions/WaitAction.js +1 -1
  34. package/esm/components/CustomStyle.js +1 -1
  35. package/esm/components/ErrorBoundary.js +1 -1
  36. package/esm/components/LazyComponent.js +1 -1
  37. package/esm/components/Overlay.js +13 -16
  38. package/esm/components/PopOver.js +2 -2
  39. package/esm/env.js +1 -1
  40. package/esm/envOverwrite.js +1 -1
  41. package/esm/factory.d.ts +1 -1
  42. package/esm/factory.js +5 -3
  43. package/esm/index.d.ts +4 -3
  44. package/esm/index.js +10 -9
  45. package/esm/locale.js +1 -1
  46. package/esm/polyfills.js +1 -1
  47. package/esm/renderers/Form.js +1 -1
  48. package/esm/renderers/Item.d.ts +1 -0
  49. package/esm/renderers/Item.js +2 -2
  50. package/esm/renderers/Options.d.ts +46 -1
  51. package/esm/renderers/Options.js +921 -914
  52. package/esm/renderers/Placeholder.js +1 -1
  53. package/esm/renderers/builtin.js +1 -1
  54. package/esm/renderers/register.js +1 -1
  55. package/esm/renderers/wrapControl.d.ts +2 -1
  56. package/esm/renderers/wrapControl.js +3 -3
  57. package/esm/store/app.js +1 -1
  58. package/esm/store/combo.js +1 -1
  59. package/esm/store/crud.d.ts +4 -2
  60. package/esm/store/crud.js +39 -141
  61. package/esm/store/form.js +1 -1
  62. package/esm/store/formItem.js +2 -2
  63. package/esm/store/iRenderer.js +1 -1
  64. package/esm/store/index.js +1 -1
  65. package/esm/store/list.js +1 -1
  66. package/esm/store/manager.js +1 -1
  67. package/esm/store/modal.js +1 -1
  68. package/esm/store/node.js +1 -1
  69. package/esm/store/pagination.js +1 -1
  70. package/esm/store/root.js +1 -1
  71. package/esm/store/service.js +1 -1
  72. package/esm/store/status.js +1 -1
  73. package/esm/store/table.js +1 -1
  74. package/esm/store/table2.js +1 -1
  75. package/esm/theme.js +1 -1
  76. package/esm/utils/Animation.js +1 -1
  77. package/esm/utils/ColorScale.js +1 -1
  78. package/esm/utils/DataSchema.js +1 -1
  79. package/esm/utils/DataScope.js +1 -1
  80. package/esm/utils/RootClose.js +1 -1
  81. package/esm/utils/SimpleMap.js +1 -1
  82. package/esm/utils/animations.js +1 -1
  83. package/esm/utils/api.d.ts +2 -1
  84. package/esm/utils/api.js +6 -4
  85. package/esm/utils/arraySlice.js +1 -1
  86. package/esm/utils/attachmentAdpator.js +4 -1
  87. package/esm/utils/autobind.js +1 -1
  88. package/esm/utils/browser.js +1 -1
  89. package/esm/utils/columnsSplit.js +1 -1
  90. package/esm/utils/concatData.js +1 -1
  91. package/esm/utils/dataMapping.js +1 -1
  92. package/esm/utils/date.js +1 -1
  93. package/esm/utils/debug.d.ts +3 -3
  94. package/esm/utils/debug.js +104 -37
  95. package/esm/utils/decodeEntity.js +1 -1
  96. package/esm/utils/dom.js +1 -1
  97. package/esm/utils/errors.js +1 -1
  98. package/esm/utils/escapeHtml.js +1 -1
  99. package/esm/utils/filter-schema.js +1 -1
  100. package/esm/utils/filter.js +1 -1
  101. package/esm/utils/formatDuration.js +1 -1
  102. package/esm/utils/formula.js +1 -1
  103. package/esm/utils/getVariable.js +1 -1
  104. package/esm/utils/grammar.js +1 -1
  105. package/esm/utils/handleAction.js +1 -1
  106. package/esm/utils/helper.d.ts +7 -0
  107. package/esm/utils/helper.js +87 -2
  108. package/esm/utils/highlight.js +1 -1
  109. package/esm/utils/icon.js +1 -1
  110. package/esm/utils/image.js +1 -1
  111. package/esm/utils/index.d.ts +1 -0
  112. package/esm/utils/isPureVariable.js +1 -1
  113. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  114. package/esm/utils/keyToPath.js +1 -1
  115. package/esm/utils/labelToString.js +1 -1
  116. package/esm/utils/loopTooMuch.d.ts +1 -0
  117. package/esm/utils/loopTooMuch.js +27 -0
  118. package/esm/utils/makeSorter.js +1 -1
  119. package/esm/utils/math.js +1 -1
  120. package/esm/utils/memoryParse.js +1 -1
  121. package/esm/utils/normalizeLink.js +1 -1
  122. package/esm/utils/normalizeOptions.js +1 -1
  123. package/esm/utils/object.js +1 -1
  124. package/esm/utils/offset.js +1 -1
  125. package/esm/utils/offsetParent.js +1 -1
  126. package/esm/utils/optionValueCompare.js +1 -1
  127. package/esm/utils/position.js +11 -6
  128. package/esm/utils/prettyBytes.js +1 -1
  129. package/esm/utils/printElement.js +1 -1
  130. package/esm/utils/renderer-event.d.ts +4 -0
  131. package/esm/utils/renderer-event.js +97 -11
  132. package/esm/utils/replaceText.js +1 -1
  133. package/esm/utils/resize-sensor.js +1 -1
  134. package/esm/utils/resolveCondition.js +1 -1
  135. package/esm/utils/resolveVariable.js +1 -1
  136. package/esm/utils/resolveVariableAndFilter.js +1 -1
  137. package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
  138. package/esm/utils/scrollPosition.js +1 -1
  139. package/esm/utils/string2regExp.js +1 -1
  140. package/esm/utils/stripNumber.js +1 -1
  141. package/esm/utils/style-helper.js +1 -1
  142. package/esm/utils/style.js +1 -1
  143. package/esm/utils/toNumber.js +1 -1
  144. package/esm/utils/tokenize.js +1 -1
  145. package/esm/utils/tpl-builtin.js +1 -1
  146. package/esm/utils/tpl-lodash.js +1 -1
  147. package/esm/utils/tpl.js +1 -1
  148. package/esm/utils/uncontrollable.js +1 -1
  149. package/esm/utils/validateId.js +1 -1
  150. package/esm/utils/validations.js +5 -3
  151. package/esm/utils/visitedCache.js +1 -1
  152. package/lib/Root.js +1 -1
  153. package/lib/RootRenderer.d.ts +1 -1
  154. package/lib/RootRenderer.js +4 -2
  155. package/lib/SchemaRenderer.d.ts +1 -0
  156. package/lib/SchemaRenderer.js +7 -3
  157. package/lib/Scoped.d.ts +1 -1
  158. package/lib/Scoped.js +1 -1
  159. package/lib/StatusScoped.js +1 -1
  160. package/lib/StyleManager.js +1 -1
  161. package/lib/WithRootStore.js +1 -1
  162. package/lib/WithStore.js +1 -1
  163. package/lib/actions/Action.js +4 -1
  164. package/lib/actions/AjaxAction.js +1 -1
  165. package/lib/actions/BreakAction.js +1 -1
  166. package/lib/actions/BroadcastAction.d.ts +1 -1
  167. package/lib/actions/BroadcastAction.js +5 -5
  168. package/lib/actions/CmptAction.d.ts +1 -0
  169. package/lib/actions/CmptAction.js +50 -50
  170. package/lib/actions/ContinueAction.js +1 -1
  171. package/lib/actions/CopyAction.js +1 -1
  172. package/lib/actions/CustomAction.js +1 -1
  173. package/lib/actions/DialogAction.js +1 -1
  174. package/lib/actions/DrawerAction.js +1 -1
  175. package/lib/actions/EmailAction.js +1 -1
  176. package/lib/actions/EventAction.js +1 -1
  177. package/lib/actions/LinkAction.js +1 -1
  178. package/lib/actions/LoopAction.js +1 -1
  179. package/lib/actions/PageAction.js +1 -1
  180. package/lib/actions/ParallelAction.js +1 -1
  181. package/lib/actions/PrintAction.js +1 -1
  182. package/lib/actions/StatusAction.js +1 -1
  183. package/lib/actions/SwitchAction.js +1 -1
  184. package/lib/actions/ToastAction.js +1 -1
  185. package/lib/actions/WaitAction.js +1 -1
  186. package/lib/components/CustomStyle.js +1 -1
  187. package/lib/components/ErrorBoundary.js +1 -1
  188. package/lib/components/LazyComponent.js +1 -1
  189. package/lib/components/Overlay.js +11 -14
  190. package/lib/components/PopOver.js +2 -2
  191. package/lib/env.js +1 -1
  192. package/lib/envOverwrite.js +1 -1
  193. package/lib/factory.d.ts +1 -1
  194. package/lib/factory.js +5 -3
  195. package/lib/index.d.ts +4 -3
  196. package/lib/index.js +14 -5
  197. package/lib/locale.js +1 -1
  198. package/lib/polyfills.js +1 -1
  199. package/lib/renderers/Form.js +1 -1
  200. package/lib/renderers/Item.d.ts +1 -0
  201. package/lib/renderers/Item.js +2 -2
  202. package/lib/renderers/Options.d.ts +46 -1
  203. package/lib/renderers/Options.js +920 -912
  204. package/lib/renderers/Placeholder.js +1 -1
  205. package/lib/renderers/builtin.js +1 -1
  206. package/lib/renderers/register.js +1 -1
  207. package/lib/renderers/wrapControl.d.ts +2 -1
  208. package/lib/renderers/wrapControl.js +3 -3
  209. package/lib/store/app.js +1 -1
  210. package/lib/store/combo.d.ts +25 -24
  211. package/lib/store/combo.js +1 -1
  212. package/lib/store/crud.d.ts +4 -2
  213. package/lib/store/crud.js +37 -139
  214. package/lib/store/form.d.ts +11 -10
  215. package/lib/store/form.js +1 -1
  216. package/lib/store/formItem.js +2 -2
  217. package/lib/store/iRenderer.js +1 -1
  218. package/lib/store/index.js +1 -1
  219. package/lib/store/list.js +1 -1
  220. package/lib/store/manager.js +1 -1
  221. package/lib/store/modal.js +1 -1
  222. package/lib/store/node.js +1 -1
  223. package/lib/store/pagination.js +1 -1
  224. package/lib/store/root.js +1 -1
  225. package/lib/store/service.js +1 -1
  226. package/lib/store/status.js +1 -1
  227. package/lib/store/table.d.ts +21 -20
  228. package/lib/store/table.js +1 -1
  229. package/lib/store/table2.js +1 -1
  230. package/lib/theme.js +1 -1
  231. package/lib/utils/Animation.js +1 -1
  232. package/lib/utils/ColorScale.js +1 -1
  233. package/lib/utils/DataSchema.js +1 -1
  234. package/lib/utils/DataScope.js +1 -1
  235. package/lib/utils/RootClose.js +1 -1
  236. package/lib/utils/SimpleMap.js +1 -1
  237. package/lib/utils/animations.js +1 -1
  238. package/lib/utils/api.d.ts +2 -1
  239. package/lib/utils/api.js +5 -2
  240. package/lib/utils/arraySlice.js +1 -1
  241. package/lib/utils/attachmentAdpator.js +4 -1
  242. package/lib/utils/autobind.js +1 -1
  243. package/lib/utils/browser.js +1 -1
  244. package/lib/utils/columnsSplit.js +1 -1
  245. package/lib/utils/concatData.js +1 -1
  246. package/lib/utils/dataMapping.js +1 -1
  247. package/lib/utils/date.js +1 -1
  248. package/lib/utils/debug.d.ts +3 -3
  249. package/lib/utils/debug.js +103 -36
  250. package/lib/utils/decodeEntity.js +1 -1
  251. package/lib/utils/dom.js +1 -1
  252. package/lib/utils/errors.js +1 -1
  253. package/lib/utils/escapeHtml.js +1 -1
  254. package/lib/utils/filter-schema.js +1 -1
  255. package/lib/utils/filter.js +1 -1
  256. package/lib/utils/formatDuration.js +1 -1
  257. package/lib/utils/formula.js +1 -1
  258. package/lib/utils/getVariable.js +1 -1
  259. package/lib/utils/grammar.js +1 -1
  260. package/lib/utils/handleAction.js +1 -1
  261. package/lib/utils/helper.d.ts +7 -0
  262. package/lib/utils/helper.js +87 -1
  263. package/lib/utils/highlight.js +1 -1
  264. package/lib/utils/icon.js +1 -1
  265. package/lib/utils/image.js +1 -1
  266. package/lib/utils/index.d.ts +1 -0
  267. package/lib/utils/isPureVariable.js +1 -1
  268. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  269. package/lib/utils/keyToPath.js +1 -1
  270. package/lib/utils/labelToString.js +1 -1
  271. package/lib/utils/loopTooMuch.d.ts +1 -0
  272. package/lib/utils/loopTooMuch.js +31 -0
  273. package/lib/utils/makeSorter.js +1 -1
  274. package/lib/utils/math.js +1 -1
  275. package/lib/utils/memoryParse.js +1 -1
  276. package/lib/utils/normalizeLink.js +1 -1
  277. package/lib/utils/normalizeOptions.js +1 -1
  278. package/lib/utils/object.js +1 -1
  279. package/lib/utils/offset.js +1 -1
  280. package/lib/utils/offsetParent.js +1 -1
  281. package/lib/utils/optionValueCompare.js +1 -1
  282. package/lib/utils/position.js +11 -6
  283. package/lib/utils/prettyBytes.js +1 -1
  284. package/lib/utils/printElement.js +1 -1
  285. package/lib/utils/renderer-event.d.ts +4 -0
  286. package/lib/utils/renderer-event.js +99 -10
  287. package/lib/utils/replaceText.js +1 -1
  288. package/lib/utils/resize-sensor.js +1 -1
  289. package/lib/utils/resolveCondition.js +1 -1
  290. package/lib/utils/resolveVariable.js +1 -1
  291. package/lib/utils/resolveVariableAndFilter.js +1 -1
  292. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  293. package/lib/utils/scrollPosition.js +1 -1
  294. package/lib/utils/string2regExp.js +1 -1
  295. package/lib/utils/stripNumber.js +1 -1
  296. package/lib/utils/style-helper.js +1 -1
  297. package/lib/utils/style.js +1 -1
  298. package/lib/utils/toNumber.js +1 -1
  299. package/lib/utils/tokenize.js +1 -1
  300. package/lib/utils/tpl-builtin.js +1 -1
  301. package/lib/utils/tpl-lodash.js +1 -1
  302. package/lib/utils/tpl.js +1 -1
  303. package/lib/utils/uncontrollable.js +1 -1
  304. package/lib/utils/validateId.js +1 -1
  305. package/lib/utils/validations.js +5 -3
  306. package/lib/utils/visitedCache.js +1 -1
  307. package/package.json +5 -4
package/esm/Root.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -58,7 +58,9 @@ var RootRenderer = /** @class */ (function (_super) {
58
58
  }
59
59
  }
60
60
  });
61
- return loadAsyncRenderersByType(types, true);
61
+ return hasAsyncRenderers(types)
62
+ ? loadAsyncRenderersByType(types, true)
63
+ : undefined;
62
64
  });
63
65
  return _this;
64
66
  }
@@ -30,6 +30,7 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
30
30
  };
31
31
  toDispose: Array<() => any>;
32
32
  unbindEvent: (() => void) | undefined;
33
+ unbindGlobalEvent: (() => void) | undefined;
33
34
  isStatic: any;
34
35
  constructor(props: SchemaRendererProps);
35
36
  componentDidMount(): void;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -16,7 +16,7 @@ import { DebugWrapper } from './utils/debug.js';
16
16
  import { getExprProperties } from './utils/filter-schema.js';
17
17
  import { formateId, anyChanged, chainEvents, TestIdBuilder, autobind } from './utils/helper.js';
18
18
  import { SimpleMap } from './utils/SimpleMap.js';
19
- import { bindEvent, dispatchEvent } from './utils/renderer-event.js';
19
+ import { bindEvent, bindGlobalEventForRenderer, dispatchEvent } from './utils/renderer-event.js';
20
20
  import { isAlive } from 'mobx-state-tree';
21
21
  import { reaction } from 'mobx';
22
22
  import 'amis-formula';
@@ -82,6 +82,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
82
82
  _this.animationClassNames = {};
83
83
  _this.toDispose = [];
84
84
  _this.unbindEvent = undefined;
85
+ _this.unbindGlobalEvent = undefined;
85
86
  _this.isStatic = undefined;
86
87
  var animations = (_a = props === null || props === void 0 ? void 0 : props.schema) === null || _a === void 0 ? void 0 : _a.animations;
87
88
  if (animations) {
@@ -125,10 +126,11 @@ var SchemaRenderer = /** @class */ (function (_super) {
125
126
  }
126
127
  };
127
128
  SchemaRenderer.prototype.componentWillUnmount = function () {
128
- var _a;
129
+ var _a, _b;
129
130
  this.toDispose.forEach(function (fn) { return fn(); });
130
131
  this.toDispose = [];
131
132
  (_a = this.unbindEvent) === null || _a === void 0 ? void 0 : _a.call(this);
133
+ (_b = this.unbindGlobalEvent) === null || _b === void 0 ? void 0 : _b.call(this);
132
134
  this.removeAnimationStyle();
133
135
  };
134
136
  // 限制:只有 schema 除外的 props 变化,或者 schema 里面的某个成员值发生变化才更新。
@@ -208,7 +210,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
208
210
  };
209
211
  SchemaRenderer.prototype.childRef = function (ref) {
210
212
  var _this = this;
211
- var _a, _b;
213
+ var _a, _b, _c;
212
214
  // todo 这里有个问题,就是注意以下的这段注释
213
215
  // > // 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
214
216
  // > 而 visibleOn 和 hiddenOn 是无效的,
@@ -227,7 +229,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
227
229
  if (ref) {
228
230
  // 这里无法区分监听的是不是广播,所以又bind一下,主要是为了绑广播
229
231
  (_b = this.unbindEvent) === null || _b === void 0 ? void 0 : _b.call(this);
232
+ (_c = this.unbindGlobalEvent) === null || _c === void 0 ? void 0 : _c.call(this);
230
233
  this.unbindEvent = bindEvent(ref);
234
+ this.unbindGlobalEvent = bindGlobalEventForRenderer(ref);
231
235
  }
232
236
  this.cRef = ref;
233
237
  };
package/esm/Scoped.d.ts CHANGED
@@ -24,7 +24,7 @@ export interface ScopedComponentType extends React.Component<RendererProps> {
24
24
  focus?: () => void;
25
25
  doAction?: (action: ActionObject, data: RendererData, throwErrors?: boolean, args?: any) => void;
26
26
  receive?: (values: RendererData, subPath?: string, replace?: boolean) => void;
27
- reload?: (subPath?: string, query?: RendererData | null, ctx?: RendererData, silent?: boolean, replace?: boolean, args?: any) => void;
27
+ reload?: (subpath?: string, query?: any, ctx?: RendererData, silent?: boolean, replace?: boolean, args?: any) => void;
28
28
  context: any;
29
29
  setData?: (value?: object, replace?: boolean, index?: number) => void;
30
30
  }
package/esm/Scoped.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/esm/WithStore.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -14,6 +14,7 @@ import '../utils/memoryParse.js';
14
14
  import '@rc-component/mini-decimal';
15
15
  import { dataMapping } from '../utils/dataMapping.js';
16
16
  import '../utils/filter.js';
17
+ import { debug } from '../utils/debug.js';
17
18
 
18
19
  // 循环动作执行状态
19
20
  var LoopStatus;
@@ -277,6 +278,8 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
277
278
  : mergeData;
278
279
  (_x = console.group) === null || _x === void 0 ? void 0 : _x.call(console, "run action ".concat(action.actionType));
279
280
  console.debug("[".concat(action.actionType, "] action args, data"), args, data);
281
+ debug('action', "run action ".concat(action.actionType, " with args"), args);
282
+ debug('action', "run action ".concat(action.actionType, " with data"), data);
280
283
  stopped = false;
281
284
  return [4 /*yield*/, actionInstrance.run(__assign(__assign(__assign({}, action), { args: args, rawData: actionConfig.data, data: action.actionType === 'reload' ? actionData : data }), key), renderer, event, mergeData)];
282
285
  case 5:
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -15,5 +15,5 @@ export interface IBroadcastAction extends ListenerAction {
15
15
  * @implements {Action}
16
16
  */
17
17
  export declare class BroadcastAction implements RendererAction {
18
- run(action: IBroadcastAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void | RendererEvent<any, any>>;
18
+ run(action: IBroadcastAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
19
19
  }
@@ -1,11 +1,11 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
6
6
  import { __awaiter, __generator } from 'tslib';
7
7
  import '../utils/helper.js';
8
- import { dispatchEvent } from '../utils/renderer-event.js';
8
+ import { dispatchGlobalEvent } from '../utils/renderer-event.js';
9
9
  import { registerAction } from './Action.js';
10
10
  import { createObject } from '../utils/object.js';
11
11
 
@@ -22,6 +22,7 @@ var BroadcastAction = /** @class */ (function () {
22
22
  BroadcastAction.prototype.run = function (action, renderer, event) {
23
23
  var _a, _b, _c;
24
24
  return __awaiter(this, void 0, void 0, function () {
25
+ var eventName;
25
26
  return __generator(this, function (_d) {
26
27
  switch (_d.label) {
27
28
  case 0:
@@ -31,10 +32,9 @@ var BroadcastAction = /** @class */ (function () {
31
32
  }
32
33
  // 作为一个新的事件,需要把广播动作的args参数追加到事件数据中
33
34
  event.setData(createObject(event.data, (_b = action.data) !== null && _b !== void 0 ? _b : {}));
34
- return [4 /*yield*/, dispatchEvent(((_c = action.args) === null || _c === void 0 ? void 0 : _c.eventName) || action.eventName, renderer, event.context.scoped, action.data, event)];
35
- case 1:
36
- // 直接触发对应的动作
37
- return [2 /*return*/, _d.sent()];
35
+ eventName = ((_c = action.args) === null || _c === void 0 ? void 0 : _c.eventName) || action.eventName;
36
+ return [4 /*yield*/, dispatchGlobalEvent(eventName, action.data)];
37
+ case 1: return [2 /*return*/, _d.sent()];
38
38
  }
39
39
  });
40
40
  });
@@ -3,6 +3,7 @@ import { RendererAction, ListenerAction, ListenerContext } from './Action';
3
3
  export interface ICmptAction extends ListenerAction {
4
4
  actionType: string;
5
5
  args: {
6
+ resetPage?: boolean;
6
7
  path?: string;
7
8
  value?: string | {
8
9
  [key: string]: string;
@@ -1,9 +1,9 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
6
- import { __awaiter, __generator } from 'tslib';
6
+ import { __awaiter, __generator, __assign } from 'tslib';
7
7
  import '../utils/helper.js';
8
8
  import { registerAction } from './Action.js';
9
9
  import { getRendererByName } from '../factory.js';
@@ -20,12 +20,12 @@ var CmptAction = /** @class */ (function () {
20
20
  function CmptAction() {
21
21
  }
22
22
  CmptAction.prototype.run = function (action, renderer, event) {
23
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
23
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7;
24
24
  return __awaiter(this, void 0, void 0, function () {
25
- var key, dataMergeMode, path, beforeSetData, res, component, msg, result, _6, dispatchEvent_1, data, valid, _7, e_1, result, e_2;
26
- var _8, _9, _10, _11, _12, _13;
27
- return __generator(this, function (_14) {
28
- switch (_14.label) {
25
+ var key, dataMergeMode, path, beforeSetData, res, component, msg, result, _8, dispatchEvent_1, data, valid, _9, e_1, result, e_2;
26
+ var _10, _11, _12, _13, _14, _15;
27
+ return __generator(this, function (_16) {
28
+ switch (_16.label) {
29
29
  case 0:
30
30
  key = action.componentId || action.componentName;
31
31
  dataMergeMode = action.dataMergeMode || 'merge';
@@ -35,11 +35,11 @@ var CmptAction = /** @class */ (function () {
35
35
  if (!(beforeSetData && typeof beforeSetData === 'function')) return [3 /*break*/, 2];
36
36
  return [4 /*yield*/, beforeSetData(renderer, action, event)];
37
37
  case 1:
38
- res = _14.sent();
38
+ res = _16.sent();
39
39
  if (res === false) {
40
40
  return [2 /*return*/];
41
41
  }
42
- _14.label = 2;
42
+ _16.label = 2;
43
43
  case 2:
44
44
  component = key
45
45
  ? (_d = event.context.scoped) === null || _d === void 0 ? void 0 : _d[action.componentId ? 'getComponentById' : 'getComponentByName'](key)
@@ -63,86 +63,86 @@ var CmptAction = /** @class */ (function () {
63
63
  }
64
64
  }
65
65
  if (!(action.actionType === 'reload')) return [3 /*break*/, 4];
66
- return [4 /*yield*/, ((_l = component === null || component === void 0 ? void 0 : component.reload) === null || _l === void 0 ? void 0 : _l.call(component, undefined, action.data, event.data, undefined, dataMergeMode === 'override', action.args))];
66
+ return [4 /*yield*/, ((_l = component === null || component === void 0 ? void 0 : component.reload) === null || _l === void 0 ? void 0 : _l.call(component, undefined, action.data, event.data, undefined, dataMergeMode === 'override', __assign(__assign({}, action.args), { resetPage: (_o = (_m = action.args) === null || _m === void 0 ? void 0 : _m.resetPage) !== null && _o !== void 0 ? _o : action.resetPage })))];
67
67
  case 3:
68
- result = _14.sent();
68
+ result = _16.sent();
69
69
  if (result && action.outputVar) {
70
- event.setData(extendObject(event.data, (_8 = {},
71
- _8[action.outputVar] = result,
72
- _8)));
70
+ event.setData(extendObject(event.data, (_10 = {},
71
+ _10[action.outputVar] = result,
72
+ _10)));
73
73
  }
74
74
  return [2 /*return*/, result];
75
75
  case 4:
76
76
  if (!(action.actionType === 'validateFormItem' &&
77
- ((_o = getRendererByName((_m = component === null || component === void 0 ? void 0 : component.props) === null || _m === void 0 ? void 0 : _m.type)) === null || _o === void 0 ? void 0 : _o.isFormItem))) return [3 /*break*/, 11];
78
- _6 = (component === null || component === void 0 ? void 0 : component.props) || {}, dispatchEvent_1 = _6.dispatchEvent, data = _6.data;
79
- _14.label = 5;
77
+ ((_q = getRendererByName((_p = component === null || component === void 0 ? void 0 : component.props) === null || _p === void 0 ? void 0 : _p.type)) === null || _q === void 0 ? void 0 : _q.isFormItem))) return [3 /*break*/, 11];
78
+ _8 = (component === null || component === void 0 ? void 0 : component.props) || {}, dispatchEvent_1 = _8.dispatchEvent, data = _8.data;
79
+ _16.label = 5;
80
80
  case 5:
81
- _14.trys.push([5, 9, , 10]);
82
- return [4 /*yield*/, ((_q = component === null || component === void 0 ? void 0 : (_p = component.props).onValidate) === null || _q === void 0 ? void 0 : _q.call(_p))];
81
+ _16.trys.push([5, 9, , 10]);
82
+ return [4 /*yield*/, ((_s = component === null || component === void 0 ? void 0 : (_r = component.props).onValidate) === null || _s === void 0 ? void 0 : _s.call(_r))];
83
83
  case 6:
84
- _7 = (_14.sent());
85
- if (_7) return [3 /*break*/, 8];
86
- return [4 /*yield*/, ((_r = component === null || component === void 0 ? void 0 : component.validate) === null || _r === void 0 ? void 0 : _r.call(component))];
84
+ _9 = (_16.sent());
85
+ if (_9) return [3 /*break*/, 8];
86
+ return [4 /*yield*/, ((_t = component === null || component === void 0 ? void 0 : component.validate) === null || _t === void 0 ? void 0 : _t.call(component))];
87
87
  case 7:
88
- _7 = (_14.sent());
89
- _14.label = 8;
88
+ _9 = (_16.sent());
89
+ _16.label = 8;
90
90
  case 8:
91
- valid = _7;
91
+ valid = _9;
92
92
  if (valid) {
93
- event.setData(createObject(event.data, (_9 = {},
94
- _9[action.outputVar || "".concat(action.actionType, "Result")] = {
93
+ event.setData(createObject(event.data, (_11 = {},
94
+ _11[action.outputVar || "".concat(action.actionType, "Result")] = {
95
95
  error: '',
96
- value: (_t = (_s = component === null || component === void 0 ? void 0 : component.props) === null || _s === void 0 ? void 0 : _s.formItem) === null || _t === void 0 ? void 0 : _t.value
96
+ value: (_v = (_u = component === null || component === void 0 ? void 0 : component.props) === null || _u === void 0 ? void 0 : _u.formItem) === null || _v === void 0 ? void 0 : _v.value
97
97
  },
98
- _9)));
98
+ _11)));
99
99
  dispatchEvent_1 && dispatchEvent_1('formItemValidateSucc', data);
100
100
  }
101
101
  else {
102
- event.setData(createObject(event.data, (_10 = {},
103
- _10[action.outputVar || "".concat(action.actionType, "Result")] = {
104
- error: (((_v = (_u = component === null || component === void 0 ? void 0 : component.props) === null || _u === void 0 ? void 0 : _u.formItem) === null || _v === void 0 ? void 0 : _v.errors) || []).join(','),
105
- value: (_x = (_w = component === null || component === void 0 ? void 0 : component.props) === null || _w === void 0 ? void 0 : _w.formItem) === null || _x === void 0 ? void 0 : _x.value
102
+ event.setData(createObject(event.data, (_12 = {},
103
+ _12[action.outputVar || "".concat(action.actionType, "Result")] = {
104
+ error: (((_x = (_w = component === null || component === void 0 ? void 0 : component.props) === null || _w === void 0 ? void 0 : _w.formItem) === null || _x === void 0 ? void 0 : _x.errors) || []).join(','),
105
+ value: (_z = (_y = component === null || component === void 0 ? void 0 : component.props) === null || _y === void 0 ? void 0 : _y.formItem) === null || _z === void 0 ? void 0 : _z.value
106
106
  },
107
- _10)));
107
+ _12)));
108
108
  dispatchEvent_1 && dispatchEvent_1('formItemValidateError', data);
109
109
  }
110
110
  return [3 /*break*/, 10];
111
111
  case 9:
112
- e_1 = _14.sent();
113
- event.setData(createObject(event.data, (_11 = {},
114
- _11[action.outputVar || "".concat(action.actionType, "Result")] = {
112
+ e_1 = _16.sent();
113
+ event.setData(createObject(event.data, (_13 = {},
114
+ _13[action.outputVar || "".concat(action.actionType, "Result")] = {
115
115
  error: e_1.message || '未知错误',
116
- value: (_z = (_y = component === null || component === void 0 ? void 0 : component.props) === null || _y === void 0 ? void 0 : _y.formItem) === null || _z === void 0 ? void 0 : _z.value
116
+ value: (_1 = (_0 = component === null || component === void 0 ? void 0 : component.props) === null || _0 === void 0 ? void 0 : _0.formItem) === null || _1 === void 0 ? void 0 : _1.value
117
117
  },
118
- _11)));
118
+ _13)));
119
119
  dispatchEvent_1 && dispatchEvent_1('formItemValidateError', data);
120
120
  return [3 /*break*/, 10];
121
121
  case 10: return [2 /*return*/];
122
122
  case 11:
123
- _14.trys.push([11, 13, , 14]);
124
- return [4 /*yield*/, ((_0 = component === null || component === void 0 ? void 0 : component.doAction) === null || _0 === void 0 ? void 0 : _0.call(component, action, event.data, true, action.args))];
123
+ _16.trys.push([11, 13, , 14]);
124
+ return [4 /*yield*/, ((_2 = component === null || component === void 0 ? void 0 : component.doAction) === null || _2 === void 0 ? void 0 : _2.call(component, action, event.data, true, action.args))];
125
125
  case 12:
126
- result = _14.sent();
126
+ result = _16.sent();
127
127
  if (['validate', 'submit'].includes(action.actionType)) {
128
- event.setData(createObject(event.data, (_12 = {},
129
- _12[action.outputVar || "".concat(action.actionType, "Result")] = {
128
+ event.setData(createObject(event.data, (_14 = {},
129
+ _14[action.outputVar || "".concat(action.actionType, "Result")] = {
130
130
  error: '',
131
- payload: (_1 = result === null || result === void 0 ? void 0 : result.__payload) !== null && _1 !== void 0 ? _1 : (_3 = (_2 = component === null || component === void 0 ? void 0 : component.props) === null || _2 === void 0 ? void 0 : _2.store) === null || _3 === void 0 ? void 0 : _3.data,
131
+ payload: (_3 = result === null || result === void 0 ? void 0 : result.__payload) !== null && _3 !== void 0 ? _3 : (_5 = (_4 = component === null || component === void 0 ? void 0 : component.props) === null || _4 === void 0 ? void 0 : _4.store) === null || _5 === void 0 ? void 0 : _5.data,
132
132
  responseData: result === null || result === void 0 ? void 0 : result.__response
133
133
  },
134
- _12)));
134
+ _14)));
135
135
  }
136
136
  return [2 /*return*/, result];
137
137
  case 13:
138
- e_2 = _14.sent();
139
- event.setData(createObject(event.data, (_13 = {},
140
- _13[action.outputVar || "".concat(action.actionType, "Result")] = {
138
+ e_2 = _16.sent();
139
+ event.setData(createObject(event.data, (_15 = {},
140
+ _15[action.outputVar || "".concat(action.actionType, "Result")] = {
141
141
  error: e_2.message,
142
142
  errors: e_2.name === 'ValidateError' ? e_2.detail : e_2,
143
- payload: (_5 = (_4 = component === null || component === void 0 ? void 0 : component.props) === null || _4 === void 0 ? void 0 : _4.store) === null || _5 === void 0 ? void 0 : _5.data
143
+ payload: (_7 = (_6 = component === null || component === void 0 ? void 0 : component.props) === null || _6 === void 0 ? void 0 : _6.store) === null || _7 === void 0 ? void 0 : _7.data
144
144
  },
145
- _13)));
145
+ _15)));
146
146
  return [3 /*break*/, 14];
147
147
  case 14: return [2 /*return*/];
148
148
  }
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0
2
+ * amis-core v6.10.0-beta.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5