amis-core 6.13.0-beta.1 → 6.13.0-beta.10

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 (313) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.js +15 -7
  3. package/esm/SchemaRenderer.d.ts +3 -0
  4. package/esm/SchemaRenderer.js +63 -10
  5. package/esm/Scoped.js +1 -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 +8 -4
  10. package/esm/actions/Action.js +1 -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 +1 -1
  18. package/esm/actions/DialogAction.js +1 -1
  19. package/esm/actions/DrawerAction.js +1 -1
  20. package/esm/actions/EmailAction.js +1 -1
  21. package/esm/actions/EventAction.js +1 -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 +1 -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 +1 -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 +15 -2
  41. package/esm/globalVarClientHandler.js +1 -1
  42. package/esm/globalVarDefaultValueHandler.js +1 -1
  43. package/esm/index.js +5 -5
  44. package/esm/locale.js +1 -1
  45. package/esm/polyfills.js +1 -1
  46. package/esm/renderers/Form.js +3 -5
  47. package/esm/renderers/Item.js +2 -17
  48. package/esm/renderers/Options.js +1 -1
  49. package/esm/renderers/Placeholder.js +1 -1
  50. package/esm/renderers/builtin.js +1 -1
  51. package/esm/renderers/register.js +1 -1
  52. package/esm/renderers/wrapControl.js +10 -4
  53. package/esm/store/app.d.ts +4 -0
  54. package/esm/store/app.js +1 -1
  55. package/esm/store/combo.d.ts +12 -0
  56. package/esm/store/combo.js +1 -1
  57. package/esm/store/crud.d.ts +5 -0
  58. package/esm/store/crud.js +5 -1
  59. package/esm/store/form.d.ts +4 -1
  60. package/esm/store/form.js +3 -2
  61. package/esm/store/formItem.js +1 -1
  62. package/esm/store/iRenderer.d.ts +4 -0
  63. package/esm/store/iRenderer.js +27 -4
  64. package/esm/store/index.js +1 -1
  65. package/esm/store/list.d.ts +4 -0
  66. package/esm/store/list.js +1 -1
  67. package/esm/store/manager.js +1 -1
  68. package/esm/store/modal.d.ts +4 -0
  69. package/esm/store/modal.js +1 -1
  70. package/esm/store/node.js +1 -1
  71. package/esm/store/pagination.d.ts +4 -0
  72. package/esm/store/pagination.js +1 -1
  73. package/esm/store/root.d.ts +14 -2
  74. package/esm/store/root.js +181 -49
  75. package/esm/store/service.d.ts +4 -0
  76. package/esm/store/service.js +1 -1
  77. package/esm/store/status.js +1 -1
  78. package/esm/store/table.d.ts +53 -92
  79. package/esm/store/table.js +42 -20
  80. package/esm/store/table2.d.ts +5 -0
  81. package/esm/store/table2.js +17 -10
  82. package/esm/theme.js +1 -1
  83. package/esm/utils/Animation.js +1 -1
  84. package/esm/utils/ColorScale.js +1 -1
  85. package/esm/utils/DataSchema.js +1 -1
  86. package/esm/utils/DataScope.js +1 -1
  87. package/esm/utils/RootClose.js +1 -1
  88. package/esm/utils/SimpleMap.js +1 -1
  89. package/esm/utils/animations.js +1 -1
  90. package/esm/utils/api.js +8 -3
  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 +1 -1
  100. package/esm/utils/decodeEntity.js +1 -1
  101. package/esm/utils/dom.js +6 -3
  102. package/esm/utils/errors.js +2 -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 +1 -1
  108. package/esm/utils/getPageId.js +1 -1
  109. package/esm/utils/getVariable.js +1 -1
  110. package/esm/utils/grammar.js +1 -1
  111. package/esm/utils/handleAction.js +1 -1
  112. package/esm/utils/helper.js +1 -1
  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/index.js +1 -1
  117. package/esm/utils/isPureVariable.js +2 -2
  118. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  119. package/esm/utils/keyToPath.js +1 -1
  120. package/esm/utils/labelToString.js +1 -1
  121. package/esm/utils/loopTooMuch.js +1 -1
  122. package/esm/utils/makeSorter.js +1 -1
  123. package/esm/utils/math.js +1 -1
  124. package/esm/utils/memoryParse.js +1 -1
  125. package/esm/utils/normalizeLink.js +1 -1
  126. package/esm/utils/normalizeOptions.js +6 -2
  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 +1 -1
  135. package/esm/utils/replaceText.js +1 -1
  136. package/esm/utils/resize-sensor.js +1 -1
  137. package/esm/utils/resolveCondition.js +1 -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.js +1 -1
  145. package/esm/utils/style.d.ts +13 -0
  146. package/esm/utils/style.js +43 -3
  147. package/esm/utils/toNumber.js +1 -1
  148. package/esm/utils/tokenize.js +1 -1
  149. package/esm/utils/tpl-builtin.js +1 -1
  150. package/esm/utils/tpl-lodash.js +1 -1
  151. package/esm/utils/tpl.js +6 -2
  152. package/esm/utils/uncontrollable.js +1 -1
  153. package/esm/utils/validateId.js +1 -1
  154. package/esm/utils/validations.js +1 -1
  155. package/esm/utils/visitedCache.js +1 -1
  156. package/lib/Root.js +1 -1
  157. package/lib/RootRenderer.d.ts +1 -1
  158. package/lib/RootRenderer.js +15 -7
  159. package/lib/SchemaRenderer.d.ts +3 -0
  160. package/lib/SchemaRenderer.js +65 -8
  161. package/lib/Scoped.js +1 -1
  162. package/lib/StatusScoped.js +1 -1
  163. package/lib/StyleManager.js +1 -1
  164. package/lib/WithRootStore.js +1 -1
  165. package/lib/WithStore.js +8 -4
  166. package/lib/actions/Action.js +1 -1
  167. package/lib/actions/AjaxAction.js +1 -1
  168. package/lib/actions/BreakAction.js +1 -1
  169. package/lib/actions/BroadcastAction.js +1 -1
  170. package/lib/actions/CmptAction.js +1 -1
  171. package/lib/actions/ContinueAction.js +1 -1
  172. package/lib/actions/CopyAction.js +1 -1
  173. package/lib/actions/CustomAction.js +1 -1
  174. package/lib/actions/DialogAction.js +1 -1
  175. package/lib/actions/DrawerAction.js +1 -1
  176. package/lib/actions/EmailAction.js +1 -1
  177. package/lib/actions/EventAction.js +1 -1
  178. package/lib/actions/LinkAction.js +1 -1
  179. package/lib/actions/LoopAction.js +1 -1
  180. package/lib/actions/PageAction.js +1 -1
  181. package/lib/actions/ParallelAction.js +1 -1
  182. package/lib/actions/PrintAction.js +1 -1
  183. package/lib/actions/StatusAction.js +1 -1
  184. package/lib/actions/SwitchAction.js +1 -1
  185. package/lib/actions/ToastAction.js +1 -1
  186. package/lib/actions/WaitAction.js +1 -1
  187. package/lib/components/Animations.js +1 -1
  188. package/lib/components/CustomStyle.js +1 -1
  189. package/lib/components/ErrorBoundary.js +1 -1
  190. package/lib/components/LazyComponent.js +1 -1
  191. package/lib/components/Overlay.js +1 -1
  192. package/lib/components/PopOver.js +1 -1
  193. package/lib/env.js +1 -1
  194. package/lib/envOverwrite.js +1 -1
  195. package/lib/factory.js +1 -1
  196. package/lib/globalVar.js +19 -2
  197. package/lib/globalVarClientHandler.js +1 -1
  198. package/lib/globalVarDefaultValueHandler.js +1 -1
  199. package/lib/index.js +6 -4
  200. package/lib/locale.js +1 -1
  201. package/lib/polyfills.js +1 -1
  202. package/lib/renderers/Form.js +3 -5
  203. package/lib/renderers/Item.d.ts +1 -1
  204. package/lib/renderers/Item.js +2 -17
  205. package/lib/renderers/Options.js +1 -1
  206. package/lib/renderers/Placeholder.js +1 -1
  207. package/lib/renderers/builtin.js +1 -1
  208. package/lib/renderers/register.js +1 -1
  209. package/lib/renderers/wrapControl.js +10 -4
  210. package/lib/store/app.d.ts +4 -0
  211. package/lib/store/app.js +1 -1
  212. package/lib/store/combo.d.ts +36 -24
  213. package/lib/store/combo.js +1 -1
  214. package/lib/store/crud.d.ts +5 -0
  215. package/lib/store/crud.js +5 -1
  216. package/lib/store/form.d.ts +14 -11
  217. package/lib/store/form.js +3 -2
  218. package/lib/store/formItem.js +1 -1
  219. package/lib/store/iRenderer.d.ts +4 -0
  220. package/lib/store/iRenderer.js +30 -3
  221. package/lib/store/index.js +1 -1
  222. package/lib/store/list.d.ts +4 -0
  223. package/lib/store/list.js +1 -1
  224. package/lib/store/manager.js +1 -1
  225. package/lib/store/modal.d.ts +4 -0
  226. package/lib/store/modal.js +1 -1
  227. package/lib/store/node.js +1 -1
  228. package/lib/store/pagination.d.ts +4 -0
  229. package/lib/store/pagination.js +1 -1
  230. package/lib/store/root.d.ts +14 -2
  231. package/lib/store/root.js +178 -46
  232. package/lib/store/service.d.ts +4 -0
  233. package/lib/store/service.js +1 -1
  234. package/lib/store/status.js +1 -1
  235. package/lib/store/table.d.ts +73 -113
  236. package/lib/store/table.js +41 -19
  237. package/lib/store/table2.d.ts +5 -0
  238. package/lib/store/table2.js +17 -10
  239. package/lib/theme.js +1 -1
  240. package/lib/utils/Animation.js +1 -1
  241. package/lib/utils/ColorScale.js +1 -1
  242. package/lib/utils/DataSchema.js +1 -1
  243. package/lib/utils/DataScope.js +1 -1
  244. package/lib/utils/RootClose.js +1 -1
  245. package/lib/utils/SimpleMap.js +1 -1
  246. package/lib/utils/animations.js +1 -1
  247. package/lib/utils/api.js +8 -3
  248. package/lib/utils/arraySlice.js +1 -1
  249. package/lib/utils/attachmentAdpator.js +1 -1
  250. package/lib/utils/autobind.js +1 -1
  251. package/lib/utils/browser.js +1 -1
  252. package/lib/utils/columnsSplit.js +1 -1
  253. package/lib/utils/concatData.js +1 -1
  254. package/lib/utils/dataMapping.js +1 -1
  255. package/lib/utils/date.js +1 -1
  256. package/lib/utils/debug.js +1 -1
  257. package/lib/utils/decodeEntity.js +1 -1
  258. package/lib/utils/dom.js +6 -3
  259. package/lib/utils/errors.js +2 -1
  260. package/lib/utils/escapeHtml.js +1 -1
  261. package/lib/utils/filter-schema.js +1 -1
  262. package/lib/utils/filter.js +1 -1
  263. package/lib/utils/formatDuration.js +1 -1
  264. package/lib/utils/formula.js +1 -1
  265. package/lib/utils/getPageId.js +1 -1
  266. package/lib/utils/getVariable.js +1 -1
  267. package/lib/utils/grammar.js +1 -1
  268. package/lib/utils/handleAction.js +1 -1
  269. package/lib/utils/helper.js +1 -1
  270. package/lib/utils/highlight.js +1 -1
  271. package/lib/utils/icon.js +1 -1
  272. package/lib/utils/image.js +1 -1
  273. package/lib/utils/index.js +1 -1
  274. package/lib/utils/isPureVariable.js +2 -2
  275. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  276. package/lib/utils/keyToPath.js +1 -1
  277. package/lib/utils/labelToString.js +1 -1
  278. package/lib/utils/loopTooMuch.js +1 -1
  279. package/lib/utils/makeSorter.js +1 -1
  280. package/lib/utils/math.js +1 -1
  281. package/lib/utils/memoryParse.js +1 -1
  282. package/lib/utils/normalizeLink.js +1 -1
  283. package/lib/utils/normalizeOptions.js +6 -2
  284. package/lib/utils/object.js +1 -1
  285. package/lib/utils/offset.js +1 -1
  286. package/lib/utils/offsetParent.js +1 -1
  287. package/lib/utils/optionValueCompare.js +1 -1
  288. package/lib/utils/position.js +1 -1
  289. package/lib/utils/prettyBytes.js +1 -1
  290. package/lib/utils/printElement.js +1 -1
  291. package/lib/utils/renderer-event.js +1 -1
  292. package/lib/utils/replaceText.js +1 -1
  293. package/lib/utils/resize-sensor.js +1 -1
  294. package/lib/utils/resolveCondition.js +1 -1
  295. package/lib/utils/resolveVariable.js +1 -1
  296. package/lib/utils/resolveVariableAndFilter.js +1 -1
  297. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  298. package/lib/utils/scrollPosition.js +1 -1
  299. package/lib/utils/string2regExp.js +1 -1
  300. package/lib/utils/stripNumber.js +1 -1
  301. package/lib/utils/style-helper.js +1 -1
  302. package/lib/utils/style.d.ts +13 -0
  303. package/lib/utils/style.js +44 -2
  304. package/lib/utils/toNumber.js +1 -1
  305. package/lib/utils/tokenize.js +1 -1
  306. package/lib/utils/tpl-builtin.js +1 -1
  307. package/lib/utils/tpl-lodash.js +1 -1
  308. package/lib/utils/tpl.js +6 -2
  309. package/lib/utils/uncontrollable.js +1 -1
  310. package/lib/utils/validateId.js +1 -1
  311. package/lib/utils/validations.js +1 -1
  312. package/lib/utils/visitedCache.js +1 -1
  313. package/package.json +2 -2
