amis-core 6.13.0 → 6.14.0-beta.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 (300) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.d.ts +1 -1
  3. package/esm/RootRenderer.js +1 -1
  4. package/esm/SchemaRenderer.js +3 -2
  5. package/esm/Scoped.js +2 -1
  6. package/esm/StatusScoped.js +1 -1
  7. package/esm/StyleManager.js +1 -1
  8. package/esm/WithRootStore.js +1 -1
  9. package/esm/WithStore.js +1 -1
  10. package/esm/actions/Action.js +2 -1
  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 +1 -1
  15. package/esm/actions/ContinueAction.js +1 -1
  16. package/esm/actions/CopyAction.js +1 -1
  17. package/esm/actions/CustomAction.js +2 -1
  18. package/esm/actions/DialogAction.js +2 -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 +1 -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/Animations.js +2 -1
  32. package/esm/components/CustomStyle.js +1 -1
  33. package/esm/components/ErrorBoundary.js +1 -1
  34. package/esm/components/LazyComponent.js +1 -1
  35. package/esm/components/Overlay.js +2 -1
  36. package/esm/components/PopOver.js +1 -1
  37. package/esm/env.js +1 -1
  38. package/esm/envOverwrite.js +1 -1
  39. package/esm/factory.js +1 -1
  40. package/esm/globalVar.js +1 -1
  41. package/esm/globalVarClientHandler.js +1 -1
  42. package/esm/globalVarDefaultValueHandler.js +1 -1
  43. package/esm/index.js +8 -7
  44. package/esm/locale.js +1 -1
  45. package/esm/polyfills.js +1 -1
  46. package/esm/renderers/Form.d.ts +5 -0
  47. package/esm/renderers/Form.js +1 -1
  48. package/esm/renderers/Item.d.ts +40 -58
  49. package/esm/renderers/Item.js +19 -11
  50. package/esm/renderers/Options.js +1 -1
  51. package/esm/renderers/Placeholder.js +1 -1
  52. package/esm/renderers/builtin.js +1 -1
  53. package/esm/renderers/register.js +1 -1
  54. package/esm/renderers/wrapControl.js +1 -1
  55. package/esm/store/app.js +2 -1
  56. package/esm/store/combo.d.ts +24 -24
  57. package/esm/store/combo.js +1 -1
  58. package/esm/store/crud.js +1 -1
  59. package/esm/store/form.d.ts +10 -10
  60. package/esm/store/form.js +1 -1
  61. package/esm/store/formItem.js +1 -1
  62. package/esm/store/iRenderer.js +4 -3
  63. package/esm/store/index.js +1 -1
  64. package/esm/store/list.js +1 -1
  65. package/esm/store/manager.js +1 -1
  66. package/esm/store/modal.js +1 -1
  67. package/esm/store/node.js +1 -1
  68. package/esm/store/pagination.js +1 -1
  69. package/esm/store/root.d.ts +1 -1
  70. package/esm/store/root.js +39 -42
  71. package/esm/store/service.js +2 -1
  72. package/esm/store/status.js +1 -1
  73. package/esm/store/table.d.ts +199 -22
  74. package/esm/store/table.js +8 -1
  75. package/esm/store/table2.js +1 -1
  76. package/esm/theme.js +1 -1
  77. package/esm/utils/Animation.js +1 -1
  78. package/esm/utils/ColorScale.js +1 -1
  79. package/esm/utils/DataSchema.js +1 -1
  80. package/esm/utils/DataScope.js +1 -1
  81. package/esm/utils/RootClose.js +1 -1
  82. package/esm/utils/SimpleMap.js +1 -1
  83. package/esm/utils/animations.js +1 -1
  84. package/esm/utils/api.js +1 -1
  85. package/esm/utils/arraySlice.js +1 -1
  86. package/esm/utils/attachmentAdpator.js +1 -1
  87. package/esm/utils/autobind.js +1 -1
  88. package/esm/utils/browser.js +1 -1
  89. package/esm/utils/columnsSplit.js +1 -1
  90. package/esm/utils/concatData.js +1 -1
  91. package/esm/utils/dataMapping.js +1 -1
  92. package/esm/utils/date.js +5 -3
  93. package/esm/utils/debug.js +1 -1
  94. package/esm/utils/decodeEntity.js +1 -1
  95. package/esm/utils/dom.js +1 -1
  96. package/esm/utils/errors.js +1 -1
  97. package/esm/utils/escapeHtml.js +1 -1
  98. package/esm/utils/filter-schema.d.ts +1 -1
  99. package/esm/utils/filter-schema.js +6 -1
  100. package/esm/utils/filter.js +1 -1
  101. package/esm/utils/formatDuration.js +1 -1
  102. package/esm/utils/formula.js +1 -1
  103. package/esm/utils/getPageId.js +1 -1
  104. package/esm/utils/getVariable.js +1 -1
  105. package/esm/utils/grammar.js +1 -1
  106. package/esm/utils/handleAction.js +1 -1
  107. package/esm/utils/helper.js +4 -4
  108. package/esm/utils/highlight.js +1 -1
  109. package/esm/utils/icon.js +1 -1
  110. package/esm/utils/image.js +1 -1
  111. package/esm/utils/index.d.ts +1 -0
  112. package/esm/utils/index.js +3 -2
  113. package/esm/utils/isPureVariable.js +1 -1
  114. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  115. package/esm/utils/keyToPath.js +1 -1
  116. package/esm/utils/labelToString.js +1 -1
  117. package/esm/utils/loopTooMuch.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.js +1 -1
  131. package/esm/utils/replaceText.js +1 -1
  132. package/esm/utils/resize-sensor.js +1 -1
  133. package/esm/utils/resolveCondition.js +1 -1
  134. package/esm/utils/resolveVariable.js +1 -1
  135. package/esm/utils/resolveVariableAndFilter.js +1 -1
  136. package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
  137. package/esm/utils/scrollPosition.js +1 -1
  138. package/esm/utils/string2regExp.js +1 -1
  139. package/esm/utils/stripNumber.js +1 -1
  140. package/esm/utils/style-helper.js +1 -1
  141. package/esm/utils/style.js +1 -1
  142. package/esm/utils/toNumber.js +1 -1
  143. package/esm/utils/tokenize.js +1 -1
  144. package/esm/utils/tpl-builtin.js +1 -1
  145. package/esm/utils/tpl-lodash.js +1 -1
  146. package/esm/utils/tpl.js +1 -1
  147. package/esm/utils/uncontrollable.js +1 -1
  148. package/esm/utils/validateId.js +1 -1
  149. package/esm/utils/validations.js +1 -1
  150. package/esm/utils/visitedCache.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.js +2 -1
  155. package/lib/StatusScoped.js +1 -1
  156. package/lib/StyleManager.js +1 -1
  157. package/lib/WithRootStore.js +1 -1
  158. package/lib/WithStore.js +1 -1
  159. package/lib/actions/Action.js +2 -1
  160. package/lib/actions/AjaxAction.js +1 -1
  161. package/lib/actions/BreakAction.js +1 -1
  162. package/lib/actions/BroadcastAction.js +1 -1
  163. package/lib/actions/CmptAction.js +1 -1
  164. package/lib/actions/ContinueAction.js +1 -1
  165. package/lib/actions/CopyAction.js +1 -1
  166. package/lib/actions/CustomAction.js +2 -1
  167. package/lib/actions/DialogAction.js +2 -1
  168. package/lib/actions/DrawerAction.js +2 -1
  169. package/lib/actions/EmailAction.js +1 -1
  170. package/lib/actions/EventAction.js +2 -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.js +1 -1
  176. package/lib/actions/StatusAction.js +1 -1
  177. package/lib/actions/SwitchAction.js +1 -1
  178. package/lib/actions/ToastAction.js +1 -1
  179. package/lib/actions/WaitAction.js +1 -1
  180. package/lib/components/Animations.js +2 -1
  181. package/lib/components/CustomStyle.js +1 -1
  182. package/lib/components/ErrorBoundary.js +1 -1
  183. package/lib/components/LazyComponent.js +1 -1
  184. package/lib/components/Overlay.js +2 -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.js +1 -1
  189. package/lib/globalVar.js +1 -1
  190. package/lib/globalVarClientHandler.js +1 -1
  191. package/lib/globalVarDefaultValueHandler.js +1 -1
  192. package/lib/index.js +8 -6
  193. package/lib/locale.js +1 -1
  194. package/lib/polyfills.js +1 -1
  195. package/lib/renderers/Form.d.ts +5 -0
  196. package/lib/renderers/Form.js +1 -1
  197. package/lib/renderers/Item.d.ts +40 -58
  198. package/lib/renderers/Item.js +18 -10
  199. package/lib/renderers/Options.js +1 -1
  200. package/lib/renderers/Placeholder.js +1 -1
  201. package/lib/renderers/builtin.js +1 -1
  202. package/lib/renderers/register.js +1 -1
  203. package/lib/renderers/wrapControl.js +1 -1
  204. package/lib/store/app.js +2 -1
  205. package/lib/store/combo.d.ts +25 -24
  206. package/lib/store/combo.js +1 -1
  207. package/lib/store/crud.js +1 -1
  208. package/lib/store/form.d.ts +11 -10
  209. package/lib/store/form.js +1 -1
  210. package/lib/store/formItem.js +1 -1
  211. package/lib/store/iRenderer.js +4 -3
  212. package/lib/store/index.js +1 -1
  213. package/lib/store/list.js +1 -1
  214. package/lib/store/manager.js +1 -1
  215. package/lib/store/modal.js +1 -1
  216. package/lib/store/node.js +1 -1
  217. package/lib/store/pagination.js +1 -1
  218. package/lib/store/root.d.ts +2 -1
  219. package/lib/store/root.js +39 -42
  220. package/lib/store/service.js +2 -1
  221. package/lib/store/status.js +1 -1
  222. package/lib/store/table.d.ts +200 -22
  223. package/lib/store/table.js +8 -1
  224. package/lib/store/table2.js +1 -1
  225. package/lib/theme.js +1 -1
  226. package/lib/utils/Animation.js +1 -1
  227. package/lib/utils/ColorScale.js +1 -1
  228. package/lib/utils/DataSchema.js +1 -1
  229. package/lib/utils/DataScope.js +1 -1
  230. package/lib/utils/RootClose.js +1 -1
  231. package/lib/utils/SimpleMap.js +1 -1
  232. package/lib/utils/animations.js +1 -1
  233. package/lib/utils/api.js +1 -1
  234. package/lib/utils/arraySlice.js +1 -1
  235. package/lib/utils/attachmentAdpator.js +1 -1
  236. package/lib/utils/autobind.js +1 -1
  237. package/lib/utils/browser.js +1 -1
  238. package/lib/utils/columnsSplit.js +1 -1
  239. package/lib/utils/concatData.js +1 -1
  240. package/lib/utils/dataMapping.js +1 -1
  241. package/lib/utils/date.js +5 -3
  242. package/lib/utils/debug.js +1 -1
  243. package/lib/utils/decodeEntity.js +1 -1
  244. package/lib/utils/dom.js +1 -1
  245. package/lib/utils/errors.js +1 -1
  246. package/lib/utils/escapeHtml.js +1 -1
  247. package/lib/utils/filter-schema.d.ts +1 -1
  248. package/lib/utils/filter-schema.js +6 -1
  249. package/lib/utils/filter.js +1 -1
  250. package/lib/utils/formatDuration.js +1 -1
  251. package/lib/utils/formula.js +1 -1
  252. package/lib/utils/getPageId.js +1 -1
  253. package/lib/utils/getVariable.js +1 -1
  254. package/lib/utils/grammar.js +1 -1
  255. package/lib/utils/handleAction.js +1 -1
  256. package/lib/utils/helper.js +4 -4
  257. package/lib/utils/highlight.js +1 -1
  258. package/lib/utils/icon.js +1 -1
  259. package/lib/utils/image.js +1 -1
  260. package/lib/utils/index.d.ts +1 -0
  261. package/lib/utils/index.js +4 -2
  262. package/lib/utils/isPureVariable.js +1 -1
  263. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  264. package/lib/utils/keyToPath.js +1 -1
  265. package/lib/utils/labelToString.js +1 -1
  266. package/lib/utils/loopTooMuch.js +1 -1
  267. package/lib/utils/makeSorter.js +1 -1
  268. package/lib/utils/math.js +1 -1
  269. package/lib/utils/memoryParse.js +1 -1
  270. package/lib/utils/normalizeLink.js +1 -1
  271. package/lib/utils/normalizeOptions.js +1 -1
  272. package/lib/utils/object.js +1 -1
  273. package/lib/utils/offset.js +1 -1
  274. package/lib/utils/offsetParent.js +1 -1
  275. package/lib/utils/optionValueCompare.js +1 -1
  276. package/lib/utils/position.js +1 -1
  277. package/lib/utils/prettyBytes.js +1 -1
  278. package/lib/utils/printElement.js +1 -1
  279. package/lib/utils/renderer-event.js +1 -1
  280. package/lib/utils/replaceText.js +1 -1
  281. package/lib/utils/resize-sensor.js +1 -1
  282. package/lib/utils/resolveCondition.js +1 -1
  283. package/lib/utils/resolveVariable.js +1 -1
  284. package/lib/utils/resolveVariableAndFilter.js +1 -1
  285. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  286. package/lib/utils/scrollPosition.js +1 -1
  287. package/lib/utils/string2regExp.js +1 -1
  288. package/lib/utils/stripNumber.js +1 -1
  289. package/lib/utils/style-helper.js +1 -1
  290. package/lib/utils/style.js +1 -1
  291. package/lib/utils/toNumber.js +1 -1
  292. package/lib/utils/tokenize.js +1 -1
  293. package/lib/utils/tpl-builtin.js +1 -1
  294. package/lib/utils/tpl-lodash.js +1 -1
  295. package/lib/utils/tpl.js +1 -1
  296. package/lib/utils/uncontrollable.js +1 -1
  297. package/lib/utils/validateId.js +1 -1
  298. package/lib/utils/validations.js +1 -1
  299. package/lib/utils/visitedCache.js +1 -1
  300. package/package.json +2 -2
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -151,6 +151,7 @@ var Row = types
151
151
  checkdisable: false,
