amis-core 3.4.2 → 3.5.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 (277) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.js +12 -2
  3. package/esm/SchemaRenderer.js +1 -1
  4. package/esm/Scoped.js +2 -2
  5. package/esm/StatusScoped.js +1 -1
  6. package/esm/WithRootStore.js +1 -1
  7. package/esm/WithStore.js +8 -4
  8. package/esm/actions/Action.js +1 -1
  9. package/esm/actions/AjaxAction.js +1 -1
  10. package/esm/actions/BreakAction.js +1 -1
  11. package/esm/actions/BroadcastAction.js +1 -1
  12. package/esm/actions/CmptAction.d.ts +1 -0
  13. package/esm/actions/CmptAction.js +23 -23
  14. package/esm/actions/ContinueAction.js +1 -1
  15. package/esm/actions/CopyAction.js +1 -1
  16. package/esm/actions/CustomAction.js +2 -2
  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/LinkAction.js +1 -1
  21. package/esm/actions/LoopAction.js +1 -1
  22. package/esm/actions/PageAction.js +1 -1
  23. package/esm/actions/ParallelAction.js +1 -1
  24. package/esm/actions/StatusAction.js +1 -1
  25. package/esm/actions/SwitchAction.js +1 -1
  26. package/esm/actions/ToastAction.js +1 -1
  27. package/esm/components/CustomStyle.js +9 -9
  28. package/esm/components/LazyComponent.js +1 -1
  29. package/esm/components/Overlay.js +2 -1
  30. package/esm/components/PopOver.js +2 -2
  31. package/esm/env.d.ts +11 -3
  32. package/esm/env.js +1 -1
  33. package/esm/envOverwrite.js +1 -1
  34. package/esm/factory.js +1 -3
  35. package/esm/index.d.ts +1 -0
  36. package/esm/index.js +4 -4
  37. package/esm/locale.js +1 -1
  38. package/esm/polyfills.js +1 -1
  39. package/esm/renderers/Form.js +10 -4
  40. package/esm/renderers/Item.d.ts +2 -6
  41. package/esm/renderers/Item.js +11 -17
  42. package/esm/renderers/Options.js +2 -2
  43. package/esm/renderers/Placeholder.js +1 -1
  44. package/esm/renderers/builtin.js +1 -1
  45. package/esm/renderers/register.js +1 -1
  46. package/esm/renderers/wrapControl.js +41 -22
  47. package/esm/store/app.js +7 -5
  48. package/esm/store/combo.d.ts +120 -0
  49. package/esm/store/combo.js +3 -2
  50. package/esm/store/crud.d.ts +13 -2
  51. package/esm/store/crud.js +88 -23
  52. package/esm/store/form.d.ts +50 -0
  53. package/esm/store/form.js +5 -2
  54. package/esm/store/formItem.d.ts +1 -0
  55. package/esm/store/formItem.js +18 -6
  56. package/esm/store/iRenderer.js +2 -2
  57. package/esm/store/index.js +1 -1
  58. package/esm/store/list.js +1 -1
  59. package/esm/store/manager.js +1 -1
  60. package/esm/store/modal.js +1 -1
  61. package/esm/store/node.js +1 -1
  62. package/esm/store/pagination.js +1 -1
  63. package/esm/store/root.js +2 -2
  64. package/esm/store/service.js +1 -1
  65. package/esm/store/status.js +1 -1
  66. package/esm/store/table.d.ts +454 -83
  67. package/esm/store/table.js +114 -74
  68. package/esm/store/table2.d.ts +1 -1
  69. package/esm/store/table2.js +5 -4
  70. package/esm/theme.js +1 -1
  71. package/esm/types.d.ts +6 -0
  72. package/esm/utils/Animation.js +1 -1
  73. package/esm/utils/ColorScale.js +1 -1
  74. package/esm/utils/DataSchema.js +1 -1
  75. package/esm/utils/DataScope.js +1 -1
  76. package/esm/utils/RootClose.js +1 -1
  77. package/esm/utils/SimpleMap.js +1 -1
  78. package/esm/utils/api.js +2 -1
  79. package/esm/utils/arraySlice.js +1 -1
  80. package/esm/utils/attachmentAdpator.d.ts +2 -1
  81. package/esm/utils/attachmentAdpator.js +17 -11
  82. package/esm/utils/autobind.js +1 -1
  83. package/esm/utils/columnsSplit.js +1 -1
  84. package/esm/utils/dataMapping.js +1 -1
  85. package/esm/utils/date.js +1 -1
  86. package/esm/utils/debug.d.ts +1 -1
  87. package/esm/utils/debug.js +5 -3
  88. package/esm/utils/decodeEntity.js +1 -1
  89. package/esm/utils/dom.js +1 -1
  90. package/esm/utils/errors.js +1 -1
  91. package/esm/utils/escapeHtml.js +1 -1
  92. package/esm/utils/filter-schema.d.ts +8 -0
  93. package/esm/utils/filter-schema.js +32 -14
  94. package/esm/utils/filter.js +1 -1
  95. package/esm/utils/formatDuration.js +1 -1
  96. package/esm/utils/formula.js +1 -1
  97. package/esm/utils/getVariable.js +1 -1
  98. package/esm/utils/grammar.js +1 -1
  99. package/esm/utils/handleAction.js +2 -1
  100. package/esm/utils/helper.d.ts +15 -1
  101. package/esm/utils/helper.js +59 -12
  102. package/esm/utils/highlight.js +1 -1
  103. package/esm/utils/icon.js +1 -1
  104. package/esm/utils/image.js +1 -1
  105. package/esm/utils/isPureVariable.js +1 -1
  106. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  107. package/esm/utils/keyToPath.js +1 -1
  108. package/esm/utils/makeSorter.js +1 -1
  109. package/esm/utils/math.js +1 -1
  110. package/esm/utils/memoryParse.js +1 -1
  111. package/esm/utils/normalizeLink.js +1 -1
  112. package/esm/utils/normalizeOptions.js +1 -1
  113. package/esm/utils/object.js +1 -1
  114. package/esm/utils/offset.js +1 -1
  115. package/esm/utils/offsetParent.js +1 -1
  116. package/esm/utils/optionValueCompare.js +1 -1
  117. package/esm/utils/position.js +1 -1
  118. package/esm/utils/prettyBytes.js +1 -1
  119. package/esm/utils/renderer-event.js +1 -1
  120. package/esm/utils/replaceText.d.ts +1 -1
  121. package/esm/utils/replaceText.js +9 -4
  122. package/esm/utils/resize-sensor.js +1 -1
  123. package/esm/utils/resolveCondition.js +1 -1
  124. package/esm/utils/resolveVariable.js +1 -1
  125. package/esm/utils/resolveVariableAndFilter.js +1 -1
  126. package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
  127. package/esm/utils/scrollPosition.js +1 -1
  128. package/esm/utils/string2regExp.js +1 -1
  129. package/esm/utils/stripNumber.js +1 -1
  130. package/esm/utils/style-helper.js +5 -4
  131. package/esm/utils/style.js +1 -1
  132. package/esm/utils/toNumber.js +1 -1
  133. package/esm/utils/tokenize.js +1 -1
  134. package/esm/utils/tpl-builtin.js +1 -1
  135. package/esm/utils/tpl-lodash.js +1 -1
  136. package/esm/utils/tpl.js +1 -1
  137. package/esm/utils/uncontrollable.js +1 -1
  138. package/esm/utils/validations.js +1 -1
  139. package/lib/Root.js +1 -1
  140. package/lib/RootRenderer.js +12 -2
  141. package/lib/SchemaRenderer.js +1 -1
  142. package/lib/Scoped.js +2 -2
  143. package/lib/StatusScoped.js +1 -1
  144. package/lib/WithRootStore.js +1 -1
  145. package/lib/WithStore.js +8 -4
  146. package/lib/actions/Action.js +1 -1
  147. package/lib/actions/AjaxAction.js +1 -1
  148. package/lib/actions/BreakAction.js +1 -1
  149. package/lib/actions/BroadcastAction.js +1 -1
  150. package/lib/actions/CmptAction.d.ts +1 -0
  151. package/lib/actions/CmptAction.js +23 -23
  152. package/lib/actions/ContinueAction.js +1 -1
  153. package/lib/actions/CopyAction.js +1 -1
  154. package/lib/actions/CustomAction.js +2 -2
  155. package/lib/actions/DialogAction.js +1 -1
  156. package/lib/actions/DrawerAction.js +1 -1
  157. package/lib/actions/EmailAction.js +1 -1
  158. package/lib/actions/LinkAction.js +1 -1
  159. package/lib/actions/LoopAction.js +1 -1
  160. package/lib/actions/PageAction.js +1 -1
  161. package/lib/actions/ParallelAction.js +1 -1
  162. package/lib/actions/StatusAction.js +1 -1
  163. package/lib/actions/SwitchAction.js +1 -1
  164. package/lib/actions/ToastAction.js +1 -1
  165. package/lib/components/CustomStyle.js +9 -9
  166. package/lib/components/LazyComponent.js +1 -1
  167. package/lib/components/Overlay.js +2 -1
  168. package/lib/components/PopOver.js +2 -2
  169. package/lib/env.d.ts +11 -3
  170. package/lib/env.js +1 -1
  171. package/lib/envOverwrite.js +1 -1
  172. package/lib/factory.js +1 -3
  173. package/lib/index.d.ts +1 -0
  174. package/lib/index.js +7 -2
  175. package/lib/locale.js +1 -1
  176. package/lib/polyfills.js +1 -1
  177. package/lib/renderers/Form.js +10 -4
  178. package/lib/renderers/Item.d.ts +2 -6
  179. package/lib/renderers/Item.js +11 -17
  180. package/lib/renderers/Options.js +2 -2
  181. package/lib/renderers/Placeholder.js +1 -1
  182. package/lib/renderers/builtin.js +1 -1
  183. package/lib/renderers/register.js +1 -1
  184. package/lib/renderers/wrapControl.js +41 -22
  185. package/lib/store/app.js +6 -4
  186. package/lib/store/combo.d.ts +144 -25
  187. package/lib/store/combo.js +3 -2
  188. package/lib/store/crud.d.ts +13 -2
  189. package/lib/store/crud.js +88 -23
  190. package/lib/store/form.d.ts +60 -11
  191. package/lib/store/form.js +5 -2
  192. package/lib/store/formItem.d.ts +1 -0
  193. package/lib/store/formItem.js +16 -4
  194. package/lib/store/iRenderer.js +2 -2
  195. package/lib/store/index.js +1 -1
  196. package/lib/store/list.js +1 -1
  197. package/lib/store/manager.js +1 -1
  198. package/lib/store/modal.js +1 -1
  199. package/lib/store/node.js +1 -1
  200. package/lib/store/pagination.js +1 -1
  201. package/lib/store/root.js +2 -2
  202. package/lib/store/service.js +1 -1
  203. package/lib/store/status.js +1 -1
  204. package/lib/store/table.d.ts +474 -104
  205. package/lib/store/table.js +112 -72
  206. package/lib/store/table2.d.ts +1 -1
  207. package/lib/store/table2.js +5 -4
  208. package/lib/theme.js +1 -1
  209. package/lib/types.d.ts +6 -0
  210. package/lib/utils/Animation.js +1 -1
  211. package/lib/utils/ColorScale.js +1 -1
  212. package/lib/utils/DataSchema.js +1 -1
  213. package/lib/utils/DataScope.js +1 -1
  214. package/lib/utils/RootClose.js +1 -1
  215. package/lib/utils/SimpleMap.js +1 -1
  216. package/lib/utils/api.js +2 -1
  217. package/lib/utils/arraySlice.js +1 -1
  218. package/lib/utils/attachmentAdpator.d.ts +2 -1
  219. package/lib/utils/attachmentAdpator.js +17 -11
  220. package/lib/utils/autobind.js +1 -1
  221. package/lib/utils/columnsSplit.js +1 -1
  222. package/lib/utils/dataMapping.js +1 -1
  223. package/lib/utils/date.js +1 -1
  224. package/lib/utils/debug.d.ts +1 -1
  225. package/lib/utils/debug.js +4 -2
  226. package/lib/utils/decodeEntity.js +1 -1
  227. package/lib/utils/dom.js +1 -1
  228. package/lib/utils/errors.js +1 -1
  229. package/lib/utils/escapeHtml.js +1 -1
  230. package/lib/utils/filter-schema.d.ts +8 -0
  231. package/lib/utils/filter-schema.js +31 -13
  232. package/lib/utils/filter.js +1 -1
  233. package/lib/utils/formatDuration.js +1 -1
  234. package/lib/utils/formula.js +1 -1
  235. package/lib/utils/getVariable.js +1 -1
  236. package/lib/utils/grammar.js +1 -1
  237. package/lib/utils/handleAction.js +2 -1
  238. package/lib/utils/helper.d.ts +15 -1
  239. package/lib/utils/helper.js +62 -11
  240. package/lib/utils/highlight.js +1 -1
  241. package/lib/utils/icon.js +1 -1
  242. package/lib/utils/image.js +1 -1
  243. package/lib/utils/isPureVariable.js +1 -1
  244. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  245. package/lib/utils/keyToPath.js +1 -1
  246. package/lib/utils/makeSorter.js +1 -1
  247. package/lib/utils/math.js +1 -1
  248. package/lib/utils/memoryParse.js +1 -1
  249. package/lib/utils/normalizeLink.js +1 -1
  250. package/lib/utils/normalizeOptions.js +1 -1
  251. package/lib/utils/object.js +1 -1
  252. package/lib/utils/offset.js +1 -1
  253. package/lib/utils/offsetParent.js +1 -1
  254. package/lib/utils/optionValueCompare.js +1 -1
  255. package/lib/utils/position.js +1 -1
  256. package/lib/utils/prettyBytes.js +1 -1
  257. package/lib/utils/renderer-event.js +1 -1
  258. package/lib/utils/replaceText.d.ts +1 -1
  259. package/lib/utils/replaceText.js +9 -4
  260. package/lib/utils/resize-sensor.js +1 -1
  261. package/lib/utils/resolveCondition.js +1 -1
  262. package/lib/utils/resolveVariable.js +1 -1
  263. package/lib/utils/resolveVariableAndFilter.js +1 -1
  264. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  265. package/lib/utils/scrollPosition.js +1 -1
  266. package/lib/utils/string2regExp.js +1 -1
  267. package/lib/utils/stripNumber.js +1 -1
  268. package/lib/utils/style-helper.js +6 -4
  269. package/lib/utils/style.js +1 -1
  270. package/lib/utils/toNumber.js +1 -1
  271. package/lib/utils/tokenize.js +1 -1
  272. package/lib/utils/tpl-builtin.js +1 -1
  273. package/lib/utils/tpl-lodash.js +1 -1
  274. package/lib/utils/tpl.js +1 -1
  275. package/lib/utils/uncontrollable.js +1 -1
  276. package/lib/utils/validations.js +1 -1
  277. package/package.json +4 -3
