amis-core 2.3.0 → 2.3.1

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 (283) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.js +1 -1
  3. package/esm/SchemaRenderer.js +1 -1
  4. package/esm/Scoped.d.ts +1 -1
  5. package/esm/Scoped.js +1 -1
  6. package/esm/WithRootStore.js +1 -1
  7. package/esm/WithStore.js +1 -1
  8. package/esm/_virtual/index.js +1 -1
  9. package/esm/_virtual/index2.js +1 -1
  10. package/esm/_virtual/react-is.development.js +1 -1
  11. package/esm/_virtual/react-is.production.min.js +1 -1
  12. package/esm/actions/Action.d.ts +2 -1
  13. package/esm/actions/Action.js +5 -6
  14. package/esm/actions/AjaxAction.js +1 -1
  15. package/esm/actions/BreakAction.js +1 -1
  16. package/esm/actions/BroadcastAction.js +6 -5
  17. package/esm/actions/CmptAction.js +5 -4
  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/Decorators.js +1 -1
  22. package/esm/actions/DialogAction.js +1 -1
  23. package/esm/actions/DrawerAction.js +1 -1
  24. package/esm/actions/EmailAction.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/SwitchAction.js +1 -1
  30. package/esm/actions/ToastAction.js +1 -1
  31. package/esm/components/LazyComponent.js +1 -1
  32. package/esm/components/Overlay.js +1 -1
  33. package/esm/components/PopOver.js +1 -1
  34. package/esm/env.js +1 -1
  35. package/esm/envOverwrite.js +1 -1
  36. package/esm/factory.js +1 -1
  37. package/esm/index.js +1 -1
  38. package/esm/locale.js +1 -1
  39. package/esm/node_modules/@restart/hooks/esm/useCommittedRef.js +1 -1
  40. package/esm/node_modules/@restart/hooks/esm/useEventCallback.js +1 -1
  41. package/esm/node_modules/dom-helpers/esm/addEventListener.js +1 -1
  42. package/esm/node_modules/dom-helpers/esm/canUseDOM.js +1 -1
  43. package/esm/node_modules/dom-helpers/esm/contains.js +1 -1
  44. package/esm/node_modules/dom-helpers/esm/listen.js +1 -1
  45. package/esm/node_modules/dom-helpers/esm/ownerDocument.js +1 -1
  46. package/esm/node_modules/dom-helpers/esm/removeEventListener.js +1 -1
  47. package/esm/node_modules/object-assign/index.js +1 -1
  48. package/esm/node_modules/prop-types/checkPropTypes.js +1 -1
  49. package/esm/node_modules/prop-types/factoryWithThrowingShims.js +1 -1
  50. package/esm/node_modules/prop-types/factoryWithTypeCheckers.js +1 -1
  51. package/esm/node_modules/prop-types/index.js +1 -1
  52. package/esm/node_modules/prop-types/lib/ReactPropTypesSecret.js +1 -1
  53. package/esm/node_modules/prop-types/lib/has.js +1 -1
  54. package/esm/node_modules/prop-types/node_modules/react-is/cjs/react-is.development.js +1 -1
  55. package/esm/node_modules/prop-types/node_modules/react-is/cjs/react-is.production.min.js +1 -1
  56. package/esm/node_modules/prop-types/node_modules/react-is/index.js +1 -1
  57. package/esm/node_modules/react-overlays/esm/Portal.js +1 -1
  58. package/esm/node_modules/react-overlays/esm/ownerDocument.js +1 -1
  59. package/esm/node_modules/react-overlays/esm/safeFindDOMNode.js +1 -1
  60. package/esm/node_modules/react-overlays/esm/useRootClose.js +1 -1
  61. package/esm/node_modules/react-overlays/esm/useWaitForDOMRef.js +1 -1
  62. package/esm/node_modules/warning/warning.js +1 -1
  63. package/esm/renderers/Form.d.ts +5 -5
  64. package/esm/renderers/Form.js +10 -10
  65. package/esm/renderers/Item.js +1 -1
  66. package/esm/renderers/Options.js +8 -6
  67. package/esm/renderers/Placeholder.js +1 -1
  68. package/esm/renderers/builtin.js +1 -1
  69. package/esm/renderers/wrapControl.js +1 -1
  70. package/esm/store/app.js +1 -1
  71. package/esm/store/combo.js +1 -1
  72. package/esm/store/crud.js +1 -1
  73. package/esm/store/form.js +1 -1
  74. package/esm/store/formItem.js +1 -1
  75. package/esm/store/iRenderer.js +1 -1
  76. package/esm/store/index.js +1 -1
  77. package/esm/store/list.js +1 -1
  78. package/esm/store/manager.js +1 -1
  79. package/esm/store/modal.js +1 -1
  80. package/esm/store/node.js +1 -1
  81. package/esm/store/pagination.js +1 -1
  82. package/esm/store/root.js +1 -1
  83. package/esm/store/service.js +1 -1
  84. package/esm/store/table.js +1 -1
  85. package/esm/store/table2.js +1 -1
  86. package/esm/theme.js +1 -1
  87. package/esm/utils/Animation.js +1 -1
  88. package/esm/utils/ColorScale.js +1 -1
  89. package/esm/utils/DataSchema.js +1 -1
  90. package/esm/utils/DataScope.js +1 -1
  91. package/esm/utils/RootClose.js +1 -1
  92. package/esm/utils/SimpleMap.js +1 -1
  93. package/esm/utils/api.js +1 -1
  94. package/esm/utils/attachmentAdpator.js +1 -1
  95. package/esm/utils/autobind.js +1 -1
  96. package/esm/utils/columnsSplit.js +1 -1
  97. package/esm/utils/dataMapping.js +1 -1
  98. package/esm/utils/date.js +1 -1
  99. package/esm/utils/debug.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/getVariable.js +1 -1
  108. package/esm/utils/grammar.js +1 -1
  109. package/esm/utils/handleAction.js +1 -1
  110. package/esm/utils/helper.js +1 -1
  111. package/esm/utils/highlight.js +1 -1
  112. package/esm/utils/icon.js +1 -1
  113. package/esm/utils/image.js +1 -1
  114. package/esm/utils/isPureVariable.js +1 -1
  115. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  116. package/esm/utils/keyToPath.js +1 -1
  117. package/esm/utils/makeSorter.js +1 -1
  118. package/esm/utils/normalizeLink.js +1 -1
  119. package/esm/utils/normalizeOptions.js +1 -1
  120. package/esm/utils/object.js +1 -1
  121. package/esm/utils/offset.js +1 -1
  122. package/esm/utils/offsetParent.js +1 -1
  123. package/esm/utils/optionValueCompare.js +1 -1
  124. package/esm/utils/position.js +1 -1
  125. package/esm/utils/prettyBytes.js +1 -1
  126. package/esm/utils/renderer-event.js +1 -1
  127. package/esm/utils/replaceText.js +1 -1
  128. package/esm/utils/resize-sensor.js +1 -1
  129. package/esm/utils/resolveVariable.js +1 -1
  130. package/esm/utils/resolveVariableAndFilter.js +1 -1
  131. package/esm/utils/scrollPosition.js +1 -1
  132. package/esm/utils/string2regExp.js +1 -1
  133. package/esm/utils/stripNumber.js +1 -1
  134. package/esm/utils/style.js +1 -1
  135. package/esm/utils/toNumber.js +1 -1
  136. package/esm/utils/tokenize.js +1 -1
  137. package/esm/utils/tpl-builtin.js +1 -1
  138. package/esm/utils/tpl-lodash.js +1 -1
  139. package/esm/utils/tpl.js +1 -1
  140. package/esm/utils/uncontrollable.js +1 -1
  141. package/esm/utils/validations.js +1 -1
  142. package/lib/Root.js +1 -1
  143. package/lib/RootRenderer.js +1 -1
  144. package/lib/SchemaRenderer.js +1 -1
  145. package/lib/Scoped.d.ts +1 -1
  146. package/lib/Scoped.js +1 -1
  147. package/lib/WithRootStore.js +1 -1
  148. package/lib/WithStore.js +1 -1
  149. package/lib/_virtual/index.js +1 -1
  150. package/lib/_virtual/index2.js +1 -1
  151. package/lib/_virtual/react-is.development.js +1 -1
  152. package/lib/_virtual/react-is.production.min.js +1 -1
  153. package/lib/actions/Action.d.ts +2 -1
  154. package/lib/actions/Action.js +5 -6
  155. package/lib/actions/AjaxAction.js +1 -1
  156. package/lib/actions/BreakAction.js +1 -1
  157. package/lib/actions/BroadcastAction.js +6 -5
  158. package/lib/actions/CmptAction.js +5 -4
  159. package/lib/actions/ContinueAction.js +1 -1
  160. package/lib/actions/CopyAction.js +1 -1
  161. package/lib/actions/CustomAction.js +1 -1
  162. package/lib/actions/Decorators.js +1 -1
  163. package/lib/actions/DialogAction.js +1 -1
  164. package/lib/actions/DrawerAction.js +1 -1
  165. package/lib/actions/EmailAction.js +1 -1
  166. package/lib/actions/LinkAction.js +1 -1
  167. package/lib/actions/LoopAction.js +1 -1
  168. package/lib/actions/PageAction.js +1 -1
  169. package/lib/actions/ParallelAction.js +1 -1
  170. package/lib/actions/SwitchAction.js +1 -1
  171. package/lib/actions/ToastAction.js +1 -1
  172. package/lib/components/LazyComponent.js +1 -1
  173. package/lib/components/Overlay.js +1 -1
  174. package/lib/components/PopOver.js +1 -1
  175. package/lib/env.js +1 -1
  176. package/lib/envOverwrite.js +1 -1
  177. package/lib/factory.js +1 -1
  178. package/lib/index.js +1 -1
  179. package/lib/locale.js +1 -1
  180. package/lib/node_modules/@restart/hooks/esm/useCommittedRef.js +1 -1
  181. package/lib/node_modules/@restart/hooks/esm/useEventCallback.js +1 -1
  182. package/lib/node_modules/dom-helpers/esm/addEventListener.js +1 -1
  183. package/lib/node_modules/dom-helpers/esm/canUseDOM.js +1 -1
  184. package/lib/node_modules/dom-helpers/esm/contains.js +1 -1
  185. package/lib/node_modules/dom-helpers/esm/listen.js +1 -1
  186. package/lib/node_modules/dom-helpers/esm/ownerDocument.js +1 -1
  187. package/lib/node_modules/dom-helpers/esm/removeEventListener.js +1 -1
  188. package/lib/node_modules/object-assign/index.js +1 -1
  189. package/lib/node_modules/prop-types/checkPropTypes.js +1 -1
  190. package/lib/node_modules/prop-types/factoryWithThrowingShims.js +1 -1
  191. package/lib/node_modules/prop-types/factoryWithTypeCheckers.js +1 -1
  192. package/lib/node_modules/prop-types/index.js +1 -1
  193. package/lib/node_modules/prop-types/lib/ReactPropTypesSecret.js +1 -1
  194. package/lib/node_modules/prop-types/lib/has.js +1 -1
  195. package/lib/node_modules/prop-types/node_modules/react-is/cjs/react-is.development.js +1 -1
  196. package/lib/node_modules/prop-types/node_modules/react-is/cjs/react-is.production.min.js +1 -1
  197. package/lib/node_modules/prop-types/node_modules/react-is/index.js +1 -1
  198. package/lib/node_modules/react-overlays/esm/Portal.js +1 -1
  199. package/lib/node_modules/react-overlays/esm/ownerDocument.js +1 -1
  200. package/lib/node_modules/react-overlays/esm/safeFindDOMNode.js +1 -1
  201. package/lib/node_modules/react-overlays/esm/useRootClose.js +1 -1
  202. package/lib/node_modules/react-overlays/esm/useWaitForDOMRef.js +1 -1
  203. package/lib/node_modules/warning/warning.js +1 -1
  204. package/lib/renderers/Form.d.ts +5 -5
  205. package/lib/renderers/Form.js +10 -10
  206. package/lib/renderers/Item.js +1 -1
  207. package/lib/renderers/Options.js +8 -6
  208. package/lib/renderers/Placeholder.js +1 -1
  209. package/lib/renderers/builtin.js +1 -1
  210. package/lib/renderers/wrapControl.js +1 -1
  211. package/lib/store/app.js +1 -1
  212. package/lib/store/combo.js +1 -1
  213. package/lib/store/crud.js +1 -1
  214. package/lib/store/form.js +1 -1
  215. package/lib/store/formItem.js +1 -1
  216. package/lib/store/iRenderer.js +1 -1
  217. package/lib/store/index.js +1 -1
  218. package/lib/store/list.js +1 -1
  219. package/lib/store/manager.js +1 -1
  220. package/lib/store/modal.js +1 -1
  221. package/lib/store/node.js +1 -1
  222. package/lib/store/pagination.js +1 -1
  223. package/lib/store/root.js +1 -1
  224. package/lib/store/service.js +1 -1
  225. package/lib/store/table.js +1 -1
  226. package/lib/store/table2.js +1 -1
  227. package/lib/theme.js +1 -1
  228. package/lib/utils/Animation.js +1 -1
  229. package/lib/utils/ColorScale.js +1 -1
  230. package/lib/utils/DataSchema.js +1 -1
  231. package/lib/utils/DataScope.js +1 -1
  232. package/lib/utils/RootClose.js +1 -1
  233. package/lib/utils/SimpleMap.js +1 -1
  234. package/lib/utils/api.js +1 -1
  235. package/lib/utils/attachmentAdpator.js +1 -1
  236. package/lib/utils/autobind.js +1 -1
  237. package/lib/utils/columnsSplit.js +1 -1
  238. package/lib/utils/dataMapping.js +1 -1
  239. package/lib/utils/date.js +1 -1
  240. package/lib/utils/debug.js +1 -1
  241. package/lib/utils/dom.js +1 -1
  242. package/lib/utils/errors.js +1 -1
  243. package/lib/utils/escapeHtml.js +1 -1
  244. package/lib/utils/filter-schema.js +1 -1
  245. package/lib/utils/filter.js +1 -1
  246. package/lib/utils/formatDuration.js +1 -1
  247. package/lib/utils/formula.js +1 -1
  248. package/lib/utils/getVariable.js +1 -1
  249. package/lib/utils/grammar.js +1 -1
  250. package/lib/utils/handleAction.js +1 -1
  251. package/lib/utils/helper.js +1 -1
  252. package/lib/utils/highlight.js +1 -1
  253. package/lib/utils/icon.js +1 -1
  254. package/lib/utils/image.js +1 -1
  255. package/lib/utils/isPureVariable.js +1 -1
  256. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  257. package/lib/utils/keyToPath.js +1 -1
  258. package/lib/utils/makeSorter.js +1 -1
  259. package/lib/utils/normalizeLink.js +1 -1
  260. package/lib/utils/normalizeOptions.js +1 -1
  261. package/lib/utils/object.js +1 -1
  262. package/lib/utils/offset.js +1 -1
  263. package/lib/utils/offsetParent.js +1 -1
  264. package/lib/utils/optionValueCompare.js +1 -1
  265. package/lib/utils/position.js +1 -1
  266. package/lib/utils/prettyBytes.js +1 -1
  267. package/lib/utils/renderer-event.js +1 -1
  268. package/lib/utils/replaceText.js +1 -1
  269. package/lib/utils/resize-sensor.js +1 -1
  270. package/lib/utils/resolveVariable.js +1 -1
  271. package/lib/utils/resolveVariableAndFilter.js +1 -1
  272. package/lib/utils/scrollPosition.js +1 -1
  273. package/lib/utils/string2regExp.js +1 -1
  274. package/lib/utils/stripNumber.js +1 -1
  275. package/lib/utils/style.js +1 -1
  276. package/lib/utils/toNumber.js +1 -1
  277. package/lib/utils/tokenize.js +1 -1
  278. package/lib/utils/tpl-builtin.js +1 -1
  279. package/lib/utils/tpl-lodash.js +1 -1
  280. package/lib/utils/tpl.js +1 -1
  281. package/lib/utils/uncontrollable.js +1 -1
  282. package/lib/utils/validations.js +1 -1
  283. package/package.json +3 -3
