amis-core 6.14.0-beta.4 → 6.14.0-beta.6

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 (293) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.js +1 -1
  3. package/esm/SchemaRenderer.js +2 -1
  4. package/esm/Scoped.js +2 -1
  5. package/esm/StatusScoped.js +1 -1
  6. package/esm/StyleManager.js +1 -1
  7. package/esm/WithRootStore.js +1 -1
  8. package/esm/WithStore.js +1 -1
  9. package/esm/actions/Action.js +2 -1
  10. package/esm/actions/AjaxAction.js +1 -1
  11. package/esm/actions/BreakAction.js +1 -1
  12. package/esm/actions/BroadcastAction.js +1 -1
  13. package/esm/actions/CmptAction.js +1 -1
  14. package/esm/actions/ContinueAction.js +1 -1
  15. package/esm/actions/CopyAction.js +1 -1
  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 +1 -1
  23. package/esm/actions/PageAction.js +1 -1
  24. package/esm/actions/ParallelAction.js +1 -1
  25. package/esm/actions/PrintAction.js +1 -1
  26. package/esm/actions/StatusAction.js +1 -1
  27. package/esm/actions/SwitchAction.js +1 -1
  28. package/esm/actions/ToastAction.js +1 -1
  29. package/esm/actions/WaitAction.js +1 -1
  30. package/esm/components/Animations.js +2 -1
  31. package/esm/components/CustomStyle.js +60 -33
  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.js +1 -1
  37. package/esm/envOverwrite.js +1 -1
  38. package/esm/factory.js +1 -1
  39. package/esm/globalVar.js +1 -1
  40. package/esm/globalVarClientHandler.js +1 -1
  41. package/esm/globalVarDefaultValueHandler.js +1 -1
  42. package/esm/index.js +5 -5
  43. package/esm/locale.js +1 -1
  44. package/esm/polyfills.js +1 -1
  45. package/esm/renderers/Form.js +1 -1
  46. package/esm/renderers/Item.js +1 -1
  47. package/esm/renderers/Options.d.ts +3 -2
  48. package/esm/renderers/Options.js +57 -5
  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 +1 -1
  53. package/esm/store/app.js +2 -1
  54. package/esm/store/combo.js +1 -1
  55. package/esm/store/crud.js +1 -1
  56. package/esm/store/form.js +1 -1
  57. package/esm/store/formItem.js +1 -1
  58. package/esm/store/iRenderer.js +2 -1
  59. package/esm/store/index.js +1 -1
  60. package/esm/store/list.js +1 -1
  61. package/esm/store/manager.js +1 -1
  62. package/esm/store/modal.js +1 -1
  63. package/esm/store/node.js +1 -1
  64. package/esm/store/pagination.js +1 -1
  65. package/esm/store/root.js +2 -1
  66. package/esm/store/service.js +2 -1
  67. package/esm/store/status.js +1 -1
  68. package/esm/store/table.js +1 -1
  69. package/esm/store/table2.js +1 -1
  70. package/esm/theme.js +1 -1
  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 +13 -3
  76. package/esm/utils/SimpleMap.js +1 -1
  77. package/esm/utils/animations.js +1 -1
  78. package/esm/utils/api.js +1 -1
  79. package/esm/utils/arraySlice.js +1 -1
  80. package/esm/utils/attachmentAdpator.js +1 -1
  81. package/esm/utils/autobind.js +1 -1
  82. package/esm/utils/browser.js +1 -1
  83. package/esm/utils/columnsSplit.js +1 -1
  84. package/esm/utils/concatData.js +1 -1
  85. package/esm/utils/dataMapping.js +1 -1
  86. package/esm/utils/date.js +1 -1
  87. package/esm/utils/debug.js +1 -1
  88. package/esm/utils/decodeEntity.js +1 -1
  89. package/esm/utils/dom.js +2 -2
  90. package/esm/utils/errors.js +1 -1
  91. package/esm/utils/escapeHtml.js +1 -1
  92. package/esm/utils/filter-schema.js +1 -1
  93. package/esm/utils/filter.js +1 -1
  94. package/esm/utils/formatDuration.js +1 -1
  95. package/esm/utils/formula.js +1 -1
  96. package/esm/utils/getPageId.js +1 -1
  97. package/esm/utils/getVariable.js +1 -1
  98. package/esm/utils/grammar.js +1 -1
  99. package/esm/utils/handleAction.js +1 -1
  100. package/esm/utils/helper.d.ts +2 -2
  101. package/esm/utils/helper.js +3 -3
  102. package/esm/utils/highlight.js +1 -1
  103. package/esm/utils/icon.js +1 -1
  104. package/esm/utils/image.js +1 -1
  105. package/esm/utils/index.js +2 -1
  106. package/esm/utils/isPureVariable.js +1 -1
  107. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  108. package/esm/utils/keyToPath.js +1 -1
  109. package/esm/utils/labelToString.js +1 -1
  110. package/esm/utils/loopTooMuch.js +1 -1
  111. package/esm/utils/makeSorter.js +1 -1
  112. package/esm/utils/math.js +1 -1
  113. package/esm/utils/memoryParse.js +1 -1
  114. package/esm/utils/normalizeLink.js +1 -1
  115. package/esm/utils/normalizeOptions.js +1 -1
  116. package/esm/utils/object.js +1 -1
  117. package/esm/utils/offset.js +1 -1
  118. package/esm/utils/offsetParent.js +1 -1
  119. package/esm/utils/optionValueCompare.js +1 -1
  120. package/esm/utils/position.js +1 -1
  121. package/esm/utils/prettyBytes.js +1 -1
  122. package/esm/utils/printElement.js +1 -1
  123. package/esm/utils/renderer-event.js +1 -1
  124. package/esm/utils/replaceText.js +1 -1
  125. package/esm/utils/resize-sensor.js +1 -1
  126. package/esm/utils/resolveCondition.js +1 -1
  127. package/esm/utils/resolveVariable.js +1 -1
  128. package/esm/utils/resolveVariableAndFilter.js +1 -1
  129. package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
  130. package/esm/utils/scrollPosition.js +1 -1
  131. package/esm/utils/string2regExp.js +1 -1
  132. package/esm/utils/stripNumber.js +1 -1
  133. package/esm/utils/style-helper.d.ts +5 -1
  134. package/esm/utils/style-helper.js +30 -13
  135. package/esm/utils/style.js +1 -1
  136. package/esm/utils/toNumber.js +1 -1
  137. package/esm/utils/tokenize.js +1 -1
  138. package/esm/utils/tpl-builtin.js +1 -1
  139. package/esm/utils/tpl-lodash.js +1 -1
  140. package/esm/utils/tpl.js +1 -1
  141. package/esm/utils/uncontrollable.js +1 -1
  142. package/esm/utils/validateId.js +1 -1
  143. package/esm/utils/validations.js +1 -1
  144. package/esm/utils/visitedCache.js +1 -1
  145. package/lib/Root.js +1 -1
  146. package/lib/RootRenderer.d.ts +1 -1
  147. package/lib/RootRenderer.js +1 -1
  148. package/lib/SchemaRenderer.js +2 -1
  149. package/lib/Scoped.js +2 -1
  150. package/lib/StatusScoped.js +1 -1
  151. package/lib/StyleManager.js +1 -1
  152. package/lib/WithRootStore.js +1 -1
  153. package/lib/WithStore.js +1 -1
  154. package/lib/actions/Action.js +2 -1
  155. package/lib/actions/AjaxAction.js +1 -1
  156. package/lib/actions/BreakAction.js +1 -1
  157. package/lib/actions/BroadcastAction.js +1 -1
  158. package/lib/actions/CmptAction.js +1 -1
  159. package/lib/actions/ContinueAction.js +1 -1
  160. package/lib/actions/CopyAction.js +1 -1
  161. package/lib/actions/CustomAction.js +2 -1
  162. package/lib/actions/DialogAction.js +2 -1
  163. package/lib/actions/DrawerAction.js +2 -1
  164. package/lib/actions/EmailAction.js +1 -1
  165. package/lib/actions/EventAction.js +2 -1
  166. package/lib/actions/LinkAction.js +1 -1
  167. package/lib/actions/LoopAction.js +1 -1
  168. package/lib/actions/PageAction.js +1 -1
  169. package/lib/actions/ParallelAction.js +1 -1
  170. package/lib/actions/PrintAction.js +1 -1
  171. package/lib/actions/StatusAction.js +1 -1
  172. package/lib/actions/SwitchAction.js +1 -1
  173. package/lib/actions/ToastAction.js +1 -1
  174. package/lib/actions/WaitAction.js +1 -1
  175. package/lib/components/Animations.js +2 -1
  176. package/lib/components/CustomStyle.js +62 -31
  177. package/lib/components/ErrorBoundary.js +1 -1
  178. package/lib/components/LazyComponent.js +1 -1
  179. package/lib/components/Overlay.js +2 -1
  180. package/lib/components/PopOver.js +2 -1
  181. package/lib/env.js +1 -1
  182. package/lib/envOverwrite.js +1 -1
  183. package/lib/factory.js +1 -1
  184. package/lib/globalVar.js +1 -1
  185. package/lib/globalVarClientHandler.js +1 -1
  186. package/lib/globalVarDefaultValueHandler.js +1 -1
  187. package/lib/index.js +5 -4
  188. package/lib/locale.js +1 -1
  189. package/lib/polyfills.js +1 -1
  190. package/lib/renderers/Form.js +1 -1
  191. package/lib/renderers/Item.js +1 -1
  192. package/lib/renderers/Options.d.ts +3 -2
  193. package/lib/renderers/Options.js +57 -5
  194. package/lib/renderers/Placeholder.js +1 -1
  195. package/lib/renderers/builtin.js +1 -1
  196. package/lib/renderers/register.js +1 -1
  197. package/lib/renderers/wrapControl.js +1 -1
  198. package/lib/store/app.js +2 -1
  199. package/lib/store/combo.d.ts +24 -24
  200. package/lib/store/combo.js +1 -1
  201. package/lib/store/crud.js +1 -1
  202. package/lib/store/form.d.ts +10 -10
  203. package/lib/store/form.js +1 -1
  204. package/lib/store/formItem.js +1 -1
  205. package/lib/store/iRenderer.js +2 -1
  206. package/lib/store/index.js +1 -1
  207. package/lib/store/list.js +1 -1
  208. package/lib/store/manager.js +1 -1
  209. package/lib/store/modal.js +1 -1
  210. package/lib/store/node.js +1 -1
  211. package/lib/store/pagination.js +1 -1
  212. package/lib/store/root.js +2 -1
  213. package/lib/store/service.js +2 -1
  214. package/lib/store/status.js +1 -1
  215. package/lib/store/table.d.ts +20 -20
  216. package/lib/store/table.js +1 -1
  217. package/lib/store/table2.js +1 -1
  218. package/lib/theme.js +1 -1
  219. package/lib/utils/Animation.js +1 -1
  220. package/lib/utils/ColorScale.js +1 -1
  221. package/lib/utils/DataSchema.js +1 -1
  222. package/lib/utils/DataScope.js +1 -1
  223. package/lib/utils/RootClose.js +13 -2
  224. package/lib/utils/SimpleMap.js +1 -1
  225. package/lib/utils/animations.js +1 -1
  226. package/lib/utils/api.js +1 -1
  227. package/lib/utils/arraySlice.js +1 -1
  228. package/lib/utils/attachmentAdpator.js +1 -1
  229. package/lib/utils/autobind.js +1 -1
  230. package/lib/utils/browser.js +1 -1
  231. package/lib/utils/columnsSplit.js +1 -1
  232. package/lib/utils/concatData.js +1 -1
  233. package/lib/utils/dataMapping.js +1 -1
  234. package/lib/utils/date.js +1 -1
  235. package/lib/utils/debug.js +1 -1
  236. package/lib/utils/decodeEntity.js +1 -1
  237. package/lib/utils/dom.js +2 -2
  238. package/lib/utils/errors.js +1 -1
  239. package/lib/utils/escapeHtml.js +1 -1
  240. package/lib/utils/filter-schema.js +1 -1
  241. package/lib/utils/filter.js +1 -1
  242. package/lib/utils/formatDuration.js +1 -1
  243. package/lib/utils/formula.js +1 -1
  244. package/lib/utils/getPageId.js +1 -1
  245. package/lib/utils/getVariable.js +1 -1
  246. package/lib/utils/grammar.js +1 -1
  247. package/lib/utils/handleAction.js +1 -1
  248. package/lib/utils/helper.d.ts +2 -2
  249. package/lib/utils/helper.js +3 -3
  250. package/lib/utils/highlight.js +1 -1
  251. package/lib/utils/icon.js +1 -1
  252. package/lib/utils/image.js +1 -1
  253. package/lib/utils/index.js +2 -1
  254. package/lib/utils/isPureVariable.js +1 -1
  255. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  256. package/lib/utils/keyToPath.js +1 -1
  257. package/lib/utils/labelToString.js +1 -1
  258. package/lib/utils/loopTooMuch.js +1 -1
  259. package/lib/utils/makeSorter.js +1 -1
  260. package/lib/utils/math.js +1 -1
  261. package/lib/utils/memoryParse.js +1 -1
  262. package/lib/utils/normalizeLink.js +1 -1
  263. package/lib/utils/normalizeOptions.js +1 -1
  264. package/lib/utils/object.js +1 -1
  265. package/lib/utils/offset.js +1 -1
  266. package/lib/utils/offsetParent.js +1 -1
  267. package/lib/utils/optionValueCompare.js +1 -1
  268. package/lib/utils/position.js +1 -1
  269. package/lib/utils/prettyBytes.js +1 -1
  270. package/lib/utils/printElement.js +1 -1
  271. package/lib/utils/renderer-event.js +1 -1
  272. package/lib/utils/replaceText.js +1 -1
  273. package/lib/utils/resize-sensor.js +1 -1
  274. package/lib/utils/resolveCondition.js +1 -1
  275. package/lib/utils/resolveVariable.js +1 -1
  276. package/lib/utils/resolveVariableAndFilter.js +1 -1
  277. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  278. package/lib/utils/scrollPosition.js +1 -1
  279. package/lib/utils/string2regExp.js +1 -1
  280. package/lib/utils/stripNumber.js +1 -1
  281. package/lib/utils/style-helper.d.ts +5 -1
  282. package/lib/utils/style-helper.js +31 -12
  283. package/lib/utils/style.js +1 -1
  284. package/lib/utils/toNumber.js +1 -1
  285. package/lib/utils/tokenize.js +1 -1
  286. package/lib/utils/tpl-builtin.js +1 -1
  287. package/lib/utils/tpl-lodash.js +1 -1
  288. package/lib/utils/tpl.js +1 -1
  289. package/lib/utils/uncontrollable.js +1 -1
  290. package/lib/utils/validateId.js +1 -1
  291. package/lib/utils/validations.js +1 -1
  292. package/lib/utils/visitedCache.js +1 -1
  293. package/package.json +2 -2