152
152
  isHover: false,
153
153
  children: types.optional(types.array(types.late(function () { return Row; })), []),
154
+ height: 0,
154
155
  defer: false,
155
156
  loaded: false,
156
157
  loading: false,
@@ -323,6 +324,9 @@ var Row = types
323
324
  setIsHover: function (value) {
324
325
  self.isHover = value;
325
326
  },
327
+ setHeight: function (value) {
328
+ self.height = value;
329
+ },
326
330
  replaceWith: function (data) {
327
331
  Object.keys(data).forEach(function (key) {
328
332
  if (key !== 'id') {
@@ -839,6 +843,9 @@ var TableStore = iRendererStore
839
843
  });
840
844
  }
841
845
  return context;
846
+ },
847
+ getItemById: function (id) {
848
+ return findTree(self.rows, function (item) { return item.id === id; });
842
849
  }
843
850
  };
844
851
  })
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/esm/theme.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/esm/utils/api.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/esm/utils/date.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -91,7 +91,7 @@ function normalizeDate(value, format, options) {
91
91
  return undefined;
92
92
  }
93
93
  var v = (options === null || options === void 0 ? void 0 : options.utc)
94
- ? moment.utc(value, format).local()
94
+ ? moment.utc(value, format, true).local()
95
95
  : moment(value, format, true);
