amis-core 2.8.0 → 2.9.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 (297) hide show
  1. package/esm/Root.d.ts +1 -1
  2. package/esm/Root.js +1 -1
  3. package/esm/RootRenderer.d.ts +1 -1
  4. package/esm/RootRenderer.js +21 -4
  5. package/esm/SchemaRenderer.d.ts +2 -1
  6. package/esm/SchemaRenderer.js +1 -1
  7. package/esm/Scoped.js +30 -2
  8. package/esm/WithRootStore.d.ts +4 -8
  9. package/esm/WithRootStore.js +1 -1
  10. package/esm/WithStore.js +1 -1
  11. package/esm/actions/Action.d.ts +2 -1
  12. package/esm/actions/Action.js +33 -11
  13. package/esm/actions/AjaxAction.js +1 -1
  14. package/esm/actions/BreakAction.js +1 -1
  15. package/esm/actions/BroadcastAction.js +1 -1
  16. package/esm/actions/CmptAction.js +1 -1
  17. package/esm/actions/ContinueAction.js +1 -1
  18. package/esm/actions/CopyAction.js +1 -1
  19. package/esm/actions/CustomAction.js +2 -1
  20. package/esm/actions/DialogAction.d.ts +1 -1
  21. package/esm/actions/DialogAction.js +8 -3
  22. package/esm/actions/DrawerAction.js +1 -1
  23. package/esm/actions/EmailAction.js +1 -1
  24. package/esm/actions/LinkAction.js +1 -1
  25. package/esm/actions/LoopAction.js +1 -1
  26. package/esm/actions/PageAction.js +1 -1
  27. package/esm/actions/ParallelAction.js +1 -1
  28. package/esm/actions/SwitchAction.js +18 -15
  29. package/esm/actions/ToastAction.js +1 -1
  30. package/esm/components/LazyComponent.d.ts +3 -3
  31. package/esm/components/LazyComponent.js +1 -1
  32. package/esm/components/Overlay.d.ts +1 -1
  33. package/esm/components/Overlay.js +2 -1
  34. package/esm/components/PopOver.d.ts +2 -4
  35. package/esm/components/PopOver.js +2 -1
  36. package/esm/env.d.ts +3 -7
  37. package/esm/env.js +1 -1
  38. package/esm/envOverwrite.js +1 -1
  39. package/esm/factory.js +3 -1
  40. package/esm/index.d.ts +2 -3
  41. package/esm/index.js +7 -5
  42. package/esm/locale.d.ts +1 -3
  43. package/esm/locale.js +1 -1
  44. package/esm/renderers/Form.js +17 -15
  45. package/esm/renderers/Item.d.ts +9 -15
  46. package/esm/renderers/Item.js +2 -1
  47. package/esm/renderers/Options.js +2 -1
  48. package/esm/renderers/Placeholder.js +1 -1
  49. package/esm/renderers/builtin.js +1 -1
  50. package/esm/renderers/register.js +1 -1
  51. package/esm/renderers/wrapControl.d.ts +4 -8
  52. package/esm/renderers/wrapControl.js +21 -30
  53. package/esm/store/app.d.ts +4 -2
  54. package/esm/store/app.js +1 -1
  55. package/esm/store/combo.d.ts +12 -6
  56. package/esm/store/combo.js +1 -1
  57. package/esm/store/crud.d.ts +5 -2
  58. package/esm/store/crud.js +32 -12
  59. package/esm/store/form.d.ts +4 -2
  60. package/esm/store/form.js +1 -1
  61. package/esm/store/formItem.js +5 -4
  62. package/esm/store/iRenderer.d.ts +5 -2
  63. package/esm/store/iRenderer.js +15 -3
  64. package/esm/store/index.js +1 -1
  65. package/esm/store/list.d.ts +4 -2
  66. package/esm/store/list.js +5 -5
  67. package/esm/store/manager.js +1 -1
  68. package/esm/store/modal.d.ts +4 -2
  69. package/esm/store/modal.js +1 -1
  70. package/esm/store/node.js +1 -1
  71. package/esm/store/pagination.d.ts +4 -2
  72. package/esm/store/pagination.js +1 -1
  73. package/esm/store/root.d.ts +4 -2
  74. package/esm/store/root.js +1 -1
  75. package/esm/store/service.d.ts +4 -2
  76. package/esm/store/service.js +1 -1
  77. package/esm/store/table.d.ts +12 -6
  78. package/esm/store/table.js +12 -2
  79. package/esm/store/table2.d.ts +4 -2
  80. package/esm/store/table2.js +1 -1
  81. package/esm/theme.d.ts +2 -4
  82. package/esm/theme.js +1 -1
  83. package/esm/types.d.ts +39 -2
  84. package/esm/utils/Animation.js +1 -1
  85. package/esm/utils/ColorScale.js +1 -1
  86. package/esm/utils/DataSchema.js +1 -1
  87. package/esm/utils/DataScope.js +1 -1
  88. package/esm/utils/RootClose.js +1 -1
  89. package/esm/utils/SimpleMap.js +1 -1
  90. package/esm/utils/api.js +3 -4
  91. package/esm/utils/attachmentAdpator.js +1 -1
  92. package/esm/utils/autobind.js +1 -1
  93. package/esm/utils/columnsSplit.js +1 -1
  94. package/esm/utils/dataMapping.js +1 -1
  95. package/esm/utils/date.js +1 -1
  96. package/esm/utils/debug.d.ts +1 -0
  97. package/esm/utils/debug.js +1 -1
  98. package/esm/utils/decodeEntity.js +1 -1
  99. package/esm/utils/dom.js +1 -1
  100. package/esm/utils/errors.js +1 -1
  101. package/esm/utils/escapeHtml.js +1 -1
  102. package/esm/utils/filter-schema.js +1 -1
  103. package/esm/utils/filter.js +1 -1
  104. package/esm/utils/formatDuration.js +1 -1
  105. package/esm/utils/formula.d.ts +1 -0
  106. package/esm/utils/formula.js +6 -2
  107. package/esm/utils/getVariable.js +1 -1
  108. package/esm/utils/grammar.js +1 -1
  109. package/esm/utils/handleAction.js +1 -1
  110. package/esm/utils/helper.js +1 -1
  111. package/esm/utils/highlight.js +1 -1
  112. package/esm/utils/icon.js +1 -1
  113. package/esm/utils/image.js +1 -1
  114. package/esm/utils/index.d.ts +2 -0
  115. package/esm/utils/isPureVariable.js +1 -1
  116. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  117. package/esm/utils/keyToPath.js +1 -1
  118. package/esm/utils/makeSorter.js +1 -1
  119. package/esm/utils/normalizeLink.js +1 -1
  120. package/esm/utils/normalizeOptions.js +1 -1
  121. package/esm/utils/object.js +1 -1
  122. package/esm/utils/offset.js +1 -1
  123. package/esm/utils/offsetParent.js +1 -1
  124. package/esm/utils/optionValueCompare.js +7 -3
  125. package/esm/utils/position.js +1 -1
  126. package/esm/utils/prettyBytes.js +1 -1
  127. package/esm/utils/renderer-event.js +1 -1
  128. package/esm/utils/replaceText.js +1 -1
  129. package/esm/utils/resize-sensor.js +1 -1
  130. package/esm/utils/resolveCondition.d.ts +5 -0
  131. package/esm/utils/resolveCondition.js +306 -0
  132. package/esm/utils/resolveVariable.js +1 -1
  133. package/esm/utils/resolveVariableAndFilter.js +1 -1
  134. package/esm/utils/resolveVariableAndFilterForAsync.d.ts +1 -0
  135. package/esm/utils/resolveVariableAndFilterForAsync.js +46 -0
  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.js +1 -1
  140. package/esm/utils/style.js +1 -1
  141. package/esm/utils/toNumber.js +1 -1
  142. package/esm/utils/tokenize.js +1 -1
  143. package/esm/utils/tpl-builtin.js +1 -1
  144. package/esm/utils/tpl-lodash.js +1 -1
  145. package/esm/utils/tpl.d.ts +7 -0
  146. package/esm/utils/tpl.js +23 -3
  147. package/esm/utils/uncontrollable.js +1 -1
  148. package/esm/utils/validations.js +1 -1
  149. package/lib/Root.d.ts +1 -1
  150. package/lib/Root.js +1 -1
  151. package/lib/RootRenderer.d.ts +1 -1
  152. package/lib/RootRenderer.js +21 -4
  153. package/lib/SchemaRenderer.d.ts +2 -1
  154. package/lib/SchemaRenderer.js +1 -1
  155. package/lib/Scoped.js +30 -2
  156. package/lib/WithRootStore.d.ts +4 -8
  157. package/lib/WithRootStore.js +1 -1
  158. package/lib/WithStore.js +1 -1
  159. package/lib/actions/Action.d.ts +2 -1
  160. package/lib/actions/Action.js +32 -10
  161. package/lib/actions/AjaxAction.js +1 -1
  162. package/lib/actions/BreakAction.js +1 -1
  163. package/lib/actions/BroadcastAction.js +1 -1
  164. package/lib/actions/CmptAction.js +1 -1
  165. package/lib/actions/ContinueAction.js +1 -1
  166. package/lib/actions/CopyAction.js +1 -1
  167. package/lib/actions/CustomAction.js +2 -1
  168. package/lib/actions/DialogAction.d.ts +1 -1
  169. package/lib/actions/DialogAction.js +8 -3
  170. package/lib/actions/DrawerAction.js +1 -1
  171. package/lib/actions/EmailAction.js +1 -1
  172. package/lib/actions/LinkAction.js +1 -1
  173. package/lib/actions/LoopAction.js +1 -1
  174. package/lib/actions/PageAction.js +1 -1
  175. package/lib/actions/ParallelAction.js +1 -1
  176. package/lib/actions/SwitchAction.js +17 -14
  177. package/lib/actions/ToastAction.js +1 -1
  178. package/lib/components/LazyComponent.d.ts +3 -3
  179. package/lib/components/LazyComponent.js +1 -1
  180. package/lib/components/Overlay.d.ts +1 -1
  181. package/lib/components/Overlay.js +2 -1
  182. package/lib/components/PopOver.d.ts +2 -4
  183. package/lib/components/PopOver.js +2 -1
  184. package/lib/env.d.ts +3 -7
  185. package/lib/env.js +1 -1
  186. package/lib/envOverwrite.js +1 -1
  187. package/lib/factory.js +3 -1
  188. package/lib/index.d.ts +2 -3
  189. package/lib/index.js +18 -2
  190. package/lib/locale.d.ts +1 -3
  191. package/lib/locale.js +1 -1
  192. package/lib/renderers/Form.js +16 -14
  193. package/lib/renderers/Item.d.ts +9 -15
  194. package/lib/renderers/Item.js +2 -1
  195. package/lib/renderers/Options.js +2 -1
  196. package/lib/renderers/Placeholder.js +1 -1
  197. package/lib/renderers/builtin.js +1 -1
  198. package/lib/renderers/register.js +1 -1
  199. package/lib/renderers/wrapControl.d.ts +4 -8
  200. package/lib/renderers/wrapControl.js +20 -28
  201. package/lib/store/app.d.ts +4 -2
  202. package/lib/store/app.js +1 -1
  203. package/lib/store/combo.d.ts +12 -6
  204. package/lib/store/combo.js +1 -1
  205. package/lib/store/crud.d.ts +5 -2
  206. package/lib/store/crud.js +31 -11
  207. package/lib/store/form.d.ts +4 -2
  208. package/lib/store/form.js +1 -1
  209. package/lib/store/formItem.js +5 -4
  210. package/lib/store/iRenderer.d.ts +5 -2
  211. package/lib/store/iRenderer.js +15 -3
  212. package/lib/store/index.js +1 -1
  213. package/lib/store/list.d.ts +4 -2
  214. package/lib/store/list.js +5 -5
  215. package/lib/store/manager.js +1 -1
  216. package/lib/store/modal.d.ts +4 -2
  217. package/lib/store/modal.js +1 -1
  218. package/lib/store/node.js +1 -1
  219. package/lib/store/pagination.d.ts +4 -2
  220. package/lib/store/pagination.js +1 -1
  221. package/lib/store/root.d.ts +4 -2
  222. package/lib/store/root.js +1 -1
  223. package/lib/store/service.d.ts +4 -2
  224. package/lib/store/service.js +1 -1
  225. package/lib/store/table.d.ts +12 -6
  226. package/lib/store/table.js +12 -2
  227. package/lib/store/table2.d.ts +4 -2
  228. package/lib/store/table2.js +1 -1
  229. package/lib/theme.d.ts +2 -4
  230. package/lib/theme.js +1 -1
  231. package/lib/types.d.ts +39 -2
  232. package/lib/utils/Animation.js +1 -1
  233. package/lib/utils/ColorScale.js +1 -1
  234. package/lib/utils/DataSchema.js +1 -1
  235. package/lib/utils/DataScope.js +1 -1
  236. package/lib/utils/RootClose.js +1 -1
  237. package/lib/utils/SimpleMap.js +1 -1
  238. package/lib/utils/api.js +2 -3
  239. package/lib/utils/attachmentAdpator.js +1 -1
  240. package/lib/utils/autobind.js +1 -1
  241. package/lib/utils/columnsSplit.js +1 -1
  242. package/lib/utils/dataMapping.js +1 -1
  243. package/lib/utils/date.js +1 -1
  244. package/lib/utils/debug.d.ts +1 -0
  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.d.ts +1 -0
  254. package/lib/utils/formula.js +6 -1
  255. package/lib/utils/getVariable.js +1 -1
  256. package/lib/utils/grammar.js +1 -1
  257. package/lib/utils/handleAction.js +1 -1
  258. package/lib/utils/helper.js +1 -1
  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/index.d.ts +2 -0
  263. package/lib/utils/isPureVariable.js +1 -1
  264. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  265. package/lib/utils/keyToPath.js +1 -1
  266. package/lib/utils/makeSorter.js +1 -1
  267. package/lib/utils/normalizeLink.js +1 -1
  268. package/lib/utils/normalizeOptions.js +1 -1
  269. package/lib/utils/object.js +1 -1
  270. package/lib/utils/offset.js +1 -1
  271. package/lib/utils/offsetParent.js +1 -1
  272. package/lib/utils/optionValueCompare.js +7 -3
  273. package/lib/utils/position.js +1 -1
  274. package/lib/utils/prettyBytes.js +1 -1
  275. package/lib/utils/renderer-event.js +1 -1
  276. package/lib/utils/replaceText.js +1 -1
  277. package/lib/utils/resize-sensor.js +1 -1
  278. package/lib/utils/resolveCondition.d.ts +5 -0
  279. package/lib/utils/resolveCondition.js +322 -0
  280. package/lib/utils/resolveVariable.js +1 -1
  281. package/lib/utils/resolveVariableAndFilter.js +1 -1
  282. package/lib/utils/resolveVariableAndFilterForAsync.d.ts +1 -0
  283. package/lib/utils/resolveVariableAndFilterForAsync.js +50 -0
  284. package/lib/utils/scrollPosition.js +1 -1
  285. package/lib/utils/string2regExp.js +1 -1
  286. package/lib/utils/stripNumber.js +1 -1
  287. package/lib/utils/style-helper.js +1 -1
  288. package/lib/utils/style.js +1 -1
  289. package/lib/utils/toNumber.js +1 -1
  290. package/lib/utils/tokenize.js +1 -1
  291. package/lib/utils/tpl-builtin.js +1 -1
  292. package/lib/utils/tpl-lodash.js +1 -1
  293. package/lib/utils/tpl.d.ts +7 -0
  294. package/lib/utils/tpl.js +22 -1
  295. package/lib/utils/uncontrollable.js +1 -1
  296. package/lib/utils/validations.js +1 -1
  297. package/package.json +5 -5