package/lib/utils/normalizeOptions.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/object.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/offset.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/offsetParent.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/optionValueCompare.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/position.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/prettyBytes.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/printElement.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/renderer-event.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/replaceText.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/resize-sensor.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/resolveCondition.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/resolveVariable.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/resolveVariableAndFilter.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/resolveVariableAndFilterForAsync.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/scrollPosition.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/string2regExp.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/stripNumber.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/style-helper.d.ts CHANGED
@@ -54,16 +54,19 @@ export declare function insertCustomStyle(params: {
54
54
  defaultData?: any;
55
55
  customStyleClassPrefix?: string;
56
56
  doc?: Document;
57
+ cssHasExpression?: boolean;
57
58
  [propName: string]: any;
58
59
  }): void;
59
60
  /**
60
61
  * 根据路径获取默认值
61
62
  */
62
63
  export declare function getValueByPath(path: string, data: any): any;
64
+ export declare function hasExpression(customStyle: any): boolean;
63
65
  export declare function formatCustomStyle(params: {
64
66
  customStyle: any;
65
67
  id?: string;
66
68
  doc?: Document;
69
+ cssHasExpression?: boolean;
67
70
  customStyleClassPrefix?: string;
68
71
  [propName: string]: any;
69
72
  }): {
@@ -78,6 +81,7 @@ export declare function insertEditCustomStyle(params: {
78
81
  customStyle: any;
79
82
  id?: string;
80
83
  doc?: Document;
84
+ cssHasExpression?: boolean;
81
85
  customStyleClassPrefix?: string;
82
86
  [propName: string]: any;
83
87
  }): string;
@@ -92,7 +96,7 @@ export interface InsertCustomStyle {
92
96
  /**
93
97
  * 移除自定义样式
94
98
  */
95
- export declare function removeCustomStyle(type: string, id: string, doc?: Document, data?: any): void;
99
+ export declare function removeCustomStyle(type: string, id: string, doc?: Document, data?: any, cssHasExpression?: boolean): void;
96
100
  export declare function formatInputThemeCss(themeCss: any): any;
97
101
  export declare function setThemeClassName(params: {
98
102
  name: string | string[];
package/lib/utils/style-helper.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -15,6 +15,8 @@ var map = require('lodash/map');
15
15
  var isEmpty = require('lodash/isEmpty');
16
16
  var kebabCase = require('lodash/kebabCase');
17
17
  var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
18
+ var some = require('lodash/some');
19
+ var formula = require('./formula.js');
18
20
 
19
21
  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
20
22
 
@@ -23,6 +25,7 @@ var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
23
25
  var map__default = /*#__PURE__*/_interopDefaultLegacy(map);
24
26
  var isEmpty__default = /*#__PURE__*/_interopDefaultLegacy(isEmpty);
25
27
  var kebabCase__default = /*#__PURE__*/_interopDefaultLegacy(kebabCase);
28
+ var some__default = /*#__PURE__*/_interopDefaultLegacy(some);
26
29
 
27
30
  var valueMap = {
28
31
  'marginTop': 'margin-top',
@@ -167,7 +170,8 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
167
170
  }
168
171
  var className = item.key + '-' + (id === null || id === void 0 ? void 0 : id.replace('u:', ''));
169
172
  var weightsList = item.weights || {};
170
- if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
173
+ var cssHasExpression = hasExpression(body);
174
+ if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number' && cssHasExpression !== false) {
171
175
  className += "-".concat(data.index);
172
176
  }
173
177
  var statusMap = {
@@ -281,14 +285,14 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
281
285
  }
282
286
  function insertCustomStyle(params) {
283
287
  var _a;
284
- var themeCss = params.themeCss, classNames = params.classNames, id = params.id, defaultData = params.defaultData, customStyleClassPrefix = params.customStyleClassPrefix, doc = params.doc, data = params.data;
288
+ var themeCss = params.themeCss, classNames = params.classNames, id = params.id, defaultData = params.defaultData, customStyleClassPrefix = params.customStyleClassPrefix, doc = params.doc, data = params.data, cssHasExpression = params.cssHasExpression;
285
289
  if (!themeCss) {
286
290
  return;
287
291
  }
288
292
  var value = formatStyle(themeCss, classNames, id, defaultData, data).value;
289
293
  value = customStyleClassPrefix ? "".concat(customStyleClassPrefix, " ").concat(value) : value;
290
294
  var classId = ((_a = id === null || id === void 0 ? void 0 : id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id + '';
291
- if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
295
+ if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number' && cssHasExpression !== false) {
292
296
  classId += "-".concat(data.index);
293
297
  }
294
298
  // 这里需要插入到wrapperCustomStyle的前面
@@ -346,15 +350,27 @@ function traverseStyle(style, path, result) {
346
350
  }
347
351
  });
348
352
  }
353
+ function hasExpression(customStyle) {
354
+ var styles = {};
355
+ traverseStyle(customStyle || {}, '', styles);
356
+ if (!isEmpty__default["default"](styles)) {
357
+ return some__default["default"](Object.keys(styles), function (key) {
358
+ return some__default["default"](styles[key], function (value, k) {
359
+ return formula.isExpression(value) || formula.isExpression(k);
360
+ });
361
+ });
362
+ }
363
+ return false;
364
+ }
349
365
  function formatCustomStyle(params) {
350
366
  var _a, _b;
351
- var customStyle = params.customStyle; params.doc; var data = params.data, customStyleClassPrefix = params.customStyleClassPrefix;
367
+ var customStyle = params.customStyle; params.doc; var data = params.data, cssHasExpression = params.cssHasExpression, customStyleClassPrefix = params.customStyleClassPrefix;
352
368
  var id = ((_b = (_a = params.id) === null || _a === void 0 ? void 0 : _a.replace) === null || _b === void 0 ? void 0 : _b.call(_a, 'u:', '')) || params.id + '';
353
369
  var styles = {};
354
370
  traverseStyle(customStyle, '', styles);
355
371
  var content = '';
356
372
  var index = '';
357
- if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
373
+ if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number' && cssHasExpression !== false) {
358
374
  index = "-".concat(data.index);
359
375
  }
360
376
  if (!isEmpty__default["default"](styles)) {
@@ -364,17 +380,18 @@ function formatCustomStyle(params) {
364
380
  }
365
381
  Object.keys(styles).forEach(function (key) {
366
382
  if (!isObject__default["default"](styles[key])) {
367
- content += "\n".concat(className_1, " {\n ").concat(key, ": ").concat(resolveVariableAndFilter.resolveVariableAndFilter(styles[key].replace(/['|"]/g, ''), data, '| raw') || styles[key], "\n}");
383
+ // 这里如果有表达式 应该先运行表达式 在执行替换 否则表达式始终运行不过去
384
+ content += "\n".concat(className_1, " {\n ").concat(key, ": ").concat((resolveVariableAndFilter.resolveVariableAndFilter(styles[key], data, '| raw') || styles[key]).replace(/['|"]/g, ''), "\n}");
368
385
  }
369
386
  else if (key.startsWith('root')) {
370
387
  var res = map__default["default"](styles[key], function (value, key) {
371
- return "".concat(key, ": ").concat(resolveVariableAndFilter.resolveVariableAndFilter(value.replace(/['|"]/g, ''), data, '| raw') || value, ";");
388
+ return "".concat(key, ": ").concat((resolveVariableAndFilter.resolveVariableAndFilter(value, data, '| raw') || value).replace(/['|"]/g, ''), ";");
372
389
  });
373
390
  content += "\n".concat(key.replace(/root/g, className_1), " {\n ").concat(res.join('\n '), "\n}");
374
391
  }
375
392
  else {
376
393
  var res = map__default["default"](styles[key], function (value, key) {
377
- return "".concat(key, ": ").concat(resolveVariableAndFilter.resolveVariableAndFilter(value.replace(/['|"]/g, ''), data, '| raw') || value, ";");
394
+ return "".concat(key, ": ").concat((resolveVariableAndFilter.resolveVariableAndFilter(value, data, '| raw') || value).replace(/['|"]/g, ''), ";");
378
395
  });
379
396
  var keys = key.split(',');
380
397
  content += "\n".concat(keys.map(function (key) { return "".concat(className_1, " ").concat(key); }), " {\n ").concat(res.join('\n '), "\n}");
@@ -404,10 +421,10 @@ function insertEditCustomStyle(params) {
404
421
  /**
405
422
  * 移除自定义样式
406
423
  */
407
- function removeCustomStyle(type, id, doc, data) {
424
+ function removeCustomStyle(type, id, doc, data, cssHasExpression) {
408
425
  var _a;
409
426
  var styleId = 'amis-' + (type ? type + '-' : '') + (((_a = id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id + '');
410
- if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
427
+ if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number' && cssHasExpression !== false) {
411
428
  styleId += "-".concat(data.index);
412
429
  }
413
430
  var style = (doc || document).getElementById(styleId);
@@ -434,8 +451,9 @@ function setThemeClassName(params) {
434
451
  if (!id || !themeCss) {
435
452
  return '';
436
453
  }
454
+ var cssHasExpression = hasExpression(themeCss || {});
437
455
  var index = '';
438
- if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
456
+ if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number' && cssHasExpression !== false) {
439
457
  index = "-".concat(data.index);
440
458
  }
441
459
  function setClassName(name, id) {
@@ -461,6 +479,7 @@ exports.formatCustomStyle = formatCustomStyle;
461
479
  exports.formatInputThemeCss = formatInputThemeCss;
462
480
  exports.formatStyle = formatStyle;
463
481
  exports.getValueByPath = getValueByPath;
482
+ exports.hasExpression = hasExpression;
464
483
  exports.inheritValueMap = inheritValueMap;
465
484
  exports.insertCustomStyle = insertCustomStyle;
466
485
  exports.insertEditCustomStyle = insertEditCustomStyle;
package/lib/utils/style.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/toNumber.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/tokenize.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/tpl-builtin.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/tpl-lodash.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
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.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/uncontrollable.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/validateId.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/validations.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/utils/visitedCache.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.4
2
+ * amis-core v6.14.0-beta.6
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.14.0-beta.4",
3
+ "version": "6.14.0-beta.6",
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.14.0-beta.4",
62
+ "amis-formula": "^6.14.0-beta.6",
63
63
  "classnames": "2.3.2",
64
64
  "cross-env": "^7.0.3",
65
65
  "file-saver": "^2.0.2",