amis-core 6.6.0 → 6.7.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 (299) hide show
  1. package/esm/Root.js +4 -3
  2. package/esm/RootRenderer.d.ts +1 -1
  3. package/esm/RootRenderer.js +1 -1
  4. package/esm/SchemaRenderer.js +5 -5
  5. package/esm/Scoped.js +1 -1
  6. package/esm/StatusScoped.js +1 -1
  7. package/esm/WithRootStore.js +1 -1
  8. package/esm/WithStore.js +1 -1
  9. package/esm/actions/Action.js +32 -31
  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 +55 -48
  14. package/esm/actions/ContinueAction.js +1 -1
  15. package/esm/actions/CopyAction.js +1 -1
  16. package/esm/actions/CustomAction.js +11 -3
  17. package/esm/actions/DialogAction.js +1 -1
  18. package/esm/actions/DrawerAction.js +1 -1
  19. package/esm/actions/EmailAction.js +1 -1
  20. package/esm/actions/EventAction.js +1 -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/CustomStyle.js +1 -1
  31. package/esm/components/ErrorBoundary.js +1 -1
  32. package/esm/components/LazyComponent.js +1 -1
  33. package/esm/components/Overlay.js +1 -1
  34. package/esm/components/PopOver.d.ts +2 -0
  35. package/esm/components/PopOver.js +4 -4
  36. package/esm/env.d.ts +4 -0
  37. package/esm/env.js +1 -1
  38. package/esm/envOverwrite.js +1 -1
  39. package/esm/factory.js +1 -1
  40. package/esm/index.js +3 -3
  41. package/esm/locale.js +1 -1
  42. package/esm/polyfills.js +1 -1
  43. package/esm/renderers/Form.js +82 -10
  44. package/esm/renderers/Item.js +23 -8
  45. package/esm/renderers/Options.js +1 -1
  46. package/esm/renderers/Placeholder.js +1 -1
  47. package/esm/renderers/builtin.js +1 -1
  48. package/esm/renderers/register.js +1 -1
  49. package/esm/renderers/wrapControl.js +1 -1
  50. package/esm/store/app.d.ts +1 -0
  51. package/esm/store/app.js +1 -1
  52. package/esm/store/combo.d.ts +3 -0
  53. package/esm/store/combo.js +1 -1
  54. package/esm/store/crud.d.ts +1 -0
  55. package/esm/store/crud.js +1 -1
  56. package/esm/store/form.d.ts +1 -0
  57. package/esm/store/form.js +1 -1
  58. package/esm/store/formItem.js +1 -1
  59. package/esm/store/iRenderer.d.ts +1 -0
  60. package/esm/store/iRenderer.js +7 -3
  61. package/esm/store/index.js +1 -1
  62. package/esm/store/list.d.ts +1 -0
  63. package/esm/store/list.js +1 -1
  64. package/esm/store/manager.js +1 -1
  65. package/esm/store/modal.d.ts +1 -0
  66. package/esm/store/modal.js +1 -1
  67. package/esm/store/node.js +1 -1
  68. package/esm/store/pagination.d.ts +1 -0
  69. package/esm/store/pagination.js +1 -1
  70. package/esm/store/root.d.ts +1 -0
  71. package/esm/store/root.js +1 -1
  72. package/esm/store/service.d.ts +1 -0
  73. package/esm/store/service.js +1 -1
  74. package/esm/store/status.js +1 -1
  75. package/esm/store/table.d.ts +3 -0
  76. package/esm/store/table.js +1 -1
  77. package/esm/store/table2.d.ts +1 -0
  78. package/esm/store/table2.js +1 -1
  79. package/esm/theme.js +1 -1
  80. package/esm/types.d.ts +1 -1
  81. package/esm/utils/Animation.js +1 -1
  82. package/esm/utils/ColorScale.js +1 -1
  83. package/esm/utils/DataSchema.js +1 -1
  84. package/esm/utils/DataScope.js +2 -2
  85. package/esm/utils/RootClose.js +1 -1
  86. package/esm/utils/SimpleMap.js +1 -1
  87. package/esm/utils/api.js +2 -2
  88. package/esm/utils/arraySlice.js +1 -1
  89. package/esm/utils/attachmentAdpator.js +1 -1
  90. package/esm/utils/autobind.js +1 -1
  91. package/esm/utils/browser.js +1 -1
  92. package/esm/utils/columnsSplit.js +1 -1
  93. package/esm/utils/concatData.js +1 -1
  94. package/esm/utils/dataMapping.js +1 -1
  95. package/esm/utils/date.js +1 -1
  96. package/esm/utils/debug.js +1 -1
  97. package/esm/utils/decodeEntity.js +1 -1
  98. package/esm/utils/dom.js +1 -1
  99. package/esm/utils/errors.js +1 -1
  100. package/esm/utils/escapeHtml.js +1 -1
  101. package/esm/utils/filter-schema.js +1 -1
  102. package/esm/utils/filter.js +1 -1
  103. package/esm/utils/formatDuration.js +1 -1
  104. package/esm/utils/formula.js +1 -1
  105. package/esm/utils/getVariable.js +1 -1
  106. package/esm/utils/grammar.js +1 -1
  107. package/esm/utils/handleAction.js +1 -1
  108. package/esm/utils/helper.d.ts +1 -0
  109. package/esm/utils/helper.js +19 -6
  110. package/esm/utils/highlight.js +1 -1
  111. package/esm/utils/icon.js +1 -1
  112. package/esm/utils/image.js +1 -1
  113. package/esm/utils/isPureVariable.js +1 -1
  114. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  115. package/esm/utils/keyToPath.js +1 -1
  116. package/esm/utils/labelToString.js +1 -1
  117. package/esm/utils/makeSorter.js +1 -1
  118. package/esm/utils/math.js +1 -1
  119. package/esm/utils/memoryParse.js +1 -1
  120. package/esm/utils/normalizeLink.js +1 -1
  121. package/esm/utils/normalizeOptions.js +1 -1
  122. package/esm/utils/object.js +1 -1
  123. package/esm/utils/offset.js +1 -1
  124. package/esm/utils/offsetParent.js +1 -1
  125. package/esm/utils/optionValueCompare.js +1 -1
  126. package/esm/utils/position.js +1 -1
  127. package/esm/utils/prettyBytes.js +1 -1
  128. package/esm/utils/printElement.js +1 -1
  129. package/esm/utils/renderer-event.js +5 -3
  130. package/esm/utils/replaceText.js +1 -1
  131. package/esm/utils/resize-sensor.js +1 -1
  132. package/esm/utils/resolveCondition.js +1 -1
  133. package/esm/utils/resolveVariable.js +1 -1
  134. package/esm/utils/resolveVariableAndFilter.js +1 -1
  135. package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
  136. package/esm/utils/scrollPosition.js +1 -1
  137. package/esm/utils/string2regExp.js +1 -1
  138. package/esm/utils/stripNumber.js +1 -1
  139. package/esm/utils/style-helper.d.ts +4 -2
  140. package/esm/utils/style-helper.js +27 -13
  141. package/esm/utils/style.js +1 -1
  142. package/esm/utils/toNumber.js +1 -1
  143. package/esm/utils/tokenize.js +1 -1
  144. package/esm/utils/tpl-builtin.js +1 -1
  145. package/esm/utils/tpl-lodash.js +1 -1
  146. package/esm/utils/tpl.js +1 -1
  147. package/esm/utils/uncontrollable.js +1 -1
  148. package/esm/utils/validateId.js +3 -3
  149. package/esm/utils/validations.js +1 -1
  150. package/lib/Root.js +4 -3
  151. package/lib/RootRenderer.js +1 -1
  152. package/lib/SchemaRenderer.js +5 -5
  153. package/lib/Scoped.js +1 -1
  154. package/lib/StatusScoped.js +1 -1
  155. package/lib/WithRootStore.js +1 -1
  156. package/lib/WithStore.js +1 -1
  157. package/lib/actions/Action.js +32 -31
  158. package/lib/actions/AjaxAction.js +1 -1
  159. package/lib/actions/BreakAction.js +1 -1
  160. package/lib/actions/BroadcastAction.js +1 -1
  161. package/lib/actions/CmptAction.js +55 -48
  162. package/lib/actions/ContinueAction.js +1 -1
  163. package/lib/actions/CopyAction.js +1 -1
  164. package/lib/actions/CustomAction.js +11 -3
  165. package/lib/actions/DialogAction.js +1 -1
  166. package/lib/actions/DrawerAction.js +1 -1
  167. package/lib/actions/EmailAction.js +1 -1
  168. package/lib/actions/EventAction.js +1 -1
  169. package/lib/actions/LinkAction.js +1 -1
  170. package/lib/actions/LoopAction.js +1 -1
  171. package/lib/actions/PageAction.js +1 -1
  172. package/lib/actions/ParallelAction.js +1 -1
  173. package/lib/actions/PrintAction.js +1 -1
  174. package/lib/actions/StatusAction.js +1 -1
  175. package/lib/actions/SwitchAction.js +1 -1
  176. package/lib/actions/ToastAction.js +1 -1
  177. package/lib/actions/WaitAction.js +1 -1
  178. package/lib/components/CustomStyle.js +1 -1
  179. package/lib/components/ErrorBoundary.js +1 -1
  180. package/lib/components/LazyComponent.js +1 -1
  181. package/lib/components/Overlay.js +1 -1
  182. package/lib/components/PopOver.d.ts +2 -0
  183. package/lib/components/PopOver.js +4 -4
  184. package/lib/env.d.ts +4 -0
  185. package/lib/env.js +1 -1
  186. package/lib/envOverwrite.js +1 -1
  187. package/lib/factory.js +1 -1
  188. package/lib/index.js +3 -2
  189. package/lib/locale.js +1 -1
  190. package/lib/polyfills.js +1 -1
  191. package/lib/renderers/Form.js +82 -10
  192. package/lib/renderers/Item.d.ts +1 -1
  193. package/lib/renderers/Item.js +23 -8
  194. package/lib/renderers/Options.js +1 -1
  195. package/lib/renderers/Placeholder.js +1 -1
  196. package/lib/renderers/builtin.js +1 -1
  197. package/lib/renderers/register.js +1 -1
  198. package/lib/renderers/wrapControl.js +1 -1
  199. package/lib/store/app.d.ts +1 -0
  200. package/lib/store/app.js +1 -1
  201. package/lib/store/combo.d.ts +27 -24
  202. package/lib/store/combo.js +1 -1
  203. package/lib/store/crud.d.ts +1 -0
  204. package/lib/store/crud.js +1 -1
  205. package/lib/store/form.d.ts +11 -10
  206. package/lib/store/form.js +1 -1
  207. package/lib/store/formItem.js +1 -1
  208. package/lib/store/iRenderer.d.ts +1 -0
  209. package/lib/store/iRenderer.js +7 -3
  210. package/lib/store/index.js +1 -1
  211. package/lib/store/list.d.ts +1 -0
  212. package/lib/store/list.js +1 -1
  213. package/lib/store/manager.js +1 -1
  214. package/lib/store/modal.d.ts +1 -0
  215. package/lib/store/modal.js +1 -1
  216. package/lib/store/node.js +1 -1
  217. package/lib/store/pagination.d.ts +1 -0
  218. package/lib/store/pagination.js +1 -1
  219. package/lib/store/root.d.ts +1 -0
  220. package/lib/store/root.js +1 -1
  221. package/lib/store/service.d.ts +1 -0
  222. package/lib/store/service.js +1 -1
  223. package/lib/store/status.js +1 -1
  224. package/lib/store/table.d.ts +23 -20
  225. package/lib/store/table.js +1 -1
  226. package/lib/store/table2.d.ts +1 -0
  227. package/lib/store/table2.js +1 -1
  228. package/lib/theme.js +1 -1
  229. package/lib/types.d.ts +1 -1
  230. package/lib/utils/Animation.js +1 -1
  231. package/lib/utils/ColorScale.js +1 -1
  232. package/lib/utils/DataSchema.js +1 -1
  233. package/lib/utils/DataScope.js +2 -2
  234. package/lib/utils/RootClose.js +1 -1
  235. package/lib/utils/SimpleMap.js +1 -1
  236. package/lib/utils/api.js +2 -2
  237. package/lib/utils/arraySlice.js +1 -1
  238. package/lib/utils/attachmentAdpator.js +1 -1
  239. package/lib/utils/autobind.js +1 -1
  240. package/lib/utils/browser.js +1 -1
  241. package/lib/utils/columnsSplit.js +1 -1
  242. package/lib/utils/concatData.js +1 -1
  243. package/lib/utils/dataMapping.js +1 -1
  244. package/lib/utils/date.js +1 -1
  245. package/lib/utils/debug.js +1 -1
  246. package/lib/utils/decodeEntity.js +1 -1
  247. package/lib/utils/dom.js +1 -1
  248. package/lib/utils/errors.js +1 -1
  249. package/lib/utils/escapeHtml.js +1 -1
  250. package/lib/utils/filter-schema.js +1 -1
  251. package/lib/utils/filter.js +1 -1
  252. package/lib/utils/formatDuration.js +1 -1
  253. package/lib/utils/formula.js +1 -1
  254. package/lib/utils/getVariable.js +1 -1
  255. package/lib/utils/grammar.js +1 -1
  256. package/lib/utils/handleAction.js +1 -1
  257. package/lib/utils/helper.d.ts +1 -0
  258. package/lib/utils/helper.js +19 -5
  259. package/lib/utils/highlight.js +1 -1
  260. package/lib/utils/icon.js +1 -1
  261. package/lib/utils/image.js +1 -1
  262. package/lib/utils/isPureVariable.js +1 -1
  263. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  264. package/lib/utils/keyToPath.js +1 -1
  265. package/lib/utils/labelToString.js +1 -1
  266. package/lib/utils/makeSorter.js +1 -1
  267. package/lib/utils/math.js +1 -1
  268. package/lib/utils/memoryParse.js +1 -1
  269. package/lib/utils/normalizeLink.js +1 -1
  270. package/lib/utils/normalizeOptions.js +1 -1
  271. package/lib/utils/object.js +1 -1
  272. package/lib/utils/offset.js +1 -1
  273. package/lib/utils/offsetParent.js +1 -1
  274. package/lib/utils/optionValueCompare.js +1 -1
  275. package/lib/utils/position.js +1 -1
  276. package/lib/utils/prettyBytes.js +1 -1
  277. package/lib/utils/printElement.js +1 -1
  278. package/lib/utils/renderer-event.js +5 -3
  279. package/lib/utils/replaceText.js +1 -1
  280. package/lib/utils/resize-sensor.js +1 -1
  281. package/lib/utils/resolveCondition.js +1 -1
  282. package/lib/utils/resolveVariable.js +1 -1
  283. package/lib/utils/resolveVariableAndFilter.js +1 -1
  284. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  285. package/lib/utils/scrollPosition.js +1 -1
  286. package/lib/utils/string2regExp.js +1 -1
  287. package/lib/utils/stripNumber.js +1 -1
  288. package/lib/utils/style-helper.d.ts +4 -2
  289. package/lib/utils/style-helper.js +27 -13
  290. package/lib/utils/style.js +1 -1
  291. package/lib/utils/toNumber.js +1 -1
  292. package/lib/utils/tokenize.js +1 -1
  293. package/lib/utils/tpl-builtin.js +1 -1
  294. package/lib/utils/tpl-lodash.js +1 -1
  295. package/lib/utils/tpl.js +1 -1
  296. package/lib/utils/uncontrollable.js +1 -1
  297. package/lib/utils/validateId.js +3 -3
  298. package/lib/utils/validations.js +1 -1
  299. package/package.json +2 -2
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -3,6 +3,7 @@ export declare const valueMap: PlainObject;
3
3
  export declare const inheritValueMap: PlainObject;
