amis-core 3.6.3 → 6.0.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 (286) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.js +1 -1
  3. package/esm/SchemaRenderer.js +1 -1
  4. package/esm/Scoped.js +2 -1
  5. package/esm/StatusScoped.js +1 -1
  6. package/esm/WithRootStore.js +1 -1
  7. package/esm/WithStore.js +1 -1
  8. package/esm/actions/Action.js +31 -27
  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 +65 -26
  13. package/esm/actions/ContinueAction.js +1 -1
  14. package/esm/actions/CopyAction.js +1 -1
  15. package/esm/actions/CustomAction.js +3 -2
  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/LinkAction.js +1 -1
  20. package/esm/actions/LoopAction.js +1 -1
  21. package/esm/actions/PageAction.js +1 -1
  22. package/esm/actions/ParallelAction.js +1 -1
  23. package/esm/actions/StatusAction.js +1 -1
  24. package/esm/actions/SwitchAction.js +1 -1
  25. package/esm/actions/ToastAction.js +1 -1
  26. package/esm/components/CustomStyle.js +1 -1
  27. package/esm/components/ErrorBoundary.js +1 -1
  28. package/esm/components/LazyComponent.js +1 -1
  29. package/esm/components/Overlay.js +3 -2
  30. package/esm/components/PopOver.js +3 -2
  31. package/esm/env.js +1 -1
  32. package/esm/envOverwrite.js +1 -1
  33. package/esm/factory.js +1 -1
  34. package/esm/index.js +4 -2
  35. package/esm/locale.js +1 -1
  36. package/esm/polyfills.js +1 -1
  37. package/esm/renderers/Form.js +125 -111
  38. package/esm/renderers/Item.js +4 -3
  39. package/esm/renderers/Options.js +163 -49
  40. package/esm/renderers/Placeholder.js +1 -1
  41. package/esm/renderers/builtin.js +1 -1
  42. package/esm/renderers/register.js +1 -1
  43. package/esm/renderers/wrapControl.js +4 -3
  44. package/esm/store/app.d.ts +2 -2
  45. package/esm/store/app.js +3 -2
  46. package/esm/store/combo.d.ts +7 -7
  47. package/esm/store/combo.js +1 -1
  48. package/esm/store/crud.d.ts +3 -2
  49. package/esm/store/crud.js +18 -4
  50. package/esm/store/form.d.ts +3 -3
  51. package/esm/store/form.js +5 -5
  52. package/esm/store/formItem.js +1 -1
  53. package/esm/store/iRenderer.d.ts +1 -1
  54. package/esm/store/iRenderer.js +7 -2
  55. package/esm/store/index.js +1 -1
  56. package/esm/store/list.d.ts +1 -1
  57. package/esm/store/list.js +18 -13
  58. package/esm/store/manager.js +1 -1
  59. package/esm/store/modal.d.ts +2 -2
  60. package/esm/store/modal.js +1 -1
  61. package/esm/store/node.js +1 -1
  62. package/esm/store/pagination.d.ts +2 -1
  63. package/esm/store/pagination.js +3 -2
  64. package/esm/store/root.d.ts +2 -2
  65. package/esm/store/root.js +3 -2
  66. package/esm/store/service.d.ts +2 -2
  67. package/esm/store/service.js +11 -7
  68. package/esm/store/status.js +1 -1
  69. package/esm/store/table.d.ts +7 -7
  70. package/esm/store/table.js +26 -11
  71. package/esm/store/table2.d.ts +14 -3
  72. package/esm/store/table2.js +22 -9
  73. package/esm/theme.js +1 -1
  74. package/esm/types.d.ts +7 -0
  75. package/esm/utils/Animation.js +1 -1
  76. package/esm/utils/ColorScale.js +1 -1
  77. package/esm/utils/DataSchema.js +1 -1
  78. package/esm/utils/DataScope.js +1 -1
  79. package/esm/utils/RootClose.js +1 -1
  80. package/esm/utils/SimpleMap.js +1 -1
  81. package/esm/utils/api.js +1 -1
  82. package/esm/utils/arraySlice.js +1 -1
  83. package/esm/utils/attachmentAdpator.js +1 -1
  84. package/esm/utils/autobind.js +1 -1
  85. package/esm/utils/browser.d.ts +1 -0
  86. package/esm/utils/browser.js +11 -0
  87. package/esm/utils/columnsSplit.js +1 -1
  88. package/esm/utils/concatData.d.ts +8 -0
  89. package/esm/utils/concatData.js +39 -0
  90. package/esm/utils/dataMapping.js +1 -1
  91. package/esm/utils/date.js +1 -1
  92. package/esm/utils/debug.js +1 -1
  93. package/esm/utils/decodeEntity.js +1 -1
  94. package/esm/utils/dom.js +1 -1
  95. package/esm/utils/errors.js +1 -1
  96. package/esm/utils/escapeHtml.js +1 -1
  97. package/esm/utils/filter-schema.js +1 -1
  98. package/esm/utils/filter.js +1 -1
  99. package/esm/utils/formatDuration.js +1 -1
  100. package/esm/utils/formula.js +1 -1
  101. package/esm/utils/getVariable.js +1 -1
  102. package/esm/utils/grammar.js +1 -1
  103. package/esm/utils/handleAction.js +1 -1
  104. package/esm/utils/helper.d.ts +6 -1
  105. package/esm/utils/helper.js +23 -6
  106. package/esm/utils/highlight.js +1 -1
  107. package/esm/utils/icon.js +1 -1
  108. package/esm/utils/image.js +1 -1
  109. package/esm/utils/index.d.ts +2 -0
  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/makeSorter.js +1 -1
  114. package/esm/utils/math.js +1 -1
  115. package/esm/utils/memoryParse.js +1 -1
  116. package/esm/utils/normalizeLink.js +1 -1
  117. package/esm/utils/normalizeOptions.js +1 -1
  118. package/esm/utils/object.js +1 -1
  119. package/esm/utils/offset.js +1 -1
  120. package/esm/utils/offsetParent.js +1 -1
  121. package/esm/utils/optionValueCompare.js +1 -1
  122. package/esm/utils/position.js +1 -1
  123. package/esm/utils/prettyBytes.js +1 -1
  124. package/esm/utils/renderer-event.js +19 -3
  125. package/esm/utils/replaceText.js +1 -1
  126. package/esm/utils/resize-sensor.js +1 -1
  127. package/esm/utils/resolveCondition.js +1 -1
  128. package/esm/utils/resolveVariable.js +1 -1
  129. package/esm/utils/resolveVariableAndFilter.js +1 -1
  130. package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
  131. package/esm/utils/scrollPosition.js +1 -1
  132. package/esm/utils/string2regExp.js +1 -1
  133. package/esm/utils/stripNumber.js +1 -1
  134. package/esm/utils/style-helper.js +4 -6
  135. package/esm/utils/style.js +1 -1
  136. package/esm/utils/toNumber.js +1 -1
  137. package/esm/utils/tokenize.js +1 -1
  138. package/esm/utils/tpl-builtin.js +1 -1
  139. package/esm/utils/tpl-lodash.js +1 -1
  140. package/esm/utils/tpl.js +1 -1
  141. package/esm/utils/uncontrollable.js +1 -1
  142. package/esm/utils/validations.js +1 -1
  143. package/lib/Root.js +1 -1
  144. package/lib/RootRenderer.d.ts +1 -1
  145. package/lib/RootRenderer.js +1 -1
  146. package/lib/SchemaRenderer.js +1 -1
  147. package/lib/Scoped.js +2 -1
  148. package/lib/StatusScoped.js +1 -1
  149. package/lib/WithRootStore.js +1 -1
  150. package/lib/WithStore.js +1 -1
  151. package/lib/actions/Action.js +31 -27
  152. package/lib/actions/AjaxAction.js +1 -1
  153. package/lib/actions/BreakAction.js +1 -1
  154. package/lib/actions/BroadcastAction.js +1 -1
  155. package/lib/actions/CmptAction.js +65 -26
  156. package/lib/actions/ContinueAction.js +1 -1
  157. package/lib/actions/CopyAction.js +1 -1
  158. package/lib/actions/CustomAction.js +3 -2
  159. package/lib/actions/DialogAction.js +1 -1
  160. package/lib/actions/DrawerAction.js +1 -1
  161. package/lib/actions/EmailAction.js +1 -1
  162. package/lib/actions/LinkAction.js +1 -1
  163. package/lib/actions/LoopAction.js +1 -1
  164. package/lib/actions/PageAction.js +1 -1
  165. package/lib/actions/ParallelAction.js +1 -1
  166. package/lib/actions/StatusAction.js +1 -1
  167. package/lib/actions/SwitchAction.js +1 -1
  168. package/lib/actions/ToastAction.js +1 -1
  169. package/lib/components/CustomStyle.js +1 -1
  170. package/lib/components/ErrorBoundary.js +1 -1
  171. package/lib/components/LazyComponent.js +1 -1
  172. package/lib/components/Overlay.js +3 -2
  173. package/lib/components/PopOver.js +3 -2
  174. package/lib/env.js +1 -1
  175. package/lib/envOverwrite.js +1 -1
  176. package/lib/factory.js +1 -1
  177. package/lib/index.js +6 -2
  178. package/lib/locale.js +1 -1
  179. package/lib/polyfills.js +1 -1
  180. package/lib/renderers/Form.js +125 -111
  181. package/lib/renderers/Item.js +4 -3
  182. package/lib/renderers/Options.js +163 -49
  183. package/lib/renderers/Placeholder.js +1 -1
  184. package/lib/renderers/builtin.js +1 -1
  185. package/lib/renderers/register.js +1 -1
  186. package/lib/renderers/wrapControl.js +4 -3
  187. package/lib/store/app.d.ts +2 -2
  188. package/lib/store/app.js +3 -2
  189. package/lib/store/combo.d.ts +31 -31
  190. package/lib/store/combo.js +1 -1
  191. package/lib/store/crud.d.ts +3 -2
  192. package/lib/store/crud.js +18 -4
  193. package/lib/store/form.d.ts +13 -13
  194. package/lib/store/form.js +5 -5
  195. package/lib/store/formItem.js +1 -1
  196. package/lib/store/iRenderer.d.ts +1 -1
  197. package/lib/store/iRenderer.js +7 -2
  198. package/lib/store/index.js +1 -1
  199. package/lib/store/list.d.ts +1 -1
  200. package/lib/store/list.js +18 -14
  201. package/lib/store/manager.js +1 -1
  202. package/lib/store/modal.d.ts +2 -2
  203. package/lib/store/modal.js +1 -1
  204. package/lib/store/node.js +1 -1
  205. package/lib/store/pagination.d.ts +2 -1
  206. package/lib/store/pagination.js +3 -2
  207. package/lib/store/root.d.ts +2 -2
  208. package/lib/store/root.js +3 -2
  209. package/lib/store/service.d.ts +2 -2
  210. package/lib/store/service.js +11 -7
  211. package/lib/store/status.js +1 -1
  212. package/lib/store/table.d.ts +27 -27
  213. package/lib/store/table.js +26 -12
  214. package/lib/store/table2.d.ts +14 -3
  215. package/lib/store/table2.js +22 -9
  216. package/lib/theme.js +1 -1
  217. package/lib/types.d.ts +7 -0
  218. package/lib/utils/Animation.js +1 -1
  219. package/lib/utils/ColorScale.js +1 -1
  220. package/lib/utils/DataSchema.js +1 -1
  221. package/lib/utils/DataScope.js +1 -1
  222. package/lib/utils/RootClose.js +1 -1
  223. package/lib/utils/SimpleMap.js +1 -1
  224. package/lib/utils/api.js +1 -1
  225. package/lib/utils/arraySlice.js +1 -1
  226. package/lib/utils/attachmentAdpator.js +1 -1
  227. package/lib/utils/autobind.js +1 -1
  228. package/lib/utils/browser.d.ts +1 -0
  229. package/lib/utils/browser.js +15 -0
  230. package/lib/utils/columnsSplit.js +1 -1
  231. package/lib/utils/concatData.d.ts +8 -0
  232. package/lib/utils/concatData.js +43 -0
  233. package/lib/utils/dataMapping.js +1 -1
  234. package/lib/utils/date.js +1 -1
  235. package/lib/utils/debug.js +1 -1
  236. package/lib/utils/decodeEntity.js +1 -1
  237. package/lib/utils/dom.js +1 -1
  238. package/lib/utils/errors.js +1 -1
  239. package/lib/utils/escapeHtml.js +1 -1
  240. package/lib/utils/filter-schema.js +1 -1
  241. package/lib/utils/filter.js +1 -1
  242. package/lib/utils/formatDuration.js +1 -1
  243. package/lib/utils/formula.js +1 -1
  244. package/lib/utils/getVariable.js +1 -1
  245. package/lib/utils/grammar.js +1 -1
  246. package/lib/utils/handleAction.js +1 -1
  247. package/lib/utils/helper.d.ts +6 -1
  248. package/lib/utils/helper.js +23 -6
  249. package/lib/utils/highlight.js +1 -1
  250. package/lib/utils/icon.js +1 -1
  251. package/lib/utils/image.js +1 -1
  252. package/lib/utils/index.d.ts +2 -0
  253. package/lib/utils/isPureVariable.js +1 -1
  254. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  255. package/lib/utils/keyToPath.js +1 -1
  256. package/lib/utils/makeSorter.js +1 -1
  257. package/lib/utils/math.js +1 -1
  258. package/lib/utils/memoryParse.js +1 -1
  259. package/lib/utils/normalizeLink.js +1 -1
  260. package/lib/utils/normalizeOptions.js +1 -1
  261. package/lib/utils/object.js +1 -1
  262. package/lib/utils/offset.js +1 -1
  263. package/lib/utils/offsetParent.js +1 -1
  264. package/lib/utils/optionValueCompare.js +1 -1
  265. package/lib/utils/position.js +1 -1
  266. package/lib/utils/prettyBytes.js +1 -1
  267. package/lib/utils/renderer-event.js +19 -3
  268. package/lib/utils/replaceText.js +1 -1
  269. package/lib/utils/resize-sensor.js +1 -1
  270. package/lib/utils/resolveCondition.js +1 -1
  271. package/lib/utils/resolveVariable.js +1 -1
  272. package/lib/utils/resolveVariableAndFilter.js +1 -1
  273. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  274. package/lib/utils/scrollPosition.js +1 -1
  275. package/lib/utils/string2regExp.js +1 -1
  276. package/lib/utils/stripNumber.js +1 -1
  277. package/lib/utils/style-helper.js +4 -6
  278. package/lib/utils/style.js +1 -1
  279. package/lib/utils/toNumber.js +1 -1
  280. package/lib/utils/tokenize.js +1 -1
  281. package/lib/utils/tpl-builtin.js +1 -1
  282. package/lib/utils/tpl-lodash.js +1 -1
  283. package/lib/utils/tpl.js +1 -1
  284. package/lib/utils/uncontrollable.js +1 -1
  285. package/lib/utils/validations.js +1 -1
  286. package/package.json +4 -3