package/esm/Root.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
package/esm/Scoped.d.ts CHANGED
@@ -8,7 +8,7 @@ import { RendererData, ActionObject } from './types';
8
8
  export interface ScopedComponentType extends React.Component<RendererProps> {
9
9
  focus?: () => void;
10
10
  doAction?: (action: ActionObject, data: RendererData, throwErrors?: boolean) => void;
11
- receive?: (values: RendererData, subPath?: string) => void;
11
+ receive?: (values: RendererData, subPath?: string, replace?: boolean) => void;
12
12
  reload?: (subPath?: string, query?: RendererData | null, ctx?: RendererData) => void;
13
13
  context: any;
14
14
  }
package/esm/Scoped.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
package/esm/WithStore.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -15,7 +15,8 @@ export interface ListenerAction {
15
15
  actionType: string;
16
16
  description?: string;
17
17
  componentId?: string;
18
- args?: Record<string, any>;
18
+ args?: Record<string, any> | null;
19
+ dataMergeMode?: 'merge' | 'override';
19
20
  outputVar?: string;
20
21
  preventDefault?: boolean;
21
22
  stopPropagation?: boolean;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -95,12 +95,11 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
95
95
  evalExpression(String(actionConfig.preventDefault), mergeData);
96
96
  stopPropagation = actionConfig.stopPropagation &&
97
97
  evalExpression(String(actionConfig.stopPropagation), mergeData);
98
- args = event.data;
99
- if (actionConfig.args) {
100
- args = dataMapping(actionConfig.args, mergeData, function (key) {
98
+ args = actionConfig.args !== undefined
99
+ ? dataMapping(actionConfig.args, mergeData, function (key) {
101
100
  return ['adaptor', 'responseAdaptor', 'requestAdaptor'].includes(key);
102
- });
103
- }
101
+ })
102
+ : event.data;
104
103
  return [4 /*yield*/, actionInstrance.run(__assign(__assign({}, actionConfig), { args: args }), renderer, event, mergeData)];
105
104
  case 1:
106
105
  _b.sent();
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -20,20 +20,21 @@ var BroadcastAction = /** @class */ (function () {
20
20
  function BroadcastAction() {
21
21
  }
22
22
  BroadcastAction.prototype.run = function (action, renderer, event) {
23
+ var _a;
23
24
  return __awaiter(this, void 0, void 0, function () {
24
- return __generator(this, function (_a) {
25
- switch (_a.label) {
25
+ return __generator(this, function (_b) {
26
+ switch (_b.label) {
26
27
  case 0:
27
28
  if (!action.eventName) {
28
29
  console.error('eventName 未定义,请定义事件名称');
29
30
  return [2 /*return*/];
30
31
  }
31
32
  // 作为一个新的事件,需要把广播动作的args参数追加到事件数据中
32
- event.setData(createObject(event.data, action.args));
33
+ event.setData(createObject(event.data, (_a = action.args) !== null && _a !== void 0 ? _a : {}));
33
34
  return [4 /*yield*/, dispatchEvent(action.eventName, renderer, event.context.scoped, action.args, event)];
34
35
  case 1:
35
36
  // 直接触发对应的动作
36
- return [2 /*return*/, _a.sent()];
37
+ return [2 /*return*/, _b.sent()];
37
38
  }
38
39
  });
39
40
  });
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -19,11 +19,12 @@ var CmptAction = /** @class */ (function () {
19
19
  CmptAction.prototype.run = function (action, renderer, event) {
20
20
  var _a, _b, _c, _d, _e, _f, _g, _h;
21
21
  return __awaiter(this, void 0, void 0, function () {
22
- var component;
22
+ var component, dataMergeMode;
23
23
  return __generator(this, function (_j) {
24
24
  component = action.componentId && renderer.props.$schema.id !== action.componentId
25
25
  ? (_a = event.context.scoped) === null || _a === void 0 ? void 0 : _a.getComponentById(action.componentId)
26
26
  : renderer;
27
+ dataMergeMode = action.dataMergeMode || 'merge';
27
28
  // 显隐&状态控制
28
29
  if (['show', 'hidden'].includes(action.actionType)) {
29
30
  return [2 /*return*/, renderer.props.topStore.setVisible(action.componentId, action.actionType === 'show')];
@@ -34,7 +35,7 @@ var CmptAction = /** @class */ (function () {
34
35
  // 数据更新
35
36
  if (action.actionType === 'setValue') {
36
37
  if (component === null || component === void 0 ? void 0 : component.setData) {
37
- return [2 /*return*/, component === null || component === void 0 ? void 0 : component.setData((_b = action.args) === null || _b === void 0 ? void 0 : _b.value, (_c = action.args) === null || _c === void 0 ? void 0 : _c.index)];
38
+ return [2 /*return*/, component === null || component === void 0 ? void 0 : component.setData((_b = action.args) === null || _b === void 0 ? void 0 : _b.value, dataMergeMode === 'override', (_c = action.args) === null || _c === void 0 ? void 0 : _c.index)];
38
39
  }
39
40
  else {
40
41
  return [2 /*return*/, (_e = component === null || component === void 0 ? void 0 : (_d = component.props).onChange) === null || _e === void 0 ? void 0 : _e.call(_d, (_f = action.args) === null || _f === void 0 ? void 0 : _f.value)];
@@ -42,7 +43,7 @@ var CmptAction = /** @class */ (function () {
42
43
  }
43
44
  // 刷新
44
45
  if (action.actionType === 'reload') {
45
- return [2 /*return*/, (_g = component === null || component === void 0 ? void 0 : component.reload) === null || _g === void 0 ? void 0 : _g.call(component, undefined, action.args)];
46
+ return [2 /*return*/, (_g = component === null || component === void 0 ? void 0 : component.reload) === null || _g === void 0 ? void 0 : _g.call(component, undefined, action.args, undefined, undefined, dataMergeMode === 'override')];
46
47
  }
47
48
  // 执行组件动作
48
49
  return [2 /*return*/, (_h = component === null || component === void 0 ? void 0 : component.doAction) === null || _h === void 0 ? void 0 : _h.call(component, action, action.args)];
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
package/esm/env.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
package/esm/factory.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
package/esm/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
package/esm/locale.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.3.0
2
+ * amis-core v2.3.1
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -320,14 +320,14 @@ export default class Form extends React.Component<FormProps, object> {
320
320
  beforePageUnload(e: any): any;
321
321
  onInit(): Promise<void>;
322
322
  reload(subPath?: string, query?: any, ctx?: any, silent?: boolean): void;
323
- receive(values: object): void;
323
+ receive(values: object, name?: string, replace?: boolean): void;
324
324
  silentReload(target?: string, query?: any): void;
325
325
  initInterval(value: any): any;
326
326
  isValidated(): boolean;
327
327
  validate(forceValidate?: boolean): Promise<boolean>;
328
328
  clearErrors(): void;
329
329
  getValues(): any;
330
- setValues(value: any): void;
330
+ setValues(value: any, replace?: boolean): void;
331
331
  submit(fn?: (values: object) => Promise<any>): Promise<any>;
332
332
  flush(): void;
333
333
  reset(): void;
@@ -369,7 +369,7 @@ export declare class FormRenderer extends Form {
369
369
  submitToTarget(target: string, values: object): void;
370
370
  reloadTarget(target: string, data: any): void;
371
371
  closeTarget(target: string): void;
372
- reload(target?: string, query?: any, ctx?: any, silent?: boolean): void;
373
- receive(values: object, name?: string): void;
374
- setData(values: object): void;
372
+ reload(target?: string, query?: any, ctx?: any, silent?: boolean, replace?: boolean): void;
373
+ receive(values: object, name?: string, replace?: boolean): void;
374
+ setData(values: object, replace?: boolean): void;
375
375
  }