4
4
  interface extra {
5
5
  important?: boolean;
6
+ parent?: string;
6
7
  inner?: string;
7
8
  pre?: string;
8
9
  suf?: string;
@@ -42,10 +43,11 @@ export interface CustomStyleClassName {
42
43
  default?: extra;
43
44
  hover?: extra;
44
45
  active?: extra;
46
+ focused?: extra;
45
47
  disabled?: extra;
46
48
  };
47
49
  }
48
- export declare function insertCustomStyle(prams: {
50
+ export declare function insertCustomStyle(params: {
49
51
  themeCss: any;
50
52
  classNames: CustomStyleClassName[];
51
53
  id: string;
@@ -81,7 +83,7 @@ export interface InsertCustomStyle {
81
83
  export declare function removeCustomStyle(type: string, id: string, doc?: Document, data?: any): void;
82
84
  export declare function formatInputThemeCss(themeCss: any): any;
83
85
  export declare function setThemeClassName(params: {
84
- name: string;
86
+ name: string | string[];
85
87
  id?: string;
86
88
  themeCss: any;
87
89
  extra?: string;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -145,7 +145,8 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
145
145
  default: '',
146
146
  hover: ':hover',
147
147
  active: ':hover:active',
148
- disabled: '.is-disabled'
148
+ focused: '',
149
+ disabled: ''
149
150
  };
150
151
  var _loop_1 = function (item) {
151
152
  var body = themeCss[item.key];
@@ -161,6 +162,7 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
161
162
  default: {},
162
163
  hover: {},
163
164
  active: {},
165
+ focused: {},
164
166
  disabled: {}
165
167
  };
166
168
  Object.keys(body).forEach(function (key) {
@@ -174,6 +176,9 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
174
176
  else if (!!~key.indexOf(':active')) {
175
177
  statusMap.active[key.replace(':active', '')] = body[key];
176
178
  }
179
+ else if (!!~key.indexOf(':focused')) {
180
+ statusMap.focused[key.replace(':focused', '')] = body[key];
181
+ }
177
182
  else if (!!~key.indexOf(':disabled')) {
178
183
  statusMap.disabled[key.replace(':disabled', '')] = body[key];
179
184
  }
@@ -229,9 +234,10 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
229
234
  if (styles.length > 0) {
230
235
  var cx = ((weights === null || weights === void 0 ? void 0 : weights.pre) || '') + className + ((weights === null || weights === void 0 ? void 0 : weights.suf) || '');
231
236
  var inner = (weights === null || weights === void 0 ? void 0 : weights.inner) || '';
237
+ var parent_1 = (weights === null || weights === void 0 ? void 0 : weights.parent) || '';
232
238
  res.push({
233
- className: cx + status2string[status] + inner,
234
- content: ".".concat(cx + status2string[status], " ").concat(inner, "{\n ").concat(styles.join('\n '), "\n}")
239
+ className: parent_1 + cx + status2string[status] + inner,
240
+ content: "".concat(parent_1, " .").concat(cx + status2string[status], " ").concat(inner, "{\n ").concat(styles.join('\n '), "\n}")
235
241
  });
236
242
  // TODO:切换状态暂时先不改变组件的样式
237
243
  // if (['hover', 'active', 'disabled'].includes(status)) {
@@ -261,9 +267,9 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
261
267
  origin: res
262
268
  };
263
269
  }
264
- function insertCustomStyle(prams) {
270
+ function insertCustomStyle(params) {
265
271
  var _a;
266
- var themeCss = prams.themeCss, classNames = prams.classNames, id = prams.id, defaultData = prams.defaultData, customStyleClassPrefix = prams.customStyleClassPrefix, doc = prams.doc, data = prams.data;
272
+ var themeCss = params.themeCss, classNames = params.classNames, id = params.id, defaultData = params.defaultData, customStyleClassPrefix = params.customStyleClassPrefix, doc = params.doc, data = params.data;
267
273
  if (!themeCss) {
268
274
  return;
269
275
  }
@@ -397,21 +403,29 @@ function formatInputThemeCss(themeCss) {
397
403
  return inputFontThemeCss;
398
404
  }
399
405
  function setThemeClassName(params) {
400
- var _a;
401
406
  var name = params.name, id = params.id, themeCss = params.themeCss, extra = params.extra, data = params.data;
402
407
  if (!id || !themeCss) {
403
408
  return '';
404
409
  }
405
- if (name !== 'wrapperCustomStyle' && !themeCss[name]) {
406
- return '';
407
- }
408
410
  var index = '';
409
411
  if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
410
412
  index = "-".concat(data.index);
411
413
  }
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);
414
+ function setClassName(name, id) {
415
+ var _a;
416
+ if (name !== 'wrapperCustomStyle' && !themeCss[name]) {
417
+ return '';
418
+ }
419
+ return ("".concat(name, "-").concat(((_a = id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id) +
420
+ (extra ? "-".concat(extra) : '') +
421
+ index);
422
+ }
423
+ if (typeof name === 'string') {
424
+ return setClassName(name, id);
425
+ }
426
+ else {
427
+ return name.map(function (n) { return setClassName(n, id); }).join(' ');
428
+ }
415
429
  }
416
430
 
417
431
  export { addStyle, findOrCreateStyle, formatInputThemeCss, formatStyle, getValueByPath, inheritValueMap, insertCustomStyle, insertEditCustomStyle, insertStyle, removeCustomStyle, setThemeClassName, valueMap };
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.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.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -122,8 +122,8 @@ function verifyRegion(province, city, country) {
122
122
  return false;
123
123
  }
124
124
  // 这里暂时不获取市和区的具体信息,因为调用CityDB会把校验函数传染为异步
125
- // city位: 00表示省;01-20,51-70表示省直辖市;21-50表示地区(自治州、盟)
126
- if (!/^(?:[0-6]\d|70)$/.test(city)) {
125
+ // city位: 00表示省;01-20,51-70表示省直辖市;21-50表示地区(自治州、盟), 90 表示 直辖县级市
126
+ if (!/^(?:[0-6]\d|70|90)$/.test(city)) {
127
127
  return false;
128
128
  }
129
129
  if (!/^\d\d$/.test(country)) {
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.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.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -77,6 +77,7 @@ function renderChildren(prefix, node, props) {
77
77
  return renderChild(prefix, node, props);
78
78
  }
79
79
  function renderChild(prefix, node, props) {
80
+ var _a, _b;
80
81
  if (Array.isArray(node)) {
81
82
  return renderChildren(prefix, node, props);
82
83
  }
@@ -103,9 +104,9 @@ function renderChild(prefix, node, props) {
103
104
  // 找渲染器也是在那,所以没办法在之前根据渲染器信息来包裹个组件下发 statusStore
104
105
  // 所以这里先根据 type 来处理一下
105
106
  // 等后续把状态处理再抽一层,可以把此处放到 SchemaRenderer 里面去
106
- return (_J$X_(StatusScopedSchemaRenderer, tslib.__assign({ render: renderChild }, props, { schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
107
+ return (_J$X_(StatusScopedSchemaRenderer, tslib.__assign({ render: renderChild }, props, { key: (_a = props.key) !== null && _a !== void 0 ? _a : schema.key, schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
107
108
  }
108
- return (_J$X_(SchemaRenderer.SchemaRenderer, tslib.__assign({ render: renderChild }, props, { schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
109
+ return (_J$X_(SchemaRenderer.SchemaRenderer, tslib.__assign({ render: renderChild }, props, { key: (_b = props.key) !== null && _b !== void 0 ? _b : schema.key, schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
109
110
  }
110
111
  var ScopedRootRenderer = StatusScoped.StatusScoped(Scoped.HocScoped(Root));
111
112
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -227,7 +227,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
227
227
  var e_1, _a;
228
228
  var _this = this;
229
229
  var _b, _c, _d, _e, _f, _g;
230
- var _h = this.props; _h.$path; var __ = _h.schema, rootStore = _h.rootStore, statusStore = _h.statusStore, render = _h.render, rest = tslib.__rest(_h, ["$path", "schema", "rootStore", "statusStore", "render"]);
230
+ var _h = this.props; _h.$path; var __ = _h.schema, rootStore = _h.rootStore, statusStore = _h.statusStore, render = _h.render, propKey = _h.key, rest = tslib.__rest(_h, ["$path", "schema", "rootStore", "statusStore", "render", "key"]);
231
231
  if (__ == null) {
232
232
  return null;
233
233
  }
@@ -277,12 +277,12 @@ var SchemaRenderer = /** @class */ (function (_super) {
277
277
  else if (schema.component && reactIs.isValidElementType(schema.component)) {
278
278
  var isSFC = !(schema.component.prototype instanceof React__default["default"].Component);
279
279
  var defaultData_1 = schema.data, defaultValue_1 = schema.value, // render时的value改放defaultValue中
280
- defaultActiveKey_1 = schema.activeKey, propKey_1 = schema.key, restSchema_1 = tslib.__rest(schema, ["data", "value", "activeKey", "key"]);
280
+ defaultActiveKey_1 = schema.activeKey, restSchema_1 = tslib.__rest(schema, ["data", "value", "activeKey"]);
281
281
  return rest.invisible
282
282
  ? null
283
283
  : _J$X_(schema.component, tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, rest), restSchema_1), exprProps), {
284
284
  // value: defaultValue, // 备注: 此处并没有将value传递给渲染器
285
- defaultData: defaultData_1, defaultValue: defaultValue_1, defaultActiveKey: defaultActiveKey_1, propKey: propKey_1, $path: $path, $schema: schema, ref: isSFC ? undefined : this.refFn, forwardedRef: isSFC ? this.refFn : undefined, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent }));
285
+ defaultData: defaultData_1, defaultValue: defaultValue_1, defaultActiveKey: defaultActiveKey_1, propKey: propKey, $path: $path, $schema: schema, ref: isSFC ? undefined : this.refFn, forwardedRef: isSFC ? this.refFn : undefined, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent }));
286
286
  }
287
287
  else if (Object.keys(schema).length === 0) {
288
288
  return null;
@@ -309,7 +309,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
309
309
  }
310
310
  var renderer = this.renderer;
311
311
  schema = factory.filterSchema(schema, renderer, rest);
312
- var defaultData = schema.data, defaultValue = schema.value, propKey = schema.key, defaultActiveKey = schema.activeKey, restSchema = tslib.__rest(schema, ["data", "value", "key", "activeKey"]);
312
+ var defaultData = schema.data, defaultValue = schema.value, defaultActiveKey = schema.activeKey, restSchema = tslib.__rest(schema, ["data", "value", "activeKey"]);
313
313
  var Component = renderer.component;
314
314
  // 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
315
315
  // 而 visibleOn 和 hiddenOn 是无效的,
package/lib/Scoped.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.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.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -190,33 +190,34 @@ var runActions = function (actions, renderer, event) { return tslib.__awaiter(vo
190
190
  }); };
191
191
  // 执行动作,与原有动作处理打通
192
192
  var runAction = function (actionInstrance, actionConfig, renderer, event) { return tslib.__awaiter(void 0, void 0, void 0, function () {
193
- var additional, action, mergeData, expression, isStop, preventDefault, key, api, cmptFlag, targetComponent, args, afterMappingData, actionData, data, stopped, actionResult, stopPropagation;
194
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
195
- return tslib.__generator(this, function (_w) {
196
- switch (_w.label) {
193
+ var additional, action, rendererProto, mergeData, expression, isStop, preventDefault, key, api, cmptFlag, targetComponent, args, afterMappingData, actionData, data, stopped, actionResult, stopPropagation;
194
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
195
+ return tslib.__generator(this, function (_z) {
196
+ switch (_z.label) {
197
197
  case 0:
198
198
  additional = {
199
199
  event: event
200
200
  };
201
201
  action = tslib.__assign({}, actionConfig);
202
202
  action.args = tslib.__assign({}, actionConfig.args);
203
+ rendererProto = (_c = (_b = (_a = renderer.props).getData) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : renderer.props.data;
203
204
  // __rendererData默认为renderer.props.data,兼容表单项值变化时的data读取
204
- if (!((_a = event.data) === null || _a === void 0 ? void 0 : _a.__rendererData)) {
205
+ if (!((_d = event.data) === null || _d === void 0 ? void 0 : _d.__rendererData)) {
205
206
  additional = {
206
207
  event: event,
207
- __rendererData: renderer.props.data // 部分组件交互后会有更新,如果想要获取那部分数据,可以通过事件数据获取
208
+ __rendererData: rendererProto // 部分组件交互后会有更新,如果想要获取那部分数据,可以通过事件数据获取
208
209
  };
209
210
  }
210
- mergeData = object.createObject(object.createObject(renderer.props.data.__super
211
- ? object.createObject(renderer.props.data.__super, additional)
212
- : additional, renderer.props.data), event.data);
213
- expression = (_b = action.expression) !== null && _b !== void 0 ? _b : action.execOn;
211
+ mergeData = object.createObject(object.createObject(rendererProto.__super
212
+ ? object.createObject(rendererProto.__super, additional)
213
+ : additional, rendererProto), event.data);
214
+ expression = (_e = action.expression) !== null && _e !== void 0 ? _e : action.execOn;
214
215
  isStop = false;
215
216
  if (!expression) return [3 /*break*/, 2];
216
217
  return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(expression, mergeData, true)];
217
218
  case 1:
218
- isStop = !(_w.sent());
219
- _w.label = 2;
219
+ isStop = !(_z.sent());
220
+ _z.label = 2;
220
221
  case 2:
221
222
  if (isStop) {
222
223
  return [2 /*return*/];
@@ -225,8 +226,8 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
225
226
  if (!action.preventDefault) return [3 /*break*/, 4];
226
227
  return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(action.preventDefault, mergeData, false)];
227
228
  case 3:
228
- preventDefault = _w.sent();
229
- _w.label = 4;
229
+ preventDefault = _z.sent();
230
+ _z.label = 4;
230
231
  case 4:
231
232
  key = {
232
233
  componentId: dataMapping.dataMapping(action.componentId, mergeData),
@@ -234,25 +235,25 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
234
235
  };
235
236
  // 兼容args包裹的用法
236
237
  if (action.actionType === 'dialog') {
237
- action.dialog = tslib.__assign({}, ((_c = action.dialog) !== null && _c !== void 0 ? _c : (_d = action.args) === null || _d === void 0 ? void 0 : _d.dialog));
238
- (_e = action.args) === null || _e === void 0 ? true : delete _e.dialog;
238
+ action.dialog = tslib.__assign({}, ((_f = action.dialog) !== null && _f !== void 0 ? _f : (_g = action.args) === null || _g === void 0 ? void 0 : _g.dialog));
239
+ (_h = action.args) === null || _h === void 0 ? true : delete _h.dialog;
239
240
  }
240
241
  else if (action.actionType === 'drawer') {
241
- action.drawer = tslib.__assign({}, ((_f = action.drawer) !== null && _f !== void 0 ? _f : (_g = action.args) === null || _g === void 0 ? void 0 : _g.drawer));
242
- (_h = action.args) === null || _h === void 0 ? true : delete _h.drawer;
242
+ action.drawer = tslib.__assign({}, ((_j = action.drawer) !== null && _j !== void 0 ? _j : (_k = action.args) === null || _k === void 0 ? void 0 : _k.drawer));
243
+ (_l = action.args) === null || _l === void 0 ? true : delete _l.drawer;
243
244
  }
244
245
  else if (['ajax', 'download'].includes(action.actionType)) {
245
- api = (_j = action.api) !== null && _j !== void 0 ? _j : (_k = action.args) === null || _k === void 0 ? void 0 : _k.api;
246
+ api = (_m = action.api) !== null && _m !== void 0 ? _m : (_o = action.args) === null || _o === void 0 ? void 0 : _o.api;
246
247
  action.api = typeof api === 'string' ? api : tslib.__assign({}, api);
247
- action.options = tslib.__assign({}, ((_l = action.options) !== null && _l !== void 0 ? _l : (_m = action.args) === null || _m === void 0 ? void 0 : _m.options));
248
- action.messages = tslib.__assign({}, ((_o = action.messages) !== null && _o !== void 0 ? _o : (_p = action.args) === null || _p === void 0 ? void 0 : _p.messages));
249
- (_q = action.args) === null || _q === void 0 ? true : delete _q.api;
250
- (_r = action.args) === null || _r === void 0 ? true : delete _r.options;
251
- (_s = action.args) === null || _s === void 0 ? true : delete _s.messages;
248
+ action.options = tslib.__assign({}, ((_p = action.options) !== null && _p !== void 0 ? _p : (_q = action.args) === null || _q === void 0 ? void 0 : _q.options));
249
+ action.messages = tslib.__assign({}, ((_r = action.messages) !== null && _r !== void 0 ? _r : (_s = action.args) === null || _s === void 0 ? void 0 : _s.messages));
250
+ (_t = action.args) === null || _t === void 0 ? true : delete _t.api;
251
+ (_u = action.args) === null || _u === void 0 ? true : delete _u.options;
252
+ (_v = action.args) === null || _v === void 0 ? true : delete _v.messages;
252
253
  }
253
254
  cmptFlag = key.componentId || key.componentName;
254
255
  targetComponent = cmptFlag
255
- ? (_t = event.context.scoped) === null || _t === void 0 ? void 0 : _t[action.componentId ? 'getComponentById' : 'getComponentByName'](cmptFlag)
256
+ ? (_w = event.context.scoped) === null || _w === void 0 ? void 0 : _w[action.componentId ? 'getComponentById' : 'getComponentByName'](cmptFlag)
256
257
  : renderer;
257
258
  args = dataMapping.dataMapping(action.args, mergeData, function (key) {
258
259
  var _a;
@@ -281,12 +282,12 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
281
282
  !['ajax', 'download', 'dialog', 'drawer'].includes(action.actionType) // 避免非法配置影响对actionData的判断,导致动作配置中的数据映射失败
282
283
  ? actionData
283
284
  : mergeData;
284
- (_u = console.group) === null || _u === void 0 ? void 0 : _u.call(console, "run action ".concat(action.actionType));
285
+ (_x = console.group) === null || _x === void 0 ? void 0 : _x.call(console, "run action ".concat(action.actionType));
285
286
  console.debug("[".concat(action.actionType, "] action args, data"), args, data);
286
287
  stopped = false;
287
288
  return [4 /*yield*/, actionInstrance.run(tslib.__assign(tslib.__assign(tslib.__assign({}, action), { args: args, rawData: actionConfig.data, data: action.actionType === 'reload' ? actionData : data }), key), renderer, event, mergeData)];
288
289
  case 5:
289
- actionResult = _w.sent();
290
+ actionResult = _z.sent();
290
291
  // 二次确认弹窗如果取消,则终止后续动作
291
292
  if ((action === null || action === void 0 ? void 0 : action.actionType) === 'confirmDialog' && !actionResult) {
292
293
  stopped = true;
@@ -296,11 +297,11 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
296
297
  if (!action.stopPropagation) return [3 /*break*/, 7];
297
298
  return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(action.stopPropagation, mergeData, false)];
298
299
  case 6:
299
- stopPropagation = _w.sent();
300
- _w.label = 7;
300
+ stopPropagation = _z.sent();
301
+ _z.label = 7;
301
302
  case 7:
302
303
  console.debug("[".concat(action.actionType, "] action end event"), event);
303
- (_v = console.groupEnd) === null || _v === void 0 ? void 0 : _v.call(console);
304
+ (_y = console.groupEnd) === null || _y === void 0 ? void 0 : _y.call(console);
304
305
  // 阻止原有动作执行
305
306
  preventDefault && event.preventDefault();
306
307
  // 阻止后续动作执行
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v6.6.0
2
+ * amis-core v6.7.0
3
3
  * Copyright 2018-2024 fex
4
4
  */
5
5