amis-core 6.9.0-rc.1 → 6.9.0-rc.11

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 (315) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.js +1 -1
  3. package/esm/SchemaRenderer.d.ts +13 -0
  4. package/esm/SchemaRenderer.js +76 -6
  5. package/esm/Scoped.d.ts +1 -1
  6. package/esm/Scoped.js +1 -1
  7. package/esm/StatusScoped.js +1 -1
  8. package/esm/StyleManager.d.ts +18 -0
  9. package/esm/StyleManager.js +55 -0
  10. package/esm/WithRootStore.js +1 -1
  11. package/esm/WithStore.js +1 -1
  12. package/esm/actions/Action.js +4 -1
  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 +57 -50
  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 +3 -3
  32. package/esm/actions/WaitAction.js +1 -1
  33. package/esm/components/CustomStyle.js +1 -1
  34. package/esm/components/ErrorBoundary.js +1 -1
  35. package/esm/components/LazyComponent.js +1 -1
  36. package/esm/components/Overlay.js +1 -1
  37. package/esm/components/PopOver.js +1 -1
  38. package/esm/env.d.ts +0 -4
  39. package/esm/env.js +1 -1
  40. package/esm/envOverwrite.js +1 -1
  41. package/esm/factory.d.ts +7 -1
  42. package/esm/factory.js +51 -5
  43. package/esm/index.d.ts +6 -4
  44. package/esm/index.js +13 -6
  45. package/esm/locale.d.ts +1 -1
  46. package/esm/locale.js +13 -2
  47. package/esm/polyfills.js +1 -1
  48. package/esm/renderers/Form.d.ts +2 -2
  49. package/esm/renderers/Form.js +11 -6
  50. package/esm/renderers/Item.d.ts +2 -1
  51. package/esm/renderers/Item.js +9 -10
  52. package/esm/renderers/Options.d.ts +46 -1
  53. package/esm/renderers/Options.js +921 -914
  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.d.ts +2 -1
  58. package/esm/renderers/wrapControl.js +8 -7
  59. package/esm/store/app.js +1 -1
  60. package/esm/store/combo.d.ts +2 -0
  61. package/esm/store/combo.js +1 -1
  62. package/esm/store/crud.js +1 -1
  63. package/esm/store/form.d.ts +1 -0
  64. package/esm/store/form.js +5 -1
  65. package/esm/store/formItem.js +4 -4
  66. package/esm/store/iRenderer.js +1 -1
  67. package/esm/store/index.js +1 -1
  68. package/esm/store/list.js +1 -1
  69. package/esm/store/manager.js +1 -1
  70. package/esm/store/modal.js +1 -1
  71. package/esm/store/node.js +1 -1
  72. package/esm/store/pagination.js +1 -1
  73. package/esm/store/root.js +1 -1
  74. package/esm/store/service.js +1 -1
  75. package/esm/store/status.js +1 -1
  76. package/esm/store/table.d.ts +2 -0
  77. package/esm/store/table.js +1 -1
  78. package/esm/store/table2.js +1 -1
  79. package/esm/theme.d.ts +1 -1
  80. package/esm/theme.js +13 -2
  81. package/esm/types.d.ts +2 -0
  82. package/esm/utils/Animation.js +1 -1
  83. package/esm/utils/ColorScale.js +1 -1
  84. package/esm/utils/DataSchema.js +1 -1
  85. package/esm/utils/DataScope.js +1 -1
  86. package/esm/utils/RootClose.js +1 -1
  87. package/esm/utils/SimpleMap.js +1 -1
  88. package/esm/utils/animations.d.ts +19 -0
  89. package/esm/utils/animations.js +58 -0
  90. package/esm/utils/api.d.ts +2 -1
  91. package/esm/utils/api.js +11 -4
  92. package/esm/utils/arraySlice.js +1 -1
  93. package/esm/utils/attachmentAdpator.js +4 -1
  94. package/esm/utils/autobind.js +1 -1
  95. package/esm/utils/browser.js +1 -1
  96. package/esm/utils/columnsSplit.js +1 -1
  97. package/esm/utils/concatData.js +1 -1
  98. package/esm/utils/dataMapping.js +1 -1
  99. package/esm/utils/date.js +1 -1
  100. package/esm/utils/debug.d.ts +3 -3
  101. package/esm/utils/debug.js +104 -37
  102. package/esm/utils/decodeEntity.js +1 -1
  103. package/esm/utils/dom.js +1 -1
  104. package/esm/utils/errors.js +1 -1
  105. package/esm/utils/escapeHtml.js +1 -1
  106. package/esm/utils/filter-schema.js +1 -1
  107. package/esm/utils/filter.js +1 -1
  108. package/esm/utils/formatDuration.js +1 -1
  109. package/esm/utils/formula.js +1 -1
  110. package/esm/utils/getVariable.js +1 -1
  111. package/esm/utils/grammar.js +1 -1
  112. package/esm/utils/handleAction.js +1 -1
  113. package/esm/utils/helper.d.ts +1 -0
  114. package/esm/utils/helper.js +15 -2
  115. package/esm/utils/highlight.js +1 -1
  116. package/esm/utils/icon.js +1 -1
  117. package/esm/utils/image.js +1 -1
  118. package/esm/utils/index.d.ts +1 -0
  119. package/esm/utils/isPureVariable.js +1 -1
  120. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  121. package/esm/utils/keyToPath.js +1 -1
  122. package/esm/utils/labelToString.js +2 -2
  123. package/esm/utils/loopTooMuch.d.ts +1 -0
  124. package/esm/utils/loopTooMuch.js +27 -0
  125. package/esm/utils/makeSorter.js +1 -1
  126. package/esm/utils/math.js +1 -1
  127. package/esm/utils/memoryParse.js +1 -1
  128. package/esm/utils/normalizeLink.js +1 -1
  129. package/esm/utils/normalizeOptions.js +1 -1
  130. package/esm/utils/object.js +1 -1
  131. package/esm/utils/offset.js +1 -1
  132. package/esm/utils/offsetParent.js +1 -1
  133. package/esm/utils/optionValueCompare.js +1 -1
  134. package/esm/utils/position.js +11 -6
  135. package/esm/utils/prettyBytes.js +1 -1
  136. package/esm/utils/printElement.js +1 -1
  137. package/esm/utils/renderer-event.js +1 -1
  138. package/esm/utils/replaceText.js +1 -1
  139. package/esm/utils/resize-sensor.js +1 -1
  140. package/esm/utils/resolveCondition.js +1 -1
  141. package/esm/utils/resolveVariable.js +1 -1
  142. package/esm/utils/resolveVariableAndFilter.js +1 -1
  143. package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
  144. package/esm/utils/scrollPosition.js +1 -1
  145. package/esm/utils/string2regExp.js +1 -1
  146. package/esm/utils/stripNumber.js +1 -1
  147. package/esm/utils/style-helper.js +1 -1
  148. package/esm/utils/style.js +1 -1
  149. package/esm/utils/toNumber.js +1 -1
  150. package/esm/utils/tokenize.js +1 -1
  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/validateId.js +1 -1
  156. package/esm/utils/validations.js +17 -12
  157. package/esm/utils/visitedCache.js +1 -1
  158. package/lib/Root.js +1 -1
  159. package/lib/RootRenderer.js +1 -1
  160. package/lib/SchemaRenderer.d.ts +13 -0
  161. package/lib/SchemaRenderer.js +75 -5
  162. package/lib/Scoped.d.ts +1 -1
  163. package/lib/Scoped.js +1 -1
  164. package/lib/StatusScoped.js +1 -1
  165. package/lib/StyleManager.d.ts +18 -0
  166. package/lib/StyleManager.js +63 -0
  167. package/lib/WithRootStore.js +1 -1
  168. package/lib/WithStore.js +1 -1
  169. package/lib/actions/Action.js +4 -1
  170. package/lib/actions/AjaxAction.js +1 -1
  171. package/lib/actions/BreakAction.js +1 -1
  172. package/lib/actions/BroadcastAction.js +1 -1
  173. package/lib/actions/CmptAction.js +56 -49
  174. package/lib/actions/ContinueAction.js +1 -1
  175. package/lib/actions/CopyAction.js +1 -1
  176. package/lib/actions/CustomAction.js +1 -1
  177. package/lib/actions/DialogAction.js +1 -1
  178. package/lib/actions/DrawerAction.js +1 -1
  179. package/lib/actions/EmailAction.js +1 -1
  180. package/lib/actions/EventAction.js +1 -1
  181. package/lib/actions/LinkAction.js +1 -1
  182. package/lib/actions/LoopAction.js +1 -1
  183. package/lib/actions/PageAction.js +1 -1
  184. package/lib/actions/ParallelAction.js +1 -1
  185. package/lib/actions/PrintAction.js +1 -1
  186. package/lib/actions/StatusAction.js +1 -1
  187. package/lib/actions/SwitchAction.js +1 -1
  188. package/lib/actions/ToastAction.js +2 -2
  189. package/lib/actions/WaitAction.js +1 -1
  190. package/lib/components/CustomStyle.js +1 -1
  191. package/lib/components/ErrorBoundary.js +1 -1
  192. package/lib/components/LazyComponent.js +1 -1
  193. package/lib/components/Overlay.js +1 -1
  194. package/lib/components/PopOver.js +1 -1
  195. package/lib/env.d.ts +0 -4
  196. package/lib/env.js +1 -1
  197. package/lib/envOverwrite.js +1 -1
  198. package/lib/factory.d.ts +7 -1
  199. package/lib/factory.js +52 -4
  200. package/lib/index.d.ts +6 -4
  201. package/lib/index.js +17 -2
  202. package/lib/locale.d.ts +1 -1
  203. package/lib/locale.js +13 -2
  204. package/lib/polyfills.js +1 -1
  205. package/lib/renderers/Form.d.ts +2 -2
  206. package/lib/renderers/Form.js +11 -6
  207. package/lib/renderers/Item.d.ts +2 -1
  208. package/lib/renderers/Item.js +8 -9
  209. package/lib/renderers/Options.d.ts +46 -1
  210. package/lib/renderers/Options.js +920 -912
  211. package/lib/renderers/Placeholder.js +1 -1
  212. package/lib/renderers/builtin.js +1 -1
  213. package/lib/renderers/register.js +1 -1
  214. package/lib/renderers/wrapControl.d.ts +2 -1
  215. package/lib/renderers/wrapControl.js +8 -7
  216. package/lib/store/app.js +1 -1
  217. package/lib/store/combo.d.ts +2 -1
  218. package/lib/store/combo.js +1 -1
  219. package/lib/store/crud.js +1 -1
  220. package/lib/store/form.d.ts +1 -1
  221. package/lib/store/form.js +5 -1
  222. package/lib/store/formItem.js +4 -4
  223. package/lib/store/iRenderer.js +1 -1
  224. package/lib/store/index.js +1 -1
  225. package/lib/store/list.js +1 -1
  226. package/lib/store/manager.js +1 -1
  227. package/lib/store/modal.js +1 -1
  228. package/lib/store/node.js +1 -1
  229. package/lib/store/pagination.js +1 -1
  230. package/lib/store/root.js +1 -1
  231. package/lib/store/service.js +1 -1
  232. package/lib/store/status.js +1 -1
  233. package/lib/store/table.d.ts +2 -1
  234. package/lib/store/table.js +1 -1
  235. package/lib/store/table2.js +1 -1
  236. package/lib/theme.d.ts +1 -1
  237. package/lib/theme.js +13 -2
  238. package/lib/types.d.ts +2 -0
  239. package/lib/utils/Animation.js +1 -1
  240. package/lib/utils/ColorScale.js +1 -1
  241. package/lib/utils/DataSchema.js +1 -1
  242. package/lib/utils/DataScope.js +1 -1
  243. package/lib/utils/RootClose.js +1 -1
  244. package/lib/utils/SimpleMap.js +1 -1
  245. package/lib/utils/animations.d.ts +19 -0
  246. package/lib/utils/animations.js +62 -0
  247. package/lib/utils/api.d.ts +2 -1
  248. package/lib/utils/api.js +10 -2
  249. package/lib/utils/arraySlice.js +1 -1
  250. package/lib/utils/attachmentAdpator.js +4 -1
  251. package/lib/utils/autobind.js +1 -1
  252. package/lib/utils/browser.js +1 -1
  253. package/lib/utils/columnsSplit.js +1 -1
  254. package/lib/utils/concatData.js +1 -1
  255. package/lib/utils/dataMapping.js +1 -1
  256. package/lib/utils/date.js +1 -1
  257. package/lib/utils/debug.d.ts +3 -3
  258. package/lib/utils/debug.js +103 -36
  259. package/lib/utils/decodeEntity.js +1 -1
  260. package/lib/utils/dom.js +1 -1
  261. package/lib/utils/errors.js +1 -1
  262. package/lib/utils/escapeHtml.js +1 -1
  263. package/lib/utils/filter-schema.js +1 -1
  264. package/lib/utils/filter.js +1 -1
  265. package/lib/utils/formatDuration.js +1 -1
  266. package/lib/utils/formula.js +1 -1
  267. package/lib/utils/getVariable.js +1 -1
  268. package/lib/utils/grammar.js +1 -1
  269. package/lib/utils/handleAction.js +1 -1
  270. package/lib/utils/helper.d.ts +1 -0
  271. package/lib/utils/helper.js +15 -1
  272. package/lib/utils/highlight.js +1 -1
  273. package/lib/utils/icon.js +1 -1
  274. package/lib/utils/image.js +1 -1
  275. package/lib/utils/index.d.ts +1 -0
  276. package/lib/utils/isPureVariable.js +1 -1
  277. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  278. package/lib/utils/keyToPath.js +1 -1
  279. package/lib/utils/labelToString.js +2 -2
  280. package/lib/utils/loopTooMuch.d.ts +1 -0
  281. package/lib/utils/loopTooMuch.js +31 -0
  282. package/lib/utils/makeSorter.js +1 -1
  283. package/lib/utils/math.js +1 -1
  284. package/lib/utils/memoryParse.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.js +11 -6
  292. package/lib/utils/prettyBytes.js +1 -1
  293. package/lib/utils/printElement.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/resolveCondition.js +1 -1
  298. package/lib/utils/resolveVariable.js +1 -1
  299. package/lib/utils/resolveVariableAndFilter.js +1 -1
  300. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  301. package/lib/utils/scrollPosition.js +1 -1
  302. package/lib/utils/string2regExp.js +1 -1
  303. package/lib/utils/stripNumber.js +1 -1
  304. package/lib/utils/style-helper.js +1 -1
  305. package/lib/utils/style.js +1 -1
  306. package/lib/utils/toNumber.js +1 -1
  307. package/lib/utils/tokenize.js +1 -1
  308. package/lib/utils/tpl-builtin.js +1 -1
  309. package/lib/utils/tpl-lodash.js +1 -1
  310. package/lib/utils/tpl.js +1 -1
  311. package/lib/utils/uncontrollable.js +1 -1
  312. package/lib/utils/validateId.js +1 -1
  313. package/lib/utils/validations.js +17 -12
  314. package/lib/utils/visitedCache.js +1 -1
  315. package/package.json +5 -4
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,9 +1,9 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
6
- import { __awaiter, __generator } from 'tslib';
6
+ import { __awaiter, __generator, __assign } from 'tslib';
7
7
  import { registerAction } from './Action.js';
