amis-core 6.3.0 → 6.4.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 (301) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.js +1 -1
  3. package/esm/SchemaRenderer.js +3 -2
  4. package/esm/Scoped.d.ts +1 -0
  5. package/esm/Scoped.js +28 -14
  6. package/esm/StatusScoped.js +1 -1
  7. package/esm/WithRootStore.js +1 -1
  8. package/esm/WithStore.js +1 -1
  9. package/esm/actions/Action.js +4 -2
  10. package/esm/actions/AjaxAction.js +29 -19
  11. package/esm/actions/BreakAction.js +1 -1
  12. package/esm/actions/BroadcastAction.js +1 -1
  13. package/esm/actions/CmptAction.js +2 -2
  14. package/esm/actions/ContinueAction.js +1 -1
  15. package/esm/actions/CopyAction.js +1 -1
  16. package/esm/actions/CustomAction.js +1 -1
  17. package/esm/actions/DialogAction.js +30 -14
  18. package/esm/actions/DrawerAction.js +15 -7
  19. package/esm/actions/EmailAction.js +1 -1
  20. package/esm/actions/EventAction.js +1 -1
  21. package/esm/actions/LinkAction.js +1 -1
  22. package/esm/actions/LoopAction.js +1 -1
  23. package/esm/actions/PageAction.js +1 -1
  24. package/esm/actions/ParallelAction.js +1 -1
  25. package/esm/actions/PrintAction.d.ts +2 -2
  26. package/esm/actions/PrintAction.js +6 -6
  27. package/esm/actions/StatusAction.js +1 -1
  28. package/esm/actions/SwitchAction.js +1 -1
  29. package/esm/actions/ToastAction.js +1 -1
  30. package/esm/actions/WaitAction.js +1 -1
  31. package/esm/components/CustomStyle.js +1 -4
  32. package/esm/components/ErrorBoundary.js +1 -1
  33. package/esm/components/LazyComponent.js +1 -1
  34. package/esm/components/Overlay.js +1 -1
  35. package/esm/components/PopOver.js +1 -1
  36. package/esm/env.js +1 -1
  37. package/esm/envOverwrite.js +1 -1
  38. package/esm/factory.d.ts +1 -0
  39. package/esm/factory.js +1 -1
  40. package/esm/index.js +2 -2
  41. package/esm/locale.js +1 -1
  42. package/esm/node_modules/@babel/runtime/helpers/esm/classCallCheck.js +12 -0
  43. package/esm/node_modules/@babel/runtime/helpers/esm/createClass.js +26 -0
  44. package/esm/node_modules/@babel/runtime/helpers/esm/defineProperty.js +23 -0
  45. package/esm/node_modules/@babel/runtime/helpers/esm/toPrimitive.js +19 -0
  46. package/esm/node_modules/@babel/runtime/helpers/esm/toPropertyKey.js +14 -0
  47. package/esm/node_modules/@babel/runtime/helpers/esm/typeof.js +16 -0
  48. package/esm/node_modules/@rc-component/mini-decimal/es/BigIntDecimal.js +184 -0
  49. package/esm/node_modules/@rc-component/mini-decimal/es/MiniDecimal.js +56 -0
  50. package/esm/node_modules/@rc-component/mini-decimal/es/NumberDecimal.js +119 -0
  51. package/esm/node_modules/@rc-component/mini-decimal/es/numberUtil.js +105 -0
  52. package/esm/node_modules/@rc-component/mini-decimal/es/supportUtil.js +10 -0
  53. package/esm/polyfills.js +1 -1
  54. package/esm/renderers/Form.d.ts +3 -2
  55. package/esm/renderers/Form.js +55 -44
  56. package/esm/renderers/Item.js +1 -1
  57. package/esm/renderers/Options.js +1 -1
  58. package/esm/renderers/Placeholder.js +1 -1
  59. package/esm/renderers/builtin.js +1 -1
  60. package/esm/renderers/register.js +1 -1
  61. package/esm/renderers/wrapControl.js +31 -27
  62. package/esm/store/app.js +1 -1
  63. package/esm/store/combo.js +1 -1
  64. package/esm/store/crud.js +12 -6
  65. package/esm/store/form.js +1 -1
  66. package/esm/store/formItem.js +1 -1
  67. package/esm/store/iRenderer.js +6 -3
  68. package/esm/store/index.js +1 -1
  69. package/esm/store/list.d.ts +13 -0
  70. package/esm/store/list.js +14 -1
  71. package/esm/store/manager.js +1 -1
  72. package/esm/store/modal.js +1 -1
  73. package/esm/store/node.js +1 -1
  74. package/esm/store/pagination.js +1 -1
  75. package/esm/store/root.js +1 -1
  76. package/esm/store/service.js +1 -1
  77. package/esm/store/status.js +1 -1
  78. package/esm/store/table.d.ts +1 -0
  79. package/esm/store/table.js +5 -1
  80. package/esm/store/table2.js +1 -1
  81. package/esm/theme.js +1 -1
  82. package/esm/types.d.ts +1 -1
  83. package/esm/utils/Animation.js +1 -1
  84. package/esm/utils/ColorScale.js +1 -1
  85. package/esm/utils/DataSchema.js +1 -1
  86. package/esm/utils/DataScope.js +1 -1
  87. package/esm/utils/RootClose.js +1 -1
  88. package/esm/utils/SimpleMap.js +1 -1
  89. package/esm/utils/api.js +1 -1
  90. package/esm/utils/arraySlice.js +1 -1
  91. package/esm/utils/attachmentAdpator.js +1 -1
  92. package/esm/utils/autobind.js +1 -1
  93. package/esm/utils/browser.js +1 -1
  94. package/esm/utils/columnsSplit.js +1 -1
  95. package/esm/utils/concatData.js +1 -1
  96. package/esm/utils/dataMapping.js +1 -1
  97. package/esm/utils/date.js +1 -1
  98. package/esm/utils/debug.js +1 -1
  99. package/esm/utils/decodeEntity.js +1 -1
  100. package/esm/utils/dom.js +3 -3
  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 +3 -3
  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/labelToString.js +1 -1
  118. package/esm/utils/makeSorter.js +1 -1
  119. package/esm/utils/math.js +1 -1
  120. package/esm/utils/memoryParse.js +1 -1
  121. package/esm/utils/normalizeLink.js +1 -1
  122. package/esm/utils/normalizeOptions.js +1 -1
  123. package/esm/utils/object.js +1 -1
  124. package/esm/utils/offset.js +1 -1
  125. package/esm/utils/offsetParent.js +1 -1
  126. package/esm/utils/optionValueCompare.js +1 -1
  127. package/esm/utils/position.js +1 -1
  128. package/esm/utils/prettyBytes.js +1 -1
  129. package/esm/utils/printElement.js +1 -1
  130. package/esm/utils/renderer-event.d.ts +2 -0
  131. package/esm/utils/renderer-event.js +13 -1
  132. package/esm/utils/replaceText.js +1 -1
  133. package/esm/utils/resize-sensor.js +1 -1
  134. package/esm/utils/resolveCondition.js +1 -1
  135. package/esm/utils/resolveVariable.js +1 -1
  136. package/esm/utils/resolveVariableAndFilter.js +1 -1
  137. package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
  138. package/esm/utils/scrollPosition.js +1 -1
  139. package/esm/utils/string2regExp.js +1 -1
  140. package/esm/utils/stripNumber.js +5 -2
  141. package/esm/utils/style-helper.js +1 -1
  142. package/esm/utils/style.js +1 -1
  143. package/esm/utils/toNumber.js +1 -1
  144. package/esm/utils/tokenize.js +1 -1
  145. package/esm/utils/tpl-builtin.js +1 -1
  146. package/esm/utils/tpl-lodash.js +1 -1
  147. package/esm/utils/tpl.js +4 -4
  148. package/esm/utils/uncontrollable.js +1 -1
  149. package/esm/utils/validateId.js +1 -1
  150. package/esm/utils/validations.js +1 -1
  151. package/lib/Root.js +1 -1
  152. package/lib/RootRenderer.js +1 -1
  153. package/lib/SchemaRenderer.js +3 -2
  154. package/lib/Scoped.d.ts +1 -0
  155. package/lib/Scoped.js +28 -14
  156. package/lib/StatusScoped.js +1 -1
  157. package/lib/WithRootStore.js +1 -1
  158. package/lib/WithStore.js +1 -1
  159. package/lib/actions/Action.js +4 -2
  160. package/lib/actions/AjaxAction.js +29 -19
  161. package/lib/actions/BreakAction.js +1 -1
  162. package/lib/actions/BroadcastAction.js +1 -1
  163. package/lib/actions/CmptAction.js +2 -2
  164. package/lib/actions/ContinueAction.js +1 -1
  165. package/lib/actions/CopyAction.js +1 -1
  166. package/lib/actions/CustomAction.js +1 -1
  167. package/lib/actions/DialogAction.js +30 -14
  168. package/lib/actions/DrawerAction.js +15 -7
  169. package/lib/actions/EmailAction.js +1 -1
  170. package/lib/actions/EventAction.js +1 -1
  171. package/lib/actions/LinkAction.js +1 -1
  172. package/lib/actions/LoopAction.js +1 -1
  173. package/lib/actions/PageAction.js +1 -1
  174. package/lib/actions/ParallelAction.js +1 -1
  175. package/lib/actions/PrintAction.d.ts +2 -2
  176. package/lib/actions/PrintAction.js +6 -6
  177. package/lib/actions/StatusAction.js +1 -1
  178. package/lib/actions/SwitchAction.js +1 -1
  179. package/lib/actions/ToastAction.js +1 -1
  180. package/lib/actions/WaitAction.js +1 -1
  181. package/lib/components/CustomStyle.js +1 -4
  182. package/lib/components/ErrorBoundary.js +1 -1
  183. package/lib/components/LazyComponent.js +1 -1
  184. package/lib/components/Overlay.js +1 -1
  185. package/lib/components/PopOver.js +1 -1
  186. package/lib/env.js +1 -1
  187. package/lib/envOverwrite.js +1 -1
  188. package/lib/factory.d.ts +1 -0
  189. package/lib/factory.js +1 -1
  190. package/lib/index.js +2 -2
  191. package/lib/locale.js +1 -1
  192. package/lib/node_modules/@babel/runtime/helpers/esm/classCallCheck.js +16 -0
  193. package/lib/node_modules/@babel/runtime/helpers/esm/createClass.js +30 -0
  194. package/lib/node_modules/@babel/runtime/helpers/esm/defineProperty.js +27 -0
  195. package/lib/node_modules/@babel/runtime/helpers/esm/toPrimitive.js +23 -0
  196. package/lib/node_modules/@babel/runtime/helpers/esm/toPropertyKey.js +18 -0
  197. package/lib/node_modules/@babel/runtime/helpers/esm/typeof.js +20 -0
  198. package/lib/node_modules/@rc-component/mini-decimal/es/BigIntDecimal.js +188 -0
  199. package/lib/node_modules/@rc-component/mini-decimal/es/MiniDecimal.js +61 -0
  200. package/lib/node_modules/@rc-component/mini-decimal/es/NumberDecimal.js +123 -0
  201. package/lib/node_modules/@rc-component/mini-decimal/es/numberUtil.js +114 -0
  202. package/lib/node_modules/@rc-component/mini-decimal/es/supportUtil.js +14 -0
  203. package/lib/polyfills.js +1 -1
  204. package/lib/renderers/Form.d.ts +3 -2
  205. package/lib/renderers/Form.js +55 -44
  206. package/lib/renderers/Item.js +1 -1
  207. package/lib/renderers/Options.js +1 -1
  208. package/lib/renderers/Placeholder.js +1 -1
  209. package/lib/renderers/builtin.js +1 -1
  210. package/lib/renderers/register.js +1 -1
  211. package/lib/renderers/wrapControl.js +31 -27
  212. package/lib/store/app.js +1 -1
  213. package/lib/store/combo.js +1 -1
  214. package/lib/store/crud.js +12 -6
  215. package/lib/store/form.js +1 -1
  216. package/lib/store/formItem.js +1 -1
  217. package/lib/store/iRenderer.js +5 -2
  218. package/lib/store/index.js +1 -1
  219. package/lib/store/list.d.ts +13 -0
  220. package/lib/store/list.js +14 -1
  221. package/lib/store/manager.js +1 -1
  222. package/lib/store/modal.js +1 -1
  223. package/lib/store/node.js +1 -1
  224. package/lib/store/pagination.js +1 -1
  225. package/lib/store/root.js +1 -1
  226. package/lib/store/service.js +1 -1
  227. package/lib/store/status.js +1 -1
  228. package/lib/store/table.d.ts +1 -0
  229. package/lib/store/table.js +5 -1
  230. package/lib/store/table2.js +1 -1
  231. package/lib/theme.js +1 -1
  232. package/lib/types.d.ts +1 -1
  233. package/lib/utils/Animation.js +1 -1
  234. package/lib/utils/ColorScale.js +1 -1
  235. package/lib/utils/DataSchema.js +1 -1
  236. package/lib/utils/DataScope.js +1 -1
  237. package/lib/utils/RootClose.js +1 -1
  238. package/lib/utils/SimpleMap.js +1 -1
  239. package/lib/utils/api.js +1 -1
  240. package/lib/utils/arraySlice.js +1 -1
  241. package/lib/utils/attachmentAdpator.js +1 -1
  242. package/lib/utils/autobind.js +1 -1
  243. package/lib/utils/browser.js +1 -1
  244. package/lib/utils/columnsSplit.js +1 -1
  245. package/lib/utils/concatData.js +1 -1
  246. package/lib/utils/dataMapping.js +1 -1
  247. package/lib/utils/date.js +1 -1
  248. package/lib/utils/debug.js +1 -1
  249. package/lib/utils/decodeEntity.js +1 -1
  250. package/lib/utils/dom.js +3 -3
  251. package/lib/utils/errors.js +1 -1
  252. package/lib/utils/escapeHtml.js +1 -1
  253. package/lib/utils/filter-schema.js +1 -1
  254. package/lib/utils/filter.js +1 -1
  255. package/lib/utils/formatDuration.js +1 -1
  256. package/lib/utils/formula.js +1 -1
  257. package/lib/utils/getVariable.js +1 -1
  258. package/lib/utils/grammar.js +1 -1
  259. package/lib/utils/handleAction.js +1 -1
  260. package/lib/utils/helper.js +3 -4
  261. package/lib/utils/highlight.js +1 -1
  262. package/lib/utils/icon.js +1 -1
  263. package/lib/utils/image.js +1 -1
  264. package/lib/utils/isPureVariable.js +1 -1
  265. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  266. package/lib/utils/keyToPath.js +1 -1
  267. package/lib/utils/labelToString.js +1 -1
  268. package/lib/utils/makeSorter.js +1 -1
  269. package/lib/utils/math.js +1 -1
  270. package/lib/utils/memoryParse.js +1 -1
  271. package/lib/utils/normalizeLink.js +1 -1
  272. package/lib/utils/normalizeOptions.js +1 -1
  273. package/lib/utils/object.js +1 -1
  274. package/lib/utils/offset.js +1 -1
  275. package/lib/utils/offsetParent.js +1 -1
  276. package/lib/utils/optionValueCompare.js +1 -1
  277. package/lib/utils/position.js +1 -1
  278. package/lib/utils/prettyBytes.js +1 -1
  279. package/lib/utils/printElement.js +1 -1
  280. package/lib/utils/renderer-event.d.ts +2 -0
  281. package/lib/utils/renderer-event.js +13 -1
  282. package/lib/utils/replaceText.js +1 -1
  283. package/lib/utils/resize-sensor.js +1 -1
  284. package/lib/utils/resolveCondition.js +1 -1
  285. package/lib/utils/resolveVariable.js +1 -1
  286. package/lib/utils/resolveVariableAndFilter.js +1 -1
  287. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  288. package/lib/utils/scrollPosition.js +1 -1
  289. package/lib/utils/string2regExp.js +1 -1
  290. package/lib/utils/stripNumber.js +5 -2
  291. package/lib/utils/style-helper.js +1 -1
  292. package/lib/utils/style.js +1 -1
  293. package/lib/utils/toNumber.js +1 -1
  294. package/lib/utils/tokenize.js +1 -1
  295. package/lib/utils/tpl-builtin.js +1 -1
  296. package/lib/utils/tpl-lodash.js +1 -1
  297. package/lib/utils/tpl.js +4 -4
  298. package/lib/utils/uncontrollable.js +1 -1
  299. package/lib/utils/validateId.js +1 -1
  300. package/lib/utils/validations.js +1 -1
  301. package/package.json +2 -2
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -301,25 +301,27 @@ function wrapControl(ComposedComponent) {
301
301
  var model = this.model;
302
302
  var _a = this.props, form = _a.formStore, data = _a.data, canAccessSuperData = _a.canAccessSuperData;
303
303
  var isExp = formula.isExpression(value);
304
- if (isExp) {
305
- model.changeTmpValue(formula.FormulaExec['formula'](value, data), // 对组件默认值进行运算
306
- 'formulaChanged');
307
- }
308
- else {
309
- var initialValue = model.extraName
310
- ? [
311
- getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData),
312
- getVariable.getVariable(data, model.extraName, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData)
313
- ]
314
- : getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData);
315
- if (model.extraName &&
316
- initialValue.every(function (item) { return item === undefined; })) {
317
- initialValue = undefined;
318
- }
319
- model.changeTmpValue(initialValue !== null && initialValue !== void 0 ? initialValue : formula.replaceExpression(value), typeof initialValue !== 'undefined'
320
- ? 'initialValue'
304
+ var initialValue = model.extraName
305
+ ? [
306
+ getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData),
307
+ getVariable.getVariable(data, model.extraName, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData)
308
+ ]
309
+ : getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData);
310
+ if (model.extraName &&
311
+ initialValue.every(function (item) { return item === undefined; })) {
312
+ initialValue = undefined;
313
+ }
314
+ if (typeof initialValue === 'undefined') {
315
+ value = isExp
316
+ ? formula.FormulaExec['formula'](value, data)
317
+ : formula.replaceExpression(value);
318
+ }
319
+ model.changeTmpValue(initialValue !== null && initialValue !== void 0 ? initialValue : value, // 对组件默认值进行运算
320
+ typeof initialValue !== 'undefined'
321
+ ? 'initialValue'
322
+ : isExp
323
+ ? 'formulaChanged'
321
324
  : 'defaultValue');
