amis-core 6.6.0 → 6.8.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 (312) hide show
  1. package/esm/Root.js +4 -3
  2. package/esm/RootRenderer.d.ts +1 -1
  3. package/esm/RootRenderer.js +1 -1
  4. package/esm/SchemaRenderer.d.ts +0 -1
  5. package/esm/SchemaRenderer.js +19 -10
  6. package/esm/Scoped.js +2 -1
  7. package/esm/StatusScoped.js +1 -1
  8. package/esm/WithRootStore.js +1 -1
  9. package/esm/WithStore.js +8 -8
  10. package/esm/actions/Action.js +33 -31
  11. package/esm/actions/AjaxAction.js +1 -1
  12. package/esm/actions/BreakAction.js +1 -1
  13. package/esm/actions/BroadcastAction.js +1 -1
  14. package/esm/actions/CmptAction.js +55 -48
  15. package/esm/actions/ContinueAction.js +1 -1
  16. package/esm/actions/CopyAction.js +1 -1
  17. package/esm/actions/CustomAction.js +12 -3
  18. package/esm/actions/DialogAction.js +3 -1
  19. package/esm/actions/DrawerAction.js +2 -1
  20. package/esm/actions/EmailAction.js +1 -1
  21. package/esm/actions/EventAction.js +2 -1
  22. package/esm/actions/LinkAction.js +1 -1
  23. package/esm/actions/LoopAction.js +2 -1
  24. package/esm/actions/PageAction.js +1 -1
  25. package/esm/actions/ParallelAction.js +1 -1
  26. package/esm/actions/PrintAction.js +1 -1
  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 -1
  32. package/esm/components/ErrorBoundary.js +1 -1
  33. package/esm/components/LazyComponent.js +1 -1
  34. package/esm/components/Overlay.js +2 -1
  35. package/esm/components/PopOver.d.ts +2 -0
  36. package/esm/components/PopOver.js +5 -4
  37. package/esm/env.d.ts +4 -0
  38. package/esm/env.js +1 -1
  39. package/esm/envOverwrite.js +1 -1
  40. package/esm/factory.js +1 -1
  41. package/esm/index.js +3 -3
  42. package/esm/locale.js +2 -1
  43. package/esm/polyfills.js +1 -1
  44. package/esm/renderers/Form.js +123 -25
  45. package/esm/renderers/Item.d.ts +97 -12
  46. package/esm/renderers/Item.js +180 -126
  47. package/esm/renderers/Options.js +2 -1
  48. package/esm/renderers/Placeholder.js +1 -1
  49. package/esm/renderers/builtin.js +1 -1
  50. package/esm/renderers/register.js +1 -1
  51. package/esm/renderers/wrapControl.js +2 -1
  52. package/esm/store/app.d.ts +1 -0
  53. package/esm/store/app.js +2 -1
  54. package/esm/store/combo.d.ts +411 -0
  55. package/esm/store/combo.js +1 -1
  56. package/esm/store/crud.d.ts +1 -0
  57. package/esm/store/crud.js +2 -1
  58. package/esm/store/form.d.ts +171 -0
  59. package/esm/store/form.js +2 -1
  60. package/esm/store/formItem.d.ts +5 -0
  61. package/esm/store/formItem.js +30 -8
  62. package/esm/store/iRenderer.d.ts +1 -0
  63. package/esm/store/iRenderer.js +8 -3
  64. package/esm/store/index.js +1 -1
  65. package/esm/store/list.d.ts +1 -0
  66. package/esm/store/list.js +1 -1
  67. package/esm/store/manager.js +1 -1
  68. package/esm/store/modal.d.ts +1 -0
  69. package/esm/store/modal.js +1 -1
  70. package/esm/store/node.js +1 -1
  71. package/esm/store/pagination.d.ts +1 -0
  72. package/esm/store/pagination.js +2 -1
  73. package/esm/store/root.d.ts +1 -0
  74. package/esm/store/root.js +2 -1
  75. package/esm/store/service.d.ts +1 -0
  76. package/esm/store/service.js +2 -1
  77. package/esm/store/status.js +1 -1
  78. package/esm/store/table.d.ts +382 -21
  79. package/esm/store/table.js +84 -54
  80. package/esm/store/table2.d.ts +1 -0
  81. package/esm/store/table2.js +1 -1
  82. package/esm/theme.js +1 -1
  83. package/esm/types.d.ts +1 -1
  84. package/esm/utils/Animation.js +1 -1
  85. package/esm/utils/ColorScale.js +1 -1
  86. package/esm/utils/DataSchema.js +1 -1
  87. package/esm/utils/DataScope.js +2 -2
  88. package/esm/utils/RootClose.js +1 -1
  89. package/esm/utils/SimpleMap.js +1 -1
  90. package/esm/utils/api.js +2 -2
  91. package/esm/utils/arraySlice.js +1 -1
  92. package/esm/utils/attachmentAdpator.js +1 -1
  93. package/esm/utils/autobind.js +1 -1
  94. package/esm/utils/browser.js +1 -1
  95. package/esm/utils/columnsSplit.js +1 -1
  96. package/esm/utils/concatData.js +1 -1
  97. package/esm/utils/dataMapping.js +1 -1
  98. package/esm/utils/date.js +1 -1
  99. package/esm/utils/debug.js +17 -3
  100. package/esm/utils/decodeEntity.js +1 -1
  101. package/esm/utils/dom.js +1 -1
  102. package/esm/utils/errors.js +1 -1
  103. package/esm/utils/escapeHtml.js +1 -1
  104. package/esm/utils/filter-schema.js +1 -1
  105. package/esm/utils/filter.js +1 -1
  106. package/esm/utils/formatDuration.js +1 -1
  107. package/esm/utils/formula.js +2 -1
  108. package/esm/utils/getVariable.js +1 -1
  109. package/esm/utils/grammar.js +1 -1
  110. package/esm/utils/handleAction.js +1 -1
  111. package/esm/utils/helper.d.ts +5 -1
  112. package/esm/utils/helper.js +37 -8
  113. package/esm/utils/highlight.js +1 -1
  114. package/esm/utils/icon.js +1 -1
  115. package/esm/utils/image.js +1 -1
  116. package/esm/utils/isPureVariable.js +2 -2
  117. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  118. package/esm/utils/keyToPath.js +1 -1
  119. package/esm/utils/labelToString.js +1 -1
  120. package/esm/utils/makeSorter.js +1 -1
  121. package/esm/utils/math.js +1 -1
  122. package/esm/utils/memoryParse.d.ts +2 -1
  123. package/esm/utils/memoryParse.js +10 -6
  124. package/esm/utils/normalizeLink.js +1 -1
  125. package/esm/utils/normalizeOptions.js +1 -1
  126. package/esm/utils/object.d.ts +2 -4
  127. package/esm/utils/object.js +1 -1
  128. package/esm/utils/offset.js +1 -1
  129. package/esm/utils/offsetParent.js +1 -1
  130. package/esm/utils/optionValueCompare.js +1 -1
  131. package/esm/utils/position.js +1 -1
  132. package/esm/utils/prettyBytes.js +1 -1
  133. package/esm/utils/printElement.js +1 -1
  134. package/esm/utils/renderer-event.js +5 -3
  135. package/esm/utils/replaceText.js +1 -1
  136. package/esm/utils/resize-sensor.js +30 -1
  137. package/esm/utils/resolveCondition.js +2 -1
  138. package/esm/utils/resolveVariable.js +1 -1
  139. package/esm/utils/resolveVariableAndFilter.js +1 -1
  140. package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
  141. package/esm/utils/scrollPosition.js +1 -1
  142. package/esm/utils/string2regExp.js +1 -1
  143. package/esm/utils/stripNumber.js +1 -1
  144. package/esm/utils/style-helper.d.ts +4 -2
  145. package/esm/utils/style-helper.js +27 -13
  146. package/esm/utils/style.js +2 -1
  147. package/esm/utils/toNumber.js +1 -1
  148. package/esm/utils/tokenize.js +1 -1
  149. package/esm/utils/tpl-builtin.js +2 -1
  150. package/esm/utils/tpl-lodash.js +2 -1
  151. package/esm/utils/tpl.js +1 -1
  152. package/esm/utils/uncontrollable.js +1 -1
  153. package/esm/utils/validateId.js +3 -3
  154. package/esm/utils/validations.js +2 -1
  155. package/esm/utils/visitedCache.d.ts +46 -0
  156. package/esm/utils/visitedCache.js +124 -0
  157. package/lib/Root.js +4 -3
  158. package/lib/RootRenderer.js +1 -1
  159. package/lib/SchemaRenderer.d.ts +0 -1
  160. package/lib/SchemaRenderer.js +19 -10
  161. package/lib/Scoped.js +2 -1
  162. package/lib/StatusScoped.js +1 -1
  163. package/lib/WithRootStore.js +1 -1
  164. package/lib/WithStore.js +8 -8
  165. package/lib/actions/Action.js +33 -31
  166. package/lib/actions/AjaxAction.js +1 -1
  167. package/lib/actions/BreakAction.js +1 -1
  168. package/lib/actions/BroadcastAction.js +1 -1
  169. package/lib/actions/CmptAction.js +55 -48
  170. package/lib/actions/ContinueAction.js +1 -1
  171. package/lib/actions/CopyAction.js +1 -1
  172. package/lib/actions/CustomAction.js +12 -3
  173. package/lib/actions/DialogAction.js +3 -1
  174. package/lib/actions/DrawerAction.js +2 -1
  175. package/lib/actions/EmailAction.js +1 -1
  176. package/lib/actions/EventAction.js +2 -1
  177. package/lib/actions/LinkAction.js +1 -1
  178. package/lib/actions/LoopAction.js +2 -1
  179. package/lib/actions/PageAction.js +1 -1
  180. package/lib/actions/ParallelAction.js +1 -1
  181. package/lib/actions/PrintAction.js +1 -1
  182. package/lib/actions/StatusAction.js +1 -1
  183. package/lib/actions/SwitchAction.js +1 -1
  184. package/lib/actions/ToastAction.js +1 -1
  185. package/lib/actions/WaitAction.js +1 -1
  186. package/lib/components/CustomStyle.js +1 -1
  187. package/lib/components/ErrorBoundary.js +1 -1
  188. package/lib/components/LazyComponent.js +1 -1
  189. package/lib/components/Overlay.js +2 -1
  190. package/lib/components/PopOver.d.ts +2 -0
  191. package/lib/components/PopOver.js +5 -4
  192. package/lib/env.d.ts +4 -0
  193. package/lib/env.js +1 -1
  194. package/lib/envOverwrite.js +1 -1
  195. package/lib/factory.js +1 -1
  196. package/lib/index.js +3 -2
  197. package/lib/locale.js +2 -1
  198. package/lib/polyfills.js +1 -1
  199. package/lib/renderers/Form.js +122 -24
  200. package/lib/renderers/Item.d.ts +97 -12
  201. package/lib/renderers/Item.js +179 -125
  202. package/lib/renderers/Options.js +2 -1
  203. package/lib/renderers/Placeholder.js +1 -1
  204. package/lib/renderers/builtin.js +1 -1
  205. package/lib/renderers/register.js +1 -1
  206. package/lib/renderers/wrapControl.js +2 -1
  207. package/lib/store/app.d.ts +1 -0
  208. package/lib/store/app.js +2 -1
  209. package/lib/store/combo.d.ts +435 -24
  210. package/lib/store/combo.js +1 -1
  211. package/lib/store/crud.d.ts +1 -0
  212. package/lib/store/crud.js +2 -1
  213. package/lib/store/form.d.ts +181 -10
  214. package/lib/store/form.js +2 -1
  215. package/lib/store/formItem.d.ts +5 -0
  216. package/lib/store/formItem.js +30 -8
  217. package/lib/store/iRenderer.d.ts +1 -0
  218. package/lib/store/iRenderer.js +8 -3
  219. package/lib/store/index.js +1 -1
  220. package/lib/store/list.d.ts +1 -0
  221. package/lib/store/list.js +1 -1
  222. package/lib/store/manager.js +1 -1
  223. package/lib/store/modal.d.ts +1 -0
  224. package/lib/store/modal.js +1 -1
  225. package/lib/store/node.js +1 -1
  226. package/lib/store/pagination.d.ts +1 -0
  227. package/lib/store/pagination.js +2 -1
  228. package/lib/store/root.d.ts +1 -0
  229. package/lib/store/root.js +2 -1
  230. package/lib/store/service.d.ts +1 -0
  231. package/lib/store/service.js +2 -1
  232. package/lib/store/status.js +1 -1
  233. package/lib/store/table.d.ts +402 -41
  234. package/lib/store/table.js +84 -54
  235. package/lib/store/table2.d.ts +1 -0
  236. package/lib/store/table2.js +1 -1
  237. package/lib/theme.js +1 -1
  238. package/lib/types.d.ts +1 -1
  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 +2 -2
  243. package/lib/utils/RootClose.js +1 -1
  244. package/lib/utils/SimpleMap.js +1 -1
  245. package/lib/utils/api.js +2 -2
  246. package/lib/utils/arraySlice.js +1 -1
  247. package/lib/utils/attachmentAdpator.js +1 -1
  248. package/lib/utils/autobind.js +1 -1
  249. package/lib/utils/browser.js +1 -1
  250. package/lib/utils/columnsSplit.js +1 -1
  251. package/lib/utils/concatData.js +1 -1
  252. package/lib/utils/dataMapping.js +1 -1
  253. package/lib/utils/date.js +1 -1
  254. package/lib/utils/debug.js +17 -3
  255. package/lib/utils/decodeEntity.js +1 -1
  256. package/lib/utils/dom.js +1 -1
  257. package/lib/utils/errors.js +1 -1
  258. package/lib/utils/escapeHtml.js +1 -1
  259. package/lib/utils/filter-schema.js +1 -1
  260. package/lib/utils/filter.js +1 -1
  261. package/lib/utils/formatDuration.js +1 -1
  262. package/lib/utils/formula.js +2 -1
  263. package/lib/utils/getVariable.js +1 -1
  264. package/lib/utils/grammar.js +1 -1
  265. package/lib/utils/handleAction.js +1 -1
  266. package/lib/utils/helper.d.ts +5 -1
  267. package/lib/utils/helper.js +36 -6
  268. package/lib/utils/highlight.js +1 -1
  269. package/lib/utils/icon.js +1 -1
  270. package/lib/utils/image.js +1 -1
  271. package/lib/utils/isPureVariable.js +2 -2
  272. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  273. package/lib/utils/keyToPath.js +1 -1
  274. package/lib/utils/labelToString.js +1 -1
  275. package/lib/utils/makeSorter.js +1 -1
  276. package/lib/utils/math.js +1 -1
  277. package/lib/utils/memoryParse.d.ts +2 -1
  278. package/lib/utils/memoryParse.js +10 -6
  279. package/lib/utils/normalizeLink.js +1 -1
  280. package/lib/utils/normalizeOptions.js +1 -1
  281. package/lib/utils/object.d.ts +2 -4
  282. package/lib/utils/object.js +1 -1
  283. package/lib/utils/offset.js +1 -1
  284. package/lib/utils/offsetParent.js +1 -1
  285. package/lib/utils/optionValueCompare.js +1 -1
  286. package/lib/utils/position.js +1 -1
  287. package/lib/utils/prettyBytes.js +1 -1
  288. package/lib/utils/printElement.js +1 -1
  289. package/lib/utils/renderer-event.js +5 -3
  290. package/lib/utils/replaceText.js +1 -1
  291. package/lib/utils/resize-sensor.js +30 -1
  292. package/lib/utils/resolveCondition.js +2 -1
  293. package/lib/utils/resolveVariable.js +1 -1
  294. package/lib/utils/resolveVariableAndFilter.js +1 -1
  295. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  296. package/lib/utils/scrollPosition.js +1 -1
  297. package/lib/utils/string2regExp.js +1 -1
  298. package/lib/utils/stripNumber.js +1 -1
  299. package/lib/utils/style-helper.d.ts +4 -2
  300. package/lib/utils/style-helper.js +27 -13
  301. package/lib/utils/style.js +2 -1
  302. package/lib/utils/toNumber.js +1 -1
  303. package/lib/utils/tokenize.js +1 -1
  304. package/lib/utils/tpl-builtin.js +2 -1
  305. package/lib/utils/tpl-lodash.js +2 -1
  306. package/lib/utils/tpl.js +1 -1
  307. package/lib/utils/uncontrollable.js +1 -1
  308. package/lib/utils/validateId.js +3 -3
  309. package/lib/utils/validations.js +2 -1
  310. package/lib/utils/visitedCache.d.ts +46 -0
  311. package/lib/utils/visitedCache.js +128 -0
  312. package/package.json +2 -2
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.8.0
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 { setVariable, createObject } from '../utils/object.js';
23
+ import { createObject, setVariable, createObjectFromChain, deleteVariable } from '../utils/object.js';
24
24
  import { dataMapping } from '../utils/dataMapping.js';