package/lib/utils/math.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -72,7 +72,11 @@ function normalizeOptions(options, share, valueField) {
72
72
  }
73
73
  var option = tslib.__assign(tslib.__assign({}, item), (_a = {}, _a[valueField] = value, _a));
74
74
  if (typeof option.children !== 'undefined') {
75
- option.children = normalizeOptions(option.children, share, valueField);
75
+ // 用新的 share 避免 children 内部复用全局缓存
76
+ option.children = normalizeOptions(option.children, {
77
+ values: [],
78
+ options: []
79
+ }, valueField);
76
80
  }
77
81
  else if (value !== undefined) {
78
82
  share.values.push(value);
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -8,3 +8,16 @@
8
8
  * 3. 针对 image 自动加 url
9
9
  */
10
10
  export declare function buildStyle(style: any, data: any): any;
11
+ /**
12
+ * 将 style 转换为对象
13
+ * @param style
14
+ * @returns
15
+ */
16
+ export declare function normalizeStyle(style: any): any;
17
+ /**
18
+ * 合并 style
19
+ * @param to
20
+ * @param from
21
+ * @returns
22
+ */
23
+ export declare function mergeStyle(to: any, from: any): any;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -7,7 +7,7 @@
7
7
 
8
8
  Object.defineProperty(exports, '__esModule', { value: true });
9
9
 
10
- require('tslib');
10
+ var tslib = require('tslib');
11
11
  require('amis-formula');
12
12
  require('moment');
13
13
  require('lodash/isPlainObject');
@@ -78,5 +78,47 @@ function buildStyle(style, data) {
78
78
  }
79
79
  return styleVar;
80
80
  }