322
- }
323
325
  };
324
326
  class_1.prototype.disposeModel = function () {
325
327
  var _a;
@@ -396,14 +398,15 @@ function wrapControl(ComposedComponent) {
396
398
  }
397
399
  };
398
400
  class_1.prototype.validate = function () {
401
+ var _a, _b;
399
402
  return tslib.__awaiter(this, void 0, void 0, function () {
400
- var _a, form, data, formItemDispatchEvent, result, combo$1, group, validPromises, valid;
401
- return tslib.__generator(this, function (_b) {
402
- switch (_b.label) {
403
+ var _c, form, data, formItemDispatchEvent, result, combo$1, group, validPromises, valid;
404
+ return tslib.__generator(this, function (_d) {
405
+ switch (_d.label) {
403
406
  case 0:
404
407
  if (!this.model)
405
408
  return [2 /*return*/];
406
- _a = this.props, form = _a.formStore, data = _a.data, formItemDispatchEvent = _a.formItemDispatchEvent;
409
+ _c = this.props, form = _c.formStore, data = _c.data, formItemDispatchEvent = _c.formItemDispatchEvent;
407
410
  if (!(this.model.unique &&
408
411
  (form === null || form === void 0 ? void 0 : form.parentStore) &&
409
412
  form.parentStore.storeType === combo.ComboStore.name)) return [3 /*break*/, 2];
@@ -414,15 +417,16 @@ function wrapControl(ComposedComponent) {
414
417
  });
415
418
  return [4 /*yield*/, Promise.all(validPromises)];
416
419
  case 1:
417
- result = _b.sent();
420
+ result = _d.sent();
418
421
  return [3 /*break*/, 4];
419
422
  case 2: return [4 /*yield*/, this.model.validate(data)];
420
423
  case 3:
421
- result = [_b.sent()];
422
- _b.label = 4;
424
+ result = [_d.sent()];
425
+ _d.label = 4;
423
426
  case 4:
424
427
  valid = !result.some(function (item) { return item === false; });
425
- formItemDispatchEvent === null || formItemDispatchEvent === void 0 ? void 0 : formItemDispatchEvent(valid ? 'formItemValidateSucc' : 'formItemValidateError', data);
428
+ (_a = (formItemDispatchEvent !== null && formItemDispatchEvent !== void 0 ? formItemDispatchEvent : this.props.dispatchEvent)) === null || _a === void 0 ? void 0 : _a(valid ? 'formItemValidateSucc' : 'formItemValidateError', (_b = form === null || form === void 0 ? void 0 : form.data) !== null && _b !== void 0 ? _b : this.props.data // form里的一定是最新的数据
429
+ );
426
430
  return [2 /*return*/, valid];
427
431
  }
428
432
  });
package/lib/store/app.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/store/crud.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -31,9 +31,10 @@ var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
31
31
 
32
32
  var ServerError = /** @class */ (function (_super) {
33
33
  tslib.__extends(ServerError, _super);
34
- function ServerError() {
35
- var _this = _super !== null && _super.apply(this, arguments) || this;
34
+ function ServerError(msg, response) {
35
+ var _this = _super.call(this, msg) || this;
36
36
  _this.type = 'ServerError';
37
+ _this.response = response;
37
38
  return _this;
38
39
  }
39
40
  return ServerError;
@@ -404,7 +405,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
404
405
  timeout: json.msgTimeout
405
406
  }
406
407
  : undefined);
407
- throw new ServerError(self.msg);
408
+ throw new ServerError(self.msg, json);
408
409
  }
409
410
  else {
410
411
  self.updateMessage((_h = (_g = (_f = (_e = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _e === void 0 ? void 0 : _e.success) !== null && _f !== void 0 ? _f : json.msg) !== null && _g !== void 0 ? _g : options.successMessage) !== null && _h !== void 0 ? _h : json.defaultMsg);
@@ -416,13 +417,18 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
416
417
  }
417
418
  : undefined);
418
419
  }
419
- return [2 /*return*/, json.data];
420
+ // 补一个空对象是为了区别于被取消的请求
421
+ // 请求被取消时会返回 undefined
422
+ return [2 /*return*/, json.data || {}];
420
423
  case 2:
421
424
  e_3 = _j.sent();
422
- self.markSaving(false);
423
425
  if (!mobxStateTree.isAlive(self) || self.disposed) {
424
426
  return [2 /*return*/];
425
427
  }
428
+ self.markSaving(false);
429
+ if (mobxStateTree.getEnv(self).isCancel(e_3)) {
430
+ return [2 /*return*/];
431
+ }
426
432
  !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) &&
427
433
  e_3.type !== 'ServerError' &&
428
434
  mobxStateTree.getEnv(self).notify('error', e_3.message);
package/lib/store/form.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -91,6 +91,9 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
91
91
  if (data === void 0) { data = {}; }
92
92
  if (skipSetPristine === void 0) { skipSetPristine = false; }
93
93
  self.initedAt = Date.now();
94
+ if (self.data.__tag) {
95
+ data = object.injectObjectChain(data, self.data.__tag);
96
+ }
94
97
  !skipSetPristine && (self.pristine = data);
95
98
  self.data = data;
96
99
  },
@@ -105,7 +108,7 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
105
108
  var prev = self.data;
106
109
  var newData;
107
110
  if (tag) {
108
- var proto = object.createObject(self.data.__super || null, tag);
111
+ var proto = object.createObject(self.data.__super || null, tslib.__assign(tslib.__assign({}, tag), { __tag: tag }));
109
112
  newData = object.createObject(proto, tslib.__assign(tslib.__assign({}, (replace ? {} : self.data)), data));
110
113
  }
111
114
  else {
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,6 @@
1
1
  import { SnapshotIn, Instance } from 'mobx-state-tree';
2
2
  export declare const Item: import("mobx-state-tree").IModelType<{
3
+ storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
3
4
  id: import("mobx-state-tree").ISimpleType<string>;
4
5
  pristine: import("mobx-state-tree").IType<any, any, any>;
5
6
  data: import("mobx-state-tree").IType<any, any, any>;
@@ -40,6 +41,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
40
41
  drawerData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
41
42
  } & {
42
43
  items: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IModelType<{
44
+ storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
43
45
  id: import("mobx-state-tree").ISimpleType<string>;
44
46
  pristine: import("mobx-state-tree").IType<any, any, any>;
45
47
  data: import("mobx-state-tree").IType<any, any, any>;
@@ -59,6 +61,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
59
61
  updateData({ children, ...rest }: any): void;
60
62
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
61
63
  selectedItems: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IReferenceType<import("mobx-state-tree").IModelType<{
64
+ storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
62
65
  id: import("mobx-state-tree").ISimpleType<string>;
63
66
  pristine: import("mobx-state-tree").IType<any, any, any>;
64
67
  data: import("mobx-state-tree").IType<any, any, any>;
@@ -118,6 +121,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
118
121
  } & {
119
122
  readonly allChecked: boolean;
120
123
  readonly checkableItems: ({
124
+ storeType: string;
121
125
  id: string;
122
126
  pristine: any;
123
127
  data: any;
@@ -136,6 +140,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
136
140
  reset(): void;
137
141
  updateData({ children, ...rest }: any): void;
138
142
  } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
143
+ storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
139
144
  id: import("mobx-state-tree").ISimpleType<string>;
140
145
  pristine: import("mobx-state-tree").IType<any, any, any>;
141
146
  data: import("mobx-state-tree").IType<any, any, any>;
@@ -155,6 +160,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
155
160
  updateData({ children, ...rest }: any): void;
156
161
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
157
162
  readonly unSelectedItems: ({
163
+ storeType: string;
158
164
  id: string;
159
165
  pristine: any;
160
166
  data: any;
@@ -173,6 +179,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
173
179
  reset(): void;
174
180
  updateData({ children, ...rest }: any): void;
175
181
  } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
182
+ storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
176
183
  id: import("mobx-state-tree").ISimpleType<string>;
177
184
  pristine: import("mobx-state-tree").IType<any, any, any>;
178
185
  data: import("mobx-state-tree").IType<any, any, any>;
@@ -194,6 +201,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
194
201
  isSelected: (item: IItem) => boolean;
195
202
  readonly modified: number;
196
203
  readonly modifiedItems: ({
204
+ storeType: string;
197
205
  id: string;
198
206
  pristine: any;
199
207
  data: any;
@@ -212,6 +220,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
212
220
  reset(): void;
213
221
  updateData({ children, ...rest }: any): void;
214
222
  } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
223
+ storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
215
224
  id: import("mobx-state-tree").ISimpleType<string>;
216
225
  pristine: import("mobx-state-tree").IType<any, any, any>;
217
226
  data: import("mobx-state-tree").IType<any, any, any>;
@@ -232,6 +241,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
232
241
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
233
242
  readonly moved: number;
234
243
  readonly movedItems: ({
244
+ storeType: string;
235
245
  id: string;
236
246
  pristine: any;
237
247
  data: any;
@@ -250,6 +260,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
250
260
  reset(): void;
251
261
  updateData({ children, ...rest }: any): void;
252
262
  } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
263
+ storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
253
264
  id: import("mobx-state-tree").ISimpleType<string>;
254
265
  pristine: import("mobx-state-tree").IType<any, any, any>;
255
266
  data: import("mobx-state-tree").IType<any, any, any>;
@@ -269,6 +280,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
269
280
  updateData({ children, ...rest }: any): void;
270
281
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
271
282
  } & {
283
+ getData: (superData: any) => any;
272
284
  update: (config: Partial<SListStore>) => void;
273
285
  initItems: (items: Array<object>) => void;
274
286
  updateSelected: (selected: Array<any>, valueField?: string) => void;
@@ -280,6 +292,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
280
292
  setOrderByInfo: (key: string, direction: 'asc' | 'desc') => void;
281
293
  reset: () => void;
282
294
  toggleDragging: () => void;
295
+ startDragging: () => void;
283
296
  stopDragging: () => void;
284
297
  exchange: (fromIndex: number, toIndex: number) => void;
285
298
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
package/lib/store/list.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -21,6 +21,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
21
21
 
22
22
  var Item = mobxStateTree.types
23
23
  .model('Item', {
24
+ storeType: 'Item',
24
25
  id: mobxStateTree.types.identifier,
25
26
  pristine: mobxStateTree.types.frozen(),
26
27
  data: mobxStateTree.types.frozen(),
@@ -245,6 +246,9 @@ var ListStore = iRenderer.iRendererStore
245
246
  function toggleDragging() {
246
247
  self.dragging = !self.dragging;
247
248
  }
249
+ function startDragging() {
250
+ self.dragging = true;
251
+ }
248
252
  function stopDragging() {
249
253
  self.dragging = false;
250
254
  }
@@ -256,7 +260,15 @@ var ListStore = iRenderer.iRendererStore
256
260
  newItems.splice(toIndex, 0, item);
257
261
  self.items.replace(newItems);
258
262
  }
263
+ function getData(superData) {
264
+ return object.createObject(superData, {
265
+ items: self.items.map(function (item) { return item.data; }),
266
+ selectedItems: self.selectedItems.map(function (item) { return item.data; }),
267
+ unSelectedItems: self.unSelectedItems.map(function (item) { return item.data; })
268
+ });
269
+ }
259
270
  return {
271
+ getData: getData,
260
272
  update: update,
261
273
  initItems: initItems,
262
274
  updateSelected: updateSelected,
@@ -268,6 +280,7 @@ var ListStore = iRenderer.iRendererStore
268
280
  setOrderByInfo: setOrderByInfo,
269
281
  reset: reset,
270
282
  toggleDragging: toggleDragging,
283
+ startDragging: startDragging,
271
284
  stopDragging: stopDragging,
272
285
  exchange: exchange
273
286
  };
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/store/node.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/store/root.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -13132,6 +13132,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
13132
13132
  changeOrder: (key: string, direction: 'asc' | 'desc' | '') => void;
13133
13133
  reset: () => void;
13134
13134
  toggleDragging: () => void;
13135
+ startDragging: () => void;
13135
13136
  stopDragging: () => void;
13136
13137
  exchange: (fromIndex: number, toIndex: number, item?: IRow) => void;
13137
13138
  addForm: (form: IFormStore, rowIndex: number) => void;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1368,6 +1368,9 @@ var TableStore = iRenderer.iRendererStore
1368
1368
  function toggleDragging() {
1369
1369
  self.dragging = !self.dragging;
1370
1370
  }
1371
+ function startDragging() {
1372
+ self.dragging = true;
1373
+ }
1371
1374
  function stopDragging() {
1372
1375
  self.dragging = false;
1373
1376
  }
@@ -1476,6 +1479,7 @@ var TableStore = iRenderer.iRendererStore
1476
1479
  changeOrder: changeOrder,
1477
1480
  reset: reset,
1478
1481
  toggleDragging: toggleDragging,
1482
+ startDragging: startDragging,
1479
1483
  stopDragging: stopDragging,
1480
1484
  exchange: exchange,
1481
1485
  addForm: addForm,
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/theme.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/types.d.ts CHANGED
@@ -272,7 +272,7 @@ export interface Definitions {
272
272
  [propName: string]: SchemaNode;
273
273
  }
274
274
  export interface ActionObject extends ButtonObject {
275
- actionType?: 'submit' | 'copy' | 'reload' | 'ajax' | 'saveAs' | 'dialog' | 'drawer' | 'confirmDialog' | 'jump' | 'link' | 'url' | 'email' | 'close' | 'confirm' | 'add' | 'remove' | 'delete' | 'edit' | 'cancel' | 'next' | 'prev' | 'reset' | 'validate' | 'reset-and-submit' | 'clear' | 'clear-and-submit' | 'toast' | 'goto-step' | 'goto-image' | 'expand' | 'collapse' | 'step-submit' | 'select' | 'selectAll' | 'clearAll' | 'changeTabKey' | 'clearSearch' | 'submitQuickEdit' | 'toggleExpanded' | 'setExpanded';
275
+ actionType?: 'submit' | 'copy' | 'reload' | 'ajax' | 'saveAs' | 'dialog' | 'drawer' | 'confirmDialog' | 'jump' | 'link' | 'url' | 'email' | 'close' | 'confirm' | 'add' | 'remove' | 'delete' | 'edit' | 'cancel' | 'next' | 'prev' | 'reset' | 'validate' | 'reset-and-submit' | 'clear' | 'clear-and-submit' | 'toast' | 'goto-step' | 'goto-image' | 'expand' | 'collapse' | 'step-submit' | 'select' | 'selectAll' | 'clearAll' | 'changeTabKey' | 'clearSearch' | 'submitQuickEdit' | 'initDrag' | 'cancelDrag' | 'toggleExpanded' | 'setExpanded';
276
276
  api?: BaseApiObject | string;
277
277
  asyncApi?: BaseApiObject | string;
278
278
  payload?: any;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/api.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/date.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/dom.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.3.0
2
+ * amis-core v6.4.1
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -180,14 +180,14 @@ function calculatePosition(placement, overlayNode, target, container, padding, c
180
180
  };
181
181
  var visibleX = false;
182
182
  var visibleY = false;
183
- if (transformed.x > 0 &&
183
+ if (transformed.x >= 0 &&
184
184
  transformed.x + transformed.width <
185
185
  window.innerWidth + scrollParent.scrollLeft) {
186
186
  visibleX = true;
187
187
  !visiblePlacement.atX && (visiblePlacement.atX = atX);
188
188
  !visiblePlacement.myX && (visiblePlacement.myX = myX);
189
189
  }
190
- if (transformed.y > 0 &&
190
+ if (transformed.y >= 0 &&
191
191
  transformed.y + transformed.height <
192
192
  window.innerHeight + scrollParent.scrollTop) {
193
193
  visibleY = true;