amis-core 2.0.0 → 2.1.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 (311) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.js +7 -7
  3. package/esm/SchemaRenderer.js +12 -12
  4. package/esm/Scoped.js +1 -1
  5. package/esm/WithRootStore.d.ts +0 -18
  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.js +1 -1
  13. package/esm/actions/AjaxAction.js +39 -38
  14. package/esm/actions/BreakAction.js +1 -1
  15. package/esm/actions/BroadcastAction.js +1 -1
  16. package/esm/actions/CmptAction.js +3 -3
  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/Decorators.js +1 -1
  21. package/esm/actions/DialogAction.js +2 -2
  22. package/esm/actions/DrawerAction.js +1 -1
  23. package/esm/actions/EmailAction.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/SwitchAction.js +1 -1
  29. package/esm/actions/ToastAction.js +1 -1
  30. package/esm/components/LazyComponent.js +1 -1
  31. package/esm/components/Overlay.d.ts +2 -0
  32. package/esm/components/Overlay.js +19 -2
  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.d.ts +1 -1
  37. package/esm/factory.js +1 -1
  38. package/esm/index.js +4 -4
  39. package/esm/index2.js +3 -4
  40. package/esm/locale.js +1 -1
  41. package/esm/node_modules/@restart/hooks/esm/useCommittedRef.js +1 -1
  42. package/esm/node_modules/@restart/hooks/esm/useEventCallback.js +1 -1
  43. package/esm/node_modules/dom-helpers/esm/addEventListener.js +1 -1
  44. package/esm/node_modules/dom-helpers/esm/canUseDOM.js +1 -1
  45. package/esm/node_modules/dom-helpers/esm/contains.js +1 -1
  46. package/esm/node_modules/dom-helpers/esm/listen.js +1 -1
  47. package/esm/node_modules/dom-helpers/esm/ownerDocument.js +1 -1
  48. package/esm/node_modules/dom-helpers/esm/removeEventListener.js +1 -1
  49. package/esm/node_modules/object-assign/index.js +1 -1
  50. package/esm/node_modules/prop-types/checkPropTypes.js +1 -1
  51. package/esm/node_modules/prop-types/factoryWithThrowingShims.js +1 -1
  52. package/esm/node_modules/prop-types/factoryWithTypeCheckers.js +1 -1
  53. package/esm/node_modules/prop-types/index.js +1 -1
  54. package/esm/node_modules/prop-types/lib/ReactPropTypesSecret.js +1 -1
  55. package/esm/node_modules/prop-types/lib/has.js +1 -1
  56. package/esm/node_modules/prop-types/node_modules/react-is/cjs/react-is.development.js +1 -1
  57. package/esm/node_modules/prop-types/node_modules/react-is/cjs/react-is.production.min.js +1 -1
  58. package/esm/node_modules/prop-types/node_modules/react-is/index.js +1 -1
  59. package/esm/node_modules/react-overlays/esm/Portal.js +1 -1
  60. package/esm/node_modules/react-overlays/esm/ownerDocument.js +1 -1
  61. package/esm/node_modules/react-overlays/esm/safeFindDOMNode.js +1 -1
  62. package/esm/node_modules/react-overlays/esm/useRootClose.js +1 -1
  63. package/esm/node_modules/react-overlays/esm/useWaitForDOMRef.js +1 -1
  64. package/esm/node_modules/warning/warning.js +1 -1
  65. package/esm/renderers/Form.d.ts +2 -1
  66. package/esm/renderers/Form.js +12 -6
  67. package/esm/renderers/Item.d.ts +4 -18
  68. package/esm/renderers/Item.js +21 -11
  69. package/esm/renderers/Options.js +14 -6
  70. package/esm/renderers/Placeholder.js +1 -1
  71. package/esm/renderers/builtin.js +1 -1
  72. package/esm/renderers/wrapControl.d.ts +0 -9
  73. package/esm/renderers/wrapControl.js +2 -3
  74. package/esm/store/app.d.ts +4 -1
  75. package/esm/store/app.js +5 -2
  76. package/esm/store/combo.js +1 -1
  77. package/esm/store/crud.js +1 -1
  78. package/esm/store/form.js +1 -1
  79. package/esm/store/formItem.js +4 -2
  80. package/esm/store/iRenderer.js +1 -1
  81. package/esm/store/index.d.ts +0 -5
  82. package/esm/store/index.js +1 -16
  83. package/esm/store/list.js +1 -1
  84. package/esm/store/manager.js +1 -1
  85. package/esm/store/modal.js +1 -1
  86. package/esm/store/node.js +1 -1
  87. package/esm/store/pagination.js +1 -1
  88. package/esm/store/root.d.ts +4 -0
  89. package/esm/store/root.js +14 -2
  90. package/esm/store/service.js +1 -1
  91. package/esm/store/table-v2.js +1 -1
  92. package/esm/store/table.d.ts +2 -2
  93. package/esm/store/table.js +4 -9
  94. package/esm/theme.js +1 -1
  95. package/esm/types.d.ts +2 -2
  96. package/esm/utils/Animation.js +1 -1
  97. package/esm/utils/ColorScale.js +1 -1
  98. package/esm/utils/DataSchema.js +2 -6
  99. package/esm/utils/DataScope.js +1 -1
  100. package/esm/utils/RootClose.js +1 -1
  101. package/esm/utils/SimpleMap.js +1 -1
  102. package/esm/utils/api.d.ts +7 -0
  103. package/esm/utils/api.js +47 -6
  104. package/esm/utils/attachmentAdpator.js +1 -1
  105. package/esm/utils/autobind.js +1 -1
  106. package/esm/utils/columnsSplit.js +1 -1
  107. package/esm/utils/dataMapping.d.ts +6 -0
  108. package/esm/utils/dataMapping.js +16 -2
  109. package/esm/utils/date.js +1 -1
  110. package/esm/utils/debug.js +1 -1
  111. package/esm/utils/dom.js +1 -1
  112. package/esm/utils/errors.js +1 -1
  113. package/esm/utils/escapeHtml.js +1 -1
  114. package/esm/utils/filter-schema.js +1 -1
  115. package/esm/utils/filter.js +1 -1
  116. package/esm/utils/formatDuration.js +1 -1
  117. package/esm/utils/formula.js +1 -1
  118. package/esm/utils/getVariable.js +1 -1
  119. package/esm/utils/grammar.js +1 -1
  120. package/esm/utils/handleAction.js +1 -1
  121. package/esm/utils/helper.d.ts +27 -1
  122. package/esm/utils/helper.js +23 -6
  123. package/esm/utils/highlight.js +1 -1
  124. package/esm/utils/icon.js +1 -1
  125. package/esm/utils/image.js +1 -1
  126. package/esm/utils/isPureVariable.js +1 -1
  127. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  128. package/esm/utils/keyToPath.js +1 -1
  129. package/esm/utils/makeSorter.js +1 -1
  130. package/esm/utils/normalizeLink.js +1 -1
  131. package/esm/utils/normalizeOptions.js +1 -1
  132. package/esm/utils/object.js +1 -1
  133. package/esm/utils/offset.js +1 -1
  134. package/esm/utils/offsetParent.js +1 -1
  135. package/esm/utils/optionValueCompare.js +1 -1
  136. package/esm/utils/position.d.ts +1 -1
  137. package/esm/utils/position.js +9 -1
  138. package/esm/utils/prettyBytes.js +1 -1
  139. package/esm/utils/renderer-event.js +1 -1
  140. package/esm/utils/replaceText.js +1 -1
  141. package/esm/utils/resize-sensor.js +1 -1
  142. package/esm/utils/resolveVariable.js +1 -1
  143. package/esm/utils/resolveVariableAndFilter.js +1 -1
  144. package/esm/utils/scrollPosition.d.ts +1 -1
  145. package/esm/utils/scrollPosition.js +1 -1
  146. package/esm/utils/string2regExp.js +1 -1
  147. package/esm/utils/stripNumber.js +1 -1
  148. package/esm/utils/style.js +1 -1
  149. package/esm/utils/tokenize.js +1 -1
  150. package/esm/utils/tpl-builtin.d.ts +2 -2
  151. package/esm/utils/tpl-builtin.js +1 -1
  152. package/esm/utils/tpl-lodash.js +1 -1
  153. package/esm/utils/tpl.js +1 -1
  154. package/esm/utils/uncontrollable.js +1 -1
  155. package/esm/utils/validations.js +1 -1
  156. package/lib/Root.js +1 -1
  157. package/lib/RootRenderer.js +7 -7
  158. package/lib/SchemaRenderer.js +12 -12
  159. package/lib/Scoped.js +1 -1
  160. package/lib/WithRootStore.d.ts +0 -18
  161. package/lib/WithRootStore.js +1 -1
  162. package/lib/WithStore.js +1 -1
  163. package/lib/_virtual/index.js +1 -1
  164. package/lib/_virtual/index2.js +1 -1
  165. package/lib/_virtual/react-is.development.js +1 -1
  166. package/lib/_virtual/react-is.production.min.js +1 -1
  167. package/lib/actions/Action.js +1 -1
  168. package/lib/actions/AjaxAction.js +38 -37
  169. package/lib/actions/BreakAction.js +1 -1
  170. package/lib/actions/BroadcastAction.js +1 -1
  171. package/lib/actions/CmptAction.js +3 -3
  172. package/lib/actions/ContinueAction.js +1 -1
  173. package/lib/actions/CopyAction.js +1 -1
  174. package/lib/actions/CustomAction.js +1 -1
  175. package/lib/actions/Decorators.js +1 -1
  176. package/lib/actions/DialogAction.js +2 -2
  177. package/lib/actions/DrawerAction.js +1 -1
  178. package/lib/actions/EmailAction.js +1 -1
  179. package/lib/actions/LinkAction.js +1 -1
  180. package/lib/actions/LoopAction.js +1 -1
  181. package/lib/actions/PageAction.js +1 -1
  182. package/lib/actions/ParallelAction.js +1 -1
  183. package/lib/actions/SwitchAction.js +1 -1
  184. package/lib/actions/ToastAction.js +1 -1
  185. package/lib/components/LazyComponent.js +1 -1
  186. package/lib/components/Overlay.d.ts +2 -0
  187. package/lib/components/Overlay.js +19 -2
  188. package/lib/components/PopOver.js +1 -1
  189. package/lib/env.js +1 -1
  190. package/lib/envOverwrite.js +1 -1
  191. package/lib/factory.d.ts +1 -1
  192. package/lib/factory.js +1 -1
  193. package/lib/index.js +5 -1
  194. package/lib/index2.js +4 -2
  195. package/lib/locale.js +1 -1
  196. package/lib/node_modules/@restart/hooks/esm/useCommittedRef.js +1 -1
  197. package/lib/node_modules/@restart/hooks/esm/useEventCallback.js +1 -1
  198. package/lib/node_modules/dom-helpers/esm/addEventListener.js +1 -1
  199. package/lib/node_modules/dom-helpers/esm/canUseDOM.js +1 -1
  200. package/lib/node_modules/dom-helpers/esm/contains.js +1 -1
  201. package/lib/node_modules/dom-helpers/esm/listen.js +1 -1
  202. package/lib/node_modules/dom-helpers/esm/ownerDocument.js +1 -1
  203. package/lib/node_modules/dom-helpers/esm/removeEventListener.js +1 -1
  204. package/lib/node_modules/object-assign/index.js +1 -1
  205. package/lib/node_modules/prop-types/checkPropTypes.js +1 -1
  206. package/lib/node_modules/prop-types/factoryWithThrowingShims.js +1 -1
  207. package/lib/node_modules/prop-types/factoryWithTypeCheckers.js +1 -1
  208. package/lib/node_modules/prop-types/index.js +1 -1
  209. package/lib/node_modules/prop-types/lib/ReactPropTypesSecret.js +1 -1
  210. package/lib/node_modules/prop-types/lib/has.js +1 -1
  211. package/lib/node_modules/prop-types/node_modules/react-is/cjs/react-is.development.js +1 -1
  212. package/lib/node_modules/prop-types/node_modules/react-is/cjs/react-is.production.min.js +1 -1
  213. package/lib/node_modules/prop-types/node_modules/react-is/index.js +1 -1
  214. package/lib/node_modules/react-overlays/esm/Portal.js +1 -1
  215. package/lib/node_modules/react-overlays/esm/ownerDocument.js +1 -1
  216. package/lib/node_modules/react-overlays/esm/safeFindDOMNode.js +1 -1
  217. package/lib/node_modules/react-overlays/esm/useRootClose.js +1 -1
  218. package/lib/node_modules/react-overlays/esm/useWaitForDOMRef.js +1 -1
  219. package/lib/node_modules/warning/warning.js +1 -1
  220. package/lib/renderers/Form.d.ts +2 -1
  221. package/lib/renderers/Form.js +12 -6
  222. package/lib/renderers/Item.d.ts +4 -18
  223. package/lib/renderers/Item.js +20 -10
  224. package/lib/renderers/Options.js +14 -7
  225. package/lib/renderers/Placeholder.js +1 -1
  226. package/lib/renderers/builtin.js +1 -1
  227. package/lib/renderers/wrapControl.d.ts +0 -9
  228. package/lib/renderers/wrapControl.js +2 -3
  229. package/lib/store/app.d.ts +4 -1
  230. package/lib/store/app.js +5 -2
  231. package/lib/store/combo.js +1 -1
  232. package/lib/store/crud.js +1 -1
  233. package/lib/store/form.js +1 -1
  234. package/lib/store/formItem.js +4 -2
  235. package/lib/store/iRenderer.js +1 -1
  236. package/lib/store/index.d.ts +0 -5
  237. package/lib/store/index.js +1 -16
  238. package/lib/store/list.js +1 -1
  239. package/lib/store/manager.js +1 -1
  240. package/lib/store/modal.js +1 -1
  241. package/lib/store/node.js +1 -1
  242. package/lib/store/pagination.js +1 -1
  243. package/lib/store/root.d.ts +4 -0
  244. package/lib/store/root.js +14 -2
  245. package/lib/store/service.js +1 -1
  246. package/lib/store/table-v2.js +1 -1
  247. package/lib/store/table.d.ts +2 -2
  248. package/lib/store/table.js +4 -9
  249. package/lib/theme.js +1 -1
  250. package/lib/types.d.ts +2 -2
  251. package/lib/utils/Animation.js +1 -1
  252. package/lib/utils/ColorScale.js +1 -1
  253. package/lib/utils/DataSchema.js +2 -6
  254. package/lib/utils/DataScope.js +1 -1
  255. package/lib/utils/RootClose.js +1 -1
  256. package/lib/utils/SimpleMap.js +1 -1
  257. package/lib/utils/api.d.ts +7 -0
  258. package/lib/utils/api.js +48 -5
  259. package/lib/utils/attachmentAdpator.js +1 -1
  260. package/lib/utils/autobind.js +1 -1
  261. package/lib/utils/columnsSplit.js +1 -1
  262. package/lib/utils/dataMapping.d.ts +6 -0
  263. package/lib/utils/dataMapping.js +16 -1
  264. package/lib/utils/date.js +1 -1
  265. package/lib/utils/debug.js +1 -1
  266. package/lib/utils/dom.js +1 -1
  267. package/lib/utils/errors.js +1 -1
  268. package/lib/utils/escapeHtml.js +1 -1
  269. package/lib/utils/filter-schema.js +1 -1
  270. package/lib/utils/filter.js +1 -1
  271. package/lib/utils/formatDuration.js +1 -1
  272. package/lib/utils/formula.js +1 -1
  273. package/lib/utils/getVariable.js +1 -1
  274. package/lib/utils/grammar.js +1 -1
  275. package/lib/utils/handleAction.js +1 -1
  276. package/lib/utils/helper.d.ts +27 -1
  277. package/lib/utils/helper.js +23 -5
  278. package/lib/utils/highlight.js +1 -1
  279. package/lib/utils/icon.js +1 -1
  280. package/lib/utils/image.js +1 -1
  281. package/lib/utils/isPureVariable.js +1 -1
  282. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  283. package/lib/utils/keyToPath.js +1 -1
  284. package/lib/utils/makeSorter.js +1 -1
  285. package/lib/utils/normalizeLink.js +1 -1
  286. package/lib/utils/normalizeOptions.js +1 -1
  287. package/lib/utils/object.js +1 -1
  288. package/lib/utils/offset.js +1 -1
  289. package/lib/utils/offsetParent.js +1 -1
  290. package/lib/utils/optionValueCompare.js +1 -1
  291. package/lib/utils/position.d.ts +1 -1
  292. package/lib/utils/position.js +9 -1
  293. package/lib/utils/prettyBytes.js +1 -1
  294. package/lib/utils/renderer-event.js +1 -1
  295. package/lib/utils/replaceText.js +1 -1
  296. package/lib/utils/resize-sensor.js +1 -1
  297. package/lib/utils/resolveVariable.js +1 -1
  298. package/lib/utils/resolveVariableAndFilter.js +1 -1
  299. package/lib/utils/scrollPosition.d.ts +1 -1
  300. package/lib/utils/scrollPosition.js +1 -1
  301. package/lib/utils/string2regExp.js +1 -1
  302. package/lib/utils/stripNumber.js +1 -1
  303. package/lib/utils/style.js +1 -1
  304. package/lib/utils/tokenize.js +1 -1
  305. package/lib/utils/tpl-builtin.d.ts +2 -2
  306. package/lib/utils/tpl-builtin.js +1 -1
  307. package/lib/utils/tpl-lodash.js +1 -1
  308. package/lib/utils/tpl.js +1 -1
  309. package/lib/utils/uncontrollable.js +1 -1
  310. package/lib/utils/validations.js +1 -1
  311. package/package.json +6 -6
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -220,7 +220,7 @@ export interface FormProps extends RendererProps, Omit<FormSchemaBase, 'mode' |
220
220
  lazyLoad?: boolean;
