amis-core 6.4.1 → 6.5.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 (305) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.js +1 -1
  3. package/esm/SchemaRenderer.js +15 -5
  4. package/esm/Scoped.d.ts +1 -1
  5. package/esm/Scoped.js +2 -1
  6. package/esm/StatusScoped.js +1 -1
  7. package/esm/WithRootStore.js +1 -1
  8. package/esm/WithStore.js +9 -3
  9. package/esm/actions/Action.js +6 -5
  10. package/esm/actions/AjaxAction.js +3 -3
  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 +4 -4
  16. package/esm/actions/CustomAction.js +2 -1
  17. package/esm/actions/DialogAction.js +2 -1
  18. package/esm/actions/DrawerAction.js +2 -1
  19. package/esm/actions/EmailAction.js +1 -1
  20. package/esm/actions/EventAction.js +2 -1
  21. package/esm/actions/LinkAction.js +1 -1
  22. package/esm/actions/LoopAction.js +2 -1
  23. package/esm/actions/PageAction.js +1 -1
  24. package/esm/actions/ParallelAction.js +1 -1
  25. package/esm/actions/PrintAction.d.ts +1 -1
  26. package/esm/actions/PrintAction.js +12 -6
  27. package/esm/actions/StatusAction.js +1 -1
  28. package/esm/actions/SwitchAction.js +3 -3
  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.js +2 -1
  36. package/esm/env.d.ts +2 -4
  37. package/esm/env.js +1 -1
  38. package/esm/envOverwrite.js +1 -1
  39. package/esm/factory.js +1 -1
  40. package/esm/index.js +4 -4
  41. package/esm/locale.js +2 -1
  42. package/esm/polyfills.js +1 -1
  43. package/esm/renderers/Form.d.ts +1 -1
  44. package/esm/renderers/Form.js +40 -6
  45. package/esm/renderers/Item.d.ts +27 -60
  46. package/esm/renderers/Item.js +74 -6
  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 +7 -1
  52. package/esm/store/app.js +2 -1
  53. package/esm/store/combo.js +1 -1
  54. package/esm/store/crud.js +2 -1
  55. package/esm/store/form.js +2 -1
  56. package/esm/store/formItem.js +11 -1
  57. package/esm/store/iRenderer.js +2 -1
  58. package/esm/store/index.js +1 -1
  59. package/esm/store/list.js +1 -1
  60. package/esm/store/manager.js +1 -1
  61. package/esm/store/modal.js +1 -1
  62. package/esm/store/node.js +1 -1
  63. package/esm/store/pagination.js +2 -1
  64. package/esm/store/root.js +2 -1
  65. package/esm/store/service.js +2 -1
  66. package/esm/store/status.js +1 -1
  67. package/esm/store/table.js +2 -1
  68. package/esm/store/table2.js +1 -1
  69. package/esm/theme.js +1 -1
  70. package/esm/types.d.ts +1 -0
  71. package/esm/utils/Animation.js +1 -1
  72. package/esm/utils/ColorScale.js +1 -1
  73. package/esm/utils/DataSchema.js +1 -1
  74. package/esm/utils/DataScope.js +1 -1
  75. package/esm/utils/RootClose.js +1 -1
  76. package/esm/utils/SimpleMap.js +1 -1
  77. package/esm/utils/api.js +21 -3
  78. package/esm/utils/arraySlice.js +1 -1
  79. package/esm/utils/attachmentAdpator.js +1 -1
  80. package/esm/utils/autobind.js +1 -1
  81. package/esm/utils/browser.js +1 -1
  82. package/esm/utils/columnsSplit.js +1 -1
  83. package/esm/utils/concatData.js +1 -1
  84. package/esm/utils/dataMapping.js +1 -1
  85. package/esm/utils/date.d.ts +3 -1
  86. package/esm/utils/date.js +11 -5
  87. package/esm/utils/debug.js +1 -1
  88. package/esm/utils/decodeEntity.js +1 -1
  89. package/esm/utils/dom.js +1 -1
  90. package/esm/utils/errors.js +1 -1
  91. package/esm/utils/escapeHtml.js +1 -1
  92. package/esm/utils/filter-schema.js +7 -4
  93. package/esm/utils/filter.js +1 -1
  94. package/esm/utils/formatDuration.js +1 -1
  95. package/esm/utils/formula.js +2 -1
  96. package/esm/utils/getVariable.js +1 -1
  97. package/esm/utils/grammar.js +1 -1
  98. package/esm/utils/handleAction.js +1 -1
  99. package/esm/utils/helper.js +2 -1
  100. package/esm/utils/highlight.js +1 -1
  101. package/esm/utils/icon.js +1 -1
  102. package/esm/utils/image.js +1 -1
  103. package/esm/utils/isPureVariable.js +1 -1
  104. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  105. package/esm/utils/keyToPath.js +1 -1
  106. package/esm/utils/labelToString.js +1 -1
  107. package/esm/utils/makeSorter.js +1 -1
  108. package/esm/utils/math.js +1 -1
  109. package/esm/utils/memoryParse.js +1 -1
  110. package/esm/utils/normalizeLink.js +1 -1
  111. package/esm/utils/normalizeOptions.d.ts +1 -1
  112. package/esm/utils/normalizeOptions.js +3 -2
  113. package/esm/utils/object.js +1 -1
  114. package/esm/utils/offset.js +1 -1
  115. package/esm/utils/offsetParent.js +1 -1
  116. package/esm/utils/optionValueCompare.js +1 -1
  117. package/esm/utils/position.js +1 -1
  118. package/esm/utils/prettyBytes.js +1 -1
  119. package/esm/utils/printElement.js +1 -1
  120. package/esm/utils/renderer-event.js +3 -3
  121. package/esm/utils/replaceText.js +1 -1
  122. package/esm/utils/resize-sensor.js +1 -1
  123. package/esm/utils/resolveCondition.d.ts +2 -1
  124. package/esm/utils/resolveCondition.js +60 -8
  125. package/esm/utils/resolveVariable.js +1 -1
  126. package/esm/utils/resolveVariableAndFilter.js +1 -1
  127. package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
  128. package/esm/utils/scrollPosition.js +1 -1
  129. package/esm/utils/string2regExp.js +1 -1
  130. package/esm/utils/stripNumber.js +2 -2
  131. package/esm/utils/style-helper.js +5 -3
  132. package/esm/utils/style.js +2 -1
  133. package/esm/utils/toNumber.js +1 -1
  134. package/esm/utils/tokenize.js +1 -1
  135. package/esm/utils/tpl-builtin.js +2 -1
  136. package/esm/utils/tpl-lodash.js +2 -1
  137. package/esm/utils/tpl.d.ts +8 -1
  138. package/esm/utils/tpl.js +18 -5
  139. package/esm/utils/uncontrollable.js +1 -1
  140. package/esm/utils/validateId.js +1 -1
  141. package/esm/utils/validations.js +2 -1
  142. package/lib/Root.js +1 -1
  143. package/lib/RootRenderer.js +1 -1
  144. package/lib/SchemaRenderer.js +15 -5
  145. package/lib/Scoped.d.ts +1 -1
  146. package/lib/Scoped.js +2 -1
  147. package/lib/StatusScoped.js +1 -1
  148. package/lib/WithRootStore.js +1 -1
  149. package/lib/WithStore.js +9 -3
  150. package/lib/actions/Action.js +5 -4
  151. package/lib/actions/AjaxAction.js +2 -2
  152. package/lib/actions/BreakAction.js +1 -1
  153. package/lib/actions/BroadcastAction.js +1 -1
  154. package/lib/actions/CmptAction.js +2 -2
  155. package/lib/actions/ContinueAction.js +1 -1
  156. package/lib/actions/CopyAction.js +4 -4
  157. package/lib/actions/CustomAction.js +2 -1
  158. package/lib/actions/DialogAction.js +2 -1
  159. package/lib/actions/DrawerAction.js +2 -1
  160. package/lib/actions/EmailAction.js +1 -1
  161. package/lib/actions/EventAction.js +2 -1
  162. package/lib/actions/LinkAction.js +1 -1
  163. package/lib/actions/LoopAction.js +2 -1
  164. package/lib/actions/PageAction.js +1 -1
  165. package/lib/actions/ParallelAction.js +1 -1
  166. package/lib/actions/PrintAction.d.ts +1 -1
  167. package/lib/actions/PrintAction.js +12 -6
  168. package/lib/actions/StatusAction.js +1 -1
  169. package/lib/actions/SwitchAction.js +2 -2
  170. package/lib/actions/ToastAction.js +1 -1
  171. package/lib/actions/WaitAction.js +1 -1
  172. package/lib/components/CustomStyle.js +1 -1
  173. package/lib/components/ErrorBoundary.js +1 -1
  174. package/lib/components/LazyComponent.js +1 -1
  175. package/lib/components/Overlay.js +2 -1
  176. package/lib/components/PopOver.js +2 -1
  177. package/lib/env.d.ts +2 -4
  178. package/lib/env.js +1 -1
  179. package/lib/envOverwrite.js +1 -1
  180. package/lib/factory.js +1 -1
  181. package/lib/index.js +4 -2
  182. package/lib/locale.js +2 -1
  183. package/lib/polyfills.js +1 -1
  184. package/lib/renderers/Form.d.ts +1 -1
  185. package/lib/renderers/Form.js +40 -6
  186. package/lib/renderers/Item.d.ts +27 -60
  187. package/lib/renderers/Item.js +74 -6
  188. package/lib/renderers/Options.js +2 -1
  189. package/lib/renderers/Placeholder.js +1 -1
  190. package/lib/renderers/builtin.js +1 -1
  191. package/lib/renderers/register.js +1 -1
  192. package/lib/renderers/wrapControl.js +7 -1
  193. package/lib/store/app.js +2 -1
  194. package/lib/store/combo.js +1 -1
  195. package/lib/store/crud.js +2 -1
  196. package/lib/store/form.js +2 -1
  197. package/lib/store/formItem.js +11 -1
  198. package/lib/store/iRenderer.js +2 -1
  199. package/lib/store/index.js +1 -1
  200. package/lib/store/list.js +1 -1
  201. package/lib/store/manager.js +1 -1
  202. package/lib/store/modal.js +1 -1
  203. package/lib/store/node.js +1 -1
  204. package/lib/store/pagination.js +2 -1
  205. package/lib/store/root.js +2 -1
  206. package/lib/store/service.js +2 -1
  207. package/lib/store/status.js +1 -1
  208. package/lib/store/table.js +2 -1
  209. package/lib/store/table2.js +1 -1
  210. package/lib/theme.js +1 -1
  211. package/lib/types.d.ts +1 -0
  212. package/lib/utils/Animation.js +1 -1
  213. package/lib/utils/ColorScale.js +1 -1
  214. package/lib/utils/DataSchema.js +1 -1
  215. package/lib/utils/DataScope.js +1 -1
  216. package/lib/utils/RootClose.js +1 -1
  217. package/lib/utils/SimpleMap.js +1 -1
  218. package/lib/utils/api.js +23 -3
  219. package/lib/utils/arraySlice.js +1 -1
  220. package/lib/utils/attachmentAdpator.js +1 -1
  221. package/lib/utils/autobind.js +1 -1
  222. package/lib/utils/browser.js +1 -1
  223. package/lib/utils/columnsSplit.js +1 -1
  224. package/lib/utils/concatData.js +1 -1
  225. package/lib/utils/dataMapping.js +1 -1
  226. package/lib/utils/date.d.ts +3 -1
  227. package/lib/utils/date.js +11 -5
  228. package/lib/utils/debug.js +1 -1
  229. package/lib/utils/decodeEntity.js +1 -1
  230. package/lib/utils/dom.js +1 -1
  231. package/lib/utils/errors.js +1 -1
  232. package/lib/utils/escapeHtml.js +1 -1
  233. package/lib/utils/filter-schema.js +6 -3
  234. package/lib/utils/filter.js +1 -1
  235. package/lib/utils/formatDuration.js +1 -1
  236. package/lib/utils/formula.js +2 -1
  237. package/lib/utils/getVariable.js +1 -1
  238. package/lib/utils/grammar.js +1 -1
  239. package/lib/utils/handleAction.js +1 -1
  240. package/lib/utils/helper.js +2 -1
  241. package/lib/utils/highlight.js +1 -1
  242. package/lib/utils/icon.js +1 -1
  243. package/lib/utils/image.js +1 -1
  244. package/lib/utils/isPureVariable.js +1 -1
  245. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  246. package/lib/utils/keyToPath.js +1 -1
  247. package/lib/utils/labelToString.js +1 -1
  248. package/lib/utils/makeSorter.js +1 -1
  249. package/lib/utils/math.js +1 -1
  250. package/lib/utils/memoryParse.js +1 -1
  251. package/lib/utils/normalizeLink.js +1 -1
  252. package/lib/utils/normalizeOptions.d.ts +1 -1
  253. package/lib/utils/normalizeOptions.js +3 -2
  254. package/lib/utils/object.js +1 -1
  255. package/lib/utils/offset.js +1 -1
  256. package/lib/utils/offsetParent.js +1 -1
  257. package/lib/utils/optionValueCompare.js +1 -1
  258. package/lib/utils/position.js +1 -1
  259. package/lib/utils/prettyBytes.js +1 -1
  260. package/lib/utils/printElement.js +1 -1
  261. package/lib/utils/renderer-event.js +2 -2
  262. package/lib/utils/replaceText.js +1 -1
  263. package/lib/utils/resize-sensor.js +1 -1
  264. package/lib/utils/resolveCondition.d.ts +2 -1
  265. package/lib/utils/resolveCondition.js +60 -7
  266. package/lib/utils/resolveVariable.js +1 -1
  267. package/lib/utils/resolveVariableAndFilter.js +1 -1
  268. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  269. package/lib/utils/scrollPosition.js +1 -1
  270. package/lib/utils/string2regExp.js +1 -1
  271. package/lib/utils/stripNumber.js +3 -3
  272. package/lib/utils/style-helper.js +5 -3
  273. package/lib/utils/style.js +2 -1
  274. package/lib/utils/toNumber.js +1 -1
  275. package/lib/utils/tokenize.js +1 -1
  276. package/lib/utils/tpl-builtin.js +2 -1
  277. package/lib/utils/tpl-lodash.js +2 -1
  278. package/lib/utils/tpl.d.ts +8 -1
  279. package/lib/utils/tpl.js +17 -3
  280. package/lib/utils/uncontrollable.js +1 -1
  281. package/lib/utils/validateId.js +1 -1
  282. package/lib/utils/validations.js +2 -1
  283. package/package.json +3 -2
  284. package/esm/node_modules/@babel/runtime/helpers/esm/classCallCheck.js +0 -12
  285. package/esm/node_modules/@babel/runtime/helpers/esm/createClass.js +0 -26
  286. package/esm/node_modules/@babel/runtime/helpers/esm/defineProperty.js +0 -23
  287. package/esm/node_modules/@babel/runtime/helpers/esm/toPrimitive.js +0 -19
  288. package/esm/node_modules/@babel/runtime/helpers/esm/toPropertyKey.js +0 -14
  289. package/esm/node_modules/@babel/runtime/helpers/esm/typeof.js +0 -16
  290. package/esm/node_modules/@rc-component/mini-decimal/es/BigIntDecimal.js +0 -184
  291. package/esm/node_modules/@rc-component/mini-decimal/es/MiniDecimal.js +0 -56
  292. package/esm/node_modules/@rc-component/mini-decimal/es/NumberDecimal.js +0 -119
  293. package/esm/node_modules/@rc-component/mini-decimal/es/numberUtil.js +0 -105
  294. package/esm/node_modules/@rc-component/mini-decimal/es/supportUtil.js +0 -10
  295. package/lib/node_modules/@babel/runtime/helpers/esm/classCallCheck.js +0 -16
  296. package/lib/node_modules/@babel/runtime/helpers/esm/createClass.js +0 -30
  297. package/lib/node_modules/@babel/runtime/helpers/esm/defineProperty.js +0 -27
  298. package/lib/node_modules/@babel/runtime/helpers/esm/toPrimitive.js +0 -23
  299. package/lib/node_modules/@babel/runtime/helpers/esm/toPropertyKey.js +0 -18
  300. package/lib/node_modules/@babel/runtime/helpers/esm/typeof.js +0 -20
  301. package/lib/node_modules/@rc-component/mini-decimal/es/BigIntDecimal.js +0 -188
  302. package/lib/node_modules/@rc-component/mini-decimal/es/MiniDecimal.js +0 -61
  303. package/lib/node_modules/@rc-component/mini-decimal/es/NumberDecimal.js +0 -123
  304. package/lib/node_modules/@rc-component/mini-decimal/es/numberUtil.js +0 -114
  305. package/lib/node_modules/@rc-component/mini-decimal/es/supportUtil.js +0 -14
