amis-core 6.5.0 → 6.6.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 (292) 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 +4 -1
  5. package/esm/StatusScoped.js +1 -1
  6. package/esm/WithRootStore.js +1 -1
  7. package/esm/WithStore.js +2 -2
  8. package/esm/actions/Action.js +1 -1
  9. package/esm/actions/AjaxAction.js +1 -1
  10. package/esm/actions/BreakAction.js +1 -1
  11. package/esm/actions/BroadcastAction.js +1 -1
  12. package/esm/actions/CmptAction.js +1 -1
  13. package/esm/actions/ContinueAction.js +1 -1
  14. package/esm/actions/CopyAction.js +1 -1
  15. package/esm/actions/CustomAction.js +1 -1
  16. package/esm/actions/DialogAction.js +1 -1
  17. package/esm/actions/DrawerAction.js +1 -1
  18. package/esm/actions/EmailAction.js +1 -1
  19. package/esm/actions/EventAction.js +1 -1
  20. package/esm/actions/LinkAction.js +1 -1
  21. package/esm/actions/LoopAction.js +1 -1
  22. package/esm/actions/PageAction.js +1 -1
  23. package/esm/actions/ParallelAction.js +1 -1
  24. package/esm/actions/PrintAction.js +1 -1
  25. package/esm/actions/StatusAction.js +1 -1
  26. package/esm/actions/SwitchAction.js +1 -1
  27. package/esm/actions/ToastAction.js +1 -1
  28. package/esm/actions/WaitAction.js +1 -1
  29. package/esm/components/CustomStyle.js +3 -2
  30. package/esm/components/ErrorBoundary.js +1 -1
  31. package/esm/components/LazyComponent.js +1 -1
  32. package/esm/components/Overlay.js +1 -1
  33. package/esm/components/PopOver.js +1 -1
  34. package/esm/env.js +1 -1
  35. package/esm/envOverwrite.js +1 -1
  36. package/esm/factory.js +1 -1
  37. package/esm/index.js +2 -2
  38. package/esm/locale.js +1 -1
  39. package/esm/polyfills.js +1 -1
  40. package/esm/renderers/Form.js +4 -4
  41. package/esm/renderers/Item.js +31 -30
  42. package/esm/renderers/Options.js +39 -13
  43. package/esm/renderers/Placeholder.js +1 -1
  44. package/esm/renderers/builtin.js +1 -1
  45. package/esm/renderers/register.js +1 -1
  46. package/esm/renderers/wrapControl.js +13 -9
  47. package/esm/store/app.d.ts +2 -0
  48. package/esm/store/app.js +1 -1
  49. package/esm/store/combo.d.ts +6 -0
  50. package/esm/store/combo.js +1 -1
  51. package/esm/store/crud.d.ts +2 -0
  52. package/esm/store/crud.js +1 -1
  53. package/esm/store/form.d.ts +2 -0
  54. package/esm/store/form.js +1 -1
  55. package/esm/store/formItem.js +2 -2
  56. package/esm/store/iRenderer.d.ts +2 -0
  57. package/esm/store/iRenderer.js +12 -1
  58. package/esm/store/index.js +1 -1
  59. package/esm/store/list.d.ts +2 -0
  60. package/esm/store/list.js +1 -1
  61. package/esm/store/manager.js +1 -1
  62. package/esm/store/modal.d.ts +2 -0
  63. package/esm/store/modal.js +1 -1
  64. package/esm/store/node.js +1 -1
  65. package/esm/store/pagination.d.ts +2 -0
  66. package/esm/store/pagination.js +1 -1
  67. package/esm/store/root.d.ts +2 -0
  68. package/esm/store/root.js +1 -1
  69. package/esm/store/service.d.ts +2 -0
  70. package/esm/store/service.js +1 -1
  71. package/esm/store/status.js +1 -1
  72. package/esm/store/table.d.ts +6 -0
  73. package/esm/store/table.js +1 -1
  74. package/esm/store/table2.d.ts +2 -0
  75. package/esm/store/table2.js +1 -1
  76. package/esm/theme.js +1 -1
  77. package/esm/types.d.ts +1 -0
  78. package/esm/utils/Animation.js +1 -1
  79. package/esm/utils/ColorScale.js +1 -1
  80. package/esm/utils/DataSchema.js +1 -1
  81. package/esm/utils/DataScope.js +2 -1
  82. package/esm/utils/RootClose.js +1 -1
  83. package/esm/utils/SimpleMap.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 +1 -1
  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.js +1 -1
  99. package/esm/utils/filter.js +1 -1
  100. package/esm/utils/formatDuration.js +1 -1
  101. package/esm/utils/formula.js +1 -1
  102. package/esm/utils/getVariable.js +1 -1
  103. package/esm/utils/grammar.js +1 -1
  104. package/esm/utils/handleAction.js +1 -1
  105. package/esm/utils/helper.d.ts +1 -1
  106. package/esm/utils/helper.js +9 -6
  107. package/esm/utils/highlight.js +1 -1
  108. package/esm/utils/icon.js +1 -1
  109. package/esm/utils/image.js +1 -1
  110. package/esm/utils/isPureVariable.js +1 -1
  111. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  112. package/esm/utils/keyToPath.js +1 -1
  113. package/esm/utils/labelToString.js +1 -1
  114. package/esm/utils/makeSorter.js +1 -1
  115. package/esm/utils/math.js +1 -1
  116. package/esm/utils/memoryParse.js +1 -1
  117. package/esm/utils/normalizeLink.js +1 -1
  118. package/esm/utils/normalizeOptions.js +1 -1
  119. package/esm/utils/object.js +1 -1
  120. package/esm/utils/offset.js +1 -1
  121. package/esm/utils/offsetParent.js +1 -1
  122. package/esm/utils/optionValueCompare.js +1 -1
  123. package/esm/utils/position.js +1 -1
  124. package/esm/utils/prettyBytes.js +1 -1
  125. package/esm/utils/printElement.js +1 -1
  126. package/esm/utils/renderer-event.js +5 -4
  127. package/esm/utils/replaceText.js +1 -1
  128. package/esm/utils/resize-sensor.js +1 -1
  129. package/esm/utils/resolveCondition.js +1 -1
  130. package/esm/utils/resolveVariable.js +1 -1
  131. package/esm/utils/resolveVariableAndFilter.js +1 -1
  132. package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
  133. package/esm/utils/scrollPosition.js +1 -1
  134. package/esm/utils/string2regExp.js +1 -1
  135. package/esm/utils/stripNumber.js +1 -1
  136. package/esm/utils/style-helper.js +15 -10
  137. package/esm/utils/style.js +1 -1
  138. package/esm/utils/toNumber.js +1 -1
  139. package/esm/utils/tokenize.js +1 -1
  140. package/esm/utils/tpl-builtin.js +1 -1
  141. package/esm/utils/tpl-lodash.js +1 -1
  142. package/esm/utils/tpl.js +1 -1
  143. package/esm/utils/uncontrollable.js +1 -1
  144. package/esm/utils/validateId.js +1 -1
  145. package/esm/utils/validations.js +1 -1
  146. package/lib/Root.js +1 -1
  147. package/lib/RootRenderer.d.ts +1 -1
  148. package/lib/RootRenderer.js +1 -1
  149. package/lib/SchemaRenderer.js +2 -1
  150. package/lib/Scoped.js +4 -1
  151. package/lib/StatusScoped.js +1 -1
  152. package/lib/WithRootStore.js +1 -1
  153. package/lib/WithStore.js +2 -2
  154. package/lib/actions/Action.js +1 -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 +1 -1
  162. package/lib/actions/DialogAction.js +1 -1
  163. package/lib/actions/DrawerAction.js +1 -1
  164. package/lib/actions/EmailAction.js +1 -1
  165. package/lib/actions/EventAction.js +1 -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/CustomStyle.js +3 -2
  176. package/lib/components/ErrorBoundary.js +1 -1
  177. package/lib/components/LazyComponent.js +1 -1
  178. package/lib/components/Overlay.js +1 -1
  179. package/lib/components/PopOver.js +1 -1
  180. package/lib/env.js +1 -1
  181. package/lib/envOverwrite.js +1 -1
  182. package/lib/factory.js +1 -1
  183. package/lib/index.js +2 -2
  184. package/lib/locale.js +1 -1
  185. package/lib/polyfills.js +1 -1
  186. package/lib/renderers/Form.js +4 -4
  187. package/lib/renderers/Item.js +31 -30
  188. package/lib/renderers/Options.js +39 -13
  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 +13 -9
  193. package/lib/store/app.d.ts +2 -0
  194. package/lib/store/app.js +1 -1
  195. package/lib/store/combo.d.ts +30 -24
  196. package/lib/store/combo.js +1 -1
  197. package/lib/store/crud.d.ts +2 -0
  198. package/lib/store/crud.js +1 -1
  199. package/lib/store/form.d.ts +12 -10
  200. package/lib/store/form.js +1 -1
  201. package/lib/store/formItem.js +2 -2
  202. package/lib/store/iRenderer.d.ts +2 -0
  203. package/lib/store/iRenderer.js +12 -1
  204. package/lib/store/index.js +1 -1
  205. package/lib/store/list.d.ts +2 -0
  206. package/lib/store/list.js +1 -1
  207. package/lib/store/manager.js +1 -1
  208. package/lib/store/modal.d.ts +2 -0
  209. package/lib/store/modal.js +1 -1
  210. package/lib/store/node.js +1 -1
  211. package/lib/store/pagination.d.ts +2 -0
  212. package/lib/store/pagination.js +1 -1
  213. package/lib/store/root.d.ts +2 -0
  214. package/lib/store/root.js +1 -1
  215. package/lib/store/service.d.ts +2 -0
  216. package/lib/store/service.js +1 -1
  217. package/lib/store/status.js +1 -1
  218. package/lib/store/table.d.ts +26 -20
  219. package/lib/store/table.js +1 -1
  220. package/lib/store/table2.d.ts +2 -0
  221. package/lib/store/table2.js +1 -1
  222. package/lib/theme.js +1 -1
  223. package/lib/types.d.ts +1 -0
  224. package/lib/utils/Animation.js +1 -1
  225. package/lib/utils/ColorScale.js +1 -1
  226. package/lib/utils/DataSchema.js +1 -1
  227. package/lib/utils/DataScope.js +2 -1
  228. package/lib/utils/RootClose.js +1 -1
  229. package/lib/utils/SimpleMap.js +1 -1
  230. package/lib/utils/api.js +1 -1
  231. package/lib/utils/arraySlice.js +1 -1
  232. package/lib/utils/attachmentAdpator.js +1 -1
  233. package/lib/utils/autobind.js +1 -1
  234. package/lib/utils/browser.js +1 -1
  235. package/lib/utils/columnsSplit.js +1 -1
  236. package/lib/utils/concatData.js +1 -1
  237. package/lib/utils/dataMapping.js +1 -1
  238. package/lib/utils/date.js +1 -1
  239. package/lib/utils/debug.js +1 -1
  240. package/lib/utils/decodeEntity.js +1 -1
  241. package/lib/utils/dom.js +1 -1
  242. package/lib/utils/errors.js +1 -1
  243. package/lib/utils/escapeHtml.js +1 -1
  244. package/lib/utils/filter-schema.js +1 -1
  245. package/lib/utils/filter.js +1 -1
  246. package/lib/utils/formatDuration.js +1 -1
  247. package/lib/utils/formula.js +1 -1
  248. package/lib/utils/getVariable.js +1 -1
  249. package/lib/utils/grammar.js +1 -1
  250. package/lib/utils/handleAction.js +1 -1
  251. package/lib/utils/helper.d.ts +1 -1
  252. package/lib/utils/helper.js +8 -5
  253. package/lib/utils/highlight.js +1 -1
  254. package/lib/utils/icon.js +1 -1
  255. package/lib/utils/image.js +1 -1
  256. package/lib/utils/isPureVariable.js +1 -1
  257. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  258. package/lib/utils/keyToPath.js +1 -1
  259. package/lib/utils/labelToString.js +1 -1
  260. package/lib/utils/makeSorter.js +1 -1
  261. package/lib/utils/math.js +1 -1
  262. package/lib/utils/memoryParse.js +1 -1
  263. package/lib/utils/normalizeLink.js +1 -1
  264. package/lib/utils/normalizeOptions.js +1 -1
  265. package/lib/utils/object.js +1 -1
  266. package/lib/utils/offset.js +1 -1
  267. package/lib/utils/offsetParent.js +1 -1
  268. package/lib/utils/optionValueCompare.js +1 -1
  269. package/lib/utils/position.js +1 -1
  270. package/lib/utils/prettyBytes.js +1 -1
  271. package/lib/utils/printElement.js +1 -1
  272. package/lib/utils/renderer-event.js +5 -4
  273. package/lib/utils/replaceText.js +1 -1
  274. package/lib/utils/resize-sensor.js +1 -1
  275. package/lib/utils/resolveCondition.js +1 -1
  276. package/lib/utils/resolveVariable.js +1 -1
  277. package/lib/utils/resolveVariableAndFilter.js +1 -1
  278. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  279. package/lib/utils/scrollPosition.js +1 -1
  280. package/lib/utils/string2regExp.js +1 -1
  281. package/lib/utils/stripNumber.js +1 -1
  282. package/lib/utils/style-helper.js +15 -10
  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/package.json +2 -2
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -68,7 +68,7 @@ export declare function visibilityFilter(items: any, data?: object): any;
68
68
  export declare function isDisabled(schema: {
69
69
  disabledOn?: string;
70
70
  disabled?: boolean;
71
- }, data?: object): boolean | "" | undefined;
71
+ }, data?: object): boolean | "" | Promise<boolean> | undefined;
72
72
  export declare function hasAbility(schema: any, ability: string, data?: object, defaultValue?: boolean): boolean;