@@ -1,4 +1,3 @@
1
- /// <reference types="lodash" />
2
1
  import { Instance } from 'mobx-state-tree';
3
2
  import type { IFormItemStore } from './formItem';
4
3
  import { Api, fetchOptions, Payload } from '../types';
@@ -163,6 +162,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
163
162
  readonly lastSelectValue: string;
164
163
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
165
164
  splitExtraValue(value: any): any[];
165
+ getMergedData(data: any): any;
166
166
  } & {
167
167
  focus: () => void;
168
168
  blur: () => void;
@@ -224,7 +224,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
224
224
  resetValidationStatus: (tag?: string | undefined) => void;
225
225
  openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
226
226
  closeDialog: (result?: any) => void;
227
- changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
227
+ changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
228
228
  changeEmitedValue: (value: any) => void;
229
229
  addSubFormItem: (item: {
230
230
  id: string;
@@ -306,6 +306,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
306
306
  readonly lastSelectValue: string;
307
307
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
308
308
  splitExtraValue(value: any): any[];
309
+ getMergedData(data: any): any;
309
310
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
310
311
  id: import("mobx-state-tree").ISimpleType<string>;
311
312
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -383,6 +384,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
383
384
  readonly lastSelectValue: string;
384
385
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
385
386
  splitExtraValue(value: any): any[];
387
+ getMergedData(data: any): any;
386
388
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
387
389
  removeSubFormItem: (item: {
388
390
  id: string;
@@ -464,6 +466,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
464
466
  readonly lastSelectValue: string;
465
467
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
466
468
  splitExtraValue(value: any): any[];
469
+ getMergedData(data: any): any;
467
470
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
468
471
  id: import("mobx-state-tree").ISimpleType<string>;
469
472
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -541,6 +544,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
541
544
  readonly lastSelectValue: string;
542
545
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
543
546
  splitExtraValue(value: any): any[];
547
+ getMergedData(data: any): any;
544
548
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
545
549
  loadAutoUpdateData: (api: Api, data?: object | undefined, silent?: boolean | undefined) => Promise<Payload>;
546
550
  setIsControlled: (value: any) => void;
@@ -621,6 +625,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
621
625
  readonly lastSelectValue: string;
622
626
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
623
627
  splitExtraValue(value: any): any[];
628
+ getMergedData(data: any): any;
624
629
  } & {
625
630
  focus: () => void;
626
631
  blur: () => void;
@@ -682,7 +687,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
682
687
  resetValidationStatus: (tag?: string | undefined) => void;
683
688
  openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
684
689
  closeDialog: (result?: any) => void;
685
- changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
690
+ changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
686
691
  changeEmitedValue: (value: any) => void;
687
692
  addSubFormItem: (item: {
688
693
  id: string;
@@ -764,6 +769,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
764
769
  readonly lastSelectValue: string;
765
770
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
766
771
  splitExtraValue(value: any): any[];
772
+ getMergedData(data: any): any;
767
773
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
768
774
  id: import("mobx-state-tree").ISimpleType<string>;
769
775
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -841,6 +847,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
841
847
  readonly lastSelectValue: string;
842
848
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
843
849
  splitExtraValue(value: any): any[];
850
+ getMergedData(data: any): any;
844
851
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
845
852
  removeSubFormItem: (item: {
846
853
  id: string;
@@ -922,6 +929,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
922
929
  readonly lastSelectValue: string;
923
930
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
924
931
  splitExtraValue(value: any): any[];
932
+ getMergedData(data: any): any;
925
933
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
926
934
  id: import("mobx-state-tree").ISimpleType<string>;
927
935
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -999,6 +1007,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
999
1007
  readonly lastSelectValue: string;
1000
1008
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
1001
1009
  splitExtraValue(value: any): any[];
1010
+ getMergedData(data: any): any;
1002
1011
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
1003
1012
  loadAutoUpdateData: (api: Api, data?: object | undefined, silent?: boolean | undefined) => Promise<Payload>;
1004
1013
  setIsControlled: (value: any) => void;
@@ -1084,6 +1093,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
1084
1093
  readonly lastSelectValue: string;
1085
1094
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
1086
1095
  splitExtraValue(value: any): any[];
1096
+ getMergedData(data: any): any;
1087
1097
  } & {
1088
1098
  focus: () => void;
1089
1099
  blur: () => void;
@@ -1145,7 +1155,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
1145
1155
  resetValidationStatus: (tag?: string | undefined) => void;
1146
1156
  openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
1147
1157
  closeDialog: (result?: any) => void;
1148
- changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
1158
+ changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
1149
1159
  changeEmitedValue: (value: any) => void;
1150
1160
  addSubFormItem: (item: {
1151
1161
  id: string;
@@ -1227,6 +1237,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
1227
1237
  readonly lastSelectValue: string;
1228
1238
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
1229
1239
  splitExtraValue(value: any): any[];
1240
+ getMergedData(data: any): any;
1230
1241
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
1231
1242
  id: import("mobx-state-tree").ISimpleType<string>;
1232
1243
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -1304,6 +1315,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
1304
1315
  readonly lastSelectValue: string;
1305
1316
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
1306
1317
  splitExtraValue(value: any): any[];
1318
+ getMergedData(data: any): any;
1307
1319
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
1308
1320
  removeSubFormItem: (item: {
1309
1321
  id: string;
@@ -1385,6 +1397,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
1385
1397
  readonly lastSelectValue: string;
1386
1398
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
1387
1399
  splitExtraValue(value: any): any[];
1400
+ getMergedData(data: any): any;
1388
1401
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
1389
1402
  id: import("mobx-state-tree").ISimpleType<string>;
1390
1403
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -1462,6 +1475,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
1462
1475
  readonly lastSelectValue: string;
1463
1476
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
1464
1477
  splitExtraValue(value: any): any[];
1478
+ getMergedData(data: any): any;
1465
1479
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
1466
1480
  loadAutoUpdateData: (api: Api, data?: object | undefined, silent?: boolean | undefined) => Promise<Payload>;
1467
1481
  setIsControlled: (value: any) => void;
@@ -1542,6 +1556,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
1542
1556
  readonly lastSelectValue: string;
1543
1557
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
1544
1558
  splitExtraValue(value: any): any[];
1559
+ getMergedData(data: any): any;
1545
1560
  } & {
1546
1561
  focus: () => void;
1547
1562
  blur: () => void;
@@ -1603,7 +1618,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
1603
1618
  resetValidationStatus: (tag?: string | undefined) => void;
1604
1619
  openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
1605
1620
  closeDialog: (result?: any) => void;
1606
- changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
1621
+ changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
1607
1622
  changeEmitedValue: (value: any) => void;
1608
1623
  addSubFormItem: (item: {
1609
1624
  id: string;
@@ -1685,6 +1700,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
1685
1700
  readonly lastSelectValue: string;
1686
1701
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
1687
1702
  splitExtraValue(value: any): any[];
1703
+ getMergedData(data: any): any;
1688
1704
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
1689
1705
  id: import("mobx-state-tree").ISimpleType<string>;
1690
1706
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -1762,6 +1778,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
1762
1778
  readonly lastSelectValue: string;
1763
1779
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
1764
1780
  splitExtraValue(value: any): any[];
1781
+ getMergedData(data: any): any;
1765
1782
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
1766
1783
  removeSubFormItem: (item: {
1767
1784
  id: string;
@@ -1843,6 +1860,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
1843
1860
  readonly lastSelectValue: string;
1844
1861
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
1845
1862
  splitExtraValue(value: any): any[];
1863
+ getMergedData(data: any): any;
1846
1864
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
1847
1865
  id: import("mobx-state-tree").ISimpleType<string>;
1848
1866
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -1920,6 +1938,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
1920
1938
  readonly lastSelectValue: string;
1921
1939
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
1922
1940
  splitExtraValue(value: any): any[];
1941
+ getMergedData(data: any): any;
1923
1942
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
1924
1943
  loadAutoUpdateData: (api: Api, data?: object | undefined, silent?: boolean | undefined) => Promise<Payload>;
1925
1944
  setIsControlled: (value: any) => void;
@@ -2009,6 +2028,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
2009
2028
  readonly lastSelectValue: string;
2010
2029
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
2011
2030
  splitExtraValue(value: any): any[];
2031
+ getMergedData(data: any): any;
2012
2032
  } & {
2013
2033
  focus: () => void;
2014
2034
  blur: () => void;
@@ -2070,7 +2090,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
2070
2090
  resetValidationStatus: (tag?: string | undefined) => void;
2071
2091
  openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
2072
2092
  closeDialog: (result?: any) => void;
2073
- changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
2093
+ changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
2074
2094
  changeEmitedValue: (value: any) => void;
2075
2095
  addSubFormItem: (item: {
2076
2096
  id: string;
@@ -2152,6 +2172,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
2152
2172
  readonly lastSelectValue: string;
2153
2173
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
2154
2174
  splitExtraValue(value: any): any[];
2175
+ getMergedData(data: any): any;
2155
2176
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
2156
2177
  id: import("mobx-state-tree").ISimpleType<string>;
2157
2178
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -2229,6 +2250,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
2229
2250
  readonly lastSelectValue: string;
2230
2251
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
2231
2252
  splitExtraValue(value: any): any[];
2253
+ getMergedData(data: any): any;
2232
2254
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
2233
2255
  removeSubFormItem: (item: {
2234
2256
  id: string;
@@ -2310,6 +2332,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
2310
2332
  readonly lastSelectValue: string;
2311
2333
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
2312
2334
  splitExtraValue(value: any): any[];
2335
+ getMergedData(data: any): any;
2313
2336
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
2314
2337
  id: import("mobx-state-tree").ISimpleType<string>;
2315
2338
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -2387,6 +2410,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
2387
2410
  readonly lastSelectValue: string;
2388
2411
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
2389
2412
  splitExtraValue(value: any): any[];
2413
+ getMergedData(data: any): any;
2390
2414
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
2391
2415
  loadAutoUpdateData: (api: Api, data?: object | undefined, silent?: boolean | undefined) => Promise<Payload>;
2392
2416
  setIsControlled: (value: any) => void;
@@ -2467,6 +2491,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
2467
2491
  readonly lastSelectValue: string;
2468
2492
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
2469
2493
  splitExtraValue(value: any): any[];
2494
+ getMergedData(data: any): any;
2470
2495
  } & {
2471
2496
  focus: () => void;
2472
2497
  blur: () => void;
@@ -2528,7 +2553,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
2528
2553
  resetValidationStatus: (tag?: string | undefined) => void;
2529
2554
  openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
2530
2555
  closeDialog: (result?: any) => void;
2531
- changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
2556
+ changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
2532
2557
  changeEmitedValue: (value: any) => void;
2533
2558
  addSubFormItem: (item: {
2534
2559
  id: string;
@@ -2610,6 +2635,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
2610
2635
  readonly lastSelectValue: string;
2611
2636
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
2612
2637
  splitExtraValue(value: any): any[];
2638
+ getMergedData(data: any): any;
2613
2639
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
2614
2640
  id: import("mobx-state-tree").ISimpleType<string>;
2615
2641
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -2687,6 +2713,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
2687
2713
  readonly lastSelectValue: string;
2688
2714
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
2689
2715
  splitExtraValue(value: any): any[];
2716
+ getMergedData(data: any): any;
2690
2717
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
2691
2718
  removeSubFormItem: (item: {
2692
2719
  id: string;
@@ -2768,6 +2795,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
2768
2795
  readonly lastSelectValue: string;
2769
2796
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
2770
2797
  splitExtraValue(value: any): any[];
2798
+ getMergedData(data: any): any;
2771
2799
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
2772
2800
  id: import("mobx-state-tree").ISimpleType<string>;
2773
2801
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -2845,6 +2873,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
2845
2873
  readonly lastSelectValue: string;
2846
2874
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
2847
2875
  splitExtraValue(value: any): any[];
2876
+ getMergedData(data: any): any;
2848
2877
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
2849
2878
  loadAutoUpdateData: (api: Api, data?: object | undefined, silent?: boolean | undefined) => Promise<Payload>;
2850
2879
  setIsControlled: (value: any) => void;
@@ -2929,6 +2958,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
2929
2958
  readonly lastSelectValue: string;
2930
2959
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
2931
2960
  splitExtraValue(value: any): any[];
2961
+ getMergedData(data: any): any;
2932
2962
  } & {
2933
2963
  focus: () => void;
2934
2964
  blur: () => void;
@@ -2990,7 +3020,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
2990
3020
  resetValidationStatus: (tag?: string | undefined) => void;
2991
3021
  openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
2992
3022
  closeDialog: (result?: any) => void;
2993
- changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
3023
+ changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
2994
3024
  changeEmitedValue: (value: any) => void;
2995
3025
  addSubFormItem: (item: {
2996
3026
  id: string;
@@ -3072,6 +3102,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
3072
3102
  readonly lastSelectValue: string;
3073
3103
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
3074
3104
  splitExtraValue(value: any): any[];
3105
+ getMergedData(data: any): any;
3075
3106
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
3076
3107
  id: import("mobx-state-tree").ISimpleType<string>;
3077
3108
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -3149,6 +3180,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
3149
3180
  readonly lastSelectValue: string;
3150
3181
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
3151
3182
  splitExtraValue(value: any): any[];
3183
+ getMergedData(data: any): any;
3152
3184
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
3153
3185
  removeSubFormItem: (item: {
3154
3186
  id: string;
@@ -3230,6 +3262,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
3230
3262
  readonly lastSelectValue: string;
3231
3263
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
3232
3264
  splitExtraValue(value: any): any[];
3265
+ getMergedData(data: any): any;
3233
3266
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
3234
3267
  id: import("mobx-state-tree").ISimpleType<string>;
3235
3268
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -3307,6 +3340,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
3307
3340
  readonly lastSelectValue: string;
3308
3341
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
3309
3342
  splitExtraValue(value: any): any[];
3343
+ getMergedData(data: any): any;
3310
3344
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
3311
3345
  loadAutoUpdateData: (api: Api, data?: object | undefined, silent?: boolean | undefined) => Promise<Payload>;
3312
3346
  setIsControlled: (value: any) => void;
@@ -3387,6 +3421,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
3387
3421
  readonly lastSelectValue: string;
3388
3422
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
3389
3423
  splitExtraValue(value: any): any[];
3424
+ getMergedData(data: any): any;
3390
3425
  } & {
3391
3426
  focus: () => void;
3392
3427
  blur: () => void;
@@ -3448,7 +3483,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
3448
3483
  resetValidationStatus: (tag?: string | undefined) => void;
3449
3484
  openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
3450
3485
  closeDialog: (result?: any) => void;
3451
- changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
3486
+ changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
3452
3487
  changeEmitedValue: (value: any) => void;
3453
3488
  addSubFormItem: (item: {
3454
3489
  id: string;
@@ -3530,6 +3565,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
3530
3565
  readonly lastSelectValue: string;
3531
3566
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
3532
3567
  splitExtraValue(value: any): any[];
3568
+ getMergedData(data: any): any;
3533
3569
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
3534
3570
  id: import("mobx-state-tree").ISimpleType<string>;
3535
3571
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -3607,6 +3643,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
3607
3643
  readonly lastSelectValue: string;
3608
3644
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
3609
3645
  splitExtraValue(value: any): any[];
3646
+ getMergedData(data: any): any;
3610
3647
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
3611
3648
  removeSubFormItem: (item: {
3612
3649
  id: string;
@@ -3688,6 +3725,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
3688
3725
  readonly lastSelectValue: string;
3689
3726
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
3690
3727
  splitExtraValue(value: any): any[];
3728
+ getMergedData(data: any): any;
3691
3729
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
3692
3730
  id: import("mobx-state-tree").ISimpleType<string>;
3693
3731
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -3765,6 +3803,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
3765
3803
  readonly lastSelectValue: string;
3766
3804
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
3767
3805
  splitExtraValue(value: any): any[];
3806
+ getMergedData(data: any): any;
3768
3807
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
3769
3808
  loadAutoUpdateData: (api: Api, data?: object | undefined, silent?: boolean | undefined) => Promise<Payload>;
3770
3809
  setIsControlled: (value: any) => void;
@@ -3849,6 +3888,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
3849
3888
  readonly lastSelectValue: string;
3850
3889
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
3851
3890
  splitExtraValue(value: any): any[];
3891
+ getMergedData(data: any): any;
3852
3892
  } & {
3853
3893
  focus: () => void;
3854
3894
  blur: () => void;
@@ -3910,7 +3950,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
3910
3950
  resetValidationStatus: (tag?: string | undefined) => void;
3911
3951
  openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
3912
3952
  closeDialog: (result?: any) => void;
3913
- changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
3953
+ changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
3914
3954
  changeEmitedValue: (value: any) => void;
3915
3955
  addSubFormItem: (item: {
3916
3956
  id: string;
@@ -3992,6 +4032,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
3992
4032
  readonly lastSelectValue: string;
3993
4033
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
3994
4034
  splitExtraValue(value: any): any[];
4035
+ getMergedData(data: any): any;
3995
4036
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
3996
4037
  id: import("mobx-state-tree").ISimpleType<string>;
3997
4038
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -4069,6 +4110,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
4069
4110
  readonly lastSelectValue: string;
4070
4111
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
4071
4112
  splitExtraValue(value: any): any[];
4113
+ getMergedData(data: any): any;
4072
4114
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
4073
4115
  removeSubFormItem: (item: {
4074
4116
  id: string;
@@ -4150,6 +4192,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
4150
4192
  readonly lastSelectValue: string;
4151
4193
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
4152
4194
  splitExtraValue(value: any): any[];
4195
+ getMergedData(data: any): any;
4153
4196
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
4154
4197
  id: import("mobx-state-tree").ISimpleType<string>;
4155
4198
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -4227,6 +4270,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
4227
4270
  readonly lastSelectValue: string;
4228
4271
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
4229
4272
  splitExtraValue(value: any): any[];
4273
+ getMergedData(data: any): any;
4230
4274
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
4231
4275
  loadAutoUpdateData: (api: Api, data?: object | undefined, silent?: boolean | undefined) => Promise<Payload>;
4232
4276
  setIsControlled: (value: any) => void;
@@ -4307,6 +4351,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
4307
4351
  readonly lastSelectValue: string;
4308
4352
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
4309
4353
  splitExtraValue(value: any): any[];
4354
+ getMergedData(data: any): any;
4310
4355
  } & {
4311
4356
  focus: () => void;
4312
4357
  blur: () => void;
@@ -4368,7 +4413,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
4368
4413
  resetValidationStatus: (tag?: string | undefined) => void;
4369
4414
  openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
4370
4415
  closeDialog: (result?: any) => void;
4371
- changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
4416
+ changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
4372
4417
  changeEmitedValue: (value: any) => void;
4373
4418
  addSubFormItem: (item: {
4374
4419
  id: string;
@@ -4450,6 +4495,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
4450
4495
  readonly lastSelectValue: string;
4451
4496
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
4452
4497
  splitExtraValue(value: any): any[];
4498
+ getMergedData(data: any): any;
4453
4499
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
4454
4500
  id: import("mobx-state-tree").ISimpleType<string>;
4455
4501
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -4527,6 +4573,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
4527
4573
  readonly lastSelectValue: string;
4528
4574
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
4529
4575
  splitExtraValue(value: any): any[];
4576
+ getMergedData(data: any): any;
4530
4577
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
4531
4578
  removeSubFormItem: (item: {
4532
4579
  id: string;
@@ -4608,6 +4655,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
4608
4655
  readonly lastSelectValue: string;
4609
4656
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
4610
4657
  splitExtraValue(value: any): any[];
4658
+ getMergedData(data: any): any;
4611
4659
  } & any & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
4612
4660
  id: import("mobx-state-tree").ISimpleType<string>;
4613
4661
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -4685,6 +4733,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
4685
4733
  readonly lastSelectValue: string;
4686
4734
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
4687
4735
  splitExtraValue(value: any): any[];
4736
+ getMergedData(data: any): any;
4688
4737
  } & any, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) => void;
4689
4738
  loadAutoUpdateData: (api: Api, data?: object | undefined, silent?: boolean | undefined) => Promise<Payload>;
4690
4739
  setIsControlled: (value: any) => void;
package/lib/store/form.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.4.2
2
+ * amis-core v3.5.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -169,7 +169,7 @@ var FormStore = service.ServiceStore.named('FormStore')
169
169
  }
170
170
  }
171
171
  item.reset();
172
- item.validateOnChange && item.validate(self.data);
172
+ self.inited && item.validateOnChange && item.validate(self.data);
173
173
  });
174
174
  // 同步 options
175
175
  syncOptions();
@@ -618,6 +618,9 @@ var FormStore = service.ServiceStore.named('FormStore')
618
618
  if (item.name && item.type !== 'hidden') {
619
619
  object.setVariable(toClear, item.name, item.resetValue);
620
620
  }
621
+ if (item.extraName && typeof item.extraName === 'string') {
622
+ object.setVariable(toClear, item.extraName, item.resetValue);
623
+ }
621
624
  });
622
625
  setValues(toClear);
623
626
  self.validated = false;
@@ -77,6 +77,7 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
77
77
  readonly lastSelectValue: string;
78
78
  getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
79
79
  splitExtraValue(value: any): any[];
80
+ getMergedData(data: any): any;
80
81
  } & {
81
82
  focus: () => void;
82
83
  blur: () => void;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.4.2
2
+ * amis-core v3.5.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -218,6 +218,13 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
218
218
  ? value.split(delimiter || ',').map(function (v) { return v.trim(); })
219
219
  : [];
220
220
  return values;
221
+ },
222
+ getMergedData: function (data) {
223
+ var result = object.cloneObject(data);
224
+ object.setVariable(result, self.name, self.tmpValue);
225
+ object.setVariable(result, '__value', self.tmpValue);
226
+ object.setVariable(result, '__name', self.name);
227
+ return result;
221
228
  }
222
229
  };
223
230
  })
@@ -867,8 +874,13 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
867
874
  options_2.push.apply(options_2, tslib.__spreadArray([], tslib.__read(item.selectedOptions.map(function (item) { return item && item.value; })), false));
868
875
  }
869
876
  });
870
- if (filteredOptions.length) {
871
- filteredOptions = filteredOptions.filter(function (option) { return !~options_2.indexOf(option.value); });
877
+ if (filteredOptions.length && options_2.length) {
878
+ filteredOptions = helper.mapTree(filteredOptions, function (item) {
879
+ if (~options_2.indexOf(item.value)) {
880
+ return tslib.__assign(tslib.__assign({}, item), { disabled: true });
881
+ }
882
+ return item;
883
+ });
872
884
  }
873
885
  }
874
886
  helper.isArrayChildrenModified(self.selectedOptions, selectedOptions) &&
@@ -891,7 +903,7 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
891
903
  self.validated = false;
892
904
  if (subStore && subStore.storeType === 'ComboStore') {
893
905
  var combo = subStore;
894
- combo.forms.forEach(function (form) { return form.reset(); });
906
+ combo.forms.forEach(function (form) { return form.reset(undefined, false); }); // 仅重置校验状态,不要重置数据
895
907
  }
896
908
  !keepErrors && clearError();
897
909
  }
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.4.2
2
+ * amis-core v3.5.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -28,7 +28,6 @@ require('../utils/dom.js');
28
28
  require('../utils/errors.js');
29
29
  require('../utils/tpl.js');
30
30
  require('lodash/isPlainObject');
31
- require('classnames');
32
31
  require('lodash/isObject');
33
32
  require('lodash/isString');
34
33
  require('lodash/isBoolean');
@@ -47,6 +46,7 @@ require('lodash/mapValues');
47
46
  require('lodash/camelCase');
48
47
  require('lodash/map');
49
48
  require('lodash/isEmpty');
49
+ require('lodash/kebabCase');
50
50
  require('uncontrollable');
51
51
  require('hoist-non-react-statics');
52
52
  require('../utils/validations.js');
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.4.2
2
+ * amis-core v3.5.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
package/lib/store/list.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.4.2
2
+ * amis-core v3.5.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.4.2
2
+ * amis-core v3.5.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.4.2
2
+ * amis-core v3.5.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
package/lib/store/node.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.4.2
2
+ * amis-core v3.5.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.4.2
2
+ * amis-core v3.5.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5