amis-core 6.12.0-beta.9 → 6.13.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 (310) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.d.ts +1 -0
  3. package/esm/RootRenderer.js +9 -4
  4. package/esm/SchemaRenderer.d.ts +2 -1
  5. package/esm/SchemaRenderer.js +6 -13
  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.d.ts +1 -0
  12. package/esm/actions/Action.js +25 -17
  13. package/esm/actions/AjaxAction.js +1 -1
  14. package/esm/actions/BreakAction.js +1 -1
  15. package/esm/actions/BroadcastAction.js +1 -1
  16. package/esm/actions/CmptAction.js +54 -56
  17. package/esm/actions/ContinueAction.js +1 -1
  18. package/esm/actions/CopyAction.js +1 -1
  19. package/esm/actions/CustomAction.js +1 -1
  20. package/esm/actions/DialogAction.js +1 -1
  21. package/esm/actions/DrawerAction.js +1 -1
  22. package/esm/actions/EmailAction.js +1 -1
  23. package/esm/actions/EventAction.js +1 -1
  24. package/esm/actions/LinkAction.js +1 -1
  25. package/esm/actions/LoopAction.js +1 -1
  26. package/esm/actions/PageAction.js +1 -1
  27. package/esm/actions/ParallelAction.js +1 -1
  28. package/esm/actions/PrintAction.js +1 -1
  29. package/esm/actions/StatusAction.js +1 -1
  30. package/esm/actions/SwitchAction.js +1 -1
  31. package/esm/actions/ToastAction.js +1 -1
  32. package/esm/actions/WaitAction.js +1 -1
  33. package/esm/components/Animations.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 +1 -1
  38. package/esm/components/PopOver.js +1 -1
  39. package/esm/env.d.ts +4 -0
  40. package/esm/env.js +1 -1
  41. package/esm/envOverwrite.js +1 -1
  42. package/esm/factory.d.ts +2 -1
  43. package/esm/factory.js +4 -2
  44. package/esm/globalVar.js +1 -1
  45. package/esm/globalVarClientHandler.js +1 -1
  46. package/esm/globalVarDefaultValueHandler.js +1 -1
  47. package/esm/index.js +6 -6
  48. package/esm/locale.js +1 -1
  49. package/esm/polyfills.js +1 -1
  50. package/esm/renderers/Form.js +1 -1
  51. package/esm/renderers/Item.js +1 -1
  52. package/esm/renderers/Options.d.ts +4 -0
  53. package/esm/renderers/Options.js +2 -2
  54. package/esm/renderers/Placeholder.js +1 -1
  55. package/esm/renderers/builtin.js +1 -1
  56. package/esm/renderers/register.js +1 -1
  57. package/esm/renderers/wrapControl.js +1 -1
  58. package/esm/store/app.js +1 -1
  59. package/esm/store/combo.d.ts +28 -26
  60. package/esm/store/combo.js +1 -1
  61. package/esm/store/crud.d.ts +4 -2
  62. package/esm/store/crud.js +27 -22
  63. package/esm/store/form.d.ts +13 -11
  64. package/esm/store/form.js +15 -11
  65. package/esm/store/formItem.d.ts +1 -1
  66. package/esm/store/formItem.js +8 -2
  67. package/esm/store/iRenderer.js +1 -1
  68. package/esm/store/index.js +4 -2
  69. package/esm/store/list.js +1 -1
  70. package/esm/store/manager.js +1 -1
  71. package/esm/store/modal.js +1 -1
  72. package/esm/store/node.js +1 -1
  73. package/esm/store/pagination.js +1 -1
  74. package/esm/store/root.js +1 -1
  75. package/esm/store/service.js +1 -1
  76. package/esm/store/status.js +1 -1
  77. package/esm/store/table.d.ts +25 -22
  78. package/esm/store/table.js +29 -20
  79. package/esm/store/table2.js +6 -3
  80. package/esm/theme.js +1 -1
  81. package/esm/utils/Animation.js +1 -1
  82. package/esm/utils/ColorScale.js +1 -1
  83. package/esm/utils/DataSchema.js +1 -1
  84. package/esm/utils/DataScope.js +1 -1
  85. package/esm/utils/RootClose.js +1 -1
  86. package/esm/utils/SimpleMap.js +1 -1
  87. package/esm/utils/animations.js +1 -1
  88. package/esm/utils/api.js +1 -1
  89. package/esm/utils/arraySlice.js +1 -1
  90. package/esm/utils/attachmentAdpator.js +1 -1
  91. package/esm/utils/autobind.js +1 -1
  92. package/esm/utils/browser.js +1 -1
  93. package/esm/utils/columnsSplit.js +1 -1
  94. package/esm/utils/concatData.js +1 -1
  95. package/esm/utils/dataMapping.js +1 -1
  96. package/esm/utils/date.js +1 -1
  97. package/esm/utils/debug.d.ts +1 -0
  98. package/esm/utils/debug.js +11 -3
  99. package/esm/utils/decodeEntity.js +1 -1
  100. package/esm/utils/dom.js +1 -1
  101. package/esm/utils/errors.js +1 -1
  102. package/esm/utils/escapeHtml.js +1 -1
  103. package/esm/utils/filter-schema.js +1 -1
  104. package/esm/utils/filter.js +1 -1
  105. package/esm/utils/formatDuration.js +1 -1
  106. package/esm/utils/formula.js +1 -1
  107. package/esm/utils/getPageId.d.ts +1 -0
  108. package/esm/utils/getPageId.js +16 -0
  109. package/esm/utils/getVariable.js +1 -1
  110. package/esm/utils/grammar.js +1 -1
  111. package/esm/utils/handleAction.js +1 -1
  112. package/esm/utils/helper.js +1 -1
  113. package/esm/utils/highlight.js +1 -1
  114. package/esm/utils/icon.js +1 -1
  115. package/esm/utils/image.js +1 -1
  116. package/esm/utils/index.js +2 -2
  117. package/esm/utils/isPureVariable.js +1 -1
  118. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  119. package/esm/utils/keyToPath.js +1 -1
  120. package/esm/utils/labelToString.js +1 -1
  121. package/esm/utils/loopTooMuch.js +1 -1
  122. package/esm/utils/makeSorter.js +1 -1
  123. package/esm/utils/math.js +1 -1
  124. package/esm/utils/memoryParse.js +1 -1
  125. package/esm/utils/normalizeLink.js +1 -1
  126. package/esm/utils/normalizeOptions.js +1 -1
  127. package/esm/utils/object.js +1 -1
  128. package/esm/utils/offset.js +1 -1
  129. package/esm/utils/offsetParent.js +1 -1
  130. package/esm/utils/optionValueCompare.js +1 -1
  131. package/esm/utils/position.js +1 -1
  132. package/esm/utils/prettyBytes.js +1 -1
  133. package/esm/utils/printElement.js +1 -1
  134. package/esm/utils/renderer-event.js +9 -3
  135. package/esm/utils/replaceText.js +1 -1
  136. package/esm/utils/resize-sensor.js +1 -1
  137. package/esm/utils/resolveCondition.js +1 -1
  138. package/esm/utils/resolveVariable.js +1 -1
  139. package/esm/utils/resolveVariableAndFilter.js +1 -1
  140. package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
  141. package/esm/utils/scrollPosition.js +1 -1
  142. package/esm/utils/string2regExp.js +1 -1
  143. package/esm/utils/stripNumber.js +1 -1
  144. package/esm/utils/style-helper.js +1 -1
  145. package/esm/utils/style.js +1 -1
  146. package/esm/utils/toNumber.js +1 -1
  147. package/esm/utils/tokenize.js +1 -1
  148. package/esm/utils/tpl-builtin.js +1 -1
  149. package/esm/utils/tpl-lodash.js +1 -1
  150. package/esm/utils/tpl.js +1 -1
  151. package/esm/utils/uncontrollable.js +1 -1
  152. package/esm/utils/validateId.js +1 -1
  153. package/esm/utils/validations.js +1 -1
  154. package/esm/utils/visitedCache.js +1 -1
  155. package/lib/Root.js +1 -1
  156. package/lib/RootRenderer.d.ts +1 -0
  157. package/lib/RootRenderer.js +9 -4
  158. package/lib/SchemaRenderer.d.ts +2 -1
  159. package/lib/SchemaRenderer.js +4 -11
  160. package/lib/Scoped.js +1 -1
  161. package/lib/StatusScoped.js +1 -1
  162. package/lib/StyleManager.js +1 -1
  163. package/lib/WithRootStore.js +1 -1
  164. package/lib/WithStore.js +1 -1
  165. package/lib/actions/Action.d.ts +1 -0
  166. package/lib/actions/Action.js +25 -16
  167. package/lib/actions/AjaxAction.js +1 -1
  168. package/lib/actions/BreakAction.js +1 -1
  169. package/lib/actions/BroadcastAction.js +1 -1
  170. package/lib/actions/CmptAction.js +53 -55
  171. package/lib/actions/ContinueAction.js +1 -1
  172. package/lib/actions/CopyAction.js +1 -1
  173. package/lib/actions/CustomAction.js +1 -1
  174. package/lib/actions/DialogAction.js +1 -1
  175. package/lib/actions/DrawerAction.js +1 -1
  176. package/lib/actions/EmailAction.js +1 -1
  177. package/lib/actions/EventAction.js +1 -1
  178. package/lib/actions/LinkAction.js +1 -1
  179. package/lib/actions/LoopAction.js +1 -1
  180. package/lib/actions/PageAction.js +1 -1
  181. package/lib/actions/ParallelAction.js +1 -1
  182. package/lib/actions/PrintAction.js +1 -1
  183. package/lib/actions/StatusAction.js +1 -1
  184. package/lib/actions/SwitchAction.js +1 -1
  185. package/lib/actions/ToastAction.js +1 -1
  186. package/lib/actions/WaitAction.js +1 -1
  187. package/lib/components/Animations.js +1 -1
  188. package/lib/components/CustomStyle.js +1 -1
  189. package/lib/components/ErrorBoundary.js +1 -1
  190. package/lib/components/LazyComponent.js +1 -1
  191. package/lib/components/Overlay.js +1 -1
  192. package/lib/components/PopOver.js +1 -1
  193. package/lib/env.d.ts +4 -0
  194. package/lib/env.js +1 -1
  195. package/lib/envOverwrite.js +1 -1
  196. package/lib/factory.d.ts +2 -1
  197. package/lib/factory.js +4 -2
  198. package/lib/globalVar.js +1 -1
  199. package/lib/globalVarClientHandler.js +1 -1
  200. package/lib/globalVarDefaultValueHandler.js +1 -1
  201. package/lib/index.js +6 -4
  202. package/lib/locale.js +1 -1
  203. package/lib/polyfills.js +1 -1
  204. package/lib/renderers/Form.js +1 -1
  205. package/lib/renderers/Item.js +1 -1
  206. package/lib/renderers/Options.d.ts +4 -0
  207. package/lib/renderers/Options.js +2 -2
  208. package/lib/renderers/Placeholder.js +1 -1
  209. package/lib/renderers/builtin.js +1 -1
  210. package/lib/renderers/register.js +1 -1
  211. package/lib/renderers/wrapControl.js +1 -1
  212. package/lib/store/app.js +1 -1
  213. package/lib/store/combo.d.ts +28 -27
  214. package/lib/store/combo.js +1 -1
  215. package/lib/store/crud.d.ts +4 -2
  216. package/lib/store/crud.js +27 -22
  217. package/lib/store/form.d.ts +13 -12
  218. package/lib/store/form.js +15 -11
  219. package/lib/store/formItem.d.ts +1 -1
  220. package/lib/store/formItem.js +8 -2
  221. package/lib/store/iRenderer.js +1 -1
  222. package/lib/store/index.js +4 -2
  223. package/lib/store/list.js +1 -1
  224. package/lib/store/manager.js +1 -1
  225. package/lib/store/modal.js +1 -1
  226. package/lib/store/node.js +1 -1
  227. package/lib/store/pagination.js +1 -1
  228. package/lib/store/root.d.ts +0 -1
  229. package/lib/store/root.js +1 -1
  230. package/lib/store/service.js +1 -1
  231. package/lib/store/status.js +1 -1
  232. package/lib/store/table.d.ts +25 -23
  233. package/lib/store/table.js +28 -19
  234. package/lib/store/table2.js +6 -3
  235. package/lib/theme.js +1 -1
  236. package/lib/utils/Animation.js +1 -1
  237. package/lib/utils/ColorScale.js +1 -1
  238. package/lib/utils/DataSchema.js +1 -1
  239. package/lib/utils/DataScope.js +1 -1
  240. package/lib/utils/RootClose.js +1 -1
  241. package/lib/utils/SimpleMap.js +1 -1
  242. package/lib/utils/animations.js +1 -1
  243. package/lib/utils/api.js +1 -1
  244. package/lib/utils/arraySlice.js +1 -1
  245. package/lib/utils/attachmentAdpator.js +1 -1
  246. package/lib/utils/autobind.js +1 -1
  247. package/lib/utils/browser.js +1 -1
  248. package/lib/utils/columnsSplit.js +1 -1
  249. package/lib/utils/concatData.js +1 -1
  250. package/lib/utils/dataMapping.js +1 -1
  251. package/lib/utils/date.js +1 -1
  252. package/lib/utils/debug.d.ts +1 -0
  253. package/lib/utils/debug.js +11 -2
  254. package/lib/utils/decodeEntity.js +1 -1
  255. package/lib/utils/dom.js +1 -1
  256. package/lib/utils/errors.js +1 -1
  257. package/lib/utils/escapeHtml.js +1 -1
  258. package/lib/utils/filter-schema.js +1 -1
  259. package/lib/utils/filter.js +1 -1
  260. package/lib/utils/formatDuration.js +1 -1
  261. package/lib/utils/formula.js +1 -1
  262. package/lib/utils/getPageId.d.ts +1 -0
  263. package/lib/utils/getPageId.js +20 -0
  264. package/lib/utils/getVariable.js +1 -1
  265. package/lib/utils/grammar.js +1 -1
  266. package/lib/utils/handleAction.js +1 -1
  267. package/lib/utils/helper.js +1 -1
  268. package/lib/utils/highlight.js +1 -1
  269. package/lib/utils/icon.js +1 -1
  270. package/lib/utils/image.js +1 -1
  271. package/lib/utils/index.js +2 -1
  272. package/lib/utils/isPureVariable.js +1 -1
  273. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  274. package/lib/utils/keyToPath.js +1 -1
  275. package/lib/utils/labelToString.js +1 -1
  276. package/lib/utils/loopTooMuch.js +1 -1
  277. package/lib/utils/makeSorter.js +1 -1
  278. package/lib/utils/math.js +1 -1
  279. package/lib/utils/memoryParse.js +1 -1
  280. package/lib/utils/normalizeLink.js +1 -1
  281. package/lib/utils/normalizeOptions.js +1 -1
  282. package/lib/utils/object.js +1 -1
  283. package/lib/utils/offset.js +1 -1
  284. package/lib/utils/offsetParent.js +1 -1
  285. package/lib/utils/optionValueCompare.js +1 -1
  286. package/lib/utils/position.js +1 -1
  287. package/lib/utils/prettyBytes.js +1 -1
  288. package/lib/utils/printElement.js +1 -1
  289. package/lib/utils/renderer-event.js +9 -3
  290. package/lib/utils/replaceText.js +1 -1
  291. package/lib/utils/resize-sensor.js +1 -1
  292. package/lib/utils/resolveCondition.js +1 -1
  293. package/lib/utils/resolveVariable.js +1 -1
  294. package/lib/utils/resolveVariableAndFilter.js +1 -1
  295. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  296. package/lib/utils/scrollPosition.js +1 -1
  297. package/lib/utils/string2regExp.js +1 -1
  298. package/lib/utils/stripNumber.js +1 -1
  299. package/lib/utils/style-helper.js +1 -1
  300. package/lib/utils/style.js +1 -1
  301. package/lib/utils/toNumber.js +1 -1
  302. package/lib/utils/tokenize.js +1 -1
  303. package/lib/utils/tpl-builtin.js +1 -1
  304. package/lib/utils/tpl-lodash.js +1 -1
  305. package/lib/utils/tpl.js +1 -1
  306. package/lib/utils/uncontrollable.js +1 -1
  307. package/lib/utils/validateId.js +1 -1
  308. package/lib/utils/validations.js +1 -1
  309. package/lib/utils/visitedCache.js +1 -1
  310. package/package.json +2 -2
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -112,6 +112,16 @@ var getOmitActionProp = function (type) {
112
112
  }