package/lib/store/form.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -140,9 +140,10 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
140
140
  ? nodeValueArray
141
141
  : Array.isArray(value)
142
142
  ? value
143
- : typeof value === 'string'
144
- ? value.split(self.delimiter || ',')
145
- : [value];
143
+ : // 单选时不应该分割
144
+ typeof value === 'string' && self.multiple
145
+ ? value.split(self.delimiter || ',')
146
+ : [value];
146
147
  var selected = valueArray.map(function (item) {
147
148
  return item && item.hasOwnProperty(self.valueField || 'value')
148
149
  ? item[self.valueField || 'value']
@@ -1,4 +1,5 @@
1
1
  import { Instance, SnapshotIn } from 'mobx-state-tree';
2
+ import { IScopedContext } from '../Scoped';
2
3
  export declare const iRendererStore: import("mobx-state-tree").IModelType<{
3
4
  id: import("mobx-state-tree").ISimpleType<string>;
4
5
  path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -37,10 +38,12 @@ export declare const iRendererStore: import("mobx-state-tree").IModelType<{
37
38
  updateData(data?: object, tag?: object, replace?: boolean): void;
38
39
  changeValue(name: string, value: any, changePristine?: boolean, force?: boolean, otherModifier?: ((data: Object) => void) | undefined): void;
39
40
  setCurrentAction(action: object): void;
40
- openDialog(ctx: any, additonal?: object, callback?: ((ret: any) => void) | undefined): void;
41
+ openDialog(ctx: any, additonal?: object, callback?: ((ret: any) => void) | undefined, scoped?: IScopedContext): void;
41
42
  closeDialog(result?: any): void;
42
- openDrawer(ctx: any, additonal?: object, callback?: ((ret: any) => void) | undefined): void;
43
+ openDrawer(ctx: any, additonal?: object, callback?: ((ret: any) => void) | undefined, scoped?: IScopedContext): void;
43
44
  closeDrawer(result?: any): void;
45
+ getDialogScoped(): IScopedContext | null;
46
+ getDrawerScoped(): IScopedContext | null;
44
47
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
45
48
  export type IIRendererStore = Instance<typeof iRendererStore>;
46
49
  export type SIRendererStore = SnapshotIn<typeof iRendererStore>;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -43,6 +43,8 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
43
43
  }); })