@@ -3,6 +3,7 @@ import { Api, fetchOptions } from '../types';
3
3
  import { IFormStore } from './form';
4
4
  export declare const Column: import("mobx-state-tree").IModelType<{
5
5
  title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
6
+ label: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
6
7
  name: import("mobx-state-tree").IType<string | undefined, string, string>;
7
8
  toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
8
9
  breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -73,6 +74,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
73
74
  } & {
74
75
  columns: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IModelType<{
75
76
  title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
77
+ label: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
76
78
  name: import("mobx-state-tree").IType<string | undefined, string, string>;
77
79
  toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
78
80
  breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -142,6 +144,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
142
144
  dragging: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
143
145
  rowSelectionKeyField: import("mobx-state-tree").IType<string | undefined, string, string>;
144
146
  formsRef: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IType<any, any, any>>, [undefined]>;
147
+ canAccessSuperData: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
145
148
  }, {
146
149
  readonly parentStore: any;
147
150
  readonly __: any;
@@ -160,7 +163,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
160
163
  setTopStore(value: any): void;
161
164
  initData(data?: object, skipSetPristine?: boolean): void;
162
165
  reset(): void;
163
- updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
166
+ updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
164
167
  changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
165
168
  setCurrentAction(action: object): void;
166
169
  openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
@@ -177,7 +180,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
177
180
  markBusying: (busying?: boolean) => void;
178
181
  fetchInitData: (api: Api, data?: object | undefined, options?: fetchOptions | undefined) => Promise<any>;
179
182
  fetchData: (api: Api, data?: object | undefined, options?: fetchOptions | undefined) => Promise<any>;
180
- reInitData: (data: object | undefined, replace?: boolean) => void;
183
+ reInitData: (data: object | undefined, replace?: boolean, concatFields?: string | string[] | undefined) => void;
181
184
  updateMessage: (msg?: string | undefined, error?: boolean) => void;
182
185
  clearMessage: () => void;
183
186
  setHasRemoteData: () => void;
@@ -188,6 +191,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
188
191
  readonly toggable: boolean;
189
192
  readonly columnsData: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").IModelType<{
190
193
  title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
194
+ label: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
191
195
  name: import("mobx-state-tree").IType<string | undefined, string, string>;
192
196
  toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
193
197
  breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -201,6 +205,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
201
205
  setToggled(value: boolean): void;
202
206
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IModelType<{
203
207
  title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
208
+ label: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
204
209
  name: import("mobx-state-tree").IType<string | undefined, string, string>;
205
210
  toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
206
211
  breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -215,6 +220,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
215
220
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
216
221
  readonly toggableColumns: ({
217
222
  title: any;
223
+ label: any;
218
224
  name: string;
219
225
  toggled: boolean;
220
226
  breakpoint: any;
@@ -228,6 +234,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
228
234
  setToggled(value: boolean): void;
229
235
  } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
230
236
  title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
237
+ label: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
231
238
  name: import("mobx-state-tree").IType<string | undefined, string, string>;
232
239
  toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
233
240
  breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -243,6 +250,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
243
250
  readonly filteredColumns: any[];
244
251
  readonly activeToggaleColumns: ({
245
252
  title: any;
253
+ label: any;
246
254
  name: string;
247
255
  toggled: boolean;
248
256
  breakpoint: any;
@@ -256,6 +264,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
256
264
  setToggled(value: boolean): void;
257
265
  } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
258
266
  title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
267
+ label: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
259
268
  name: import("mobx-state-tree").IType<string | undefined, string, string>;
260
269
  toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
261
270
  breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -507,7 +516,9 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
507
516
  reset(): void;
508
517
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
509
518
  } & {
510
- update: (config: Partial<STableStore2>) => void;
519
+ update: (config: Partial<STableStore2>, options?: {
520
+ resolveDefinitions?: ((ref: string) => any) | undefined;
521
+ } | undefined) => void;
511
522
  persistSaveToggledColumns: () => void;
512
523
  setOrderByInfo: (key: string, direction: 'asc' | 'desc') => void;
513
524
  updateQuery: (values: object, updater?: Function, pageNoField?: string, pageSizeField?: string, replace?: boolean) => void;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -24,6 +24,7 @@ var ServerError = /** @class */ (function (_super) {
24
24
  var Column = types
25
25
  .model('Column', {
26
26
  title: types.optional(types.frozen(), undefined),
27
+ label: types.optional(types.frozen(), undefined),
27
28
  name: '',
28
29
  toggled: false,
29
30
  breakpoint: types.optional(types.frozen(), undefined),
@@ -150,12 +151,13 @@ var TableStore2 = ServiceStore.named('TableStore2')
150
151
  pageSize: 10,
151
152
  dragging: false,
152
153
  rowSelectionKeyField: 'id',
153
- formsRef: types.optional(types.array(types.frozen()), [])
154
+ formsRef: types.optional(types.array(types.frozen()), []),
155
+ canAccessSuperData: false
154
156
  })
155
157
  .views(function (self) {
156
158
  function getToggable() {
157
159
  if (self.columnsTogglable === 'auto') {
158
- return self.columns.filter.length > 10;
160
+ return self.columns.filter(function (item) { return !/^__/.test(item.type); }).length > 5;
159
161
  }
160
162
  return !!self.columnsTogglable;
161
163
  }
@@ -248,7 +250,9 @@ var TableStore2 = ServiceStore.named('TableStore2')
248
250
  return getActiveToggableColumns();
249
251
  },
250
252
  get dataSource() {
251
- return self.rows.map(function (item) { return item.data; });
253
+ return self.rows.map(function (item) {
254
+ return self.canAccessSuperData ? item.locals : item.data;
255
+ });
252
256
  },
253
257
  get currentSelectedRowKeys() {
254
258
  if (self.data && self.data.selectedItems) {
@@ -290,17 +294,26 @@ var TableStore2 = ServiceStore.named('TableStore2')
290
294
  };
291
295
  })
292
296
  .actions(function (self) {
293
- function updateColumns(columns) {
297
+ function updateColumns(columns, options) {
294
298
  if (columns && Array.isArray(columns)) {
295
299
  var cols = columns.filter(function (column) { return column; }).concat();
296
- cols = cols.map(function (item, index) { return (__assign(__assign({}, item), { index: index, type: item.type || 'plain', pristine: item, toggled: item.toggled !== false, breakpoint: item.breakpoint, children: item.children ? updateColumns(item.children) : [] })); });
300
+ cols = cols.map(function (item, index) {
301
+ if ((options === null || options === void 0 ? void 0 : options.resolveDefinitions) &&
302
+ typeof (item === null || item === void 0 ? void 0 : item.$ref) == 'string' &&
303
+ item.$ref) {
304
+ item = __assign(__assign({}, options.resolveDefinitions(item.$ref)), item);
305
+ }
306
+ return __assign(__assign({}, item), { index: index, type: item.type || 'plain', pristine: item, toggled: item.toggled !== false, breakpoint: item.breakpoint, children: item.children ? updateColumns(item.children, options) : [] });
307
+ });
297
308
  return cols;
298
309
  }
299
310
  return;
300
311
  }
301
- function update(config) {
312
+ function update(config, options) {
302
313
  config.columnsTogglable !== void 0 &&
303
314
  (self.columnsTogglable = config.columnsTogglable);
315
+ config.canAccessSuperData !== undefined &&
316
+ (self.canAccessSuperData = !!config.canAccessSuperData);
304
317
  if (typeof config.orderBy === 'string') {
305
318
  setOrderByInfo(config.orderBy, config.order === 'desc' ? 'desc' : 'asc');
306
319
  }
@@ -308,7 +321,7 @@ var TableStore2 = ServiceStore.named('TableStore2')
308
321
  self.rowSelectionKeyField = config.rowSelectionKeyField;
309
322
  }
310
323
  if (config.columns && Array.isArray(config.columns)) {
311
- self.columns.replace(updateColumns(config.columns));
324
+ self.columns.replace(updateColumns(config.columns, options));
312
325
  }
313
326
  }
314
327
  function exchange(fromIndex, toIndex, item) {
@@ -500,7 +513,7 @@ var TableStore2 = ServiceStore.named('TableStore2')
500
513
  if (!isEmpty(json.data) || json.ok) {
501
514
  self.updateData(normalizeApiResponseData(json.data), {
502
515
  __saved: Date.now()
503
- }, !!api && api.replaceData);
516
+ }, !!api && api.replaceData, api === null || api === void 0 ? void 0 : api.concatDataFields);
504
517
  self.updatedAt = Date.now();
505
518
  }
506
519
  if (!json.ok) {
package/esm/theme.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
package/esm/types.d.ts CHANGED
@@ -129,6 +129,13 @@ export interface BaseApiObject {
129
129
  * 默认都是追加模式,如果想完全替换把这个配置成 true
130
130
  */
131
131
  replaceData?: boolean;
132
+ /**
133
+ * 是否将两次返回的数据字段,做一个合并。配置返回对象中的字段名,支持配置多个。
134
+ *
135
+ * 比如:同时返回 log 字段,第一次返回 {log: '1'},第二次返回 {log: '2'},合并后的结果是 {log: ['1', '2']]}
136
+ * 再比如:同时返回 items 字段,第一次返回 {items: [1, 2]},第二次返回 {items: [3, 4]},合并后的结果是 {items: [1, 2, 3, 4]}
137
+ */
138
+ concatDataFields?: string | Array<string>;
132
139
  /**
133
140
  * 是否自动刷新,当 url 中的取值结果变化时,自动刷新数据。
134
141
  *
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
package/esm/utils/api.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -0,0 +1 @@
1
+ export declare const chromeVersion: number | boolean;
@@ -0,0 +1,11 @@
1
+ /**
2
+ * amis-core v6.0.0
3
+ * Copyright 2018-2023 fex
4
+ */
5
+
6
+ var chromeVersion = (function getChromeVersion() {
7
+ var raw = navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./);
8
+ return raw ? parseInt(raw[2], 10) : false;
9
+ })();
10
+
11
+ export { chromeVersion };
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -0,0 +1,8 @@
1
+ /**
2
+ * 合并两次数据,满足轮训时总合并数据的需求,比如日志接口,每次返回一部分,但是前端组件需要全部展示。
3
+ *
4
+ * @param data
5
+ * @param origin
6
+ * @param keys
7
+ */
8
+ export declare function concatData(data: any, origin: any, keys: string | string[]): any;
@@ -0,0 +1,39 @@
1
+ /**
2
+ * amis-core v6.0.0
3
+ * Copyright 2018-2023 fex
4
+ */
5
+
6
+ import { __assign } from 'tslib';
7
+ import { getVariable } from './getVariable.js';
8
+ import { setVariable } from './object.js';
9
+
10
+ /**
11
+ * 合并两次数据,满足轮训时总合并数据的需求,比如日志接口,每次返回一部分,但是前端组件需要全部展示。
12
+ *
13
+ * @param data
14
+ * @param origin
15
+ * @param keys
16
+ */
17
+ function concatData(data, origin, keys) {
18
+ keys = Array.isArray(keys)
19
+ ? keys
20
+ : keys
21
+ .split(',')
22
+ .map(function (item) { return item.trim(); })
23
+ .filter(function (item) { return item; });
24
+ var newData = __assign({}, data);
25
+ var modified = false;
26
+ origin &&
27
+ keys.forEach(function (key) {
28
+ var prev = getVariable(origin, key);
29
+ var next = getVariable(data, key);
30
+ var args = [];
31
+ typeof prev !== 'undefined' && args.push(prev);
32
+ typeof next !== 'undefined' && args.push(next);
33
+ modified = true;
34
+ setVariable(newData, key, [].concat.apply([], args));
35
+ });
36
+ return modified ? newData : data;
37
+ }
38
+
39
+ export { concatData };
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
package/esm/utils/date.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
package/esm/utils/dom.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -346,13 +346,17 @@ export declare function convertArrayValueToMoment(value: number[], types: string
346
346
  export declare function getRange(min: number, max: number, step?: number): number[];
347
347
  export declare function repeatCount(count: number, iterator: (index: number) => any): any[];
348
348
  export declare function isNumeric(value: any): boolean;
349
+ export type PrimitiveTypes = 'boolean' | 'number';
349
350
  /**
350
351
  * 解析Query字符串中的原始类型,目前仅支持转化布尔类型
351
352
  *
352
353
  * @param query 查询字符串
354
+ * @param options 配置参数
353
355
  * @returns 解析后的查询字符串
354
356
  */
355
- export declare function parsePrimitiveQueryString(rawQuery: Record<string, any>): any;
357
+ export declare function parsePrimitiveQueryString(rawQuery: Record<string, any>, options?: {
358
+ primitiveTypes: PrimitiveTypes[];
359
+ }): any;
356
360
  /**
357
361
  * 获取URL链接中的query参数(包含hash mode)
358
362
  *
@@ -366,6 +370,7 @@ export declare function parseQuery(location?: Location | {
366
370
  [propName: string]: any;
367
371
  }, options?: {
368
372
  parsePrimitive?: boolean;
373
+ primitiveTypes?: PrimitiveTypes[];
369
374
  }): Record<string, any>;
370
375
  export declare function differenceFromAll<T>(allOptions: Array<T>, options: Array<T>, getValue: (item: T) => any): Array<T>;
371
376
  /**
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1441,17 +1441,34 @@ function isNumeric(value) {
1441
1441
  * 解析Query字符串中的原始类型,目前仅支持转化布尔类型
1442
1442
  *
1443
1443
  * @param query 查询字符串
1444
+ * @param options 配置参数
1444
1445
  * @returns 解析后的查询字符串
1445
1446
  */
1446
- function parsePrimitiveQueryString(rawQuery) {
1447
+ function parsePrimitiveQueryString(rawQuery, options) {
1447
1448
  if (!isPlainObject(rawQuery)) {
1448
1449
  return rawQuery;
1449
1450
  }
1451
+ options = options || { primitiveTypes: ['boolean'] };
1452
+ if (!Array.isArray(options.primitiveTypes) ||
1453
+ options.primitiveTypes.length === 0) {
1454
+ options.primitiveTypes = ['boolean'];
1455
+ }
1450
1456
  var query = JSONValueMap(rawQuery, function (value) {
1451
- /** 解析布尔类型,后续有需要在这里扩充 */
1452
- if (value === 'true' || value === 'false') {
1457
+ var _a, _b;
1458
+ if ((((_a = options === null || options === void 0 ? void 0 : options.primitiveTypes) === null || _a === void 0 ? void 0 : _a.includes('boolean')) && value === 'true') ||
1459
+ value === 'false') {
1460
+ /** 解析布尔类型 */
1453
1461
  return value === 'true';
1454
1462
  }
1463
+ else if (((_b = options === null || options === void 0 ? void 0 : options.primitiveTypes) === null || _b === void 0 ? void 0 : _b.includes('number')) &&
1464
+ isNumeric(value) &&
1465
+ isFinite(value) &&
1466
+ value >= -Number.MAX_SAFE_INTEGER &&
1467
+ value <= Number.MAX_SAFE_INTEGER) {
1468
+ /** 解析数字类型 */
1469
+ var result = Number(value);
1470
+ return !isNaN(result) ? result : value;
1471
+ }
1455
1472
  return value;
1456
1473
  });
1457
1474
  return query;
@@ -1465,13 +1482,13 @@ function parsePrimitiveQueryString(rawQuery) {
1465
1482
  */
1466
1483
  function parseQuery(location, options) {
1467
1484
  var _a;
1468
- var _b = (options || {}).parsePrimitive, parsePrimitive = _b === void 0 ? false : _b;
1485
+ var _b = options || {}, _c = _b.parsePrimitive, parsePrimitive = _c === void 0 ? false : _c, _d = _b.primitiveTypes, primitiveTypes = _d === void 0 ? ['boolean'] : _d;
1469
1486
  var query = (location && !(location instanceof Location) && (location === null || location === void 0 ? void 0 : location.query)) ||
1470
1487
  (location && (location === null || location === void 0 ? void 0 : location.search) && qsparse(location.search.substring(1))) ||
1471
1488
  (window.location.search && qsparse(window.location.search.substring(1)));
1472
1489
  var normalizedQuery = isPlainObject(query)
1473
1490
  ? parsePrimitive
1474
- ? parsePrimitiveQueryString(query)
1491
+ ? parsePrimitiveQueryString(query, { primitiveTypes: primitiveTypes })
1475
1492
  : query
1476
1493
  : {};
1477
1494
  /* 处理hash中的query */
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
package/esm/utils/icon.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,8 +1,10 @@
1
1
  export * from './api';
2
2
  export * from './attachmentAdpator';
3
3
  export * from './autobind';
4
+ export * from './browser';
4
5
  export * from './ColorScale';
5
6
  export * from './columnsSplit';
7
+ export * from './concatData';
6
8
  export * from './dataMapping';
7
9
  export * from './DataSchema';
8
10
  export * from './DataScope';
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.6.3
2
+ * amis-core v6.0.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5