package/lib/types.d.ts CHANGED
@@ -186,6 +186,7 @@ export interface ApiObject extends BaseApiObject {
186
186
  withCredentials?: boolean;
187
187
  cancelExecutor?: (cancel: Function) => void;
188
188
  };
189
+ originUrl?: string;
189
190
  jsonql?: any;
190
191
  graphql?: string;
191
192
  operationName?: string;
package/lib/utils/Animation.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/ColorScale.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/DataSchema.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/DataScope.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/RootClose.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/SimpleMap.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
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.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -15,17 +15,22 @@ require('moment');
15
15
  var object = require('./object.js');
16
16
  var tokenize = require('./tokenize.js');
17
17
  var memoryParse = require('./memoryParse.js');
18
+ require('@rc-component/mini-decimal');
18
19
  var dataMapping = require('./dataMapping.js');
19
20
  require('./filter.js');
20
21
  var tpl = require('./tpl.js');
21
22
  var helper = require('./helper.js');
22
23
  var isPlainObject = require('lodash/isPlainObject');
23
24
  var debug = require('./debug.js');
25
+ var cloneDeep = require('lodash/cloneDeep');
26
+ var isEqual = require('lodash/isEqual');
24
27
 
25
28
  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
26
29
 
27
30
  var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
28
31
  var isPlainObject__default = /*#__PURE__*/_interopDefaultLegacy(isPlainObject);