73
73
  export declare function makeHorizontalDeeper(horizontal: {
74
74
  left: string;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -14,7 +14,7 @@ import isNumber from 'lodash/isNumber';
14
14
  import isString from 'lodash/isString';
15
15
  import qs from 'qs';
16
16
  import { compile } from 'path-to-regexp';
17
- import { evalExpression, filter } from './tpl.js';
17
+ import { evalExpressionWithConditionBuilder, evalExpression, filter } from './tpl.js';
18
18
  import { autobindMethod } from './autobind.js';
19
19
  import 'amis-formula';
20
20
  import 'moment';
@@ -282,8 +282,10 @@ function hasVisibleExpression(schema) {
282
282
  function isVisible(schema, data) {
283
283
  return !(schema.hidden ||
284
284
  schema.visible === false ||
285
- (schema.hiddenOn && evalExpression(schema.hiddenOn, data)) ||
286
- (schema.visibleOn && !evalExpression(schema.visibleOn, data)));
285
+ (schema.hiddenOn &&
286
+ evalExpressionWithConditionBuilder(schema.hiddenOn, data)) ||
287
+ (schema.visibleOn &&
288
+ !evalExpressionWithConditionBuilder(schema.visibleOn, data)));
287
289
  }
288
290
  function isUnfolded(node, config) {
289
291
  var foldedField = config.foldedField, unfoldedField = config.unfoldedField;
@@ -307,14 +309,15 @@ function visibilityFilter(items, data) {
307
309
  }
308
310
  function isDisabled(schema, data) {
309
311
  return (schema.disabled ||
310
- (schema.disabledOn && evalExpression(schema.disabledOn, data)));
312
+ (schema.disabledOn &&
313
+ evalExpressionWithConditionBuilder(schema.disabledOn, data)));
311
314
  }
312
315
  function hasAbility(schema, ability, data, defaultValue) {
313
316
  if (defaultValue === void 0) { defaultValue = true; }
314
317
  return schema.hasOwnProperty(ability)
315
318
  ? schema[ability]
316
319
  : schema.hasOwnProperty("".concat(ability, "On"))
317
- ? evalExpression(schema["".concat(ability, "On")], data || schema)
320
+ ? evalExpressionWithConditionBuilder(schema["".concat(ability, "On")], data || schema)
318
321
  : defaultValue;
319
322
  }
320
323
  function makeHorizontalDeeper(horizontal, count) {
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/esm/utils/icon.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/esm/utils/math.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -122,9 +122,10 @@ var bindEvent = function (renderer) {
122
122
  return function (eventName) {
123
123
  // eventName用来避免过滤广播事件
124
124
  rendererEventListeners = rendererEventListeners.filter(function (item) {
125
- return item.renderer === renderer && eventName !== undefined
126
- ? item.type !== eventName
127
- : true;
125
+ // 如果 eventName undefined,表示全部解绑,否则解绑指定事件
126
+ return eventName === undefined
127
+ ? item.renderer !== renderer
128
+ : item.renderer !== renderer || item.type !== eventName;
128
129
  });
129
130
  };
130
131
  }
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -262,13 +262,14 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
262
262
  };
263
263
  }
264
264
  function insertCustomStyle(prams) {
265
+ var _a;
265
266
  var themeCss = prams.themeCss, classNames = prams.classNames, id = prams.id, defaultData = prams.defaultData, customStyleClassPrefix = prams.customStyleClassPrefix, doc = prams.doc, data = prams.data;
266
267
  if (!themeCss) {
267
268
  return;
268
269
  }
269
270
  var value = formatStyle(themeCss, classNames, id, defaultData, data).value;
270
271
  value = customStyleClassPrefix ? "".concat(customStyleClassPrefix, " ").concat(value) : value;
271
- var classId = id.replace('u:', '');
272
+ var classId = ((_a = id === null || id === void 0 ? void 0 : id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id + '';
272
273
  if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
273
274
  classId += "-".concat(data.index);
274
275
  }
@@ -323,7 +324,9 @@ function traverseStyle(style, path, result) {
323
324
  * 设置源码编辑自定义样式
324
325
  */
325
326
  function insertEditCustomStyle(params) {
326
- var customStyle = params.customStyle, id = params.id, doc = params.doc, data = params.data;
327
+ var _a, _b;
328
+ var customStyle = params.customStyle, doc = params.doc, data = params.data;
329
+ 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 + '';
327
330
  var styles = {};
328
331
  traverseStyle(customStyle, '', styles);
329
332
  var content = '';
@@ -332,7 +335,7 @@ function insertEditCustomStyle(params) {
332
335
  index = "-".concat(data.index);
333
336
  }
334
337
  if (!isEmpty(styles)) {
335
- var className_1 = "wrapperCustomStyle-".concat(id === null || id === void 0 ? void 0 : id.replace('u:', '')).concat(index);
338
+ var className_1 = "wrapperCustomStyle-".concat(id).concat(index);
336
339
  Object.keys(styles).forEach(function (key) {
337
340
  if (!isObject(styles[key])) {
338
341
  content += "\n.".concat(className_1, " {\n ").concat(key, ": ").concat(resolveVariableAndFilter(styles[key].replace(/['|"]/g, ''), data, '| raw') || styles[key], "\n}");
@@ -360,18 +363,17 @@ function insertEditCustomStyle(params) {
360
363
  }
361
364
  insertStyle({
362
365
  style: content,
363
- classId: 'wrapperCustomStyle-' +
364
- ((typeof id === 'string' ? id.replace('u:', '') : '') || uuid()) +
365
- index,
366
+ classId: 'wrapperCustomStyle-' + (id || uuid()) + index,
366
367
  doc: doc,
367
- id: typeof id === 'string' ? id.replace('u:', '').replace(/(-.*)/, '') : ''
368
+ id: id.replace(/(-.*)/, '')
368
369
  });
369
370
  }
370
371
  /**
371
372
  * 移除自定义样式
372
373
  */
373
374
  function removeCustomStyle(type, id, doc, data) {
374
- var styleId = 'amis-' + (type ? type + '-' : '') + id.replace('u:', '');
375
+ var _a;
376
+ var styleId = 'amis-' + (type ? type + '-' : '') + (((_a = id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id + '');
375
377
  if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
376
378
  styleId += "-".concat(data.index);
377
379
  }
@@ -395,6 +397,7 @@ function formatInputThemeCss(themeCss) {
395
397
  return inputFontThemeCss;
396
398
  }
397
399
  function setThemeClassName(params) {
400
+ var _a;
398
401
  var name = params.name, id = params.id, themeCss = params.themeCss, extra = params.extra, data = params.data;
399
402
  if (!id || !themeCss) {
400
403
  return '';
@@ -406,7 +409,9 @@ function setThemeClassName(params) {
406
409
  if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
407
410
  index = "-".concat(data.index);
408
411
  }
409
- return "".concat(name, "-").concat(id.replace('u:', '')) + (extra ? "-".concat(extra) : '') + index;
412
+ return ("".concat(name, "-").concat(((_a = id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id) +
413
+ (extra ? "-".concat(extra) : '') +
414
+ index);
410
415
  }
411
416
 
412
417
  export { addStyle, findOrCreateStyle, formatInputThemeCss, formatStyle, getValueByPath, inheritValueMap, insertCustomStyle, insertEditCustomStyle, insertStyle, removeCustomStyle, setThemeClassName, valueMap };
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/esm/utils/tpl.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/Root.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -30,5 +30,5 @@ export declare class RootRenderer extends React.Component<RootRendererProps> {
30
30
  renderError(): React.ReactNode;
31
31
  renderDialog(): React.ReactNode;
32
32
  renderDrawer(): React.ReactNode;
33
- render(): string | number | boolean | React.JSX.Element | Iterable<React.ReactNode> | null | undefined;
33
+ render(): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
34
34
  }
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -49,6 +49,7 @@ var RENDERER_TRANSMISSION_OMIT_PROPS = [
49
49
  'className',
50
50
  'style',
51
51
  'data',
52
+ 'originData',
52
53
  'children',
53
54
  'ref',
54
55
  'visible',
package/lib/Scoped.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -161,6 +161,9 @@ function createScopedTools(path, parent, env, rendererType) {
161
161
  unRegisterComponent: function (component) {
162
162
  // 自己本身实际上注册在父级 Scoped 上。
163
163
  if (component.props.$path === path && parent) {
164
+ // 如果是自己,尝试把自己从父级 Scoped 上移除,否则在某些场景下会导致父级的 children 一直增长。
165
+ var idx_1 = parent.children.indexOf(self);
166
+ ~idx_1 && parent.children.splice(idx_1, 1);
164
167
  return parent.unRegisterComponent(component);
165
168
  }
166
169
  var idx = components.indexOf(component);
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
package/lib/WithStore.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -165,7 +165,7 @@ function HocStoreFactory(renderer) {
165
165
  // 目前主要的问题是,如果 combo 中表单项名字和 combo 本身的名字一样,会导致里面的值会被覆盖成数组
166
166
  ((_e = props.store) === null || _e === void 0 ? void 0 : _e.storeType) === 'ComboStore'
167
167
  ? undefined
168
- : helper.syncDataFromSuper(tslib.__assign(tslib.__assign({}, store.data), props.data), props.data.__super, prevProps.data.__super, store, false)), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
168
+ : helper.syncDataFromSuper(tslib.__assign(tslib.__assign({}, store.pristineDiff), props.data), props.data.__super, prevProps.data.__super, store, false)), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
169
169
  }
170
170
  else {
171
171
  store.initData(object.createObject(props.scope, props.data), ((_g = props.updatePristineAfterStoreDataReInit) !== null && _g !== void 0 ? _g : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.5.0
2
+ * amis-core v6.6.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5