221
221
  simpleMode?: boolean;
222
222
  onInit?: (values: object, props: any) => any;
223
- onReset?: (values: object) => void;
223
+ onReset?: (values: object, action?: any) => void;
224
224
  onSubmit?: (values: object, action: any) => any;
225
225
  onChange?: (values: object, diff: object, props: any) => any;
226
226
  onFailed?: (reason: string, errors: any) => any;
@@ -305,6 +305,7 @@ export default class Form extends React.Component<FormProps, object> {
305
305
  emitChange(submit: boolean): Promise<void>;
306
306
  handleBulkChange(values: Object, submit: boolean): void;
307
307
  handleFormSubmit(e: React.UIEvent<any>): false | Promise<any>;
308
+ handleReset(action: any): (data: any) => void;
308
309
  handleAction(e: React.UIEvent<any> | void, action: ActionObject, data: object, throwErrors?: boolean, delegate?: IScopedContext): Promise<any>;
309
310
  handleQuery(query: any): void;
310
311
  handleDialogConfirm(values: object[], action: ActionObject, ctx: any, targets: Array<any>): void;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -434,6 +434,12 @@ var Form = /** @class */ (function (_super) {
434
434
  type: 'submit'
435
435
  }, this.props.store.data);
436
436
  };
437
+ Form.prototype.handleReset = function (action) {
438
+ var onReset = this.props.onReset;
439
+ return function (data) {
440
+ onReset && onReset(data, action);
441
+ };
442
+ };
437
443
  Form.prototype.handleAction = function (e, action, data, throwErrors, delegate) {
438
444
  if (throwErrors === void 0) { throwErrors = false; }
439
445
  return tslib.__awaiter(this, void 0, void 0, function () {
@@ -483,10 +489,10 @@ var Form = /** @class */ (function (_super) {
483
489
  action.actionType === 'clear-and-submit') {
484
490
  store.setCurrentAction(action);
485
491
  if (action.actionType === 'reset-and-submit') {
486
- store.reset(onReset);
492
+ store.reset(this.handleReset(action));
487
493
  }
488
494
  else if (action.actionType === 'clear-and-submit') {
489
- store.clear(onReset);
495
+ store.clear(this.handleReset(action));
490
496
  }
491
497
  return [2 /*return*/, this.submit(function (values) {
492
498
  var _a;
@@ -593,8 +599,8 @@ var Form = /** @class */ (function (_super) {
593
599
  if (onFinished && onFinished(values, action) === false) {
594
600
  return values;
595
601
  }
596
- resetAfterSubmit && store.reset(onReset);
597
- clearAfterSubmit && store.clear(onReset);
602
+ resetAfterSubmit && store.reset(_this.handleReset(action));
603
+ clearAfterSubmit && store.clear(_this.handleReset(action));
598
604
  clearPersistDataAfterSubmit && store.clearLocalPersistData();
599
605
  if (action.redirect || redirect) {
600
606
  var finalRedirect = tpl.filter(action.redirect || redirect, store.data);
@@ -901,7 +907,7 @@ var Form = /** @class */ (function (_super) {
901
907
  return (React__default["default"].createElement(WrapperComponent, { className: cx("Form", "Form--".concat(mode || 'normal'), columnCount ? "Form--column Form--column-".concat(columnCount) : null, className), onSubmit: this.handleFormSubmit, noValidate: true },
902
908
  React__default["default"].createElement("input", { type: "submit", style: { display: 'none' } }),
903
909
  debug ? (React__default["default"].createElement("pre", null,
904
- React__default["default"].createElement("code", null, JSON.stringify(store.data, null, 2)))) : null,
910
+ React__default["default"].createElement("code", { className: cx('Form--debug') }, JSON.stringify(store.data, null, 2)))) : null,
905
911
  render('spinner', { type: 'spinner' }, {
906
912
  overlay: true,
907
913
  show: store.loading
@@ -299,13 +299,14 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
299
299
  lastSearchTerm: any;
300
300
  target: HTMLElement;
301
301
  constructor(props: FormItemProps);
302
+ componentDidUpdate(prevProps: FormItemProps): void;
302
303
  componentDidMount(): void;
303
304
  componentWillUnmount(): void;
304
305
  handleFocus(e: any): void;
305
306
  handleBlur(e: any): void;
306
307
  handleAutoFill(type: string): void;
307
308
  updateAutoFillData(context: any): void;
308
- syncAutoFill: import("lodash").DebouncedFunc<(term: any) => void>;
309
+ syncAutoFill: import("lodash").DebouncedFunc<(term: any, reload?: boolean) => void>;
309
310
  buildSchema(): JSX.Element | {
310
311
  type: any;
311
312
  className: string;
@@ -387,9 +388,7 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
387
388
  export declare const detectProps: string[];
388
389
  export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (Control: FormControlComponent) => {
389
390
  new (props: Omit<any, "rootStore"> | Readonly<Omit<any, "rootStore">>): {
390
- render(): JSX.Element; /**
391
- * label自定义宽度,默认单位为px
392
- */
391
+ render(): JSX.Element;
393
392
  context: any;
394
393
  setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
395
394
  forceUpdate(callback?: (() => void) | undefined): void;
@@ -414,9 +413,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
414
413
  UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): void;
415
414
  };
416
415
  new (props: Omit<any, "rootStore">, context: any): {
417
- render(): JSX.Element; /**
418
- * label自定义宽度,默认单位为px
419
- */
416
+ render(): JSX.Element;
420
417
  context: any;
421
418
  setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
422
419
  forceUpdate(callback?: (() => void) | undefined): void;
@@ -443,8 +440,6 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
443
440
  displayName: string;
444
441
  contextType: React.Context<{
445
442
  storeType: string;
446
- visibleState: any;
447
- disableState: any;
448
443
  } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
449
444
  readonly fetcher: any;
450
445
  readonly notify: any;
@@ -607,15 +602,8 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
607
602
  addChildId: (id: string) => void;
608
603
  removeChildId: (id: string) => void;
609
604
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
610
- setVisible(id: string, value: boolean): void;
611
- setDisable(id: string, value: boolean): void;
612
605
  } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
613
606
  storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
614
- } & {
615
- visibleState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
616
- disableState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>; /**
617
- * 显示一个小图标, 鼠标放上去的时候显示提示内容, 这个小图标跟 label 在一起
618
- */
619
607
  }, {
620
608
  readonly fetcher: any;
621
609
  readonly notify: any;
@@ -778,8 +766,6 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
778
766
  addChildId: (id: string) => void;
779
767
  removeChildId: (id: string) => void;
780
768
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
781
- setVisible(id: string, value: boolean): void;
782
- setDisable(id: string, value: boolean): void;
783
769
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
784
770
  ComposedComponent: React.ComponentType<any>;
785
771
  } & hoistNonReactStatic.NonReactStatics<any, {}> & {
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -62,8 +62,8 @@ var FormItemWrap = /** @class */ (function (_super) {
62
62
  function FormItemWrap(props) {
63
63
  var _this = _super.call(this, props) || this;
64
64
  _this.reaction = [];
65
- _this.syncAutoFill = debouce__default["default"](function (term) {
66
- (function (term) { return tslib.__awaiter(_this, void 0, void 0, function () {
65
+ _this.syncAutoFill = debouce__default["default"](function (term, reload) {
66
+ (function (term, reload) { return tslib.__awaiter(_this, void 0, void 0, function () {
67
67
  var _a, autoFill, onBulkChange, formItem, data, itemName, ctx, result;
68
68
  var _b;
69
69
  var _c, _d;
@@ -83,15 +83,15 @@ var FormItemWrap = /** @class */ (function (_super) {
83
83
  ctx = object.createObject(data, (_b = {},
84
84
  _b[itemName || ''] = term,
85
85
  _b));
86
- if (!(onBulkChange &&
86
+ if (!((onBulkChange &&
87
87
  api.isEffectiveApi(autoFill.api, ctx) &&
88
- this.lastSearchTerm !== term)) return [3 /*break*/, 3];
88
+ this.lastSearchTerm !== term) ||
89
+ reload)) return [3 /*break*/, 3];
89
90
  return [4 /*yield*/, (formItem === null || formItem === void 0 ? void 0 : formItem.loadAutoUpdateData(autoFill.api, ctx, !!((_c = autoFill.api) === null || _c === void 0 ? void 0 : _c.silent)))];
90
91
  case 2:
91
92
  result = _e.sent();
92
- if (!result)
93
- return [2 /*return*/];
94
- this.lastSearchTerm = (_d = getVariable.getVariable(result, itemName)) !== null && _d !== void 0 ? _d : term;
93
+ this.lastSearchTerm =
94
+ (_d = (result && getVariable.getVariable(result, itemName))) !== null && _d !== void 0 ? _d : term;
95
95
  if (autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) {
96
96
  result = dataMapping.dataMapping(autoFill.fillMapping, result);
97
97
  }
@@ -100,7 +100,7 @@ var FormItemWrap = /** @class */ (function (_super) {
100
100
  case 3: return [2 /*return*/];
101
101
  }
102
102
  });
103
- }); })(term).catch(function (e) { return console.error(e); });
103
+ }); })(term, reload).catch(function (e) { return console.error(e); });
104
104
  }, 250, {
105
105
  trailing: true,
106
106
  leading: false
@@ -115,6 +115,15 @@ var FormItemWrap = /** @class */ (function (_super) {
115
115
  }
116
116
  return _this;
117
117
  }
118
+ FormItemWrap.prototype.componentDidUpdate = function (prevProps) {
119
+ var _a, _b, _c;
120
+ var props = this.props;
121
+ var model = props.formItem;
122
+ if (api.isEffectiveApi((_a = props.autoFill) === null || _a === void 0 ? void 0 : _a.api, props.data) &&
123
+ api.isApiOutdated((_b = prevProps.autoFill) === null || _b === void 0 ? void 0 : _b.api, (_c = props.autoFill) === null || _c === void 0 ? void 0 : _c.api, prevProps.data, props.data)) {
124
+ this.syncAutoFill(model === null || model === void 0 ? void 0 : model.tmpValue, true);
125
+ }
126
+ };
118
127
  FormItemWrap.prototype.componentDidMount = function () {
119
128
  this.target = ReactDOM.findDOMNode(this);
120
129
  };
@@ -736,7 +745,8 @@ var detectProps = [
736
745
  'minLength',
737
746
  'maxLength',
738
747
  'embed',
739
- 'displayMode'
748
+ 'displayMode',
749
+ 'revealPassword'
740
750
  ];
741
751
  function asFormItem(config) {
742
752
  return function (Control) {
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -18,22 +18,22 @@ require('amis-formula');
18
18
  require('moment');
19
19
  var object = require('../utils/object.js');
20
20
  var isPureVariable = require('../utils/isPureVariable.js');
21
+ var getVariable = require('../utils/getVariable.js');
21
22
  var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
22
23
  var dataMapping = require('../utils/dataMapping.js');
23
24
  require('../utils/filter.js');
24
25
  var tpl = require('../utils/tpl.js');
25
26
  var findIndex = require('lodash/findIndex');
26
27
  var isPlainObject = require('lodash/isPlainObject');
27
- var merge = require('lodash/merge');
28
28
  var normalizeOptions = require('../utils/normalizeOptions.js');
29
29
  var optionValueCompare = require('../utils/optionValueCompare.js');
30
+ var keyToPath = require('../utils/keyToPath.js');
30
31
 
31
32
  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
32
33
 
33
34
  var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
34
35
  var findIndex__default = /*#__PURE__*/_interopDefaultLegacy(findIndex);
35
36
  var isPlainObject__default = /*#__PURE__*/_interopDefaultLegacy(isPlainObject);
36
- var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
37
37
 
38
38
  var detectProps = Item.detectProps.concat([
39
39
  'value',
@@ -148,7 +148,7 @@ function registerOptionsControl(config) {
148
148
  }
149
149
  }
150
150
  if (prevProps.value !== props.value || (formItem === null || formItem === void 0 ? void 0 : formItem.expressionsInOptions)) {
151
- formItem.syncOptions(undefined, props.data);
151
+ formItem === null || formItem === void 0 ? void 0 : formItem.syncOptions(undefined, props.data);
152
152
  }
153
153
  };
154
154
  FormOptionsItem.prototype.componentWillUnmount = function () {
@@ -205,9 +205,16 @@ function registerOptionsControl(config) {
205
205
  })
206
206
  }
207
207
  : object.createObject(tslib.__assign(tslib.__assign({}, data), { ancestors: helper.getTreeAncestors(formItem.filteredOptions, selectedOptions[0], true) }), selectedOptions[0]));
208
- Object.keys(toSync_1).forEach(function (key) {
209
- if (isPlainObject__default["default"](toSync_1[key]) && isPlainObject__default["default"](data[key])) {
210
- toSync_1[key] = merge__default["default"]({}, data[key], toSync_1[key]);
208
+ Object.keys(autoFill).forEach(function (key) {
209
+ var keys = keyToPath.keyToPath(key);
210
+ // 如果左边的 key 是一个路径
211
+ // 这里不希望直接把原始对象都给覆盖没了
212
+ // 而是保留原始的对象,只修改指定的属性
213
+ if (keys.length > 1 && isPlainObject__default["default"](data[keys[0]])) {
214
+ var obj = tslib.__assign({}, data[keys[0]]);
215
+ var value = getVariable.getVariable(toSync_1, key);
216
+ toSync_1[keys[0]] = obj;
217
+ object.setVariable(toSync_1, key, value);
211
218
  }
212
219
  });
213
220
  onBulkChange(toSync_1);
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -102,8 +102,6 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
102
102
  displayName: string;
103
103
  contextType: React.Context<{
104
104
  storeType: string;
105
- visibleState: any;
106
- disableState: any;
107
105
  } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
108
106
  readonly fetcher: any;
109
107
  readonly notify: any;
@@ -266,13 +264,8 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
266
264
  addChildId: (id: string) => void;
267
265
  removeChildId: (id: string) => void;
268
266
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
269
- setVisible(id: string, value: boolean): void;
270
- setDisable(id: string, value: boolean): void;
271
267
  } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
272
268
  storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
273
- } & {
274
- visibleState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
275
- disableState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
276
269
  }, {
277
270
  readonly fetcher: any;
278
271
  readonly notify: any;
@@ -435,8 +428,6 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
435
428
  addChildId: (id: string) => void;
436
429
  removeChildId: (id: string) => void;
437
430
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
438
- setVisible(id: string, value: boolean): void;
439
- setDisable(id: string, value: boolean): void;
440
431
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
441
432
  ComposedComponent: React.ComponentType<any>;
442
433
  } & hoistNonReactStatic.NonReactStatics<any, {}> & {
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -224,8 +224,7 @@ function wrapControl(ComposedComponent) {
224
224
  }
225
225
  else if (model) {
226
226
  var valueByName = getVariable.getVariable(props.data, model.name);
227
- if (valueByName !== undefined &&
228
- isEqual__default["default"](props.defaultValue, prevProps.defaultValue)) {
227
+ if (isEqual__default["default"](props.defaultValue, prevProps.defaultValue)) {
229
228
  // value 非公式表达式时,name 值优先,若 defaultValue 主动变动时,则使用 defaultValue
230
229
  if (
231
230
  // 然后才是查看关联的 name 属性值是否变化
@@ -82,7 +82,10 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
82
82
  toggleOffScreen(): void;
83
83
  setPages(pages: any): void;
84
84
  rewrite(to: string, env: RendererEnv): void;
85
- setActivePage(page: any, env: RendererEnv, params?: any): void;
85
+ setActivePage(page: any, env: RendererEnv & {
86
+ showFullBreadcrumbPath?: boolean;
87
+ showBreadcrumbHomePath?: boolean;
88
+ }, params?: any): void;
86
89
  updateActivePage(env: RendererEnv): void;
87
90
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
88
91
  export declare type IAppStore = Instance<typeof AppStore>;
package/lib/store/app.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -122,9 +122,12 @@ var AppStore = service.ServiceStore.named('AppStore')
122
122
  helper.findTree(self.pages, function (item, index, level, paths) {
123
123
  if (item.id === page.id) {
124
124
  bcn = paths.filter(function (item) { return item.path && item.label; });
125
+ if (env.showFullBreadcrumbPath) {
126
+ bcn = paths.filter(function (item) { return item.label; });
127
+ }
125
128
  bcn.push(tslib.__assign(tslib.__assign({}, item), { path: '' }));
126
129
  self.__;
127
- if (bcn[0].path !== '/') {
130
+ if (env.showBreadcrumbHomePath && bcn[0].path !== '/') {
128
131
  bcn.unshift({
129
132
  label: self.__('App.home'),
130
133
  path: '/'
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
package/lib/store/crud.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
package/lib/store/form.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -274,6 +274,7 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
274
274
  if (group.items.some(function (item) {
275
275
  return item !== self &&
276
276
  self.tmpValue !== undefined &&
277
+ self.tmpValue !== '' &&
277
278
  item.value === self.tmpValue;
278
279
  })) {
279
280
  addError(self.__('Form.unique'));
@@ -321,7 +322,8 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
321
322
  return childFirst;
322
323
  }
323
324
  }
324
- else if (option[self.valueField || 'value'] && !option.disabled) {
325
+ else if (option[self.valueField || 'value'] != null &&
326
+ !option.disabled) {
325
327
  return option;
326
328
  }
327
329
  }
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -15,9 +15,6 @@ import { IPaginationStore, PaginationStore } from './pagination';
15
15
  import { AppStore, IAppStore } from './app';
16
16
  export declare const RendererStore: import("mobx-state-tree").IModelType<{
17
17
  storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
18
- } & {
19
- visibleState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
20
- disableState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
21
18
  }, {
22
19
  readonly fetcher: any;
23
20
  readonly notify: any;
@@ -108,8 +105,6 @@ export declare const RendererStore: import("mobx-state-tree").IModelType<{
108
105
  parentId?: string | undefined;
109
106
  }): IStoreNode;
110
107
  removeStore(store: IStoreNode): void;
111
- setVisible(id: string, value: boolean): void;
112
- setDisable(id: string, value: boolean): void;
113
108
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
114
109
  export declare type IRendererStore = Instance<typeof RendererStore>;
115
110
  export { iRendererStore, IIRendererStore };
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -7,7 +7,6 @@
7
7
 
8
8
  Object.defineProperty(exports, '__esModule', { value: true });
9
9
 
10
- var tslib = require('tslib');
11
10
  var mobxStateTree = require('mobx-state-tree');
12
11
  var iRenderer = require('./iRenderer.js');
13
12
  var service = require('./service.js');
@@ -47,10 +46,6 @@ var allowedStoreList = [
47
46
  var RendererStore = mobxStateTree.types
48
47
  .model('RendererStore', {
49
48
  storeType: 'RendererStore'
50
- })
51
- .props({
52
- visibleState: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {}),
53
- disableState: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {})
54
49
  })
55
50
  .views(function (self) { return ({
56
51
  get fetcher() {
@@ -83,16 +78,6 @@ var RendererStore = mobxStateTree.types
83
78
  removeStore: function (store) {
84
79
  // store.dispose();
85
80
  manager.removeStore(store);
86
- },
87
- setVisible: function (id, value) {
88
- var _a;
89
- var state = tslib.__assign(tslib.__assign({}, self.visibleState), (_a = {}, _a[id] = value, _a));
90
- self.visibleState = state;
91
- },
92
- setDisable: function (id, value) {
93
- var _a;
94
- var state = tslib.__assign(tslib.__assign({}, self.disableState), (_a = {}, _a[id] = value, _a));
95
- self.disableState = state;
96
81
  }
97
82
  }); });
98
83
  var RegisterStore = function (store) {
package/lib/store/list.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5
 
package/lib/store/node.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.0.0
2
+ * amis-core v2.1.0
3
3
  * Copyright 2018-2022 fex
4
4
  */
5
5