44
44
  .actions(function (self) {
45
45
  var dialogCallbacks = new SimpleMap.SimpleMap();
46
+ var dialogScoped = null;
47
+ var drawerScoped = null;
46
48
  return {
47
49
  initData: function (data, skipSetPristine) {
48
50
  if (data === void 0) { data = {}; }
@@ -128,7 +130,7 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
128
130
  setCurrentAction: function (action) {
129
131
  self.action = action;
130
132
  },
131
- openDialog: function (ctx, additonal, callback) {
133
+ openDialog: function (ctx, additonal, callback, scoped) {
132
134
  var proto = ctx.__super ? ctx.__super : self.data;
133
135
  if (additonal) {
134
136
  proto = object.createObject(proto, additonal);
@@ -145,16 +147,18 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
145
147
  }
146
148
  self.dialogOpen = true;
147
149
  callback && dialogCallbacks.set(self.dialogData, callback);
150
+ dialogScoped = scoped || null;
148
151
  },
149
152
  closeDialog: function (result) {
150
153
  var callback = dialogCallbacks.get(self.dialogData);
151
154
  self.dialogOpen = false;
155
+ dialogScoped = null;
152
156
  if (callback) {
153
157
  dialogCallbacks.delete(self.dialogData);
154
158
  setTimeout(function () { return callback(result); }, 200);
155
159
  }
156
160
  },
157
- openDrawer: function (ctx, additonal, callback) {
161
+ openDrawer: function (ctx, additonal, callback, scoped) {
158
162
  var proto = ctx.__super ? ctx.__super : self.data;
159
163
  if (additonal) {
160
164
  proto = object.createObject(proto, additonal);
@@ -173,14 +177,22 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
173
177
  if (callback) {
174
178
  dialogCallbacks.set(self.drawerData, callback);
175
179
  }
180
+ drawerScoped = scoped || null;
176
181
  },
177
182
  closeDrawer: function (result) {
178
183
  var callback = dialogCallbacks.get(self.drawerData);
179
184
  self.drawerOpen = false;
185
+ drawerScoped = null;
180
186
  if (callback) {
181
187
  dialogCallbacks.delete(self.drawerData);
182
188
  setTimeout(function () { return callback(result); }, 200);
183
189
  }
190
+ },
191
+ getDialogScoped: function () {
192
+ return dialogScoped;
193
+ },
194
+ getDrawerScoped: function () {
195
+ return drawerScoped;
184
196
  }
185
197
  };
186
198
  });
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -104,10 +104,12 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
104
104
  updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
105
105
  changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
106
106
  setCurrentAction(action: object): void;
107
- openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
107
+ openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
108
108
  closeDialog(result?: any): void;
109
- openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
109
+ openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
110
110
  closeDrawer(result?: any): void;
111
+ getDialogScoped(): import("..").IScopedContext | null;
112
+ getDrawerScoped(): import("..").IScopedContext | null;
111
113
  } & {
112
114
  readonly allChecked: boolean;
113
115
  readonly checkableItems: ({
package/lib/store/list.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -53,10 +53,10 @@ var Item = mobxStateTree.types
53
53
  : true;
54
54
  },
55
55
  get draggable() {
56
- var table = mobxStateTree.getParent(self, 2);
57
- return table && table.itemDraggableOn
58
- ? tpl.evalExpression(table.itemDraggableOn, self.locals)
59
- : true;
56
+ var list = mobxStateTree.getParent(self, 2);
57
+ return list && list.itemDraggableOn
58
+ ? tpl.evalExpression(list.itemDraggableOn, self.locals)
59
+ : list.draggable;
60
60
  }
61
61
  }); })
62
62
  .actions(function (self) { return ({
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -52,10 +52,12 @@ export declare const ModalStore: import("mobx-state-tree").IModelType<{
52
52
  updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
53
53
  changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
54
54
  setCurrentAction(action: object): void;
55
- openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
55
+ openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
56
56
  closeDialog(result?: any): void;
57
- openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
57
+ openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
58
58
  closeDrawer(result?: any): void;
59
+ getDialogScoped(): import("..").IScopedContext | null;
60
+ getDrawerScoped(): import("..").IScopedContext | null;
59
61
  } & {
60
62
  readonly loading: boolean;
61
63
  } & {
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.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 v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -43,10 +43,12 @@ export declare const PaginationStore: import("mobx-state-tree").IModelType<{
43
43
  updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
44
44
  changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
45
45
  setCurrentAction(action: object): void;
46
- openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
46
+ openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
47
47
  closeDialog(result?: any): void;
48
- openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
48
+ openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
49
49
  closeDrawer(result?: any): void;
50
+ getDialogScoped(): import("..").IScopedContext | null;
51
+ getDrawerScoped(): import("..").IScopedContext | null;
50
52
  } & {
51
53
  readonly inputItems: any[];
52
54
  readonly locals: object;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -54,10 +54,12 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
54
54
  updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
55
55
  changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
56
56
  setCurrentAction(action: object): void;
57
- openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
57
+ openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
58
58
  closeDialog(result?: any): void;
59
- openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
59
+ openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
60
60
  closeDrawer(result?: any): void;
61
+ getDialogScoped(): import("..").IScopedContext | null;
62
+ getDrawerScoped(): import("..").IScopedContext | null;
61
63
  } & {
62
64
  readonly loading: boolean;
63
65
  } & {
package/lib/store/root.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -48,10 +48,12 @@ export declare const ServiceStore: import("mobx-state-tree").IModelType<{
48
48
  updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
49
49
  changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
50
50
  setCurrentAction(action: object): void;
51
- openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
51
+ openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
52
52
  closeDialog(result?: any): void;
53
- openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
53
+ openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
54
54
  closeDrawer(result?: any): void;
55
+ getDialogScoped(): import("..").IScopedContext | null;
56
+ getDrawerScoped(): import("..").IScopedContext | null;
55
57
  } & {
56
58
  readonly loading: boolean;
57
59
  } & {
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -239,10 +239,12 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
239
239
  updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
240
240
  changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
241
241
  setCurrentAction(action: object): void;
242
- openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
242
+ openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
243
243
  closeDialog(result?: any): void;
244
- openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
244
+ openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
245
245
  closeDrawer(result?: any): void;
246
+ getDialogScoped(): import("..").IScopedContext | null;
247
+ getDrawerScoped(): import("..").IScopedContext | null;
246
248
  } & {
247
249
  readonly columnsData: ({
248
250
  label: any;
@@ -352,10 +354,12 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
352
354
  updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
353
355
  changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
354
356
  setCurrentAction(action: object): void;
355
- openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
357
+ openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
356
358
  closeDialog(result?: any): void;
357
- openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
359
+ openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
358
360
  closeDrawer(result?: any): void;
361
+ getDialogScoped(): import("..").IScopedContext | null;
362
+ getDrawerScoped(): import("..").IScopedContext | null;
359
363
  } & {
360
364
  readonly loading: boolean;
361
365
  } & {
@@ -5609,10 +5613,12 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
5609
5613
  updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
5610
5614
  changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
5611
5615
  setCurrentAction(action: object): void;
5612
- openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
5616
+ openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
5613
5617
  closeDialog(result?: any): void;
5614
- openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
5618
+ openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
5615
5619
  closeDrawer(result?: any): void;
5620
+ getDialogScoped(): import("..").IScopedContext | null;
5621
+ getDrawerScoped(): import("..").IScopedContext | null;
5616
5622
  } & {
5617
5623
  readonly loading: boolean;
5618
5624
  } & {
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -826,10 +826,20 @@ var TableStore = iRenderer.iRendererStore
826
826
  (self.expandConfig &&
827
827
  self.expandConfig.expand === 'all' &&
828
828
  !self.expandConfig.accordion)) {
829
- self.expandedRows.replace(self.rows.map(function (item) { return item.id; }));
829
+ self.expandedRows.replace(getExpandAllRows(self.rows));
830
830
  }
831
831
  self.dragging = false;
832
832
  }
833
+ // 获取所有层级的子节点id
834
+ function getExpandAllRows(arr) {
835
+ return arr.reduce(function (result, current) {
836
+ result.push(current.id);
837
+ if (current.children && current.children.length) {
838
+ result = result.concat(getExpandAllRows(current.children));
839
+ }
840
+ return result;
841
+ }, []);
842
+ }
833
843
  // 尽可能的复用 row
834
844
  function replaceRow(arr, reUseRow) {
835
845
  if (reUseRow === false) {
@@ -161,10 +161,12 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
161
161
  updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
162
162
  changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
163
163
  setCurrentAction(action: object): void;
164
- openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
164
+ openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
165
165
  closeDialog(result?: any): void;
166
- openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
166
+ openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
167
167
  closeDrawer(result?: any): void;
168
+ getDialogScoped(): import("..").IScopedContext | null;
169
+ getDrawerScoped(): import("..").IScopedContext | null;
168
170
  } & {
169
171
  readonly loading: boolean;
170
172
  } & {
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
package/lib/theme.d.ts CHANGED
@@ -57,12 +57,10 @@ export declare function themeable<T extends React.ComponentType<React.ComponentP
57
57
  childRef(ref: any): void;
58
58
  getWrappedInstance(): any;
59
59
  render(): JSX.Element;
60
- context: any;
60
+ context: unknown;
61
61
  setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
62
62
  forceUpdate(callback?: (() => void) | undefined): void;
63
- readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps> & Readonly<{
64
- children?: React.ReactNode;
65
- }>;
63
+ readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps>;
66
64
  state: Readonly<{}>;
67
65
  refs: {
68
66
  [key: string]: React.ReactInstance;
package/lib/theme.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
package/lib/types.d.ts CHANGED
@@ -331,7 +331,7 @@ export interface EventTrack {
331
331
  * tabChange: tab 切换
332
332
  * netError: api 报错
333
333
  */
334
- eventType: 'api' | 'url' | 'link' | 'dialog' | 'drawer' | 'copy' | 'reload' | 'email' | 'prev' | 'next' | 'cancel' | 'close' | 'submit' | 'confirm' | 'reset' | 'reset-and-submit' | 'formItemChange' | 'tabChange' | 'pageHidden' | 'pageVisible';
334
+ eventType: 'api' | 'url' | 'link' | 'dialog' | 'drawer' | 'copy' | 'reload' | 'email' | 'prev' | 'next' | 'cancel' | 'close' | 'submit' | 'confirm' | 'reset' | 'reset-and-submit' | 'formItemChange' | 'tabChange' | 'pageLoaded' | 'pageHidden' | 'pageVisible';
335
335
  /**
336
336
  * 事件数据
337
337
  */
@@ -385,7 +385,7 @@ interface LinkItemProps {
385
385
  children?: Array<LinkItem>;
386
386
  path?: string;
387
387
  icon?: string;
388
- component?: React.ReactType;
388
+ component?: React.ElementType;
389
389
  }
390
390
  export interface NavigationObject {
391
391
  label: string;
@@ -489,4 +489,41 @@ export interface BaseSchemaWithoutType {
489
489
  staticInputClassName?: SchemaClassName;
490
490
  staticSchema?: any;
491
491
  }
492
+ export type OperatorType = 'equal' | 'not_equal' | 'is_empty' | 'is_not_empty' | 'like' | 'not_like' | 'starts_with' | 'ends_with' | 'less' | 'less_or_equal' | 'greater' | 'greater_or_equal' | 'between' | 'not_between' | 'select_equals' | 'select_not_equals' | 'select_any_in' | 'select_not_any_in' | {
493
+ label: string;
494
+ value: string;
495
+ };
496
+ export type ExpressionSimple = string | number | object | undefined;
497
+ export type ExpressionValue = ExpressionSimple | {
498
+ type: 'value';
499
+ value: ExpressionSimple;
500
+ };
501
+ export type ExpressionFunc = {
502
+ type: 'func';
503
+ func: string;
504
+ args: Array<ExpressionComplex>;
505
+ };
506
+ export type ExpressionField = {
507
+ type: 'field';
508
+ field: string;
509
+ };
510
+ export type ExpressionFormula = {
511
+ type: 'formula';
512
+ value: string;
513
+ };
514
+ export type ExpressionComplex = ExpressionValue | ExpressionFunc | ExpressionField | ExpressionFormula;
515
+ export interface ConditionRule {
516
+ id: any;
517
+ left?: ExpressionComplex;
518
+ op?: OperatorType;
519
+ right?: ExpressionComplex | Array<ExpressionComplex>;
520
+ }
521
+ export interface ConditionGroupValue {
522
+ id: string;
523
+ conjunction: 'and' | 'or';
524
+ not?: boolean;
525
+ children?: Array<ConditionRule | ConditionGroupValue>;
526
+ }
527
+ export interface ConditionValue extends ConditionGroupValue {
528
+ }
492
529
  export {};
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
package/lib/utils/api.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -380,8 +380,7 @@ function wrapFetcher(fn, tracker) {
380
380
  api.headers['Content-Type'] = 'application/json';
381
381
  }
382
382
  if (!isValidApi(api.url)) {
383
- debug.warning('api', 'invalid api url', api);
384
- return Promise.resolve();
383
+ throw new Error("invalid api url:".concat(api.url));
385
384
  }
386
385
  debug.debug('api', 'request api', api);
387
386
  tracker === null || tracker === void 0 ? void 0 : tracker({ eventType: 'api', eventData: omit__default["default"](api, ['config', 'data', 'body']) }, api.data);
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
package/lib/utils/date.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -5,6 +5,7 @@ import React, { Component } from 'react';
5
5
  export declare function enableDebug(): void;
6
6
  interface DebugWrapperProps {
7
7
  renderer: any;
8
+ children?: React.ReactNode;
8
9
  }
9
10
  export declare class DebugWrapper extends Component<DebugWrapperProps> {
10
11
  debugId: string;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
package/lib/utils/dom.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.8.0
2
+ * amis-core v2.9.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5