32
+ var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
33
+ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
29
34
 
30
35
  var rSchema = /(?:^|raw\:)(get|post|put|delete|patch|options|head|jsonp|js):/i;
31
36
  var apiCaches = [];
@@ -100,13 +105,19 @@ function buildApi(api, data, options) {
100
105
  return helper.qsstringify(query, (api === null || api === void 0 ? void 0 : api.filterEmptyQuery)
101
106
  ? {
102
107
  filter: function (key, value) {
103
- return value === '' ? undefined : value;
108
+ return value === ''
109
+ ? undefined
110
+ : // qs源码中有filter后，不会默认使用serializeDate处理date类型
111
+ value instanceof Date
112
+ ? Date.prototype.toISOString.call(value)
113
+ : value;
104
114
  }
105
115
  }
106
116
  : undefined);
107
117
  };
108
118
  /** 追加data到请求的Query中 */
109
119
  var attachDataToQuery = function (apiObject, ctx, merge) {
120
+ apiObject.originUrl = apiObject.originUrl || apiObject.url;
110
121
  var idx = apiObject.url.indexOf('?');
111
122
  if (~idx) {
112
123
  var params = (apiObject.query = tslib.__assign(tslib.__assign(tslib.__assign({}, helper.qsparse(apiObject.url.substring(idx + 1))), apiObject.query), ctx));
@@ -375,7 +386,7 @@ function wrapFetcher(fn, tracker) {
375
386
  var wrappedFetcher = function (api, data, options) {
376
387
  var _a, _b, _c;
377
388
  return tslib.__awaiter(this, void 0, void 0, function () {
378
- var apiCache, timeStamp;
389
+ var originQuery, originQueryCopy, idx, apiCache, timeStamp;
379
390
  return tslib.__generator(this, function (_d) {
380
391
  switch (_d.label) {
381
392
  case 0:
@@ -383,9 +394,18 @@ function wrapFetcher(fn, tracker) {
383
394
  api.context = data;
384
395
  if (!api.requestAdaptor) return [3 /*break*/, 2];
385
396
  debug.debug('api', 'before requestAdaptor', api);
397
+ originQuery = api.query;
398
+ originQueryCopy = isPlainObject__default["default"](api.query)
399
+ ? cloneDeep__default["default"](api.query)
400
+ : api.query;
386
401
  return [4 /*yield*/, api.requestAdaptor(api, data)];
387
402
  case 1:
388
403
  api = (_d.sent()) || api;
404
+ if (api.query !== originQuery ||
405
+ (isPlainObject__default["default"](api.query) && !isEqual__default["default"](api.query, originQueryCopy))) {
406
+ idx = api.url.indexOf('?');
407
+ api.url = "".concat(~idx ? api.url.substring(0, idx) : api.url, "?").concat(helper.qsstringify(api.query));
408
+ }
389
409
  debug.debug('api', 'after requestAdaptor', api);
390
410
  _d.label = 2;
391
411
  case 2:
package/lib/utils/arraySlice.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/attachmentAdpator.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/autobind.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/browser.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/columnsSplit.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/concatData.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/dataMapping.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/date.d.ts CHANGED
@@ -8,4 +8,6 @@ export declare function parseDuration(str: string): moment.Duration | undefined;
8
8
  * @param format
9
9
  * @returns
10
10
  */
11
- export declare function normalizeDate(value: any, format?: string): moment.Moment | undefined;
11
+ export declare function normalizeDate(value: any, format?: string, options?: {
12
+ utc?: boolean;
13
+ }): moment.Moment | undefined;
package/lib/utils/date.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -70,8 +70,12 @@ var filterDate = function (value, data, format, utc) {
70
70
  return mm([date_2.getFullYear(), date_2.getMonth(), date_2.getDate()]);
71
71
  }
72
72
  else {
73
- var result = mm(value);
74
- return result.isValid() ? result : mm(value, format);
73
+ var result = utc ? mm(value).local() : mm(value);
74
+ return result.isValid()
75
+ ? result
76
+ : utc
77
+ ? mm(value, format).local()
78
+ : mm(value, format);
75
79
  }
76
80
  };
77
81
  function parseDuration(str) {
@@ -90,11 +94,13 @@ function parseDuration(str) {
90
94
  * @param format
91
95
  * @returns
92
96
  */
93
- function normalizeDate(value, format) {
97
+ function normalizeDate(value, format, options) {
94
98
  if (!value || value === '0') {
95
99
  return undefined;
96
100
  }
97
- var v = moment__default["default"](value, format, true);
101
+ var v = (options === null || options === void 0 ? void 0 : options.utc)
102
+ ? moment__default["default"].utc(value, format).local()
103
+ : moment__default["default"](value, format, true);
98
104
  if (v.isValid()) {
99
105
  return v;
100
106
  }
package/lib/utils/debug.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/decodeEntity.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
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.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/errors.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/escapeHtml.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/filter-schema.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -58,7 +58,8 @@ function getExprProperties(schema, data, ignoreList, props) {
58
58
  var type = parts === null || parts === void 0 ? void 0 : parts[2];
59
59
  var value = schema[key];
60
60
  if (value &&
61
- typeof value === 'string' &&
61
+ (typeof value === 'string' ||
62
+ Object.prototype.toString.call(value) === '[object Object]') &&
62
63
  (parts === null || parts === void 0 ? void 0 : parts[1]) &&
63
64
  (type === 'On' || type === 'Expr')) {
64
65
  key = parts[1];
@@ -72,7 +73,9 @@ function getExprProperties(schema, data, ignoreList, props) {
72
73
  });
73
74
  }
74
75
  if (type === 'On') {
75
- value = (props === null || props === void 0 ? void 0 : props[key]) || tpl.evalExpression(value, ctx || data);
76
+ value =
77
+ (props === null || props === void 0 ? void 0 : props[key]) ||
78
+ tpl.evalExpressionWithConditionBuilder(value, ctx || data);
76
79
  }
77
80
  else {
78
81
  value = tpl.filter(value, ctx || data);
package/lib/utils/filter.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/formatDuration.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/formula.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -16,6 +16,7 @@ require('tslib');
16
16
  require('moment');
17
17
  require('lodash/isPlainObject');
18
18
  var getVariable = require('./getVariable.js');
19
+ require('@rc-component/mini-decimal');
19
20
  var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
20
21
  require('./filter.js');
21
22
  var grammar = require('./grammar.js');
package/lib/utils/getVariable.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/grammar.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/handleAction.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/helper.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -25,6 +25,7 @@ require('moment');
25
25
  var object = require('./object.js');
26
26
  var tokenize = require('./tokenize.js');
27
27
  var isPureVariable = require('./isPureVariable.js');
28
+ require('@rc-component/mini-decimal');
28
29
  var resolveVariable = require('./resolveVariable.js');
29
30
  var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
30
31
  require('./filter.js');
package/lib/utils/highlight.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/icon.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/image.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/isPureVariable.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/json-schema-2-amis-schema.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/keyToPath.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/labelToString.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/makeSorter.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/math.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/memoryParse.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/normalizeLink.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/normalizeOptions.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { Options } from '../types';
2
2
  export declare function normalizeOptions(options: string | {
3
3
  [propName: string]: string;
4
- } | Array<string> | Options, share?: {
4
+ } | Array<string | number> | Options, share?: {
5
5
  values: Array<any>;
6
6
  options: Array<any>;
7
7
  }, valueField?: string): Options;
package/lib/utils/normalizeOptions.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -40,7 +40,8 @@ function normalizeOptions(options, share, valueField) {
40
40
  });
41
41
  }
42
42
  else if (Array.isArray(options) &&
43
- typeof options[0] === 'string') {
43
+ (typeof options[0] === 'string' ||
44
+ typeof options[0] === 'number')) {
44
45
  return options.map(function (item) {
45
46
  var _a;
46
47
  var idx = share.values.indexOf(item);
package/lib/utils/object.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/offset.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/offsetParent.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/optionValueCompare.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/position.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/prettyBytes.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/printElement.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/renderer-event.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -341,7 +341,7 @@ function getMatchedEventTargets(tree, ctx, index, condition, oldCondition) {
341
341
  var result;
342
342
  return tslib.__generator(this, function (_a) {
343
343
  switch (_a.label) {
344
- case 0: return [4 /*yield*/, tpl.evalExpressionWithConditionBuilder(condition, object.createObject(ctx, data))];
344
+ case 0: return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(condition, object.createObject(ctx, data))];
345
345
  case 1:
346
346
  result = _a.sent();
347
347
  result && targets.push(item);
package/lib/utils/replaceText.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/resize-sensor.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.4.1
2
+ * amis-core v6.5.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/utils/resolveCondition.d.ts CHANGED
@@ -1,4 +1,5 @@
1
- export declare function resolveCondition(conditions: any, data: any, defaultResult?: boolean): Promise<boolean>;
1
+ export declare function resolveConditionAsync(conditions: any, data: any, defaultResult?: boolean): Promise<boolean>;
2
+ export declare function resolveCondition(conditions: any, data: any, defaultResult?: boolean): boolean | Promise<boolean>;
2
3
  export declare function registerConditionComputer(op: string, func: (left: any, right: any, fieldType?: string) => boolean, fieldType?: string): void;
3
4
  export declare function getConditionComputers(): {
4
5
  [op: string]: (left: any, right: any, fieldType?: string | undefined) => boolean;