8
8
 
9
9
  /**
@@ -19,7 +19,7 @@ var ToastAction = /** @class */ (function () {
19
19
  if (!((_a = event.context.env) === null || _a === void 0 ? void 0 : _a.notify)) {
20
20
  throw new Error('env.notify is required!');
21
21
  }
22
- (_c = (_b = event.context.env) === null || _b === void 0 ? void 0 : _b.notify) === null || _c === void 0 ? void 0 : _c.call(_b, ((_d = action.args) === null || _d === void 0 ? void 0 : _d.msgType) || 'info', String((_e = action.args) === null || _e === void 0 ? void 0 : _e.msg), action.args);
22
+ (_c = (_b = event.context.env) === null || _b === void 0 ? void 0 : _b.notify) === null || _c === void 0 ? void 0 : _c.call(_b, ((_d = action.args) === null || _d === void 0 ? void 0 : _d.msgType) || 'info', String((_e = action.args) === null || _e === void 0 ? void 0 : _e.msg), __assign(__assign({}, action.args), { mobileUI: renderer.props.mobileUI }));
23
23
  return [2 /*return*/];
24
24
  });
25
25
  });
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/esm/env.d.ts CHANGED
@@ -90,10 +90,6 @@ export interface RendererEnv {
90
90
  * 是否开启 testid 定位
91
91
  */
92
92
  enableTestid?: boolean;
93
- /**
94
- * pdfjs worker 地址,用于渲染 pdf
95
- */
96
- pdfjsWorkerSrc?: string;
97
93
  /**
98
94
  * 替换文本,用于实现 URL 替换、语言替换等
99
95
  */
package/esm/env.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/esm/factory.d.ts CHANGED
@@ -15,6 +15,7 @@ export interface RendererBasicConfig {
15
15
  type?: string;
16
16
  alias?: Array<string>;
17
17
  name?: string;
18
+ origin?: RendererBasicConfig;
18
19
  storeType?: string;
19
20
  defaultProps?: (type: string, schema: any) => any;
20
21
  shouldSyncSuperStore?: (store: any, props: any, prevProps: any) => boolean | undefined;
@@ -23,6 +24,7 @@ export interface RendererBasicConfig {
23
24
  isolateScope?: boolean;
24
25
  isFormItem?: boolean;
25
26
  autoVar?: boolean;
27
+ override?: boolean;
26
28
  }
27
29
  export interface RendererProps extends ThemeProps, LocaleProps, OnEventProps, StatusScopedProps {
28
30
  render: (region: string, node: SchemaNode, props?: PlainObject) => JSX.Element;
@@ -53,7 +55,6 @@ export interface RendererConfig extends RendererBasicConfig {
53
55
  getComponent?: () => Promise<{
54
56
  default: RendererComponent;
55
57
  } | any>;
56
- override?: boolean;
57
58
  Renderer?: RendererComponent;
58
59
  }
59
60
  export interface RenderSchemaFilter {
@@ -100,3 +101,8 @@ export declare function resolveRenderer(path: string, schema?: Schema): null | R
100
101
  export declare function getRenderers(): RendererConfig[];
101
102
  export declare function getRendererByName(name: string): RendererConfig | undefined;
102
103
  export { RendererEnv };
104
+ export interface IGlobalOptions {
105
+ pdfjsWorkerSrc: string;
106
+ }
107
+ export declare function setGlobalOptions(options: Partial<IGlobalOptions>): void;
108
+ export declare function getGlobalOptions(): IGlobalOptions;
package/esm/factory.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -36,6 +36,26 @@ function Renderer(config) {
36
36
  return renderer.component;
37
37
  };
38
38
  }
39
+ // mobx-react 的 observer 会修改原型链的 render 方法
40
+ // 如果想继承覆盖组件的 render 方法,需要把原型链 render 还原回来
41
+ // 否则无法调用 super.render 方法
42
+ function fixMobxInjectRender(klass) {
43
+ var _a;
44
+ var target = klass.prototype;
45
+ // mobx-react 篡改之前先记录原始 render
46
+ if (target === null || target === void 0 ? void 0 : target.render) {
47
+ target.__originRender = target.render;
48
+ }
49
+ // 将父级类上面被 mobx 篡改的 render 方法还原回来
50
+ // 而且当前类的 render 也是会被篡改的,所以父级上的其实不需要篡改
51
+ if ((_a = target === null || target === void 0 ? void 0 : target.__proto__) === null || _a === void 0 ? void 0 : _a.hasOwnProperty('__originRender')) {
52
+ var originProto = target.__proto__;
53
+ target.__proto__ = Object.create(originProto.__proto__ || Object);
54
+ Object.assign(target.__proto__, originProto);
55
+ target.__proto__.render = originProto.__originRender;
56
+ }
57
+ return klass;
58
+ }
39
59
  // 将 renderer 转成组件
40
60
  function rendererToComponent(component, config) {
41
61
  if (config.storeType && config.component) {
@@ -43,7 +63,7 @@ function rendererToComponent(component, config) {
43
63
  storeType: config.storeType,
44
64
  extendsData: config.storeExtendsData,
45
65
  shouldSyncSuperStore: config.shouldSyncSuperStore
46
- })(observer(component));
66
+ })(observer(fixMobxInjectRender(component)));
47
67
  }
48
68
  if (config.isolateScope) {
49
69
  component = HocScoped(component, config.type);
@@ -73,6 +93,7 @@ function registerRenderer(config) {
73
93
  exists.component &&
74
94
  exists.component !== Placeholder &&
75
95
  config.component &&
96
+ !exists.origin &&
76
97
  !config.override) {
77
98
  throw new Error("The renderer with type \"".concat(config.type, "\" has already exists, please try another type!"));
78
99
  }
@@ -94,7 +115,18 @@ function registerRenderer(config) {
94
115
  }
95
116
  renderersMap[renderer.name] = !!(renderer.component && renderer.component !== Placeholder);
96
117
  renderer.type && (renderersTypeMap[renderer.type] = renderer);
97
- (renderer.alias || []).forEach(function (alias) { return (renderersTypeMap[alias] = renderer); });
118
+ (renderer.alias || []).forEach(function (alias) {
119
+ var fork = __assign(__assign({}, renderer), { type: alias, name: alias, alias: undefined, origin: renderer });
120
+ var idx = renderers.findIndex(function (item) { return item.name === alias; });
121
+ if (~idx) {
122
+ Object.assign(renderers[idx], fork);
123
+ }
124
+ else {
125
+ renderers.push(fork);
126
+ }
127
+ renderersTypeMap[alias] = fork;
128
+ renderersMap[alias] = true;
129
+ });
98
130
  return renderer;
99
131
  }
100
132
  function unRegisterRenderer(config) {
@@ -106,7 +138,12 @@ function unRegisterRenderer(config) {
106
138
  renderers.splice(idx, 1);
107
139
  delete renderersMap[name];
108
140
  delete renderersTypeMap[renderer_1.type || ''];
109
- (_a = renderer_1.alias) === null || _a === void 0 ? void 0 : _a.forEach(function (alias) { return delete renderersTypeMap[alias]; });
141
+ (_a = renderer_1.alias) === null || _a === void 0 ? void 0 : _a.forEach(function (alias) {
142
+ var idx = renderers.findIndex(function (item) { return item.name === alias; });
143
+ idx > -1 && renderers.splice(idx, 1);
144
+ delete renderersTypeMap[alias];
145
+ delete renderersMap[alias];
146
+ });
110
147
  // 清空渲染器定位缓存
111
148
  Object.keys(cache).forEach(function (key) {
112
149
  var value = cache[key];
@@ -425,5 +462,14 @@ function getRenderers() {
425
462
  function getRendererByName(name) {
426
463
  return find(renderers, function (item) { return item.name === name; });
427
464
  }
465
+ var GlobalOptions = {
466
+ pdfjsWorkerSrc: ''
467
+ };
468
+ function setGlobalOptions(options) {
469
+ Object.assign(GlobalOptions, options);
470
+ }
471
+ function getGlobalOptions() {
472
+ return GlobalOptions;
473
+ }
428
474
 
429
- export { Renderer, addSchemaFilter, clearStoresCache, defaultOptions, extendDefaultEnv, filterSchema, getRendererByName, getRenderers, hasAsyncRenderers, isAsyncRenderer, loadAllAsyncRenderers, loadAsyncRenderer, loadAsyncRenderersByType, loadRendererError, registerRenderer, renderersMap, resolveRenderer, stores, unRegisterRenderer, updateEnv };
475
+ export { Renderer, addSchemaFilter, clearStoresCache, defaultOptions, extendDefaultEnv, filterSchema, getGlobalOptions, getRendererByName, getRenderers, hasAsyncRenderers, isAsyncRenderer, loadAllAsyncRenderers, loadAsyncRenderer, loadAsyncRenderersByType, loadRendererError, registerRenderer, renderersMap, resolveRenderer, setGlobalOptions, stores, unRegisterRenderer, updateEnv };
package/esm/index.d.ts CHANGED
@@ -6,12 +6,13 @@
6
6
  * LICENSE file in the root directory of this source tree.
7
7
  */
8
8
  /// <reference types="react" />
9
- import { Renderer, getRendererByName, getRenderers, loadAllAsyncRenderers, loadAsyncRenderersByType, loadAsyncRenderer, registerRenderer, unRegisterRenderer, resolveRenderer, filterSchema, clearStoresCache, updateEnv, addSchemaFilter, extendDefaultEnv } from './factory';
9
+ import { Renderer, getRendererByName, getRenderers, loadAllAsyncRenderers, loadAsyncRenderersByType, loadAsyncRenderer, registerRenderer, unRegisterRenderer, resolveRenderer, filterSchema, clearStoresCache, updateEnv, addSchemaFilter, extendDefaultEnv, getGlobalOptions, setGlobalOptions } from './factory';
10
10
  import type { RenderOptions, RendererConfig, RendererProps, hasAsyncRenderers } from './factory';
11
11
  import './polyfills';
12
12
  import './renderers/builtin';
13
13
  import './renderers/register';
14
14
  export * from './utils/index';
15
+ export * from './utils/animations';
15
16
  export * from './types';
16
17
  export * from './store';
17
18
  import * as utils from './utils/helper';
@@ -27,7 +28,7 @@ declare const classPrefix: string | undefined;
27
28
  export * from './actions';
28
29
  import FormItem, { FormItemWrap, registerFormItem, getFormItemByName } from './renderers/Item';
29
30
  import type { FormBaseControl, FormControlProps, FormItemProps } from './renderers/Item';
30
- import { OptionsControl, registerOptionsControl } from './renderers/Options';
31
+ import { OptionsControl, registerOptionsControl, OptionsControlBase } from './renderers/Options';
31
32
  import type { OptionsControlProps } from './renderers/Options';
32
33
  import type { FormOptionsControl } from './renderers/Options';
33
34
  import { Schema } from './types';
@@ -43,13 +44,14 @@ import PopOver from './components/PopOver';
43
44
  import ErrorBoundary from './components/ErrorBoundary';
44
45
  import { FormRenderer } from './renderers/Form';
45
46
  import type { FormHorizontal, FormSchemaBase } from './renderers/Form';
46
- import { enableDebug, disableDebug } from './utils/index';
47
+ import { enableDebug, disableDebug, wrapFetcher } from './utils/index';
47
48
  import type { OnEventProps } from './utils/index';
48
49
  import { valueMap as styleMap } from './utils/style-helper';
49
50
  import { RENDERER_TRANSMISSION_OMIT_PROPS } from './SchemaRenderer';
50
51
  import type { IItem } from './store/list';
51
52
  import CustomStyle from './components/CustomStyle';
52
53
  import { StatusScoped } from './StatusScoped';
54
+ import styleManager from './StyleManager';
53
55
  export declare const version = "__buildVersion";
54
- export { clearStoresCache, updateEnv, Renderer, RendererProps, RenderOptions, RendererEnv, EnvContext, RegisterStore, registerStore, FormItem, FormItemWrap, FormItemProps, OptionsControl, FormRenderer, FormHorizontal, utils, getRendererByName, registerRenderer, unRegisterRenderer, getRenderers, loadAllAsyncRenderers, loadAsyncRenderersByType, loadAsyncRenderer, hasAsyncRenderers, registerFormItem, getFormItemByName, registerOptionsControl, resolveRenderer, filterSchema, Scoped, ScopedContext, IScopedContext, StatusScoped, setDefaultTheme, theme, themeable, ThemeProps, getTheme, classPrefix, getClassPrefix, classnames, makeClassnames, getDefaultLocale, setDefaultLocale, registerLocale, makeTranslator, extendLocale, removeLocaleData, localeable, LocaleProps, TranslateFn, ClassNamesFn, parse, lexer, Evaluator, AsyncEvaluator, FilterContext, filters, getFilters, registerFilter, extendsFilters, registerFunction, evaluate, evaluateForAsync, LazyComponent, Overlay, PopOver, ErrorBoundary, addSchemaFilter, OptionsControlProps, FormOptionsControl, FormControlProps, FormBaseControl, extendDefaultEnv, addRootWrapper, RendererConfig, styleMap, RENDERER_TRANSMISSION_OMIT_PROPS, ScopedComponentType, IItem, IColumn, IRow, IColumn2, IRow2, OnEventProps, FormSchemaBase, filterTarget, splitTarget, CustomStyle, enableDebug, disableDebug, envOverwrite };
56
+ export { styleManager, clearStoresCache, updateEnv, Renderer, RendererProps, RenderOptions, RendererEnv, EnvContext, RegisterStore, registerStore, FormItem, FormItemWrap, FormItemProps, OptionsControl, FormRenderer, FormHorizontal, utils, getRendererByName, registerRenderer, unRegisterRenderer, getRenderers, loadAllAsyncRenderers, loadAsyncRenderersByType, loadAsyncRenderer, hasAsyncRenderers, registerFormItem, getFormItemByName, registerOptionsControl, resolveRenderer, filterSchema, Scoped, ScopedContext, IScopedContext, StatusScoped, setDefaultTheme, theme, themeable, ThemeProps, getTheme, classPrefix, getClassPrefix, classnames, makeClassnames, getDefaultLocale, setDefaultLocale, registerLocale, makeTranslator, extendLocale, removeLocaleData, localeable, LocaleProps, TranslateFn, ClassNamesFn, parse, lexer, Evaluator, AsyncEvaluator, FilterContext, filters, getFilters, registerFilter, extendsFilters, registerFunction, evaluate, evaluateForAsync, LazyComponent, Overlay, PopOver, ErrorBoundary, addSchemaFilter, OptionsControlProps, OptionsControlBase, FormOptionsControl, FormControlProps, FormBaseControl, extendDefaultEnv, addRootWrapper, RendererConfig, styleMap, RENDERER_TRANSMISSION_OMIT_PROPS, ScopedComponentType, IItem, IColumn, IRow, IColumn2, IRow2, OnEventProps, FormSchemaBase, filterTarget, splitTarget, CustomStyle, enableDebug, disableDebug, envOverwrite, getGlobalOptions, setGlobalOptions, wrapFetcher };
55
57
  export declare function render(schema: Schema, props?: RootRenderProps, options?: RenderOptions, pathPrefix?: string): JSX.Element;
package/esm/index.js CHANGED
@@ -1,16 +1,16 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
6
6
  import { __assign, __rest } from 'tslib';
7
7
  import { stores, defaultOptions } from './factory.js';
8
- export { Renderer, addSchemaFilter, clearStoresCache, extendDefaultEnv, filterSchema, getRendererByName, getRenderers, loadAllAsyncRenderers, loadAsyncRenderer, loadAsyncRenderersByType, registerRenderer, resolveRenderer, unRegisterRenderer, updateEnv } from './factory.js';
8
+ export { Renderer, addSchemaFilter, clearStoresCache, extendDefaultEnv, filterSchema, getGlobalOptions, getRendererByName, getRenderers, loadAllAsyncRenderers, loadAsyncRenderer, loadAsyncRenderersByType, registerRenderer, resolveRenderer, setGlobalOptions, unRegisterRenderer, updateEnv } from './factory.js';
9
9
  import './polyfills.js';
10
10
  import './renderers/builtin.js';
11
11
  import './renderers/register.js';
12
12
  import { wrapFetcher } from './utils/api.js';
13
- export { addApiRequestAdaptor, addApiResponseAdator, buildApi, callStrFunction, clearApiCache, getApiCache, isApiOutdated, isApiOutdatedWithData, isEffectiveApi, isSameApi, isValidApi, jsFetcher, jsonpFetcher, normalizeApi, normalizeApiResponseData, removeApiRequestAdaptor, removeApiResponseAdaptor, responseAdaptor, setApiCache, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher } from './utils/api.js';
13
+ export { addApiRequestAdaptor, addApiResponseAdaptor, addApiResponseAdator, buildApi, callStrFunction, clearApiCache, getApiCache, isApiOutdated, isApiOutdatedWithData, isEffectiveApi, isSameApi, isValidApi, jsFetcher, jsonpFetcher, normalizeApi, normalizeApiResponseData, removeApiRequestAdaptor, removeApiResponseAdaptor, responseAdaptor, setApiCache, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher } from './utils/api.js';
14
14
  export { attachmentAdpator } from './utils/attachmentAdpator.js';
15
15
  export { autobindMethod, bind } from './utils/autobind.js';
16
16
  export { chromeVersion, isSafari } from './utils/browser.js';
@@ -36,7 +36,7 @@ export { handleAction } from './utils/handleAction.js';
36
36
  import { promisify } from './utils/helper.js';
37
37
  import * as helper from './utils/helper.js';
38
38
  export { helper as utils };
39
- export { JSONTraverse, JSONValueMap, SkipOperation, TEST_ID_KEY, TestIdBuilder, ValidateError, __uri, anyChanged, autobind, buildTrackExpression, bulkBindFunctions, camel, chainEvents, chainFunctions, changedEffect, convertArrayValueToMoment, countTree, detectPropValueChanged, difference, differenceFromAll, eachTree, evalTrackExpression, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeAll, findTreeIndex, flattenTree, flattenTreeWithLeafNodes, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, importLazyComponent, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, loadStyle, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, parsePrimitiveQueryString, parseQuery, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, replaceUrlParams, rmUndefined, someTree, sortArray, spliceTree, supportsMjs, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter } from './utils/helper.js';
39
+ export { JSONTraverse, JSONValueMap, SkipOperation, TEST_ID_KEY, TestIdBuilder, ValidateError, __uri, anyChanged, autobind, buildTrackExpression, bulkBindFunctions, camel, chainEvents, chainFunctions, changedEffect, convertArrayValueToMoment, countTree, detectPropValueChanged, difference, differenceFromAll, eachTree, evalTrackExpression, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeAll, findTreeIndex, flattenTree, flattenTreeWithLeafNodes, formateId, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, importLazyComponent, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, loadStyle, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, parsePrimitiveQueryString, parseQuery, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, replaceUrlParams, rmUndefined, someTree, sortArray, spliceTree, supportsMjs, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter } from './utils/helper.js';
40
40
  export { highlight } from './utils/highlight.js';
41
41
  export { generateIcon } from './utils/icon.js';
42
42
  export { getImageDimensions, toDataURL } from './utils/image.js';
@@ -44,6 +44,7 @@ export { isPureVariable } from './utils/isPureVariable.js';
44
44
  export { JSONSchme2AMisSchema } from './utils/json-schema-2-amis-schema.js';
45
45
  export { keyToPath } from './utils/keyToPath.js';
46
46
  export { labelToString } from './utils/labelToString.js';
47
+ export { loopTooMuch } from './utils/loopTooMuch.js';
47
48
  export { makeSorter } from './utils/makeSorter.js';
48
49
  export { normalizeLink } from './utils/normalizeLink.js';
49
50
  export { normalizeOptions } from './utils/normalizeOptions.js';
@@ -77,6 +78,7 @@ export { getConditionComputers, registerConditionComputer, resolveCondition, res
77
78
  export { arraySlice } from './utils/arraySlice.js';
78
79
  export { isIntegerInRange, numberFormatter, safeAdd, safeSub } from './utils/math.js';
79
80
  export { default as animation } from './utils/Animation.js';
81
+ export { createAnimationStyle } from './utils/animations.js';
80
82
  import { RendererStore } from './store/index.js';
81
83
  export { RegisterStore, RendererStore, registerStore } from './store/index.js';
82
84
  import { getEnv } from 'mobx-state-tree';
@@ -107,7 +109,7 @@ import './actions/PageAction.js';
107
109
  import './actions/PrintAction.js';
108
110
  export { LoopStatus, getActionByType, registerAction, runAction, runActions } from './actions/Action.js';
109
111
  export { FormItem, FormItemWrap, getFormItemByName, registerFormItem } from './renderers/Item.js';
110
- export { OptionsControl, registerOptionsControl } from './renderers/Options.js';
112
+ export { OptionsControl, OptionsControlBase, registerOptionsControl } from './renderers/Options.js';
111
113
  import ScopedRootRenderer from './Root.js';
112
114
  export { addRootWrapper } from './Root.js';
113
115
  import { envOverwrite } from './envOverwrite.js';
@@ -124,6 +126,7 @@ export { FormRenderer } from './renderers/Form.js';
124
126
  export { RENDERER_TRANSMISSION_OMIT_PROPS } from './SchemaRenderer.js';
125
127
  export { default as CustomStyle } from './components/CustomStyle.js';
126
128
  export { StatusScoped } from './StatusScoped.js';
129
+ export { default as styleManager } from './StyleManager.js';
127
130
  export { stripNumber } from './utils/stripNumber.js';
128
131
  export { iRendererStore } from './store/iRenderer.js';
129
132
  export { ServiceStore } from './store/service.js';
@@ -148,7 +151,11 @@ export { StoreNode } from './store/node.js';
148
151
  */
149
152
  var classPrefix = getClassPrefix();
150
153
  // @ts-ignore
151
- var version = '6.9.0-rc.1';
154
+ var version = '6.9.0-rc.11';
155
+ window.amisVersionInfo = {
156
+ version: '6.9.0-rc.11',
157
+ buildTime: '2024-11-19T09:27:29.487Z'
158
+ };
152
159
  function render(schema, props, options, pathPrefix) {
153
160
  if (props === void 0) { props = {}; }
154
161
  if (options === void 0) { options = {}; }
package/esm/locale.d.ts CHANGED
@@ -16,7 +16,7 @@ export interface LocaleProps {
16
16
  translate: TranslateFn;
17
17
  }
18
18
  export declare const LocaleContext: React.Context<string>;
19
- export declare function localeable<T extends React.ComponentType<React.ComponentProps<T> & LocaleProps>>(ComposedComponent: T): {
19
+ export declare function localeable<T extends React.ComponentType<React.ComponentProps<T> & LocaleProps>>(ComposedComponent: T, methods?: Array<string>): {
20
20
  new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof LocaleProps>> & {
21
21
  locale?: string | undefined;
22
22
  translate?: ((str: string, ...args: any[]) => string) | undefined;
package/esm/locale.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -86,7 +86,7 @@ function setDefaultLocale(locale) {
86
86
  defaultLocale = locale;
87
87
  }
88
88
  var LocaleContext = React.createContext('');
89
- function localeable(ComposedComponent) {
89
+ function localeable(ComposedComponent, methods) {
90
90
  var _a;
91
91
  var result = hoistNonReactStatic((_a = /** @class */ (function (_super) {
92
92
  __extends(class_1, _super);
@@ -128,6 +128,17 @@ function localeable(ComposedComponent) {
128
128
  _a.contextType = LocaleContext,
129
129
  _a.ComposedComponent = ComposedComponent,
130
130
  _a), ComposedComponent);
131
+ if (Array.isArray(methods)) {
132
+ methods.forEach(function (method) {
133
+ if (ComposedComponent.prototype[method]) {
134
+ result.prototype[method] = function () {
135
+ var _a;
136
+ var fn = (_a = this.ref) === null || _a === void 0 ? void 0 : _a[method];
137
+ return fn ? fn.apply(this.ref, arguments) : undefined;
138
+ };
139
+ }
140
+ });
141
+ }
131
142
  return result;
132
143
  }
133
144
 
package/esm/polyfills.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -263,7 +263,7 @@ export interface FormProps extends RendererProps, Omit<FormSchemaBase, 'mode' |
263
263
  onSubmit?: (values: object, action: any) => any;
264
264
  onChange?: (values: object, diff: object, props: any) => any;
265
265
  onFailed?: (reason: string, errors: any) => any;
266
- onFinished: (values: object, action: any) => any;
266
+ onFinished: (values: object, action: ActionObject, store: IFormStore) => any;
267
267
  onValidate: (values: object, form: any) => any;
268
268
  onValidChange?: (valid: boolean, props: any) => void;
269
269
  messages: {
@@ -338,7 +338,7 @@ export default class Form extends React.Component<FormProps, object> {
338
338
  onInit(): Promise<void>;
339
339
  reload(subPath?: string, query?: any, ctx?: any, silent?: boolean): Promise<any>;
340
340
  receive(values: object, name?: string, replace?: boolean): Promise<any>;
341
- silentReload(target?: string, query?: any): void;
341
+ silentReload(target?: string, query?: any): Promise<any>;
342
342
  initInterval(value: any): any;
343
343
  isValidated(): boolean;
344
344
  validate(forceValidate?: boolean, throwErrors?: boolean, toastErrors?: boolean, skipFlush?: boolean): Promise<boolean>;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -92,6 +92,7 @@ var Form = /** @class */ (function (_super) {
92
92
  _this.blockRouting = _this.blockRouting.bind(_this);
93
93
  _this.beforePageUnload = _this.beforePageUnload.bind(_this);
94
94
  _this.formItemDispatchEvent = _this.formItemDispatchEvent.bind(_this);
95
+ _this.flush = _this.flush.bind(_this);
95
96
  var store = props.store, canAccessSuperData = props.canAccessSuperData, persistData = props.persistData, simpleMode = props.simpleMode, formLazyChange = props.formLazyChange;
96
97
  store.setCanAccessSuperData(canAccessSuperData !== false);
97
98
  store.setPersistData(persistData);
@@ -375,7 +376,7 @@ var Form = /** @class */ (function (_super) {
375
376
  case 3:
376
377
  // 派发初始化接口请求完成事件
377
378
  this.dispatchInited(result);
378
- return [2 /*return*/];
379
+ return [2 /*return*/, store.data];
379
380
  }
380
381
  });
381
382
  });
@@ -386,7 +387,7 @@ var Form = /** @class */ (function (_super) {
386
387
  return this.reload();
387
388
  };
388
389
  Form.prototype.silentReload = function (target, query) {
389
- this.reload(target, query, undefined, true);
390
+ return this.reload(target, query, undefined, true);
390
391
  };
391
392
  Form.prototype.initInterval = function (value) {
392
393
  var _a = this.props, interval = _a.interval, silentPolling = _a.silentPolling, stopAutoRefreshWhen = _a.stopAutoRefreshWhen, data = _a.data;
@@ -604,7 +605,7 @@ var Form = /** @class */ (function (_super) {
604
605
  if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
605
606
  onChange && onChange.apply(null, changeProps);
606
607
  }
607
- store.clearRestError();
608
+ isAlive(store) && store.clearRestError();
608
609
  if (!(!emitedFromWatch && (submit || (submitOnChange && store.inited)))) return [3 /*break*/, 3];
609
610
  return [4 /*yield*/, this.handleAction(undefined, {
610
611
  type: 'submit',
@@ -678,6 +679,9 @@ var Form = /** @class */ (function (_super) {
678
679
  _f.sent();
679
680
  _f.label = 2;
680
681
  case 2:
682
+ if (!isAlive(store)) {
683
+ return [2 /*return*/];
684
+ }
681
685
  if (trimValues) {
682
686
  store.trimValues();
683
687
  }
@@ -878,7 +882,7 @@ var Form = /** @class */ (function (_super) {
878
882
  if (values === false) {
879
883
  return store.data;
880
884
  }
881
- if (onFinished && onFinished(values, action) === false) {
885
+ if (onFinished && onFinished(values, action, store) === false) {
882
886
  return values;
883
887
  }
884
888
  resetAfterSubmit && store.reset(_this.handleReset(action));
@@ -1237,7 +1241,8 @@ var Form = /** @class */ (function (_super) {
1237
1241
  removeHook: this.removeHook,
1238
1242
  renderFormItems: this.renderFormItems,
1239
1243
  formItemDispatchEvent: this.formItemDispatchEvent,
1240
- formPristine: form.pristine
1244
+ formPristine: form.pristine,
1245
+ onFlushForm: this.flush
1241
1246
  // value: (control as any)?.name
1242
1247
  // ? getVariable(form.data, (control as any)?.name, canAccessSuperData)
1243
1248
  // : (control as any)?.value,
@@ -362,6 +362,7 @@ export interface FormItemBasicConfig extends Partial<RendererConfig> {
362
362
  renderDescription?: boolean;
363
363
  test?: RegExp | TestFunc;
364
364
  storeType?: string;
365
+ formItemStoreType?: string;
365
366
  validations?: string;
366
367
  strictMode?: boolean;
367
368
  /**
@@ -460,7 +461,7 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
460
461
  * @param ctx 上下文对象,类型为任意类型
461
462
  * @param skipIfExits 是否跳过已存在的属性,默认为 false
462
463
  */
463
- applyMapping(mapping: any, ctx: any, skipIfExits?: boolean, ignoreSelf?: boolean): void;
464
+ applyMapping(mapping: any, ctx: any, skipIfExits?: boolean): void;
464
465
  buildAutoFillSchema(): {
465
466
  popOverContainer: any;
466
467
  popOverClassName: any;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.9.0-rc.1
2
+ * amis-core v6.9.0-rc.11
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -20,7 +20,7 @@ import '../utils/browser.js';
20
20
  import '../utils/ColorScale.js';
21
21
  import 'lodash/chunk';
22
22
  import { getVariable } from '../utils/getVariable.js';
23
- import { createObject, setVariable, createObjectFromChain, deleteVariable } from '../utils/object.js';
23
+ import { createObject, setVariable, createObjectFromChain } from '../utils/object.js';
24
24
  import { dataMapping } from '../utils/dataMapping.js';
25
25
  import '../utils/DataSchema.js';
26
26
  import '../utils/DataScope.js';
@@ -118,7 +118,7 @@ var FormItemWrap = /** @class */ (function (_super) {
118
118
  if (!result) {
119
119
  return [2 /*return*/];
120
120
  }
121
- this.applyMapping((_d = autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) !== null && _d !== void 0 ? _d : { '&': '$$' }, result, false, true);
121
+ this.applyMapping((_d = autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) !== null && _d !== void 0 ? _d : { '&': '$$' }, result, false);
122
122
  _e.label = 3;
123
123
  case 3: return [3 /*break*/, 5];
124
124
  case 4:
@@ -275,10 +275,9 @@ var FormItemWrap = /** @class */ (function (_super) {
275
275
  * @param ctx 上下文对象,类型为任意类型
276
276
  * @param skipIfExits 是否跳过已存在的属性,默认为 false
277
277
  */
278
- FormItemWrap.prototype.applyMapping = function (mapping, ctx, skipIfExits, ignoreSelf) {
278
+ FormItemWrap.prototype.applyMapping = function (mapping, ctx, skipIfExits) {
279
279
  if (skipIfExits === void 0) { skipIfExits = false; }
280
- if (ignoreSelf === void 0) { ignoreSelf = false; }
281
- var _a = this.props, onBulkChange = _a.onBulkChange, data = _a.data, formItem = _a.formItem;
280
+ var _a = this.props, onBulkChange = _a.onBulkChange, data = _a.data; _a.formItem;
282
281
  var toSync = dataMapping(mapping, ctx);
283
282
  var tmpData = __assign({}, data);
284
283
  var result = __assign({}, toSync);
@@ -305,9 +304,9 @@ var FormItemWrap = /** @class */ (function (_super) {
305
304
  }
306
305
  });
307
306
  // 是否忽略自己的设置
308
- if (ignoreSelf && (formItem === null || formItem === void 0 ? void 0 : formItem.name)) {
309
- deleteVariable(result, formItem.name);
310
- }
307
+ // if (ignoreSelf && formItem?.name) {
308
+ // deleteVariable(result, formItem.name);
309
+ // }
311
310
  onBulkChange(result);
312
311
  };
313
312
  FormItemWrap.prototype.buildAutoFillSchema = function () {
@@ -1020,7 +1019,7 @@ function asFormItem(config) {
1020
1019
  })(observer(Control));
1021
1020
  delete config.storeType;
1022
1021
  }
1023
- return wrapControl(hoistNonReactStatic((_a = /** @class */ (function (_super) {
1022
+ return wrapControl(config, hoistNonReactStatic((_a = /** @class */ (function (_super) {
1024
1023
  __extends(class_1, _super);
1025
1024
  function class_1(props) {
1026
1025
  var _this = _super.call(this, props) || this;