25
25
  import '../utils/DataSchema.js';
26
26
  import '../utils/DataScope.js';
@@ -34,6 +34,7 @@ import '../utils/filter.js';
34
34
  import 'lodash/isObject';
35
35
  import 'lodash/isString';
36
36
  import 'lodash/isBoolean';
37
+ import '../utils/memoryParse.js';
37
38
  import '@rc-component/mini-decimal';
38
39
  import '../utils/image.js';
39
40
  import { keyToPath } from '../utils/keyToPath.js';
@@ -78,8 +79,7 @@ var FormItemWrap = /** @class */ (function (_super) {
78
79
  if (skipIfExits === void 0) { skipIfExits = false; }
79
80
  return __awaiter(_this, void 0, void 0, function () {
80
81
  var _a, autoFill, onBulkChange, formItem, data_1, itemName, ctx, result, e_1;
81
- var _b;
82
- var _c, _d;
82
+ var _b, _c, _d;
83
83
  return __generator(this, function (_e) {
84
84
  switch (_e.label) {
85
85
  case 0:
@@ -103,29 +103,22 @@ var FormItemWrap = /** @class */ (function (_super) {
103
103
  return [3 /*break*/, 3];
104
104
  case 1:
105
105
  itemName = formItem.name;
106
- ctx = createObject(data_1, (_b = {},
107
- _b[itemName || ''] = term,
108
- _b.__term = term,
109
- _b));
106
+ ctx = createObject(data_1, {
107
+ __term: term
108
+ });
109
+ setVariable(ctx, itemName, term);
110
110
  if (!(forceLoad ||
111
111
  (isEffectiveApi(autoFill.api, ctx) && this.lastSearchTerm !== term))) return [3 /*break*/, 3];
112
- return [4 /*yield*/, formItem.loadAutoUpdateData(autoFill.api, ctx, !!((_c = autoFill.api) === null || _c === void 0 ? void 0 : _c.silent))];
112
+ return [4 /*yield*/, formItem.loadAutoUpdateData(autoFill.api, ctx, !!((_b = autoFill.api) === null || _b === void 0 ? void 0 : _b.silent))];
113
113
  case 2:
114
114
  result = _e.sent();
115
115
  this.lastSearchTerm =
116
- (_d = (result && getVariable(result, itemName))) !== null && _d !== void 0 ? _d : term;
116
+ (_c = (result && getVariable(result, itemName))) !== null && _c !== void 0 ? _c : term;
117
117
  // 如果没有返回不应该处理
118
118
  if (!result) {
119
119
  return [2 /*return*/];
120
120
  }
121
- if (autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) {
122
- result = dataMapping(autoFill.fillMapping, result);
123
- }
124
- if (result) {
125
- // 不能把自己给清了吧
126
- setVariable(result, itemName, getVariable(result, itemName) || formItem.tmpValue);
127
- onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(result);
128
- }
121
+ this.applyMapping((_d = autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) !== null && _d !== void 0 ? _d : { '&': '$$' }, result, false, true);
129
122
  _e.label = 3;
130
123
  case 3: return [3 /*break*/, 5];
131
124
  case 4:
@@ -140,15 +133,12 @@ var FormItemWrap = /** @class */ (function (_super) {
140
133
  trailing: true,
141
134
  leading: false
142
135
  });
143
- _this.state = {
144
- isOpened: false
145
- };
146
136
  var model = props.formItem, formInited = props.formInited, addHook = props.addHook, initAutoFill = props.initAutoFill;
147
137
  if (!model) {
148
138
  return _this;
149
139
  }
150
140
  _this.toDispose.push(reaction(function () {
151
- return "".concat(model.errors.join('')).concat(model.isFocused).concat(model.dialogOpen).concat(JSON.stringify(model.filteredOptions));
141
+ return "".concat(model.errors.join('')).concat(model.isFocused).concat(model.dialogOpen).concat(JSON.stringify(model.filteredOptions)).concat(model.popOverOpen);
152
142
  }, function () { return _this.forceUpdate(); }));
153
143
  var onInit = function () {
154
144
  var _a;
@@ -206,18 +196,26 @@ var FormItemWrap = /** @class */ (function (_super) {
206
196
  this.handleAutoFill('focus');
207
197
  };
208
198
  FormItemWrap.prototype.handleBlur = function (e) {
209
- var model = this.props.formItem;
199
+ var _a = this.props, model = _a.formItem, autoFill = _a.autoFill;
210
200
  model && model.blur();
211
201
  this.props.onBlur && this.props.onBlur(e);
202
+ if (!autoFill ||
203
+ (autoFill && !(autoFill === null || autoFill === void 0 ? void 0 : autoFill.hasOwnProperty('showSuggestion')))) {
204
+ return;
205
+ }
206
+ this.handleAutoFill('blur');
212
207
  };
213
208
  FormItemWrap.prototype.handleAutoFill = function (type) {
214
209
  var _this = this;
215
- var _a = this.props, autoFill = _a.autoFill; _a.onBulkChange; var formItem = _a.formItem, data = _a.data;
210
+ var _a = this.props, autoFill = _a.autoFill, formItem = _a.formItem, data = _a.data;
216
211
  var trigger = autoFill.trigger, mode = autoFill.mode;
217
212
  if (trigger === type && mode === 'popOver') {
218
213
  // 参照录入 popOver形式
219
- this.setState({
220
- isOpened: true
214
+ formItem === null || formItem === void 0 ? void 0 : formItem.openPopOver(this.buildAutoFillSchema(), data, function (confirmed, result) {
215
+ if (!confirmed || !(result === null || result === void 0 ? void 0 : result.selectedItems)) {
216
+ return;
217
+ }
218
+ _this.updateAutoFillData(result.selectedItems);
221
219
  });
222
220
  }
223
221
  else if (
@@ -225,7 +223,7 @@ var FormItemWrap = /** @class */ (function (_super) {
225
223
  trigger === type &&
226
224
  (mode === 'dialog' || mode === 'drawer')) {
227
225
  formItem === null || formItem === void 0 ? void 0 : formItem.openDialog(this.buildAutoFillSchema(), data, function (confirmed, result) {
228
- if (!(result === null || result === void 0 ? void 0 : result.selectedItems)) {
226
+ if (!confirmed || !(result === null || result === void 0 ? void 0 : result.selectedItems)) {
229
227
  return;
230
228
  }
231
229
  _this.updateAutoFillData(result.selectedItems);
@@ -233,17 +231,21 @@ var FormItemWrap = /** @class */ (function (_super) {
233
231
  }
234
232
  };
235
233
  FormItemWrap.prototype.updateAutoFillData = function (context) {
236
- var _a = this.props, formStore = _a.formStore, autoFill = _a.autoFill, onBulkChange = _a.onBulkChange;
237
- var fillMapping = autoFill.fillMapping, multiple = autoFill.multiple;
234
+ var _a = this.props, data = _a.data, autoFill = _a.autoFill; _a.onBulkChange;
235
+ var fillMapping = autoFill.fillMapping; autoFill.multiple;
238
236
  // form原始数据
239
- var data = formStore === null || formStore === void 0 ? void 0 : formStore.data;
240
- var contextData = createObject(__assign({ items: !multiple ? [context] : context }, data), __assign({}, context));
241
- var responseData = {};
242
- responseData = dataMapping(fillMapping, contextData);
243
- if (!multiple && !fillMapping) {
244
- responseData = context;
245
- }
246
- onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(responseData);
237
+ var contextData = Array.isArray(context)
238
+ ? createObject(data, {
239
+ items: context
240
+ })
241
+ : createObjectFromChain([
242
+ data,
243
+ {
244
+ items: [context]
245
+ },
246
+ context
247
+ ]);
248
+ this.applyMapping(fillMapping !== null && fillMapping !== void 0 ? fillMapping : {}, contextData, false);
247
249
  };
248
250
  FormItemWrap.prototype.syncOptionAutoFill = function (selectedOptions, skipIfExits) {
249
251
  if (skipIfExits === void 0) { skipIfExits = false; }
@@ -257,83 +259,107 @@ var FormItemWrap = /** @class */ (function (_super) {
257
259
  autoFill &&
258
260
  !isEmpty(autoFill) &&
259
261
  formItem.filteredOptions.length) {
260
- var toSync_1 = dataMapping(autoFill, multiple
262
+ this.applyMapping(autoFill, multiple
261
263
  ? {
262
264
  items: selectedOptions.map(function (item) {
263
265
  return createObject(__assign(__assign({}, data), { ancestors: getTreeAncestors(formItem.filteredOptions, item, true) }), item);
264
266
  })
265
267
  }
266
- : createObject(__assign(__assign({}, data), { ancestors: getTreeAncestors(formItem.filteredOptions, selectedOptions[0], true) }), selectedOptions[0]));
267
- var tmpData_1 = __assign({}, data);
268
- var result_1 = __assign({}, toSync_1);
269
- Object.keys(autoFill).forEach(function (key) {
270
- var keys = keyToPath(key);
271
- var value = getVariable(toSync_1, key);
272
- if (skipIfExits) {
273
- var originValue = getVariable(data, key);
274
- if (typeof originValue !== 'undefined') {
275
- value = originValue;
276
- }
277
- }
278
- setVariable(result_1, key, value);
279
- // 如果左边的 key 是一个路径
280
- // 这里不希望直接把原始对象都给覆盖没了
281
- // 而是保留原始的对象,只修改指定的属性
282
- if (keys.length > 1 && isPlainObject(tmpData_1[keys[0]])) {
283
- // 存在情况:依次更新同一子路径的多个key,eg: a.b.c1 a.b.c2,所以需要同步更新data
284
- setVariable(tmpData_1, key, value);
285
- result_1[keys[0]] = tmpData_1[keys[0]];
268
+ : createObject(__assign(__assign({}, data), { ancestors: getTreeAncestors(formItem.filteredOptions, selectedOptions[0], true) }), selectedOptions[0]), skipIfExits);
269
+ }
270
+ };
271
+ /**
272
+ * 应用映射函数,根据给定的映射关系,更新数据对象
273
+ *
274
+ * @param mapping 映射关系,类型为任意类型
275
+ * @param ctx 上下文对象,类型为任意类型
276
+ * @param skipIfExits 是否跳过已存在的属性,默认为 false
277
+ */
278
+ FormItemWrap.prototype.applyMapping = function (mapping, ctx, skipIfExits, ignoreSelf) {
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;
282
+ var toSync = dataMapping(mapping, ctx);
283
+ var tmpData = __assign({}, data);
284
+ var result = __assign({}, toSync);
285
+ Object.keys(mapping).forEach(function (key) {
286
+ if (key === '&') {
287
+ return;
288
+ }
289
+ var keys = keyToPath(key);
290
+ var value = getVariable(toSync, key);
291
+ if (skipIfExits) {
292
+ var originValue = getVariable(data, key);
293
+ if (typeof originValue !== 'undefined') {
294
+ value = originValue;
286
295
  }
287
- });
288
- onBulkChange(result_1);
296
+ }
297
+ setVariable(result, key, value);
298
+ // 如果左边的 key 是一个路径
299
+ // 这里不希望直接把原始对象都给覆盖没了
300
+ // 而是保留原始的对象,只修改指定的属性
301
+ if (keys.length > 1 && isPlainObject(tmpData[keys[0]])) {
302
+ // 存在情况:依次更新同一子路径的多个key,eg: a.b.c1 和 a.b.c2,所以需要同步更新data
303
+ setVariable(tmpData, key, value);
304
+ result[keys[0]] = tmpData[keys[0]];
305
+ }
306
+ });
307
+ // 是否忽略自己的设置
308
+ if (ignoreSelf && (formItem === null || formItem === void 0 ? void 0 : formItem.name)) {
309
+ deleteVariable(result, formItem.name);
289
310
  }
311
+ onBulkChange(result);
290
312
  };
291
313
  FormItemWrap.prototype.buildAutoFillSchema = function () {
292
- var _this = this;
293
- var _a = this.props, render = _a.render, autoFill = _a.autoFill, ns = _a.classPrefix, cx = _a.classnames, __ = _a.translate;
314
+ var _a = this.props; _a.formItem; var autoFill = _a.autoFill, __ = _a.translate;
294
315
  if (!autoFill || (autoFill && !(autoFill === null || autoFill === void 0 ? void 0 : autoFill.hasOwnProperty('api')))) {
295
316
  return;
296
317
  }
297
- var api = autoFill.api, mode = autoFill.mode, size = autoFill.size, offset = autoFill.offset, position = autoFill.position, multiple = autoFill.multiple, filter = autoFill.filter, columns = autoFill.columns, labelField = autoFill.labelField, popOverContainer = autoFill.popOverContainer, popOverClassName = autoFill.popOverClassName, valueField = autoFill.valueField;
318
+ var api = autoFill.api, mode = autoFill.mode, size = autoFill.size, offset = autoFill.offset, position = autoFill.position, placement = autoFill.placement, multiple = autoFill.multiple, filter = autoFill.filter, columns = autoFill.columns, labelField = autoFill.labelField, popOverContainer = autoFill.popOverContainer, popOverClassName = autoFill.popOverClassName, valueField = autoFill.valueField, defaultSelection = autoFill.defaultSelection;
298
319
  var form = {
299
320
  type: 'form',
300
321
  // debug: true,
301
322
  title: '',
302
323
  className: 'suggestion-form',
303
- body: {
304
- type: 'picker',
305
- embed: true,
306
- joinValues: false,
307
- label: false,
308
- labelField: labelField,
309
- valueField: valueField || 'value',
310
- multiple: multiple,
311
- name: 'selectedItems',
312
- options: [],
313
- required: true,
314
- source: api,
315
- pickerSchema: {
316
- type: 'crud',
317
- affixHeader: false,
318
- alwaysShowPagination: true,
319
- keepItemSelectionOnPageChange: true,
320
- headerToolbar: [],
321
- footerToolbar: [
322
- {
323
- type: 'pagination',
324
- align: 'left'
325
- },
326
- {
327
- type: 'bulkActions',
328
- align: 'right',
329
- className: 'ml-2'
330
- }
331
- ],
324
+ body: [
325
+ {
326
+ type: 'picker',
327
+ embed: true,
328
+ joinValues: false,
329
+ strictMode: false,
330
+ label: false,
331
+ labelField: labelField,
332
+ valueField: valueField || 'value',
332
333
  multiple: multiple,
333
- filter: filter,
334
- columns: columns || []
334
+ name: 'selectedItems',
335
+ value: defaultSelection || [],
336
+ options: [],
337
+ required: true,
338
+ source: api,
339
+ pickerSchema: {
340
+ type: 'crud',
341
+ bodyClassName: 'mb-0',
342
+ affixHeader: false,
343
+ alwaysShowPagination: true,
344
+ keepItemSelectionOnPageChange: true,
345
+ headerToolbar: [],
346
+ footerToolbar: [
347
+ {
348
+ type: 'pagination',
349
+ align: 'left'
350
+ },
351
+ {
352
+ type: 'bulkActions',
353
+ align: 'right',
354
+ className: 'ml-2'
355
+ }
356
+ ],
357
+ multiple: multiple,
358
+ filter: filter,
359
+ columns: columns || []
360
+ }
335
361
  }
336
- },
362
+ ],
337
363
  actions: [
338
364
  {
339
365
  type: 'button',
@@ -349,13 +375,13 @@ var FormItemWrap = /** @class */ (function (_super) {
349
375
  ]
350
376
  };
351
377
  if (mode === 'popOver') {
352
- return (React.createElement(Overlay, { container: popOverContainer || this.target, target: function () { return _this.target; }, placement: position || 'left-bottom-left-top', show: true },
353
- React.createElement(PopOver, { classPrefix: ns, className: cx("".concat(ns, "Autofill-popOver"), popOverClassName), style: {
354
- minWidth: this.target ? this.target.offsetWidth : undefined
355
- }, offset: offset, onHide: this.handleClose, overlay: true }, render('popOver-auto-fill-form', form, {
356
- onAction: this.handleAction,
357
- onSubmit: this.handleSubmit
358
- }))));
378
+ return {
379
+ popOverContainer: popOverContainer,
380
+ popOverClassName: popOverClassName,
381
+ placement: placement !== null && placement !== void 0 ? placement : position,
382
+ offset: offset,
383
+ body: form
384
+ };
359
385
  }
360
386
  else {
361
387
  return {
@@ -381,23 +407,28 @@ var FormItemWrap = /** @class */ (function (_super) {
381
407
  }
382
408
  };
383
409
  // 参照录入popOver提交
384
- FormItemWrap.prototype.handleSubmit = function (values) {
410
+ FormItemWrap.prototype.handlePopOverConfirm = function (values) {
385
411
  var _a = this.props; _a.onBulkChange; var autoFill = _a.autoFill;
386
412
  if (!autoFill || (autoFill && !(autoFill === null || autoFill === void 0 ? void 0 : autoFill.hasOwnProperty('api')))) {
387
413
  return;
388
414
  }
389
415
  this.updateAutoFillData(values.selectedItems);
390
- this.handleClose();
416
+ this.closePopOver();
391
417
  };
392
- FormItemWrap.prototype.handleAction = function (e, action, data) {
418
+ FormItemWrap.prototype.handlePopOverAction = function (e, action, data, throwErrors, delegate) {
419
+ if (throwErrors === void 0) { throwErrors = false; }
420
+ var onAction = this.props.onAction;
393
421
  if (action.actionType === 'cancel') {
394
- this.handleClose();
422
+ this.closePopOver();
423
+ }
424
+ else if (onAction) {
425
+ // 不识别的丢给上层去处理。
426
+ return onAction(e, action, data, throwErrors, delegate);
395
427
  }
396
428
  };
397
- FormItemWrap.prototype.handleClose = function () {
398
- this.setState({
399
- isOpened: false
400
- });
429
+ FormItemWrap.prototype.closePopOver = function () {
430
+ var _a;
431
+ (_a = this.props.formItem) === null || _a === void 0 ? void 0 : _a.closePopOver();
401
432
  };
402
433
  FormItemWrap.prototype.handleOpenDialog = function (schema, data) {
403
434
  return __awaiter(this, void 0, void 0, function () {
@@ -452,7 +483,9 @@ var FormItemWrap = /** @class */ (function (_super) {
452
483
  return null;
453
484
  };
454
485
  FormItemWrap.prototype.render = function () {
455
- var _a = this.props, formMode = _a.formMode, inputOnly = _a.inputOnly, wrap = _a.wrap, render = _a.render, model = _a.formItem, css = _a.css, themeCss = _a.themeCss, id = _a.id, wrapperCustomStyle = _a.wrapperCustomStyle, env = _a.env;
486
+ var _this = this;
487
+ var _a, _b, _c, _d;
488
+ var _e = this.props, formMode = _e.formMode, inputOnly = _e.inputOnly, wrap = _e.wrap, render = _e.render, model = _e.formItem, css = _e.css, themeCss = _e.themeCss, id = _e.id, wrapperCustomStyle = _e.wrapperCustomStyle, env = _e.env, cx = _e.classnames, popOverContainer = _e.popOverContainer; _e.data;
456
489
  var mode = this.props.mode || formMode;
457
490
  if (wrap === false || inputOnly) {
458
491
  return this.renderControl();
@@ -470,11 +503,25 @@ var FormItemWrap = /** @class */ (function (_super) {
470
503
  formStore: undefined
471
504
  })
472
505
  : null,
506
+ model ? (React.createElement(Overlay, { container: popOverContainer || this.target, target: function () { return _this.target; }, placement: ((_a = model.popOverSchema) === null || _a === void 0 ? void 0 : _a.placement) || 'left-bottom-left-top', show: model.popOverOpen },
507
+ React.createElement(PopOver, { className: cx("Autofill-popOver", (_b = model.popOverSchema) === null || _b === void 0 ? void 0 : _b.popOverClassName), style: {
508
+ minWidth: this.target ? this.target.offsetWidth : undefined
509
+ }, offset: (_c = model.popOverSchema) === null || _c === void 0 ? void 0 : _c.offset, onHide: this.closePopOver }, render('popOver-auto-fill-form', (_d = model.popOverSchema) === null || _d === void 0 ? void 0 : _d.body, {
510
+ // data: model.popOverData,
511
+ onAction: this.handlePopOverAction,
512
+ onSubmit: this.handlePopOverConfirm
513
+ })))) : null,
473
514
  React.createElement(CustomStyle, __assign({}, this.props, { config: {
474
515
  themeCss: themeCss || css,
475
516
  classNames: [
476
517
  {
477
- key: 'labelClassName'
518
+ key: 'labelClassName',
519
+ weights: {
520
+ default: {
521
+ suf: ".".concat(cx('Form-label')),
522
+ parent: ".".concat(cx('Form-item'))
523
+ }
524
+ }
478
525
  },
479
526
  {
480
527
  key: 'descriptionClassName'
@@ -499,7 +546,8 @@ var FormItemWrap = /** @class */ (function (_super) {
499
546
  var horizontal = props.horizontal || props.formHorizontal || {};
500
547
  var left = getWidthRate(horizontal.left);
501
548
  var right = getWidthRate(horizontal.right);
502
- var labelAlign = props.labelAlign || props.formLabelAlign;
549
+ var labelAlign = (props.labelAlign !== 'inherit' && props.labelAlign) ||
550
+ props.formLabelAlign;
503
551
  var labelWidth = props.labelWidth || props.formLabelWidth;
504
552
  return (React.createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--horizontal", isStatic && staticClassName ? staticClassName : className, (_a = {
505
553
  'Form-item--horizontal-justify': horizontal.justify
@@ -837,19 +885,19 @@ var FormItemWrap = /** @class */ (function (_super) {
837
885
  __metadata("design:type", Function),
838
886
  __metadata("design:paramtypes", [Object]),
839
887
  __metadata("design:returntype", void 0)
840
- ], FormItemWrap.prototype, "handleSubmit", null);
888
+ ], FormItemWrap.prototype, "handlePopOverConfirm", null);
841
889
  __decorate([
842
890
  autobind,
843
891
  __metadata("design:type", Function),
844
- __metadata("design:paramtypes", [Object, Object, Object]),
892
+ __metadata("design:paramtypes", [Object, Object, Object, Boolean, Object]),
845
893
  __metadata("design:returntype", void 0)
846
- ], FormItemWrap.prototype, "handleAction", null);
894
+ ], FormItemWrap.prototype, "handlePopOverAction", null);
847
895
  __decorate([
848
896
  autobind,
849
897
  __metadata("design:type", Function),
850
898
  __metadata("design:paramtypes", []),
851
899
  __metadata("design:returntype", void 0)
852
- ], FormItemWrap.prototype, "handleClose", null);
900
+ ], FormItemWrap.prototype, "closePopOver", null);
853
901
  __decorate([
854
902
  autobind,
855
903
  __metadata("design:type", Function),
@@ -977,6 +1025,7 @@ function asFormItem(config) {
977
1025
  function class_1(props) {
978
1026
  var _this = _super.call(this, props) || this;
979
1027
  _this.refFn = _this.refFn.bind(_this);
1028
+ _this.getData = _this.getData.bind(_this);
980
1029
  var validations = props.validations, model = props.formItem;
981
1030
  // 组件注册的时候可能默认指定验证器类型
982
1031
  if (model && !validations && config.validations) {
@@ -1005,28 +1054,33 @@ function asFormItem(config) {
1005
1054
  class_1.prototype.refFn = function (ref) {
1006
1055
  this.ref = ref;
1007
1056
  };
1057
+ class_1.prototype.getData = function () {
1058
+ return this.props.data;
1059
+ };
1008
1060
  class_1.prototype.renderControl = function () {
1009
1061
  var _a;
1010
1062
  var _b = this.props;
1011
1063
  // 这里解构,不可轻易删除,避免被rest传到子组件
1012
1064
  _b.inputClassName; var model = _b.formItem, cx = _b.classnames; _b.children; var type = _b.type, size = _b.size, defaultSize = _b.defaultSize, mobileUI = _b.mobileUI, rest = __rest(_b, ["inputClassName", "formItem", "classnames", "children", "type", "size", "defaultSize", "mobileUI"]);
1013
- var controlSize = size && ['xs', 'sm', 'md', 'lg', 'full'].includes(size)
1014
- ? size
1015
- : defaultSize;
1016
- //@ts-ignore
1017
- var isOpened = this.state.isOpened;
1065
+ var isRuleSize = size && ['xs', 'sm', 'md', 'lg', 'full'].includes(size);
1066
+ var controlSize = isRuleSize ? size : defaultSize;
1018
1067
  return (React.createElement(React.Fragment, null,
1019
- React.createElement(Control, __assign({}, rest, { mobileUI: mobileUI, onOpenDialog: this.handleOpenDialog, size: config.sizeMutable !== false ? undefined : size, onFocus: this.handleFocus, onBlur: this.handleBlur, type: type, classnames: cx, ref: supportRef ? this.refFn : undefined, forwardedRef: supportRef ? undefined : this.refFn, formItem: model, className: cx("Form-control", (_a = {
1068
+ React.createElement(Control, __assign({}, rest, {
1069
+ // 因为 formItem 内部可能不会更新到最新的 data,所以暴露个方法可以获取到最新的
1070
+ // 获取不到最新的因为做了限制,只有表单项目 name 关联的数值变化才更新
1071
+ getData: this.getData, mobileUI: mobileUI, onOpenDialog: this.handleOpenDialog, size: config.sizeMutable !== false ? undefined : size, onFocus: this.handleFocus, onBlur: this.handleBlur, type: type, classnames: cx, ref: supportRef ? this.refFn : undefined, forwardedRef: supportRef ? undefined : this.refFn, formItem: model, style: {
1072
+ width: !isRuleSize && size ? size : undefined
1073
+ }, className: cx("Form-control", (_a = {
1020
1074
  'is-inline': !!rest.inline && !mobileUI,
1021
1075
  'is-error': model && !model.valid,
1022
- 'is-full': size === 'full'
1076
+ 'is-full': size === 'full',
1077
+ 'is-thin': config.thin
1023
1078
  },
1024
1079
  _a["Form-control--withSize Form-control--size".concat(ucFirst(controlSize))] = config.sizeMutable !== false &&
1025
1080
  typeof controlSize === 'string' &&
1026
1081
  !!controlSize &&
1027
1082
  controlSize !== 'full',
1028
- _a), model === null || model === void 0 ? void 0 : model.errClassNames, getItemInputClassName(this.props)) })),
1029
- isOpened ? this.buildAutoFillSchema() : null));
1083
+ _a), model === null || model === void 0 ? void 0 : model.errClassNames, getItemInputClassName(this.props)) }))));
1030
1084
  };
1031
1085
  return class_1;
1032
1086
  }(FormItemWrap)),
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.8.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -15,6 +15,7 @@ import 'moment';
15
15
  import { createObject, setVariable } from '../utils/object.js';
16
16
  import { isPureVariable } from '../utils/isPureVariable.js';
17
17
  import '@rc-component/mini-decimal';
18
+ import '../utils/memoryParse.js';
18
19
  import { resolveVariableAndFilter } from '../utils/resolveVariableAndFilter.js';
19
20
  import 'lodash/isPlainObject';
20
21
  import '../utils/filter.js';
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.8.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.8.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.8.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.8.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -25,6 +25,7 @@ import 'lodash/chunk';
25
25
  import { getVariable } from '../utils/getVariable.js';
26
26
  import 'lodash/isPlainObject';
27
27
  import 'amis-formula';
28
+ import '../utils/memoryParse.js';
28
29
  import { tokenize } from '../utils/tokenize.js';
29
30
  import '../utils/DataSchema.js';
30
31
  import '../utils/DataScope.js';
@@ -14,6 +14,7 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
14
14
  initedAt: import("mobx-state-tree").IType<number | undefined, number, number>;
15
15
  updatedAt: import("mobx-state-tree").IType<number | undefined, number, number>;
16
16
  pristine: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
17
+ pristineRaw: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
17
18
  upStreamData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
18
19
  action: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
19
20
  dialogOpen: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
package/esm/store/app.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.8.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -13,6 +13,7 @@ import '../utils/ColorScale.js';
13
13
  import 'react';
14
14
  import 'lodash/chunk';
15
15
  import { createObject } from '../utils/object.js';
16
+ import '../utils/memoryParse.js';
16
17
  import 'amis-formula';
17
18
  import 'lodash/isPlainObject';
18
19
  import '../utils/DataSchema.js';