113
113
  return omitList;
114
114
  };
115
+ var getTargetComponent = function (action, renderer, event, key) {
116
+ var targetComponent = renderer;
117
+ if (key && event.context.scoped) {
118
+ var func = action.componentId ? 'getComponentById' : 'getComponentByName';
119
+ if (typeof event.context.scoped[func] === 'function') {
120
+ targetComponent = event.context.scoped[func](key);
121
+ }
122
+ }
123
+ return targetComponent;
124
+ };
115
125
  var runActions = function (actions, renderer, event) { return tslib.__awaiter(void 0, void 0, void 0, function () {
116
126
  var actions_1, actions_1_1, actionConfig, actionInstrance, e_1, ignore, e_2_1;
117
127
  var e_2, _a;
@@ -197,9 +207,9 @@ var runActions = function (actions, renderer, event) { return tslib.__awaiter(vo
197
207
  // 执行动作,与原有动作处理打通
198
208
  var runAction = function (actionInstrance, actionConfig, renderer, event) { return tslib.__awaiter(void 0, void 0, void 0, function () {
199
209
  var additional, action, rendererProto, mergeData, expression, isStop, preventDefault, key, api, cmptFlag, targetComponent, args, afterMappingData, actionData, data, stopped, actionResult, stopPropagation;
200
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
201
- return tslib.__generator(this, function (_z) {
202
- switch (_z.label) {
210
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
211
+ return tslib.__generator(this, function (_y) {
212
+ switch (_y.label) {
203
213
  case 0:
204
214
  additional = {
205
215
  event: event
@@ -222,8 +232,8 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
222
232
  if (!expression) return [3 /*break*/, 2];
223
233
  return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(expression, mergeData, true)];
224
234
  case 1:
225
- isStop = !(_z.sent());
226
- _z.label = 2;
235
+ isStop = !(_y.sent());
236
+ _y.label = 2;
227
237
  case 2:
228
238
  if (isStop) {
229
239
  return [2 /*return*/];
@@ -232,8 +242,8 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
232
242
  if (!action.preventDefault) return [3 /*break*/, 4];
233
243
  return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(action.preventDefault, mergeData, false)];
234
244
  case 3:
235
- preventDefault = _z.sent();
236
- _z.label = 4;
245
+ preventDefault = _y.sent();
246
+ _y.label = 4;
237
247
  case 4:
238
248
  key = {
239
249
  componentId: dataMapping.dataMapping(action.componentId, mergeData),
@@ -258,9 +268,7 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
258
268
  (_v = action.args) === null || _v === void 0 ? true : delete _v.messages;
259
269
  }
260
270
  cmptFlag = key.componentId || key.componentName;
261
- targetComponent = cmptFlag
262
- ? (_w = event.context.scoped) === null || _w === void 0 ? void 0 : _w[action.componentId ? 'getComponentById' : 'getComponentByName'](cmptFlag)
263
- : renderer;
271
+ targetComponent = getTargetComponent(action, renderer, event, cmptFlag);
264
272
  args = dataMapping.dataMapping(action.args, mergeData, function (key) {
265
273
  var _a;
266
274
  var curCmptType = (_a = targetComponent === null || targetComponent === void 0 ? void 0 : targetComponent.props) === null || _a === void 0 ? void 0 : _a.type;
@@ -276,14 +284,14 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
276
284
  !['ajax', 'download', 'dialog', 'drawer'].includes(action.actionType) // 避免非法配置影响对actionData的判断,导致动作配置中的数据映射失败
277
285
  ? actionData
278
286
  : mergeData;
279
- (_x = console.group) === null || _x === void 0 ? void 0 : _x.call(console, "run action ".concat(action.actionType));
287
+ (_w = console.group) === null || _w === void 0 ? void 0 : _w.call(console, "run action ".concat(action.actionType));
280
288
  console.debug("[".concat(action.actionType, "] action args, data"), args, data);
281
289
  debug.debug('action', "run action ".concat(action.actionType, " with args"), args);
282
290
  debug.debug('action', "run action ".concat(action.actionType, " with data"), data);
283
291
  stopped = false;
284
292
  return [4 /*yield*/, actionInstrance.run(tslib.__assign(tslib.__assign(tslib.__assign({}, action), { args: args, rawData: actionConfig.data, data: action.actionType === 'reload' ? actionData : data }), key), renderer, event, mergeData)];
285
293
  case 5:
286
- actionResult = _z.sent();
294
+ actionResult = _y.sent();
287
295
  // 二次确认弹窗如果取消,则终止后续动作
288
296
  if ((action === null || action === void 0 ? void 0 : action.actionType) === 'confirmDialog' && !actionResult) {
289
297
  stopped = true;
@@ -293,11 +301,11 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
293
301
  if (!action.stopPropagation) return [3 /*break*/, 7];
294
302
  return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(action.stopPropagation, mergeData, false)];
295
303
  case 6:
296
- stopPropagation = _z.sent();
297
- _z.label = 7;
304
+ stopPropagation = _y.sent();
305
+ _y.label = 7;
298
306
  case 7:
299
307
  console.debug("[".concat(action.actionType, "] action end event"), event);
300
- (_y = console.groupEnd) === null || _y === void 0 ? void 0 : _y.call(console);
308
+ (_x = console.groupEnd) === null || _x === void 0 ? void 0 : _x.call(console);
301
309
  // 阻止原有动作执行
302
310
  preventDefault && event.preventDefault();
303
311
  // 阻止后续动作执行
@@ -354,6 +362,7 @@ registerComponentActionMappingIgnoreMap({
354
362
  });
355
363
 
356
364
  exports.getActionByType = getActionByType;
365
+ exports.getTargetComponent = getTargetComponent;
357
366
  exports.registerAction = registerAction;
358
367
  exports.registerActionMappingIgnoreKey = registerActionMappingIgnoreKey;
359
368
  exports.registerActionMappingIgnoreMap = registerActionMappingIgnoreMap;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -24,12 +24,12 @@ var CmptAction = /** @class */ (function () {
24
24
  function CmptAction() {
25
25
  }
26
26
  CmptAction.prototype.run = function (action, renderer, event) {
27
- 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;
27
+ 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;
28
28
  return tslib.__awaiter(this, void 0, void 0, function () {
29
- var key, dataMergeMode, path, topStore, beforeSetData, res, component, msg, result, _8, dispatchEvent_1, data, valid, _9, e_1, result, e_2;
30
- var _10, _11, _12, _13, _14, _15;
31
- return tslib.__generator(this, function (_16) {
32
- switch (_16.label) {
29
+ var key, dataMergeMode, path, topStore, beforeSetData, res, component, msg, result, _7, dispatchEvent_1, data, valid, _8, e_1, result, e_2;
30
+ var _9, _10, _11, _12, _13, _14;
31
+ return tslib.__generator(this, function (_15) {
32
+ switch (_15.label) {
33
33
  case 0:
34
34
  key = action.componentId || action.componentName;
35
35
  dataMergeMode = action.dataMergeMode || 'merge';
@@ -43,15 +43,13 @@ var CmptAction = /** @class */ (function () {
43
43
  if (!(beforeSetData && typeof beforeSetData === 'function')) return [3 /*break*/, 2];
44
44
  return [4 /*yield*/, beforeSetData(renderer, action, event)];
45
45
  case 1:
46
- res = _16.sent();
46
+ res = _15.sent();
47
47
  if (res === false) {
48
48
  return [2 /*return*/];
49
49
  }
50
- _16.label = 2;
50
+ _15.label = 2;
51
51
  case 2:
52
- component = key
53
- ? (_d = event.context.scoped) === null || _d === void 0 ? void 0 : _d[action.componentId ? 'getComponentById' : 'getComponentByName'](key)
54
- : renderer;
52
+ component = Action.getTargetComponent(action, renderer, event, key);
55
53
  // 如果key指定了,但是没找到组件,则报错
56
54
  if (key && !component) {
57
55
  msg = "\u5C1D\u8BD5\u6267\u884C\u4E00\u4E2A\u4E0D\u5B58\u5728\u7684\u76EE\u6807\u7EC4\u4EF6\u52A8\u4F5C\uFF08".concat(key, "\uFF09\uFF0C\u8BF7\u68C0\u67E5\u76EE\u6807\u7EC4\u4EF6\u975E\u9690\u85CF\u72B6\u6001\uFF0C\u4E14\u6B63\u786E\u6307\u5B9A\u4E86componentId\u6216componentName");
@@ -59,93 +57,93 @@ var CmptAction = /** @class */ (function () {
59
57
  }
60
58
  if (action.actionType === 'setValue') {
61
59
  if (component === null || component === void 0 ? void 0 : component.setData) {
62
- return [2 /*return*/, component === null || component === void 0 ? void 0 : component.setData((_e = action.args) === null || _e === void 0 ? void 0 : _e.value, dataMergeMode === 'override', (_f = action.args) === null || _f === void 0 ? void 0 : _f.index, (_g = action.args) === null || _g === void 0 ? void 0 : _g.condition)];
60
+ return [2 /*return*/, component === null || component === void 0 ? void 0 : component.setData((_d = action.args) === null || _d === void 0 ? void 0 : _d.value, dataMergeMode === 'override', (_e = action.args) === null || _e === void 0 ? void 0 : _e.index, (_f = action.args) === null || _f === void 0 ? void 0 : _f.condition)];
63
61
  }
64
62
  else {
65
- return [2 /*return*/, (_j = component === null || component === void 0 ? void 0 : (_h = component.props).onChange) === null || _j === void 0 ? void 0 : _j.call(_h, (_k = action.args) === null || _k === void 0 ? void 0 : _k.value)];
63
+ return [2 /*return*/, (_h = component === null || component === void 0 ? void 0 : (_g = component.props).onChange) === null || _h === void 0 ? void 0 : _h.call(_g, (_j = action.args) === null || _j === void 0 ? void 0 : _j.value)];
66
64
  }
67
65
  }
68
66
  if (!(action.actionType === 'reload')) return [3 /*break*/, 4];
69
- 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', tslib.__assign(tslib.__assign({}, action.args), { resetPage: (_o = (_m = action.args) === null || _m === void 0 ? void 0 : _m.resetPage) !== null && _o !== void 0 ? _o : action.resetPage })))];
67
+ return [4 /*yield*/, ((_k = component === null || component === void 0 ? void 0 : component.reload) === null || _k === void 0 ? void 0 : _k.call(component, undefined, action.data, event.data, undefined, dataMergeMode === 'override', tslib.__assign(tslib.__assign({}, action.args), { resetPage: (_m = (_l = action.args) === null || _l === void 0 ? void 0 : _l.resetPage) !== null && _m !== void 0 ? _m : action.resetPage })))];
70
68
  case 3:
71
- result = _16.sent();
69
+ result = _15.sent();
72
70
  if (result && action.outputVar) {
73
- event.setData(object.extendObject(event.data, (_10 = {},
74
- _10[action.outputVar] = result,
75
- _10)));
71
+ event.setData(object.extendObject(event.data, (_9 = {},
72
+ _9[action.outputVar] = result,
73
+ _9)));
76
74
  }
77
75
  return [2 /*return*/, result];
78
76
  case 4:
79
77
  if (!(action.actionType === 'validateFormItem' &&
80
- ((_q = factory.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];
81
- _8 = (component === null || component === void 0 ? void 0 : component.props) || {}, dispatchEvent_1 = _8.dispatchEvent, data = _8.data;
82
- _16.label = 5;
78
+ ((_p = factory.getRendererByName((_o = component === null || component === void 0 ? void 0 : component.props) === null || _o === void 0 ? void 0 : _o.type)) === null || _p === void 0 ? void 0 : _p.isFormItem))) return [3 /*break*/, 11];
79
+ _7 = (component === null || component === void 0 ? void 0 : component.props) || {}, dispatchEvent_1 = _7.dispatchEvent, data = _7.data;
80
+ _15.label = 5;
83
81
  case 5:
84
- _16.trys.push([5, 9, , 10]);
85
- return [4 /*yield*/, ((_s = component === null || component === void 0 ? void 0 : (_r = component.props).onValidate) === null || _s === void 0 ? void 0 : _s.call(_r))];
82
+ _15.trys.push([5, 9, , 10]);
83
+ return [4 /*yield*/, ((_r = component === null || component === void 0 ? void 0 : (_q = component.props).onValidate) === null || _r === void 0 ? void 0 : _r.call(_q))];
86
84
  case 6:
87
- _9 = (_16.sent());
88
- if (_9) return [3 /*break*/, 8];
89
- return [4 /*yield*/, ((_t = component === null || component === void 0 ? void 0 : component.validate) === null || _t === void 0 ? void 0 : _t.call(component))];
85
+ _8 = (_15.sent());
86
+ if (_8) return [3 /*break*/, 8];
87
+ return [4 /*yield*/, ((_s = component === null || component === void 0 ? void 0 : component.validate) === null || _s === void 0 ? void 0 : _s.call(component))];
90
88
  case 7:
91
- _9 = (_16.sent());
92
- _16.label = 8;
89
+ _8 = (_15.sent());
90
+ _15.label = 8;
93
91
  case 8:
94
- valid = _9;
92
+ valid = _8;
95
93
  if (valid) {
96
- event.setData(object.createObject(event.data, (_11 = {},
97
- _11[action.outputVar || "".concat(action.actionType, "Result")] = {
94
+ event.setData(object.createObject(event.data, (_10 = {},
95
+ _10[action.outputVar || "".concat(action.actionType, "Result")] = {
98
96
  error: '',
99
- 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
+ value: (_u = (_t = component === null || component === void 0 ? void 0 : component.props) === null || _t === void 0 ? void 0 : _t.formItem) === null || _u === void 0 ? void 0 : _u.value
100
98
  },
101
- _11)));
99
+ _10)));
102
100
  dispatchEvent_1 && dispatchEvent_1('formItemValidateSucc', data);
103
101
  }
104
102
  else {
105
- event.setData(object.createObject(event.data, (_12 = {},
106
- _12[action.outputVar || "".concat(action.actionType, "Result")] = {
107
- 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(','),
108
- 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
103
+ event.setData(object.createObject(event.data, (_11 = {},
104
+ _11[action.outputVar || "".concat(action.actionType, "Result")] = {
105
+ error: (((_w = (_v = component === null || component === void 0 ? void 0 : component.props) === null || _v === void 0 ? void 0 : _v.formItem) === null || _w === void 0 ? void 0 : _w.errors) || []).join(','),
106
+ value: (_y = (_x = component === null || component === void 0 ? void 0 : component.props) === null || _x === void 0 ? void 0 : _x.formItem) === null || _y === void 0 ? void 0 : _y.value
109
107
  },
110
- _12)));
108
+ _11)));
111
109
  dispatchEvent_1 && dispatchEvent_1('formItemValidateError', data);
112
110
  }
113
111
  return [3 /*break*/, 10];
114
112
  case 9:
115
- e_1 = _16.sent();
116
- event.setData(object.createObject(event.data, (_13 = {},
117
- _13[action.outputVar || "".concat(action.actionType, "Result")] = {
113
+ e_1 = _15.sent();
114
+ event.setData(object.createObject(event.data, (_12 = {},
115
+ _12[action.outputVar || "".concat(action.actionType, "Result")] = {
118
116
  error: e_1.message || '未知错误',
119
- 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
+ value: (_0 = (_z = component === null || component === void 0 ? void 0 : component.props) === null || _z === void 0 ? void 0 : _z.formItem) === null || _0 === void 0 ? void 0 : _0.value
120
118
  },
121
- _13)));
119
+ _12)));
122
120
  dispatchEvent_1 && dispatchEvent_1('formItemValidateError', data);
123
121
  return [3 /*break*/, 10];
124
122
  case 10: return [2 /*return*/];
125
123
  case 11:
126
- _16.trys.push([11, 13, , 14]);
127
- 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))];
124
+ _15.trys.push([11, 13, , 14]);
125
+ return [4 /*yield*/, ((_1 = component === null || component === void 0 ? void 0 : component.doAction) === null || _1 === void 0 ? void 0 : _1.call(component, action, event.data, true, action.args))];
128
126
  case 12:
129
- result = _16.sent();
127
+ result = _15.sent();
130
128
  if (['validate', 'submit'].includes(action.actionType)) {
131
- event.setData(object.createObject(event.data, (_14 = {},
132
- _14[action.outputVar || "".concat(action.actionType, "Result")] = {
129
+ event.setData(object.createObject(event.data, (_13 = {},
130
+ _13[action.outputVar || "".concat(action.actionType, "Result")] = {
133
131
  error: '',
134
- 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
+ payload: (_2 = result === null || result === void 0 ? void 0 : result.__payload) !== null && _2 !== void 0 ? _2 : (_4 = (_3 = component === null || component === void 0 ? void 0 : component.props) === null || _3 === void 0 ? void 0 : _3.store) === null || _4 === void 0 ? void 0 : _4.data,
135
133
  responseData: result === null || result === void 0 ? void 0 : result.__response
136
134
  },
137
- _14)));
135
+ _13)));
138
136
  }
139
137
  return [2 /*return*/, result];
140
138
  case 13:
141
- e_2 = _16.sent();
142
- event.setData(object.createObject(event.data, (_15 = {},
143
- _15[action.outputVar || "".concat(action.actionType, "Result")] = {
139
+ e_2 = _15.sent();
140
+ event.setData(object.createObject(event.data, (_14 = {},
141
+ _14[action.outputVar || "".concat(action.actionType, "Result")] = {
144
142
  error: e_2.message,
145
143
  errors: e_2.name === 'ValidateError' ? e_2.detail : e_2,
146
- 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
+ payload: (_6 = (_5 = component === null || component === void 0 ? void 0 : component.props) === null || _5 === void 0 ? void 0 : _5.store) === null || _6 === void 0 ? void 0 : _6.data
147
145
  },
148
- _15)));
146
+ _14)));
149
147
  return [3 /*break*/, 14];
150
148
  case 14: return [2 /*return*/];
151
149
  }
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/env.d.ts CHANGED
@@ -110,6 +110,10 @@ export interface RendererEnv {
110
110
  * 渲染器包裹组件可以外部指定
111
111
  */
112
112
  SchemaRenderer?: React.ComponentType<any>;
113
+ /**
114
+ * 获取当前页面标识
115
+ */
116
+ getPageId?: () => string;
113
117
  }
114
118
  export declare const EnvContext: React.Context<void | RendererEnv>;
115
119
  export interface EnvProps {
package/lib/env.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/factory.d.ts CHANGED
@@ -7,6 +7,7 @@ import { LocaleProps } from './locale';
7
7
  import type { RendererEnv } from './env';
8
8
  import { OnEventProps, RendererEvent } from './utils/renderer-event';
9
9
  import { StatusScopedProps } from './StatusScoped';
10
+ import type { IScopedContext } from './Scoped';
10
11
  export interface TestFunc {
11
12
  (path: string, schema?: Schema, resolveRenderer?: (path: string, schema?: Schema, props?: any) => null | RendererConfig): boolean;
12
13
  }
@@ -44,7 +45,7 @@ export interface RendererProps extends ThemeProps, LocaleProps, OnEventProps, St
44
45
  [propName: string]: any;
45
46
  };
46
47
  onBroadcast?: (type: string, rawEvent: RendererEvent<any>, ctx: any) => any;
47
- dispatchEvent: (e: React.UIEvent<any> | React.BaseSyntheticEvent<any> | string, data: any, renderer?: React.Component<RendererProps>) => Promise<RendererEvent<any>>;
48
+ dispatchEvent: (e: string | React.MouseEvent<any>, data: any, renderer?: React.Component<RendererProps>, scoped?: IScopedContext) => Promise<RendererEvent<any>>;
48
49
  mobileUI?: boolean;
49
50
  [propName: string]: any;
50
51
  }
package/lib/factory.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -19,6 +19,7 @@ var Scoped = require('./Scoped.js');
19
19
  var find = require('lodash/find');
20
20
  var WithStore = require('./WithStore.js');
21
21
  var Placeholder = require('./renderers/Placeholder.js');
22
+ var getPageId = require('./utils/getPageId.js');
22
23
  var string2regExp = require('./utils/string2regExp.js');
23
24
 
24
25
  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -393,7 +394,8 @@ var defaultOptions = {
393
394
  * 过滤 html 标签,可用来添加 xss 保护逻辑
394
395
  */
395
396
  filterHtml: function (input) { return input; },
396
- isMobile: helper.isMobile
397
+ isMobile: helper.isMobile,
398
+ getPageId: getPageId.getPageId
397
399
  };
398
400
  var stores = {};
399
401
  // 默认 env 会被缓存,所以新传入的 env 不会替换旧的。
package/lib/globalVar.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.12.0-beta.9
2
+ * amis-core v6.13.0-beta.0
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5