81
+ /**
82
+ * 将 style 转换为对象
83
+ * @param style
84
+ * @returns
85
+ */
86
+ function normalizeStyle(style) {
87
+ if (!style) {
88
+ return {};
89
+ }
90
+ else if (typeof style === 'string') {
91
+ return style.split(';').reduce(function (acc, item) {
92
+ var _a = tslib.__read(item.split(':').map(function (item) { return item.trim(); }), 2), key = _a[0], value = _a[1];
93
+ if (key && value) {
94
+ acc[camelCase__default["default"](key)] = value;
95
+ }
96
+ return acc;
97
+ }, {});
98
+ }
99
+ else {
100
+ return style;
101
+ }
102
+ }
103
+ /**
104
+ * 合并 style
105
+ * @param to
106
+ * @param from
107
+ * @returns
108
+ */
109
+ function mergeStyle(to, from) {
110
+ if (!to && !from) {
111
+ return {};
112
+ }
113
+ if (!to) {
114
+ return from;
115
+ }
116
+ if (!from) {
117
+ return to;
118
+ }
119
+ return Object.assign({}, normalizeStyle(to), normalizeStyle(from));
120
+ }
81
121
 
82
122
  exports.buildStyle = buildStyle;
123
+ exports.mergeStyle = mergeStyle;
124
+ exports.normalizeStyle = normalizeStyle;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/tpl.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -62,6 +62,7 @@ function asyncFilter(tpl, data) {
62
62
  }
