amis-core 6.14.0-beta.9 → 7.0.0-next.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 (323) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.d.ts +1 -1
  3. package/esm/RootRenderer.js +3 -3
  4. package/esm/SchemaRenderer.js +5 -1
  5. package/esm/Scoped.js +1 -1
  6. package/esm/StatusScoped.js +1 -1
  7. package/esm/StyleManager.js +1 -1
  8. package/esm/TaggerWrapper.d.ts +14 -0
  9. package/esm/TaggerWrapper.js +57 -0
  10. package/esm/WithRootStore.d.ts +70 -70
  11. package/esm/WithRootStore.js +1 -1
  12. package/esm/WithStore.js +5 -5
  13. package/esm/actions/Action.js +2 -2
  14. package/esm/actions/AjaxAction.js +1 -1
  15. package/esm/actions/BreakAction.js +1 -1
  16. package/esm/actions/BroadcastAction.js +1 -1
  17. package/esm/actions/CmptAction.js +1 -1
  18. package/esm/actions/ContinueAction.js +1 -1
  19. package/esm/actions/CopyAction.js +1 -1
  20. package/esm/actions/CustomAction.js +2 -2
  21. package/esm/actions/DialogAction.js +2 -2
  22. package/esm/actions/DrawerAction.js +2 -2
  23. package/esm/actions/EmailAction.js +1 -1
  24. package/esm/actions/EventAction.js +2 -2
  25. package/esm/actions/LinkAction.js +1 -1
  26. package/esm/actions/LoopAction.js +1 -1
  27. package/esm/actions/PageAction.js +1 -1
  28. package/esm/actions/ParallelAction.js +1 -1
  29. package/esm/actions/PrintAction.js +1 -1
  30. package/esm/actions/StatusAction.js +1 -1
  31. package/esm/actions/SwitchAction.js +1 -1
  32. package/esm/actions/ToastAction.js +1 -1
  33. package/esm/actions/WaitAction.js +1 -1
  34. package/esm/components/Animations.js +13 -5
  35. package/esm/components/CustomStyle.js +1 -1
  36. package/esm/components/ErrorBoundary.js +1 -1
  37. package/esm/components/LazyComponent.js +1 -1
  38. package/esm/components/Overlay.js +5 -5
  39. package/esm/components/PopOver.js +4 -4
  40. package/esm/env.d.ts +2 -0
  41. package/esm/env.js +1 -1
  42. package/esm/envOverwrite.js +1 -1
  43. package/esm/factory.js +5 -2
  44. package/esm/globalVar.js +1 -1
  45. package/esm/globalVarClientHandler.js +1 -1
  46. package/esm/globalVarDefaultValueHandler.js +1 -1
  47. package/esm/hooks/useEnvContext.js +1 -1
  48. package/esm/hooks/useRenderOptionsContext.js +1 -1
  49. package/esm/index.js +9 -4
  50. package/esm/locale.js +1 -1
  51. package/esm/polyfills.js +1 -1
  52. package/esm/renderers/Form.js +8 -2
  53. package/esm/renderers/Item.d.ts +35 -35
  54. package/esm/renderers/Item.js +3 -3
  55. package/esm/renderers/Options.js +1 -1
  56. package/esm/renderers/Placeholder.js +1 -1
  57. package/esm/renderers/builtin.js +1 -1
  58. package/esm/renderers/register.js +1 -1
  59. package/esm/renderers/wrapControl.d.ts +35 -35
  60. package/esm/renderers/wrapControl.js +1 -1
  61. package/esm/schema.d.ts +25 -0
  62. package/esm/store/app.js +1 -1
  63. package/esm/store/combo.d.ts +775 -808
  64. package/esm/store/combo.js +1 -1
  65. package/esm/store/crud.js +1 -1
  66. package/esm/store/form.d.ts +306 -321
  67. package/esm/store/form.js +1 -1
  68. package/esm/store/formItem.js +7 -2
  69. package/esm/store/iRenderer.js +1 -1
  70. package/esm/store/index.d.ts +16 -16
  71. package/esm/store/index.js +1 -1
  72. package/esm/store/list.d.ts +33 -33
  73. package/esm/store/list.js +1 -1
  74. package/esm/store/manager.d.ts +24 -24
  75. package/esm/store/manager.js +1 -1
  76. package/esm/store/modal.js +1 -1
  77. package/esm/store/node.js +1 -1
  78. package/esm/store/pagination.js +1 -1
  79. package/esm/store/root.js +1 -1
  80. package/esm/store/service.js +1 -1
  81. package/esm/store/status.js +1 -1
  82. package/esm/store/table.d.ts +374 -690
  83. package/esm/store/table.js +2 -2
  84. package/esm/store/table2.d.ts +37 -173
  85. package/esm/store/table2.js +5 -3
  86. package/esm/theme.js +1 -1
  87. package/esm/utils/Animation.js +1 -1
  88. package/esm/utils/ColorScale.js +1 -1
  89. package/esm/utils/DataSchema.js +1 -1
  90. package/esm/utils/DataScope.js +1 -1
  91. package/esm/utils/RootClose.js +3 -3
  92. package/esm/utils/SimpleMap.js +1 -1
  93. package/esm/utils/animations.js +1 -1
  94. package/esm/utils/api.js +1 -1
  95. package/esm/utils/arraySlice.js +1 -1
  96. package/esm/utils/attachmentAdpator.js +1 -1
  97. package/esm/utils/autobind.js +1 -1
  98. package/esm/utils/browser.js +1 -1
  99. package/esm/utils/columnsSplit.js +1 -1
  100. package/esm/utils/concatData.js +1 -1
  101. package/esm/utils/dataMapping.js +1 -1
  102. package/esm/utils/date.js +1 -1
  103. package/esm/utils/debug.js +4 -3
  104. package/esm/utils/decodeEntity.js +1 -1
  105. package/esm/utils/dom.js +4 -5
  106. package/esm/utils/errors.js +1 -1
  107. package/esm/utils/escapeHtml.js +3 -4
  108. package/esm/utils/filter-schema.js +1 -1
  109. package/esm/utils/filter.js +1 -1
  110. package/esm/utils/findDomCompat.d.ts +16 -0
  111. package/esm/utils/findDomCompat.js +253 -0
  112. package/esm/utils/formatDuration.js +1 -1
  113. package/esm/utils/formula.js +1 -1
  114. package/esm/utils/getPageId.js +1 -1
  115. package/esm/utils/getVariable.js +1 -1
  116. package/esm/utils/grammar.js +1 -1
  117. package/esm/utils/handleAction.js +1 -1
  118. package/esm/utils/helper.js +1 -1
  119. package/esm/utils/highlight.js +1 -1
  120. package/esm/utils/icon.js +1 -1
  121. package/esm/utils/image.js +1 -1
  122. package/esm/utils/index.d.ts +1 -0
  123. package/esm/utils/index.js +2 -2
  124. package/esm/utils/isPureVariable.js +1 -1
  125. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  126. package/esm/utils/keyToPath.js +1 -1
  127. package/esm/utils/labelToString.js +1 -1
  128. package/esm/utils/loopTooMuch.js +1 -1
  129. package/esm/utils/makeSorter.js +1 -1
  130. package/esm/utils/math.js +1 -1
  131. package/esm/utils/memoryParse.js +1 -1
  132. package/esm/utils/normalizeLink.js +1 -1
  133. package/esm/utils/normalizeOptions.js +1 -1
  134. package/esm/utils/object.js +1 -1
  135. package/esm/utils/offset.js +1 -1
  136. package/esm/utils/offsetParent.js +1 -1
  137. package/esm/utils/optionValueCompare.js +1 -1
  138. package/esm/utils/position.js +1 -1
  139. package/esm/utils/prettyBytes.js +1 -1
  140. package/esm/utils/printElement.js +1 -1
  141. package/esm/utils/renderer-event.js +1 -1
  142. package/esm/utils/replaceText.js +1 -1
  143. package/esm/utils/resize-sensor.js +1 -1
  144. package/esm/utils/resolveCondition.js +1 -1
  145. package/esm/utils/resolveVariable.js +1 -1
  146. package/esm/utils/resolveVariableAndFilter.js +1 -1
  147. package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
  148. package/esm/utils/scrollPosition.js +1 -1
  149. package/esm/utils/string2regExp.js +1 -1
  150. package/esm/utils/stripNumber.js +1 -1
  151. package/esm/utils/style-helper.js +1 -1
  152. package/esm/utils/style.js +1 -1
  153. package/esm/utils/toNumber.js +1 -1
  154. package/esm/utils/tokenize.js +1 -1
  155. package/esm/utils/tpl-builtin.js +1 -1
  156. package/esm/utils/tpl-lodash.js +1 -1
  157. package/esm/utils/tpl.js +1 -1
  158. package/esm/utils/uncontrollable.js +1 -1
  159. package/esm/utils/validateId.js +1 -1
  160. package/esm/utils/validations.js +5 -1
  161. package/esm/utils/visitedCache.js +1 -1
  162. package/lib/Root.js +1 -1
  163. package/lib/RootRenderer.d.ts +1 -1
  164. package/lib/RootRenderer.js +3 -3
  165. package/lib/SchemaRenderer.js +5 -1
  166. package/lib/Scoped.js +1 -1
  167. package/lib/StatusScoped.js +1 -1
  168. package/lib/StyleManager.js +1 -1
  169. package/lib/TaggerWrapper.d.ts +14 -0
  170. package/lib/TaggerWrapper.js +66 -0
  171. package/lib/WithRootStore.d.ts +70 -70
  172. package/lib/WithRootStore.js +1 -1
  173. package/lib/WithStore.js +5 -5
  174. package/lib/actions/Action.js +1 -1
  175. package/lib/actions/AjaxAction.js +1 -1
  176. package/lib/actions/BreakAction.js +1 -1
  177. package/lib/actions/BroadcastAction.js +1 -1
  178. package/lib/actions/CmptAction.js +1 -1
  179. package/lib/actions/ContinueAction.js +1 -1
  180. package/lib/actions/CopyAction.js +1 -1
  181. package/lib/actions/CustomAction.js +1 -1
  182. package/lib/actions/DialogAction.js +1 -1
  183. package/lib/actions/DrawerAction.js +1 -1
  184. package/lib/actions/EmailAction.js +1 -1
  185. package/lib/actions/EventAction.js +1 -1
  186. package/lib/actions/LinkAction.js +1 -1
  187. package/lib/actions/LoopAction.js +1 -1
  188. package/lib/actions/PageAction.js +1 -1
  189. package/lib/actions/ParallelAction.js +1 -1
  190. package/lib/actions/PrintAction.js +1 -1
  191. package/lib/actions/StatusAction.js +1 -1
  192. package/lib/actions/SwitchAction.js +1 -1
  193. package/lib/actions/ToastAction.js +1 -1
  194. package/lib/actions/WaitAction.js +1 -1
  195. package/lib/components/Animations.js +12 -4
  196. package/lib/components/CustomStyle.js +1 -1
  197. package/lib/components/ErrorBoundary.js +1 -1
  198. package/lib/components/LazyComponent.js +1 -1
  199. package/lib/components/Overlay.js +5 -6
  200. package/lib/components/PopOver.js +4 -4
  201. package/lib/env.d.ts +2 -0
  202. package/lib/env.js +1 -1
  203. package/lib/envOverwrite.js +1 -1
  204. package/lib/factory.js +5 -2
  205. package/lib/globalVar.js +1 -1
  206. package/lib/globalVarClientHandler.js +1 -1
  207. package/lib/globalVarDefaultValueHandler.js +1 -1
  208. package/lib/hooks/useEnvContext.js +1 -1
  209. package/lib/hooks/useRenderOptionsContext.js +1 -1
  210. package/lib/index.js +11 -4
  211. package/lib/locale.js +1 -1
  212. package/lib/polyfills.js +1 -1
  213. package/lib/renderers/Form.js +8 -2
  214. package/lib/renderers/Item.d.ts +35 -35
  215. package/lib/renderers/Item.js +3 -3
  216. package/lib/renderers/Options.js +1 -1
  217. package/lib/renderers/Placeholder.js +1 -1
  218. package/lib/renderers/builtin.js +1 -1
  219. package/lib/renderers/register.js +1 -1
  220. package/lib/renderers/wrapControl.d.ts +35 -35
  221. package/lib/renderers/wrapControl.js +1 -1
  222. package/lib/schema.d.ts +25 -0
  223. package/lib/store/app.js +1 -1
  224. package/lib/store/combo.d.ts +775 -808
  225. package/lib/store/combo.js +1 -1
  226. package/lib/store/crud.js +1 -1
  227. package/lib/store/form.d.ts +306 -321
  228. package/lib/store/form.js +1 -1
  229. package/lib/store/formItem.js +7 -2
  230. package/lib/store/iRenderer.js +1 -1
  231. package/lib/store/index.d.ts +16 -16
  232. package/lib/store/index.js +1 -1
  233. package/lib/store/list.d.ts +33 -33
  234. package/lib/store/list.js +1 -1
  235. package/lib/store/manager.d.ts +24 -24
  236. package/lib/store/manager.js +1 -1
  237. package/lib/store/modal.js +1 -1
  238. package/lib/store/node.js +1 -1
  239. package/lib/store/pagination.js +1 -1
  240. package/lib/store/root.js +1 -1
  241. package/lib/store/service.js +1 -1
  242. package/lib/store/status.js +1 -1
  243. package/lib/store/table.d.ts +374 -690
  244. package/lib/store/table.js +2 -2
  245. package/lib/store/table2.d.ts +37 -173
  246. package/lib/store/table2.js +5 -3
  247. package/lib/theme.js +1 -1
  248. package/lib/utils/Animation.js +1 -1
  249. package/lib/utils/ColorScale.js +1 -1
  250. package/lib/utils/DataSchema.js +1 -1
  251. package/lib/utils/DataScope.js +1 -1
  252. package/lib/utils/RootClose.js +3 -3
  253. package/lib/utils/SimpleMap.js +1 -1
  254. package/lib/utils/animations.js +1 -1
  255. package/lib/utils/api.js +1 -1
  256. package/lib/utils/arraySlice.js +1 -1
  257. package/lib/utils/attachmentAdpator.js +1 -1
  258. package/lib/utils/autobind.js +1 -1
  259. package/lib/utils/browser.js +1 -1
  260. package/lib/utils/columnsSplit.js +1 -1
  261. package/lib/utils/concatData.js +1 -1
  262. package/lib/utils/dataMapping.js +1 -1
  263. package/lib/utils/date.js +1 -1
  264. package/lib/utils/debug.js +6 -5
  265. package/lib/utils/decodeEntity.js +1 -1
  266. package/lib/utils/dom.js +4 -9
  267. package/lib/utils/errors.js +1 -1
  268. package/lib/utils/escapeHtml.js +3 -4
  269. package/lib/utils/filter-schema.js +1 -1
  270. package/lib/utils/filter.js +1 -1
  271. package/lib/utils/findDomCompat.d.ts +16 -0
  272. package/lib/utils/findDomCompat.js +262 -0
  273. package/lib/utils/formatDuration.js +1 -1
  274. package/lib/utils/formula.js +1 -1
  275. package/lib/utils/getPageId.js +1 -1
  276. package/lib/utils/getVariable.js +1 -1
  277. package/lib/utils/grammar.js +1 -1
  278. package/lib/utils/handleAction.js +1 -1
  279. package/lib/utils/helper.js +1 -1
  280. package/lib/utils/highlight.js +1 -1
  281. package/lib/utils/icon.js +1 -1
  282. package/lib/utils/image.js +1 -1
  283. package/lib/utils/index.d.ts +1 -0
  284. package/lib/utils/index.js +1 -1
  285. package/lib/utils/isPureVariable.js +1 -1
  286. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  287. package/lib/utils/keyToPath.js +1 -1
  288. package/lib/utils/labelToString.js +1 -1
  289. package/lib/utils/loopTooMuch.js +1 -1
  290. package/lib/utils/makeSorter.js +1 -1
  291. package/lib/utils/math.js +1 -1
  292. package/lib/utils/memoryParse.js +1 -1
  293. package/lib/utils/normalizeLink.js +1 -1
  294. package/lib/utils/normalizeOptions.js +1 -1
  295. package/lib/utils/object.js +1 -1
  296. package/lib/utils/offset.js +1 -1
  297. package/lib/utils/offsetParent.js +1 -1
  298. package/lib/utils/optionValueCompare.js +1 -1
  299. package/lib/utils/position.js +1 -1
  300. package/lib/utils/prettyBytes.js +1 -1
  301. package/lib/utils/printElement.js +1 -1
  302. package/lib/utils/renderer-event.js +1 -1
  303. package/lib/utils/replaceText.js +1 -1
  304. package/lib/utils/resize-sensor.js +1 -1
  305. package/lib/utils/resolveCondition.js +1 -1
  306. package/lib/utils/resolveVariable.js +1 -1
  307. package/lib/utils/resolveVariableAndFilter.js +1 -1
  308. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  309. package/lib/utils/scrollPosition.js +1 -1
  310. package/lib/utils/string2regExp.js +1 -1
  311. package/lib/utils/stripNumber.js +1 -1
  312. package/lib/utils/style-helper.js +1 -1
  313. package/lib/utils/style.js +1 -1
  314. package/lib/utils/toNumber.js +1 -1
  315. package/lib/utils/tokenize.js +1 -1
  316. package/lib/utils/tpl-builtin.js +1 -1
  317. package/lib/utils/tpl-lodash.js +1 -1
  318. package/lib/utils/tpl.js +1 -1
  319. package/lib/utils/uncontrollable.js +1 -1
  320. package/lib/utils/validateId.js +1 -1
  321. package/lib/utils/validations.js +5 -1
  322. package/lib/utils/visitedCache.js +1 -1
  323. package/package.json +4 -4
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -235,6 +235,9 @@ var validations = {
235
235
  notEmptyString: function (values, value) {
236
236
  return !isExisty(value) || !(String(value) && String(value).trim() === '');
237
237
  },
238
+ notEmpty: function (values, value) {
239
+ return !isExisty(value) || !(String(value) && String(value).trim() === '');
240
+ },
238
241
  matchRegexp1: function (values, value, regexp) {
239
242
  return validations.matchRegexp(values, value, regexp);
240
243
  },
@@ -339,6 +342,7 @@ var validateMessages = {
339
342
  isJson: 'validate.isJson',
340
343
  isLength: 'validate.isLength',
341
344
  notEmptyString: 'validate.notEmptyString',
345
+ notEmpty: 'validate.notEmptyString',
342
346
  equalsField: 'validate.equalsField',
343
347
  equals: 'validate.equals',
344
348
  isPhoneNumber: 'validate.isPhoneNumber',
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/Root.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -3,7 +3,7 @@ import type { RootProps } from './Root';
3
3
  import { IScopedContext } from './Scoped';
4
4
  import { IRootStore } from './store/root';
5
5
  import { ActionObject } from './types';
6
- import { GlobalVariableItem } from 'amis-core';
6
+ import { GlobalVariableItem } from './globalVar';
7
7
  export interface RootRendererProps extends RootProps {
8
8
  /**
9
9
  * 当前页面的路径信息,用于路由识别
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -19,7 +19,7 @@ var pick = require('lodash/pick');
19
19
  var mapValues = require('lodash/mapValues');
20
20
  var fileSaver = require('file-saver');
21
21
  var api = require('./utils/api.js');
22
- var ReactDOM = require('react-dom');
22
+ var findDomCompat = require('./utils/findDomCompat.js');
23
23
  var LazyComponent = require('./components/LazyComponent.js');
24
24
  var factory = require('./factory.js');
25
25
  var rendererEvent = require('./utils/renderer-event.js');
@@ -99,7 +99,7 @@ var RootRenderer = /** @class */ (function (_super) {
99
99
  if (typeof this.props.env.affixOffsetTop !== 'undefined' ||
100
100
  typeof this.props.env.affixOffsetBottom !== 'undefined') {
101
101
  // top: var(--affix-offset-top);
102
- var dom = ReactDOM.findDOMNode(this);
102
+ var dom = findDomCompat.findDomCompat(this);
103
103
  if (dom === null || dom === void 0 ? void 0 : dom.parentElement) {
104
104
  dom.parentElement.style.cssText += "--affix-offset-top: ".concat(this.props.env.affixOffsetTop || 0, "px; --affix-offset-bottom: ").concat(this.props.env.affixOffsetBottom || 0, "px;");
105
105
  }
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -64,6 +64,7 @@ require('lodash/kebabCase');
64
64
  require('lodash/some');
65
65
  require('./utils/resolveCondition.js');
66
66
  require('./utils/Animation.js');
67
+ var TaggerWrapper = require('./TaggerWrapper.js');
67
68
 
68
69
  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
69
70
 
@@ -485,6 +486,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
485
486
  if (schema.animations) {
486
487
  component = (_J$X_(Animations["default"], { schema: schema, component: component, show: animationShow }));
487
488
  }
489
+ if (schema.$$tagger) {
490
+ component = (_J$X_(TaggerWrapper.TaggerWrapper, { tagger: schema.$$tagger }, component));
491
+ }
488
492
  return this.props.env.enableAMISDebug ? (_J$X_(debug.DebugWrapper, { renderer: renderer }, component)) : (component);
489
493
  };
490
494
  SchemaRenderer.displayName = 'Renderer';
package/lib/Scoped.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -0,0 +1,14 @@
1
+ import React from 'react';
2
+ interface TaggerWrapperProps {
3
+ children: React.ReactElement;
4
+ tagger: {
5
+ [propName: string]: string | number;
6
+ };
7
+ }
8
+ /**
9
+ * 自动给组件对应 dom 打标记,开发态时才会进来
10
+ * @param param0
11
+ * @returns
12
+ */
13
+ export declare const TaggerWrapper: React.FC<TaggerWrapperProps>;
14
+ export default TaggerWrapper;
@@ -0,0 +1,66 @@
1
+ /**
2
+ * amis-core v7.0.0-next.1
3
+ * Copyright 2018-2025 fex
4
+ */
5
+
6
+ 'use strict';
7
+
8
+ Object.defineProperty(exports, '__esModule', { value: true });
9
+
10
+ var React = require('react');
11
+ var findDomCompat = require('./utils/findDomCompat.js');
12
+
13
+ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
14
+
15
+ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
16
+
17
+ /**
18
+ * 自动给组件对应 dom 打标记,开发态时才会进来
19
+ * @param param0
20
+ * @returns
21
+ */
22
+ var TaggerWrapper = function (_a) {
23
+ var children = _a.children, tagger = _a.tagger;
24
+ var ref = React__default["default"].useRef(null);
25
+ React__default["default"].useLayoutEffect(function () {
26
+ if (!ref.current || !tagger) {
27
+ return;
28
+ }
29
+ var dom = findDomCompat.findDomCompat(ref.current);
30
+ var attrs = {};
31
+ Object.keys(tagger).forEach(function (key) {
32
+ if (typeof tagger[key] === 'string' || typeof tagger[key] === 'number') {
33
+ attrs["data-amis-tagger-".concat(key)] = String(tagger[key]);
34
+ }
35
+ });
36
+ Object.keys(attrs).forEach(function (key) {
37
+ dom === null || dom === void 0 ? void 0 : dom.setAttribute(key, attrs[key]);
38
+ });
39
+ return function () {
40
+ Object.keys(attrs).forEach(function (key) {
41
+ dom === null || dom === void 0 ? void 0 : dom.removeAttribute(key);
42
+ });
43
+ };
44
+ }, [tagger, ref.current]);
45
+ // 合并 ref:保持原有 ref,同时添加我们的 ref
46
+ var mergedRef = React__default["default"].useCallback(function (node) {
47
+ ref.current = node;
48
+ // 如果原有 children 有 ref,也调用它
49
+ var childRef = children.ref;
50
+ if (childRef) {
51
+ if (typeof childRef === 'function') {
52
+ childRef(node);
53
+ }
54
+ else {
55
+ // ref 对象
56
+ childRef.current = node;
57
+ }
58
+ }
59
+ }, [children]);
60
+ return React__default["default"].cloneElement(children, {
61
+ ref: mergedRef
62
+ });
63
+ };
64
+
65
+ exports.TaggerWrapper = TaggerWrapper;
66
+ exports["default"] = TaggerWrapper;
@@ -1,21 +1,21 @@
1
1
  import React from 'react';
2
2
  import { IRendererStore } from './store';
3
3
  import hoistNonReactStatic from 'hoist-non-react-statics';
4
- export declare const RootStoreContext: React.Context<{
5
- storeType: string;
6
- } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
4
+ export declare const RootStoreContext: React.Context<import("mobx-state-tree").ModelInstanceTypeProps<{
5
+ storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
6
+ }> & {
7
7
  readonly fetcher: any;
8
8
  readonly notify: any;
9
9
  readonly isCancel: (value: any) => boolean;
10
10
  readonly __: import("./locale").TranslateFn;
11
- getStoreById(id: string): {
12
- id: string;
13
- path: string;
14
- storeType: string;
15
- disposed: boolean;
16
- parentId: string;
17
- childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
18
- } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
11
+ getStoreById(id: string): import("mobx-state-tree").ModelInstanceTypeProps<{
12
+ id: import("mobx-state-tree").ISimpleType<string>;
13
+ path: import("mobx-state-tree").IType<string | undefined, string, string>;
14
+ storeType: import("mobx-state-tree").ISimpleType<string>;
15
+ disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
16
+ parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
17
+ childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
18
+ }> & {
19
19
  readonly parentStore: any;
20
20
  readonly __: any;
21
21
  readonly hasChildren: boolean;
@@ -46,14 +46,14 @@ export declare const RootStoreContext: React.Context<{
46
46
  removeChildId: (id: string) => void;
47
47
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
48
48
  readonly stores: {
49
- [propName: string]: {
50
- id: string;
51
- path: string;
52
- storeType: string;
53
- disposed: boolean;
54
- parentId: string;
55
- childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
56
- } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
49
+ [propName: string]: import("mobx-state-tree").ModelInstanceTypeProps<{
50
+ id: import("mobx-state-tree").ISimpleType<string>;
51
+ path: import("mobx-state-tree").IType<string | undefined, string, string>;
52
+ storeType: import("mobx-state-tree").ISimpleType<string>;
53
+ disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
54
+ parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
55
+ childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
56
+ }> & {
57
57
  readonly parentStore: any;
58
58
  readonly __: any;
59
59
  readonly hasChildren: boolean;
@@ -100,14 +100,14 @@ export declare const RootStoreContext: React.Context<{
100
100
  readonly notify: any;
101
101
  readonly isCancel: (value: any) => boolean;
102
102
  readonly __: import("./locale").TranslateFn;
103
- getStoreById(id: string): {
104
- id: string;
105
- path: string;
106
- storeType: string;
107
- disposed: boolean;
108
- parentId: string;
109
- childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
110
- } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
103
+ getStoreById(id: string): import("mobx-state-tree").ModelInstanceTypeProps<{
104
+ id: import("mobx-state-tree").ISimpleType<string>;
105
+ path: import("mobx-state-tree").IType<string | undefined, string, string>;
106
+ storeType: import("mobx-state-tree").ISimpleType<string>;
107
+ disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
108
+ parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
109
+ childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
110
+ }> & {
111
111
  readonly parentStore: any;
112
112
  readonly __: any;
113
113
  readonly hasChildren: boolean;
@@ -138,14 +138,14 @@ export declare const RootStoreContext: React.Context<{
138
138
  removeChildId: (id: string) => void;
139
139
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
140
140
  readonly stores: {
141
- [propName: string]: {
142
- id: string;
143
- path: string;
144
- storeType: string;
145
- disposed: boolean;
146
- parentId: string;
147
- childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
148
- } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
141
+ [propName: string]: import("mobx-state-tree").ModelInstanceTypeProps<{
142
+ id: import("mobx-state-tree").ISimpleType<string>;
143
+ path: import("mobx-state-tree").IType<string | undefined, string, string>;
144
+ storeType: import("mobx-state-tree").ISimpleType<string>;
145
+ disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
146
+ parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
147
+ childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
148
+ }> & {
149
149
  readonly parentStore: any;
150
150
  readonly __: any;
151
151
  readonly hasChildren: boolean;
@@ -216,21 +216,21 @@ export declare function withRootStore<T extends React.ComponentType<React.Compon
216
216
  UNSAFE_componentWillUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, nextState: Readonly<{}>, nextContext: any): void;
217
217
  };
218
218
  displayName: string;
219
- contextType: React.Context<{
220
- storeType: string;
221
- } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
219
+ contextType: React.Context<import("mobx-state-tree").ModelInstanceTypeProps<{
220
+ storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
221
+ }> & {
222
222
  readonly fetcher: any;
223
223
  readonly notify: any;
224
224
  readonly isCancel: (value: any) => boolean;
225
225
  readonly __: import("./locale").TranslateFn;
226
- getStoreById(id: string): {
227
- id: string;
228
- path: string;
229
- storeType: string;
230
- disposed: boolean;
231
- parentId: string;
232
- childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
233
- } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
226
+ getStoreById(id: string): import("mobx-state-tree").ModelInstanceTypeProps<{
227
+ id: import("mobx-state-tree").ISimpleType<string>;
228
+ path: import("mobx-state-tree").IType<string | undefined, string, string>;
229
+ storeType: import("mobx-state-tree").ISimpleType<string>;
230
+ disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
231
+ parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
232
+ childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
233
+ }> & {
234
234
  readonly parentStore: any;
235
235
  readonly __: any;
236
236
  readonly hasChildren: boolean;
@@ -261,14 +261,14 @@ export declare function withRootStore<T extends React.ComponentType<React.Compon
261
261
  removeChildId: (id: string) => void;
262
262
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
263
263
  readonly stores: {
264
- [propName: string]: {
265
- id: string;
266
- path: string;
267
- storeType: string;
268
- disposed: boolean;
269
- parentId: string;
270
- childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
271
- } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
264
+ [propName: string]: import("mobx-state-tree").ModelInstanceTypeProps<{
265
+ id: import("mobx-state-tree").ISimpleType<string>;
266
+ path: import("mobx-state-tree").IType<string | undefined, string, string>;
267
+ storeType: import("mobx-state-tree").ISimpleType<string>;
268
+ disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
269
+ parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
270
+ childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
271
+ }> & {
272
272
  readonly parentStore: any;
273
273
  readonly __: any;
274
274
  readonly hasChildren: boolean;
@@ -315,14 +315,14 @@ export declare function withRootStore<T extends React.ComponentType<React.Compon
315
315
  readonly notify: any;
316
316
  readonly isCancel: (value: any) => boolean;
317
317
  readonly __: import("./locale").TranslateFn;
318
- getStoreById(id: string): {
319
- id: string;
320
- path: string;
321
- storeType: string;
322
- disposed: boolean;
323
- parentId: string;
324
- childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
325
- } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
318
+ getStoreById(id: string): import("mobx-state-tree").ModelInstanceTypeProps<{
319
+ id: import("mobx-state-tree").ISimpleType<string>;
320
+ path: import("mobx-state-tree").IType<string | undefined, string, string>;
321
+ storeType: import("mobx-state-tree").ISimpleType<string>;
322
+ disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
323
+ parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
324
+ childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
325
+ }> & {
326
326
  readonly parentStore: any;
327
327
  readonly __: any;
328
328
  readonly hasChildren: boolean;
@@ -353,14 +353,14 @@ export declare function withRootStore<T extends React.ComponentType<React.Compon
353
353
  removeChildId: (id: string) => void;
354
354
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
355
355
  readonly stores: {
356
- [propName: string]: {
357
- id: string;
358
- path: string;
359
- storeType: string;
360
- disposed: boolean;
361
- parentId: string;
362
- childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
363
- } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
356
+ [propName: string]: import("mobx-state-tree").ModelInstanceTypeProps<{
357
+ id: import("mobx-state-tree").ISimpleType<string>;
358
+ path: import("mobx-state-tree").IType<string | undefined, string, string>;
359
+ storeType: import("mobx-state-tree").ISimpleType<string>;
360
+ disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
361
+ parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
362
+ childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
363
+ }> & {
364
364
  readonly parentStore: any;
365
365
  readonly __: any;
366
366
  readonly hasChildren: boolean;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
package/lib/WithStore.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -54,6 +54,7 @@ function HocStoreFactory(renderer) {
54
54
  var rootStore = context;
55
55
  _this.renderChild = _this.renderChild.bind(_this);
56
56
  _this.refFn = _this.refFn.bind(_this);
57
+ _this.renderFn = props.render;
57
58
  var store = rootStore.addStore({
58
59
  id: helper.guid(),
59
60
  path: _this.props.$path,
@@ -89,8 +90,8 @@ function HocStoreFactory(renderer) {
89
90
  if (!detectField || detectField === 'data') {
90
91
  exprProps = filterSchema.getExprProperties(rest, store.data);
91
92
  _this.state = tslib.__assign({}, exprProps);
92
- _this.unReaction = mobx.reaction(function () { return JSON.stringify(filterSchema.getExprProperties(_this.props, store.data)); }, function () {
93
- return _this.setState(tslib.__assign({}, filterSchema.getExprProperties(_this.props, store.data)));
93
+ _this.unReaction = mobx.reaction(function () { return JSON.stringify(filterSchema.getExprProperties(rest, store.data)); }, function () {
94
+ return _this.setState(tslib.__assign({}, filterSchema.getExprProperties(rest, store.data)));
94
95
  });
95
96
  }
96
97
  return _this;
@@ -210,8 +211,7 @@ function HocStoreFactory(renderer) {
210
211
  };
211
212
  StoreFactory.prototype.renderChild = function (region, node, subProps) {
212
213
  if (subProps === void 0) { subProps = {}; }
213
- var render = this.props.render;
214
- return render(region, node, tslib.__assign(tslib.__assign({ data: this.store.data, dataUpdatedAt: this.store.updatedAt }, subProps), { scope: this.store.data, store: this.store }));
214
+ return this.renderFn(region, node, tslib.__assign(tslib.__assign({ data: this.store.data, dataUpdatedAt: this.store.updatedAt }, subProps), { scope: this.store.data, store: this.store }));
215
215
  };
216
216
  StoreFactory.prototype.render = function () {
217
217
  var _a;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.14.0-beta.9
2
+ * amis-core v7.0.0-next.1
3
3
  * Copyright 2018-2025 fex
4
4
  */
5
5