96
96
  if (v.isValid()) {
97
97
  return v;
@@ -106,7 +106,9 @@ function normalizeDate(value, format, options) {
106
106
  }
107
107
  while (formats.length) {
108
108
  var format_1 = formats.shift();
109
- var date = moment(value, format_1);
109
+ var date = (options === null || options === void 0 ? void 0 : options.utc)
110
+ ? moment.utc(value, format_1, true)
111
+ : moment(value, format_1, true);
110
112
  if (date.isValid()) {
111
113
  return date;
112
114
  }
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/esm/utils/dom.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  import { PlainObject } from '../types';
2
- import type { ClassValue } from '../theme';
2
+ import { type ClassValue } from '../theme';
3
3
  /**
4
4
  * 计算下发给子组件的className,处理对象类型的className,将其中的表达式计算出来,避免被classnames识别为true
5
5
  *
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -7,6 +7,7 @@ import { evalExpression, evalExpressionWithConditionBuilder, filter } from './tp
7
7
  import { mapObject, injectPropsToObject } from './helper.js';
8
8
  import isPlainObject from 'lodash/isPlainObject';
9
9
  import { tokenize } from './tokenize.js';
10
+ import { classnames } from '../theme.js';
10
11
 
11
12
  /**
12
13
  * 计算下发给子组件的className,处理对象类型的className,将其中的表达式计算出来,避免被classnames识别为true
@@ -73,6 +74,10 @@ function getExprProperties(schema, data, ignoreList, props) {
73
74
  value = filter(value, ctx || data);
74
75
  }
75
76
  }
77
+ // classNameExpr 做合并处理
78
+ if (/className$/i.test(key) && (props === null || props === void 0 ? void 0 : props[key])) {
79
+ value = classnames(value, props[key]);
80
+ }
76
81
  exprProps[key] = value;
77
82
  }
78
83
  else if ((type === 'className' || type === 'ClassName') &&
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1561,8 +1561,8 @@ function parsePrimitiveQueryString(rawQuery, options) {
1561
1561
  * @param {Boolean} options.parsePrimitive 是否将query的值解析为原始类型,目前仅支持转化布尔类型
1562
1562
  */
1563
1563
  function parseQuery(location, options) {
1564
- var _a;
1565
- var _b = options || {}, _c = _b.parsePrimitive, parsePrimitive = _c === void 0 ? false : _c, _d = _b.primitiveTypes, primitiveTypes = _d === void 0 ? ['boolean'] : _d;
1564
+ var _a, _b;
1565
+ var _c = options || {}, _d = _c.parsePrimitive, parsePrimitive = _d === void 0 ? false : _d, _e = _c.primitiveTypes, primitiveTypes = _e === void 0 ? ['boolean'] : _e;
1566
1566
  var query = (location && !(location instanceof Location) && (location === null || location === void 0 ? void 0 : location.query)) ||
1567
1567
  (location && (location === null || location === void 0 ? void 0 : location.search) && qsparse(location.search.substring(1))) ||
1568
1568
  (window.location.search && qsparse(window.location.search.substring(1)));
@@ -1572,7 +1572,7 @@ function parseQuery(location, options) {
1572
1572
  : query
1573
1573
  : {};
1574
1574
  /* 处理hash中的query */
1575
- var hash = (_a = window.location) === null || _a === void 0 ? void 0 : _a.hash;
1575
+ var hash = (_a = location === null || location === void 0 ? void 0 : location.hash) !== null && _a !== void 0 ? _a : (_b = window.location) === null || _b === void 0 ? void 0 : _b.hash;
1576
1576
  var hashQuery = {};
1577
1577
  var idx = -1;
1578
1578
  if (typeof hash === 'string' && ~(idx = hash.indexOf('?'))) {
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/esm/utils/icon.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -60,5 +60,6 @@ export * from './style-helper';
60
60
  export * from './resolveCondition';
61
61
  export * from './arraySlice';
62
62
  export * from './math';
63
+ export * from './memoryParse';
63
64
  import animation from './Animation';
64
65
  export { animation };
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -7,7 +7,7 @@ import 'tslib';
7
7
  export { getFilters, registerFilter, registerFunction } from 'amis-formula';
8
8
  import 'moment';
9
9
  import 'lodash/isPlainObject';
10
- import './memoryParse.js';
10
+ export { memoryParse } from './memoryParse.js';
11
11
  import '@rc-component/mini-decimal';
12
12
  import './filter.js';
13
13
  export { addApiRequestAdaptor, addApiResponseAdaptor, addApiResponseAdator, buildApi, callStrFunction, clearApiCache, getApiCache, isApiOutdated, isApiOutdatedWithData, isEffectiveApi, isSameApi, isValidApi, jsFetcher, jsonpFetcher, normalizeApi, normalizeApiResponseData, removeApiRequestAdaptor, removeApiResponseAdaptor, responseAdaptor, setApiCache, shouldBlockedBySendOnApi, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher } from './api.js';
@@ -23,6 +23,7 @@ import 'react-dom';
23
23
  export { JSONTraverse, JSONValueMap, SkipOperation, TEST_ID_KEY, TestIdBuilder, ValidateError, __uri, anyChanged, applyFilters, autobind, buildTrackExpression, bulkBindFunctions, camel, chainEvents, chainFunctions, changedEffect, convertArrayValueToMoment, countTree, detectPropValueChanged, difference, differenceFromAll, eachTree, evalTrackExpression, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeAll, findTreeIndex, flattenTree, flattenTreeWithLeafNodes, formateCheckThemeCss, formateId, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, importLazyComponent, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isMobileDevice, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, loadStyle, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, parsePrimitiveQueryString, parseQuery, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, replaceUrlParams, rmUndefined, someTree, sortArray, spliceTree, supportsMjs, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter } from './helper.js';
24
24
  export { ServerError } from './errors.js';
25
25
  export { asyncFilter, evalExpression, evalExpressionWithConditionBuilder, evalExpressionWithConditionBuilderAsync, evalJS, filter, registerTplEnginer, setCustomEvalExpression, setCustomEvalJs } from './tpl.js';
26
+ import '../theme.js';
26
27
  import 'lodash/isObject';
27
28
  import 'lodash/isString';
28
29
  import 'lodash/isBoolean';
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/esm/utils/math.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0
2
+ * amis-core v6.14.0-beta.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5