63
63
  // 缓存一下提升性能
64
64
  var EVAL_CACHE = {};
65
+ var WARNING_CACHE = {};
65
66
  var customEvalExpressionFn;
66
67
  function setCustomEvalExpression(fn) {
67
68
  customEvalExpressionFn = fn;
@@ -102,7 +103,10 @@ function evalExpression(expression, data) {
102
103
  return fn.call(data, data, amisFormula.getFilters());
103
104
  }
104
105
  catch (e) {
105
- console.warn(expression, e);
106
+ if (!WARNING_CACHE[expression]) {
107
+ console.warn(expression, e);
108
+ WARNING_CACHE[expression] = true;
109
+ }
106
110
  return false;
107
111
  }
108
112
  }
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.13.0-beta.1
2
+ * amis-core v6.13.0-beta.10
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "amis-core",
3
- "version": "6.13.0-beta.1",
3
+ "version": "6.13.0-beta.10",
4
4
  "description": "amis-core",
5
5
  "main": "lib/index.js",
6
6
  "module": "esm/index.js",
@@ -59,7 +59,7 @@
59
59
  ],
60
60
  "dependencies": {
61
61
  "@rc-component/mini-decimal": "^1.0.1",
62
- "amis-formula": "^6.13.0-beta.1",
62
+ "amis-formula": "^6.13.0-beta.10",
63
63
  "classnames": "2.3.2",
64
64
  "cross-env": "^7.0.3",
65
65
  "file-saver": "^2.0.2",