amis-core 3.1.1 → 3.3.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 (313) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.d.ts +1 -1
  3. package/esm/RootRenderer.js +3 -3
  4. package/esm/SchemaRenderer.js +6 -2
  5. package/esm/Scoped.d.ts +4 -1
  6. package/esm/Scoped.js +9 -5
  7. package/esm/StatusScoped.js +1 -1
  8. package/esm/WithRootStore.d.ts +4 -24
  9. package/esm/WithRootStore.js +12 -4
  10. package/esm/WithStore.js +23 -16
  11. package/esm/actions/Action.d.ts +1 -0
  12. package/esm/actions/Action.js +70 -45
  13. package/esm/actions/AjaxAction.d.ts +6 -8
  14. package/esm/actions/AjaxAction.js +20 -18
  15. package/esm/actions/BreakAction.js +1 -1
  16. package/esm/actions/BroadcastAction.js +1 -1
  17. package/esm/actions/CmptAction.d.ts +1 -2
  18. package/esm/actions/CmptAction.js +47 -32
  19. package/esm/actions/ContinueAction.js +1 -1
  20. package/esm/actions/CopyAction.js +1 -1
  21. package/esm/actions/CustomAction.js +3 -2
  22. package/esm/actions/DialogAction.d.ts +2 -0
  23. package/esm/actions/DialogAction.js +39 -23
  24. package/esm/actions/DrawerAction.js +4 -4
  25. package/esm/actions/EmailAction.js +1 -1
  26. package/esm/actions/LinkAction.js +1 -1
  27. package/esm/actions/LoopAction.js +1 -1
  28. package/esm/actions/PageAction.js +1 -1
  29. package/esm/actions/ParallelAction.js +1 -1
  30. package/esm/actions/StatusAction.d.ts +15 -0
  31. package/esm/actions/StatusAction.js +49 -0
  32. package/esm/actions/SwitchAction.js +1 -1
  33. package/esm/actions/ToastAction.js +1 -1
  34. package/esm/actions/index.d.ts +1 -0
  35. package/esm/components/CustomStyle.js +1 -1
  36. package/esm/components/LazyComponent.js +1 -1
  37. package/esm/components/Overlay.js +3 -2
  38. package/esm/components/PopOver.js +3 -2
  39. package/esm/env.js +1 -1
  40. package/esm/envOverwrite.js +1 -1
  41. package/esm/factory.js +2 -2
  42. package/esm/index.d.ts +3 -1
  43. package/esm/index.js +16 -14
  44. package/esm/locale.js +1 -1
  45. package/esm/polyfills.d.ts +3 -0
  46. package/esm/polyfills.js +18 -0
  47. package/esm/renderers/Form.d.ts +7 -7
  48. package/esm/renderers/Form.js +182 -128
  49. package/esm/renderers/Item.d.ts +82 -77
  50. package/esm/renderers/Item.js +90 -74
  51. package/esm/renderers/Options.js +1 -2
  52. package/esm/renderers/Placeholder.js +1 -1
  53. package/esm/renderers/builtin.js +1 -1
  54. package/esm/renderers/register.js +1 -1
  55. package/esm/renderers/wrapControl.d.ts +4 -24
  56. package/esm/renderers/wrapControl.js +140 -88
  57. package/esm/store/app.js +42 -4
  58. package/esm/store/combo.d.ts +564 -1892
  59. package/esm/store/combo.js +9 -2
  60. package/esm/store/crud.d.ts +4 -2
  61. package/esm/store/crud.js +17 -4
  62. package/esm/store/form.d.ts +182 -882
  63. package/esm/store/form.js +83 -81
  64. package/esm/store/formItem.d.ts +6 -2
  65. package/esm/store/formItem.js +19 -3
  66. package/esm/store/iRenderer.js +3 -2
  67. package/esm/store/index.js +1 -1
  68. package/esm/store/list.d.ts +1 -0
  69. package/esm/store/list.js +8 -2
  70. package/esm/store/manager.js +1 -1
  71. package/esm/store/modal.js +1 -1
  72. package/esm/store/node.js +1 -1
  73. package/esm/store/pagination.js +1 -1
  74. package/esm/store/root.js +3 -2
  75. package/esm/store/service.js +17 -12
  76. package/esm/store/status.js +1 -1
  77. package/esm/store/table.d.ts +604 -2020
  78. package/esm/store/table.js +86 -56
  79. package/esm/store/table2.d.ts +49 -0
  80. package/esm/store/table2.js +37 -4
  81. package/esm/theme.js +1 -1
  82. package/esm/types.d.ts +22 -5
  83. package/esm/utils/Animation.js +1 -1
  84. package/esm/utils/ColorScale.js +1 -1
  85. package/esm/utils/DataSchema.d.ts +3 -2
  86. package/esm/utils/DataSchema.js +27 -7
  87. package/esm/utils/DataScope.d.ts +10 -3
  88. package/esm/utils/DataScope.js +50 -12
  89. package/esm/utils/RootClose.js +1 -1
  90. package/esm/utils/SimpleMap.js +1 -1
  91. package/esm/utils/api.d.ts +2 -2
  92. package/esm/utils/api.js +152 -112
  93. package/esm/utils/arraySlice.d.ts +1 -0
  94. package/esm/utils/arraySlice.js +76 -0
  95. package/esm/utils/attachmentAdpator.js +1 -1
  96. package/esm/utils/autobind.js +1 -1
  97. package/esm/utils/columnsSplit.js +1 -1
  98. package/esm/utils/dataMapping.js +29 -19
  99. package/esm/utils/date.js +1 -1
  100. package/esm/utils/debug.d.ts +2 -0
  101. package/esm/utils/debug.js +34 -7
  102. package/esm/utils/decodeEntity.js +1 -1
  103. package/esm/utils/dom.js +4 -1
  104. package/esm/utils/errors.js +1 -1
  105. package/esm/utils/escapeHtml.js +1 -1
  106. package/esm/utils/filter-schema.js +1 -1
  107. package/esm/utils/filter.js +1 -1
  108. package/esm/utils/formatDuration.js +1 -1
  109. package/esm/utils/formula.d.ts +0 -1
  110. package/esm/utils/formula.js +6 -9
  111. package/esm/utils/getVariable.js +1 -1
  112. package/esm/utils/grammar.js +1 -1
  113. package/esm/utils/handleAction.js +1 -1
  114. package/esm/utils/helper.d.ts +19 -2
  115. package/esm/utils/helper.js +69 -10
  116. package/esm/utils/highlight.js +1 -1
  117. package/esm/utils/icon.d.ts +4 -2
  118. package/esm/utils/icon.js +3 -2
  119. package/esm/utils/image.js +1 -1
  120. package/esm/utils/index.d.ts +2 -0
  121. package/esm/utils/isPureVariable.js +1 -1
  122. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  123. package/esm/utils/keyToPath.js +1 -1
  124. package/esm/utils/makeSorter.js +1 -1
  125. package/esm/utils/math.d.ts +3 -0
  126. package/esm/utils/math.js +52 -0
  127. package/esm/utils/memoryParse.js +1 -1
  128. package/esm/utils/normalizeLink.js +18 -9
  129. package/esm/utils/normalizeOptions.js +1 -1
  130. package/esm/utils/object.d.ts +7 -0
  131. package/esm/utils/object.js +13 -2
  132. package/esm/utils/offset.js +1 -1
  133. package/esm/utils/offsetParent.js +1 -1
  134. package/esm/utils/optionValueCompare.js +2 -2
  135. package/esm/utils/position.js +1 -1
  136. package/esm/utils/prettyBytes.js +1 -1
  137. package/esm/utils/renderer-event.d.ts +1 -1
  138. package/esm/utils/renderer-event.js +14 -6
  139. package/esm/utils/replaceText.js +1 -1
  140. package/esm/utils/resize-sensor.js +1 -1
  141. package/esm/utils/resolveCondition.js +1 -1
  142. package/esm/utils/resolveVariable.js +1 -1
  143. package/esm/utils/resolveVariableAndFilter.js +1 -1
  144. package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
  145. package/esm/utils/scrollPosition.js +1 -1
  146. package/esm/utils/string2regExp.js +1 -1
  147. package/esm/utils/stripNumber.js +1 -1
  148. package/esm/utils/style-helper.js +1 -1
  149. package/esm/utils/style.js +1 -1
  150. package/esm/utils/toNumber.js +1 -1
  151. package/esm/utils/tokenize.js +1 -1
  152. package/esm/utils/tpl-builtin.js +1 -1
  153. package/esm/utils/tpl-lodash.js +1 -1
  154. package/esm/utils/tpl.js +1 -1
  155. package/esm/utils/uncontrollable.js +1 -1
  156. package/esm/utils/validations.js +1 -1
  157. package/lib/Root.js +10 -7
  158. package/lib/RootRenderer.d.ts +1 -1
  159. package/lib/RootRenderer.js +11 -8
  160. package/lib/SchemaRenderer.js +13 -6
  161. package/lib/Scoped.d.ts +4 -1
  162. package/lib/Scoped.js +19 -13
  163. package/lib/StatusScoped.js +5 -2
  164. package/lib/WithRootStore.d.ts +4 -24
  165. package/lib/WithRootStore.js +15 -4
  166. package/lib/WithStore.js +27 -17
  167. package/lib/actions/Action.d.ts +1 -0
  168. package/lib/actions/Action.js +70 -45
  169. package/lib/actions/AjaxAction.d.ts +6 -8
  170. package/lib/actions/AjaxAction.js +20 -18
  171. package/lib/actions/BreakAction.js +1 -1
  172. package/lib/actions/BroadcastAction.js +1 -1
  173. package/lib/actions/CmptAction.d.ts +1 -2
  174. package/lib/actions/CmptAction.js +47 -32
  175. package/lib/actions/ContinueAction.js +1 -1
  176. package/lib/actions/CopyAction.js +1 -1
  177. package/lib/actions/CustomAction.js +9 -5
  178. package/lib/actions/DialogAction.d.ts +2 -0
  179. package/lib/actions/DialogAction.js +39 -23
  180. package/lib/actions/DrawerAction.js +4 -4
  181. package/lib/actions/EmailAction.js +1 -1
  182. package/lib/actions/LinkAction.js +1 -1
  183. package/lib/actions/LoopAction.js +1 -1
  184. package/lib/actions/PageAction.js +1 -1
  185. package/lib/actions/ParallelAction.js +1 -1
  186. package/lib/actions/StatusAction.d.ts +15 -0
  187. package/lib/actions/StatusAction.js +53 -0
  188. package/lib/actions/SwitchAction.js +1 -1
  189. package/lib/actions/ToastAction.js +1 -1
  190. package/lib/actions/index.d.ts +1 -0
  191. package/lib/components/CustomStyle.js +1 -1
  192. package/lib/components/LazyComponent.js +12 -14
  193. package/lib/components/Overlay.js +15 -14
  194. package/lib/components/PopOver.js +12 -10
  195. package/lib/env.js +4 -1
  196. package/lib/envOverwrite.js +1 -1
  197. package/lib/factory.js +11 -9
  198. package/lib/index.d.ts +3 -1
  199. package/lib/index.js +26 -19
  200. package/lib/locale.js +6 -3
  201. package/lib/polyfills.d.ts +3 -0
  202. package/lib/polyfills.js +20 -0
  203. package/lib/renderers/Form.d.ts +7 -7
  204. package/lib/renderers/Form.js +194 -135
  205. package/lib/renderers/Item.d.ts +82 -77
  206. package/lib/renderers/Item.js +126 -104
  207. package/lib/renderers/Options.js +10 -5
  208. package/lib/renderers/Placeholder.js +1 -1
  209. package/lib/renderers/builtin.js +1 -1
  210. package/lib/renderers/register.js +1 -1
  211. package/lib/renderers/wrapControl.d.ts +4 -24
  212. package/lib/renderers/wrapControl.js +143 -88
  213. package/lib/store/app.js +44 -3
  214. package/lib/store/combo.d.ts +564 -1892
  215. package/lib/store/combo.js +9 -2
  216. package/lib/store/crud.d.ts +4 -2
  217. package/lib/store/crud.js +17 -4
  218. package/lib/store/form.d.ts +182 -882
  219. package/lib/store/form.js +81 -79
  220. package/lib/store/formItem.d.ts +6 -2
  221. package/lib/store/formItem.js +19 -3
  222. package/lib/store/iRenderer.js +9 -5
  223. package/lib/store/index.js +1 -1
  224. package/lib/store/list.d.ts +1 -0
  225. package/lib/store/list.js +8 -2
  226. package/lib/store/manager.js +1 -1
  227. package/lib/store/modal.js +1 -1
  228. package/lib/store/node.js +1 -1
  229. package/lib/store/pagination.js +1 -1
  230. package/lib/store/root.js +9 -5
  231. package/lib/store/service.js +17 -12
  232. package/lib/store/status.js +1 -1
  233. package/lib/store/table.d.ts +604 -2020
  234. package/lib/store/table.js +85 -55
  235. package/lib/store/table2.d.ts +49 -0
  236. package/lib/store/table2.js +36 -3
  237. package/lib/theme.js +6 -3
  238. package/lib/types.d.ts +22 -5
  239. package/lib/utils/Animation.js +1 -1
  240. package/lib/utils/ColorScale.js +1 -1
  241. package/lib/utils/DataSchema.d.ts +3 -2
  242. package/lib/utils/DataSchema.js +27 -7
  243. package/lib/utils/DataScope.d.ts +10 -3
  244. package/lib/utils/DataScope.js +50 -11
  245. package/lib/utils/RootClose.js +1 -1
  246. package/lib/utils/SimpleMap.js +1 -1
  247. package/lib/utils/api.d.ts +2 -2
  248. package/lib/utils/api.js +151 -111
  249. package/lib/utils/arraySlice.d.ts +1 -0
  250. package/lib/utils/arraySlice.js +80 -0
  251. package/lib/utils/attachmentAdpator.js +1 -1
  252. package/lib/utils/autobind.js +1 -1
  253. package/lib/utils/columnsSplit.js +8 -6
  254. package/lib/utils/dataMapping.js +29 -19
  255. package/lib/utils/date.js +1 -1
  256. package/lib/utils/debug.d.ts +2 -0
  257. package/lib/utils/debug.js +61 -33
  258. package/lib/utils/decodeEntity.js +1 -1
  259. package/lib/utils/dom.js +10 -5
  260. package/lib/utils/errors.js +1 -1
  261. package/lib/utils/escapeHtml.js +1 -1
  262. package/lib/utils/filter-schema.js +1 -1
  263. package/lib/utils/filter.js +1 -1
  264. package/lib/utils/formatDuration.js +1 -1
  265. package/lib/utils/formula.d.ts +0 -1
  266. package/lib/utils/formula.js +6 -10
  267. package/lib/utils/getVariable.js +1 -1
  268. package/lib/utils/grammar.js +1 -1
  269. package/lib/utils/handleAction.js +1 -1
  270. package/lib/utils/helper.d.ts +19 -2
  271. package/lib/utils/helper.js +70 -9
  272. package/lib/utils/highlight.js +8 -9
  273. package/lib/utils/icon.d.ts +4 -2
  274. package/lib/utils/icon.js +12 -10
  275. package/lib/utils/image.js +1 -1
  276. package/lib/utils/index.d.ts +2 -0
  277. package/lib/utils/isPureVariable.js +1 -1
  278. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  279. package/lib/utils/keyToPath.js +1 -1
  280. package/lib/utils/makeSorter.js +1 -1
  281. package/lib/utils/math.d.ts +3 -0
  282. package/lib/utils/math.js +58 -0
  283. package/lib/utils/memoryParse.js +1 -1
  284. package/lib/utils/normalizeLink.js +18 -9
  285. package/lib/utils/normalizeOptions.js +1 -1
  286. package/lib/utils/object.d.ts +7 -0
  287. package/lib/utils/object.js +13 -1
  288. package/lib/utils/offset.js +1 -1
  289. package/lib/utils/offsetParent.js +1 -1
  290. package/lib/utils/optionValueCompare.js +7 -3
  291. package/lib/utils/position.js +1 -1
  292. package/lib/utils/prettyBytes.js +1 -1
  293. package/lib/utils/renderer-event.d.ts +1 -1
  294. package/lib/utils/renderer-event.js +13 -5
  295. package/lib/utils/replaceText.js +1 -1
  296. package/lib/utils/resize-sensor.js +1 -1
  297. package/lib/utils/resolveCondition.js +1 -1
  298. package/lib/utils/resolveVariable.js +1 -1
  299. package/lib/utils/resolveVariableAndFilter.js +1 -1
  300. package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
  301. package/lib/utils/scrollPosition.js +1 -1
  302. package/lib/utils/string2regExp.js +1 -1
  303. package/lib/utils/stripNumber.js +1 -1
  304. package/lib/utils/style-helper.js +1 -1
  305. package/lib/utils/style.js +1 -1
  306. package/lib/utils/toNumber.js +1 -1
  307. package/lib/utils/tokenize.js +1 -1
  308. package/lib/utils/tpl-builtin.js +1 -1
  309. package/lib/utils/tpl-lodash.js +1 -1
  310. package/lib/utils/tpl.js +1 -1
  311. package/lib/utils/uncontrollable.js +1 -1
  312. package/lib/utils/validations.js +1 -1
  313. package/package.json +9 -4
package/esm/Root.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.1.1
2
+ * amis-core v3.3.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -25,5 +25,5 @@ export declare class RootRenderer extends React.Component<RootRendererProps> {
25
25
  handleDrawerClose(): void;
26
26
  openFeedback(dialog: any, ctx: any): Promise<unknown>;
27
27
  reloadTarget(scoped: IScopedContext, target: string, data?: any): void;
28
- render(): string | number | boolean | React.JSX.Element | React.ReactFragment | null | undefined;
28
+ render(): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
29
29
  }
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.1.1
2
+ * amis-core v3.3.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -117,7 +117,7 @@ var RootRenderer = /** @class */ (function (_super) {
117
117
  }
118
118
  else if (action.actionType === 'dialog') {
119
119
  store.setCurrentAction(action);
120
- store.openDialog(ctx, undefined, undefined, delegate);
120
+ store.openDialog(ctx, undefined, action.callback, delegate || this.context);
121
121
  }
122
122
  else if (action.actionType === 'drawer') {
123
123
  store.setCurrentAction(action);
@@ -257,7 +257,7 @@ var RootRenderer = /** @class */ (function (_super) {
257
257
  });
258
258
  store.openDialog(ctx, undefined, function (confirmed) {
259
259
  resolve(confirmed);
260
- });
260
+ }, _this.context);
261
261
  });
262
262
  };
263
263
  RootRenderer.prototype.reloadTarget = function (scoped, target, data) {
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.1.1
2
+ * amis-core v3.3.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -41,6 +41,8 @@ var RENDERER_TRANSMISSION_OMIT_PROPS = [
41
41
  'hiddenOn',
42
42
  'disabled',
43
43
  'disabledOn',
44
+ 'static',
45
+ 'staticOn',
44
46
  'component',
45
47
  'detectField',
46
48
  'defaultValue',
@@ -53,7 +55,9 @@ var RENDERER_TRANSMISSION_OMIT_PROPS = [
53
55
  'id',
54
56
  'inputOnly',
55
57
  'label',
56
- 'renderLabel'
58
+ 'renderLabel',
59
+ 'trackExpression',
60
+ 'editorSetting'
57
61
  ];
58
62
  var componentCache = new SimpleMap();
59
63
  var SchemaRenderer = /** @class */ (function (_super) {
package/esm/Scoped.d.ts CHANGED
@@ -22,6 +22,8 @@ export interface ScopedComponentType extends React.Component<RendererProps> {
22
22
  setData?: (value?: object, replace?: boolean, index?: number) => void;
23
23
  }
24
24
  export interface IScopedContext {
25
+ rendererType?: string;
26
+ component?: ScopedComponentType;
25
27
  parent?: AliasIScopedContext;
26
28
  children?: AliasIScopedContext[];
27
29
  registerComponent: (component: ScopedComponentType) => void;
@@ -33,13 +35,14 @@ export interface IScopedContext {
33
35
  send: (target: string, ctx: RendererData) => void;
34
36
  close: (target: string) => void;
35
37
  closeById: (target: string) => void;
38
+ getComponentsByRefPath: (session: string, path: string) => ScopedComponentType[];
36
39
  }
37
40
  type AliasIScopedContext = IScopedContext;
38
41
  export declare const ScopedContext: React.Context<IScopedContext>;
39
42
  export declare function HocScoped<T extends {
40
43
  $path?: string;
41
44
  env: RendererEnv;
42
- }>(ComposedComponent: React.ComponentType<T>): React.ComponentType<T & {
45
+ }>(ComposedComponent: React.ComponentType<T>, rendererType?: string): React.ComponentType<T & {
43
46
  scopeRef?: (ref: any) => void;
44
47
  }> & {
45
48
  ComposedComponent: React.ComponentType<T>;
package/esm/Scoped.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.1.1
2
+ * amis-core v3.3.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -29,8 +29,8 @@ import 'classnames';
29
29
  import 'lodash/isObject';
30
30
  import 'lodash/isString';
31
31
  import 'lodash/isBoolean';
32
- import 'lodash';
33
32
  import './utils/image.js';
33
+ import 'lodash/isEqual';
34
34
  import './actions/Action.js';
35
35
  import 'lodash/debounce';
36
36
  import 'lodash/cloneDeep';
@@ -42,6 +42,7 @@ import 'lodash/camelCase';
42
42
  import 'uncontrollable';
43
43
  import './utils/validations.js';
44
44
  import './utils/resolveCondition.js';
45
+ import 'mobx';
45
46
  import './utils/Animation.js';
46
47
 
47
48
  /**
@@ -64,13 +65,16 @@ function filterTarget(target, data) {
64
65
  }
65
66
  var rootScopedContext = createScopedTools('');
66
67
  var ScopedContext = React.createContext(rootScopedContext);
67
- function createScopedTools(path, parent, env) {
68
+ function createScopedTools(path, parent, env, rendererType) {
68
69
  var components = [];
69
70
  var self = {
71
+ rendererType: rendererType,
72
+ component: undefined,
70
73
  parent: parent,
71
74
  registerComponent: function (component) {
72
75
  // 不要把自己注册在自己的 Scoped 上,自己的 Scoped 是给子节点们注册的。
73
76
  if (component.props.$path === path && parent) {
77
+ self.component = component;
74
78
  return parent.registerComponent(component);
75
79
  }
76
80
  if (!~components.indexOf(component)) {
@@ -334,12 +338,12 @@ function closeDialog(component) {
334
338
  .forEach(closeDialog);
335
339
  component.props.onClose && component.props.onClose();
336
340
  }
337
- function HocScoped(ComposedComponent) {
341
+ function HocScoped(ComposedComponent, rendererType) {
338
342
  var ScopedComponent = /** @class */ (function (_super) {
339
343
  __extends(ScopedComponent, _super);
340
344
  function ScopedComponent(props, context) {
341
345
  var _this = _super.call(this, props) || this;
342
- _this.scoped = createScopedTools(_this.props.$path, context, _this.props.env);
346
+ _this.scoped = createScopedTools(_this.props.$path, context, _this.props.env, rendererType);
343
347
  var scopeRef = props.scopeRef;
344
348
  scopeRef && scopeRef(_this.scoped);
345
349
  return _this;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.1.1
2
+ * amis-core v3.3.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -333,30 +333,10 @@ export declare const RootStoreContext: React.Context<{
333
333
  export declare function withRootStore<T extends React.ComponentType<React.ComponentProps<T> & {
334
334
  rootStore: IRendererStore;
335
335
  }>>(ComposedComponent: T): {
336
- new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">> | Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>): {
337
- render(): React.JSX.Element;
338
- context: unknown;
339
- setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
340
- forceUpdate(callback?: (() => void) | undefined): void;
341
- readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>;
342
- state: Readonly<{}>;
343
- refs: {
344
- [key: string]: React.ReactInstance;
345
- };
346
- componentDidMount?(): void;
347
- shouldComponentUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, nextState: Readonly<{}>, nextContext: any): boolean;
348
- componentWillUnmount?(): void;
349
- componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
350
- getSnapshotBeforeUpdate?(prevProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, prevState: Readonly<{}>): any;
351
- componentDidUpdate?(prevProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, prevState: Readonly<{}>, snapshot?: any): void;
352
- componentWillMount?(): void;
353
- UNSAFE_componentWillMount?(): void;
354
- componentWillReceiveProps?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, nextContext: any): void;
355
- UNSAFE_componentWillReceiveProps?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, nextContext: any): void;
356
- componentWillUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, nextState: Readonly<{}>, nextContext: any): void;
357
- UNSAFE_componentWillUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, nextState: Readonly<{}>, nextContext: any): void;
358
- };
359
- new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>, context: any): {
336
+ new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>): {
337
+ ref: any;
338
+ getWrappedInstance(): any;
339
+ refFn(ref: any): void;
360
340
  render(): React.JSX.Element;
361
341
  context: unknown;
362
342
  setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.1.1
2
+ * amis-core v3.3.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -12,15 +12,23 @@ function withRootStore(ComposedComponent) {
12
12
  var _a;
13
13
  var result = hoistNonReactStatic((_a = /** @class */ (function (_super) {
14
14
  __extends(class_1, _super);
15
- function class_1() {
16
- return _super !== null && _super.apply(this, arguments) || this;
15
+ function class_1(props) {
16
+ var _this = _super.call(this, props) || this;
17
+ _this.refFn = _this.refFn.bind(_this);
18
+ return _this;
17
19
  }
20
+ class_1.prototype.getWrappedInstance = function () {
21
+ return this.ref.control;
22
+ };
23
+ class_1.prototype.refFn = function (ref) {
24
+ this.ref = ref;
25
+ };
18
26
  class_1.prototype.render = function () {
19
27
  var rootStore = this.context;
20
28
  var injectedProps = {
21
29
  rootStore: rootStore
22
30
  };
23
- return (React.createElement(ComposedComponent, __assign({}, this.props, injectedProps)));
31
+ return (React.createElement(ComposedComponent, __assign({}, this.props, injectedProps, { ref: this.refFn })));
24
32
  };
25
33
  return class_1;
26
34
  }(React.Component)),
package/esm/WithStore.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.1.1
2
+ * amis-core v3.3.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -14,6 +14,7 @@ import { guid, isObjectShallowModified, isSuperDataModified, syncDataFromSuper }
14
14
  import 'amis-formula';
15
15
  import 'moment';
16
16
  import { createObject, extendObject } from './utils/object.js';
17
+ import { tokenize } from './utils/tokenize.js';
17
18
  import { dataMapping } from './utils/dataMapping.js';
18
19
  import './utils/filter.js';
19
20
  import { RootStoreContext } from './WithRootStore.js';
@@ -97,20 +98,26 @@ function HocStoreFactory(renderer) {
97
98
  if (extendsData === false) {
98
99
  if (shouldSync === true ||
99
100
  prevProps.defaultData !== props.defaultData ||
100
- isObjectShallowModified(prevProps.data, props.data) ||
101
- //
102
- // 特殊处理 CRUD。
103
- // CRUD 中 toolbar 里面的 data 是空对象,但是 __super 会不一样
104
- (props.data &&
105
- prevProps.data &&
106
- props.data.__super !== prevProps.data.__super)) {
101
+ (props.trackExpression
102
+ ? tokenize(props.trackExpression, props.data) !==
103
+ tokenize(props.trackExpression, prevProps.data)
104
+ : isObjectShallowModified(prevProps.data, props.data) ||
105
+ //
106
+ // 特殊处理 CRUD。
107
+ // CRUD 中 toolbar 里面的 data 是空对象,但是 __super 会不一样
108
+ (props.data &&
109
+ prevProps.data &&
110
+ props.data.__super !== prevProps.data.__super))) {
107
111
  store.initData(extendObject(props.data, __assign(__assign(__assign({}, (store.hasRemoteData ? store.data : null)), this.formatData(props.defaultData)), this.formatData(props.data))));
108
112
  }
109
113
  }
110
114
  else if (shouldSync === true ||
111
- isObjectShallowModified(prevProps.data, props.data) ||
112
- (props.syncSuperStore !== false &&
113
- isSuperDataModified(props.data, prevProps.data, store))) {
115
+ (props.trackExpression
116
+ ? tokenize(props.trackExpression, props.data) !==
117
+ tokenize(props.trackExpression, prevProps.data)
118
+ : isObjectShallowModified(prevProps.data, props.data) ||
119
+ (props.syncSuperStore !== false &&
120
+ isSuperDataModified(props.data, prevProps.data, store)))) {
114
121
  if (props.store && props.store.data === props.data) {
115
122
  store.initData(createObject(props.store.data, props.syncSuperStore === false
116
123
  ? __assign({}, store.data) : syncDataFromSuper(store.data, props.store.data, prevProps.scope, store, props.syncSuperStore === true)));
@@ -123,9 +130,8 @@ function HocStoreFactory(renderer) {
123
130
  store.initData(createObject(props.scope, props.data));
124
131
  }
125
132
  }
126
- else if ((shouldSync === true ||
127
- !props.store ||
128
- props.data !== props.store.data) &&
133
+ else if (!props.trackExpression &&
134
+ (!props.store || props.data !== props.store.data) &&
129
135
  props.data &&
130
136
  props.data.__super) {
131
137
  // 这个用法很少,当 data.__super 值发生变化时,更新 store.data
@@ -136,9 +142,10 @@ function HocStoreFactory(renderer) {
136
142
  }
137
143
  // nextProps.data.__super !== props.data.__super) &&
138
144
  }
139
- else if (props.scope &&
145
+ else if (!props.trackExpression &&
146
+ props.scope &&
140
147
  props.data === props.store.data &&
141
- (shouldSync === true || prevProps.data !== props.data)) {
148
+ prevProps.data !== props.data) {
142
149
  // 只有父级数据变动的时候才应该进来,
143
150
  // 目前看来这个 case 很少有情况下能进来
144
151
  store.initData(createObject(props.scope, __assign({}, store.data)));
@@ -25,6 +25,7 @@ export interface ListenerAction {
25
25
  stopPropagation?: boolean;
26
26
  expression?: string | ConditionGroupValue;
27
27
  execOn?: string;
28
+ [propName: string]: any;
28
29
  }
29
30
  export interface ILogicAction extends ListenerAction {
30
31
  children?: ListenerAction[];
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.1.1
2
+ * amis-core v3.3.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -88,7 +88,7 @@ var getOmitActionProp = function (type) {
88
88
  omitList = ['drawer'];
89
89
  break;
90
90
  case 'confirmDialog':
91
- omitList = ['confirmDialog'];
91
+ omitList = ['dialog'];
92
92
  break;
93
93
  case 'reload':
94
94
  omitList = ['resetPage'];
@@ -117,11 +117,20 @@ var runActions = function (actions, renderer, event) { return __awaiter(void 0,
117
117
  // 如果存在指定组件ID,说明是组件专有动作
118
118
  if (!actionInstrance &&
119
119
  (actionConfig.componentId || actionConfig.componentName)) {
120
- actionInstrance = getActionByType('component');
120
+ actionInstrance = [
121
+ 'static',
122
+ 'nonstatic',
123
+ 'show',
124
+ 'visibility',
125
+ 'hidden',
126
+ 'enabled',
127
+ 'disabled',
128
+ 'usability'
129
+ ].includes(actionConfig.actionType)
130
+ ? getActionByType('status')
131
+ : getActionByType('component');
121
132
  }
122
- else if (actionConfig.actionType === 'url' ||
123
- actionConfig.actionType === 'link' ||
124
- actionConfig.actionType === 'jump') {
133
+ else if (['url', 'link', 'jump'].includes(actionConfig.actionType)) {
125
134
  // 打开页面动作
126
135
  actionInstrance = getActionByType('openlink');
127
136
  }
@@ -158,14 +167,16 @@ var runActions = function (actions, renderer, event) { return __awaiter(void 0,
158
167
  }); };
159
168
  // 执行动作,与原有动作处理打通
160
169
  var runAction = function (actionInstrance, actionConfig, renderer, event) { return __awaiter(void 0, void 0, void 0, function () {
161
- var additional, mergeData, expression, isStop, preventDefault, stopPropagation, key, args, afterMappingData, actionData, data, stoped, actionResult;
162
- var _a, _b, _c;
163
- return __generator(this, function (_d) {
164
- switch (_d.label) {
170
+ var additional, action, mergeData, expression, isStop, preventDefault, key, api, args, afterMappingData, actionData, data, stopped, actionResult, stopPropagation;
171
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
172
+ return __generator(this, function (_u) {
173
+ switch (_u.label) {
165
174
  case 0:
166
175
  additional = {
167
176
  event: event
168
177
  };
178
+ action = __assign({}, actionConfig);
179
+ action.args = __assign({}, actionConfig.args);
169
180
  // __rendererData默认为renderer.props.data,兼容表单项值变化时的data读取
170
181
  if (!event.data.__rendererData) {
171
182
  additional = {
@@ -176,36 +187,47 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
176
187
  mergeData = createObject(createObject(renderer.props.data.__super
177
188
  ? createObject(renderer.props.data.__super, additional)
178
189
  : additional, renderer.props.data), event.data);
179
- expression = (_a = actionConfig.expression) !== null && _a !== void 0 ? _a : actionConfig.execOn;
190
+ expression = (_a = action.expression) !== null && _a !== void 0 ? _a : action.execOn;
180
191
  isStop = false;
181
192
  if (!expression) return [3 /*break*/, 2];
182
193
  return [4 /*yield*/, evalExpressionWithConditionBuilder(expression, mergeData, true)];
183
194
  case 1:
184
- isStop = !(_d.sent());
185
- _d.label = 2;
195
+ isStop = !(_u.sent());
196
+ _u.label = 2;
186
197
  case 2:
187
198
  if (isStop) {
188
199
  return [2 /*return*/];
189
200
  }
190
201
  preventDefault = false;
191
- if (!actionConfig.preventDefault) return [3 /*break*/, 4];
192
- return [4 /*yield*/, evalExpressionWithConditionBuilder(actionConfig.preventDefault, mergeData, false)];
202
+ if (!action.preventDefault) return [3 /*break*/, 4];
203
+ return [4 /*yield*/, evalExpressionWithConditionBuilder(action.preventDefault, mergeData, false)];
193
204
  case 3:
194
- preventDefault = _d.sent();
195
- _d.label = 4;
205
+ preventDefault = _u.sent();
206
+ _u.label = 4;
196
207
  case 4:
197
- stopPropagation = false;
198
- if (!actionConfig.stopPropagation) return [3 /*break*/, 6];
199
- return [4 /*yield*/, evalExpressionWithConditionBuilder(actionConfig.stopPropagation, mergeData, false)];
200
- case 5:
201
- stopPropagation = _d.sent();
202
- _d.label = 6;
203
- case 6:
204
208
  key = {
205
- componentId: dataMapping(actionConfig.componentId, mergeData),
206
- componentName: dataMapping(actionConfig.componentName, mergeData)
209
+ componentId: dataMapping(action.componentId, mergeData),
210
+ componentName: dataMapping(action.componentName, mergeData)
207
211
  };
208
- args = dataMapping(actionConfig.args, mergeData, function (key) {
212
+ // 兼容args包裹的用法
213
+ if (action.actionType === 'dialog') {
214
+ action.dialog = __assign({}, ((_b = action.dialog) !== null && _b !== void 0 ? _b : (_c = action.args) === null || _c === void 0 ? void 0 : _c.dialog));
215
+ (_d = action.args) === null || _d === void 0 ? true : delete _d.dialog;
216
+ }
217
+ else if (action.actionType === 'drawer') {
218
+ action.drawer = __assign({}, ((_e = action.drawer) !== null && _e !== void 0 ? _e : (_f = action.args) === null || _f === void 0 ? void 0 : _f.drawer));
219
+ (_g = action.args) === null || _g === void 0 ? true : delete _g.drawer;
220
+ }
221
+ else if (action.actionType === 'ajax') {
222
+ api = (_h = action.api) !== null && _h !== void 0 ? _h : (_j = action.args) === null || _j === void 0 ? void 0 : _j.api;
223
+ action.api = typeof api === 'string' ? api : __assign({}, api);
224
+ action.options = __assign({}, ((_k = action.options) !== null && _k !== void 0 ? _k : (_l = action.args) === null || _l === void 0 ? void 0 : _l.options));
225
+ action.messages = __assign({}, ((_m = action.messages) !== null && _m !== void 0 ? _m : (_o = action.args) === null || _o === void 0 ? void 0 : _o.messages));
226
+ (_p = action.args) === null || _p === void 0 ? true : delete _p.api;
227
+ (_q = action.args) === null || _q === void 0 ? true : delete _q.options;
228
+ (_r = action.args) === null || _r === void 0 ? true : delete _r.messages;
229
+ }
230
+ args = dataMapping(action.args, mergeData, function (key) {
209
231
  return [
210
232
  'adaptor',
211
233
  'responseAdaptor',
@@ -214,31 +236,34 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
214
236
  'condition'
215
237
  ].includes(key);
216
238
  });
217
- afterMappingData = dataMapping(actionConfig.data, mergeData);
239
+ afterMappingData = dataMapping(action.data, mergeData);
218
240
  actionData = args && Object.keys(args).length
219
- ? omit(__assign(__assign({}, args), (afterMappingData !== null && afterMappingData !== void 0 ? afterMappingData : {})), getOmitActionProp(actionConfig.actionType))
241
+ ? omit(__assign(__assign({}, args), (afterMappingData !== null && afterMappingData !== void 0 ? afterMappingData : {})), getOmitActionProp(action.actionType))
220
242
  : afterMappingData;
221
- data = args && !Object.keys(args).length && actionConfig.data === undefined // 兼容历史
222
- ? {}
223
- : actionData !== undefined
224
- ? actionData
225
- : event.data;
226
- (_b = console.group) === null || _b === void 0 ? void 0 : _b.call(console, "run action ".concat(actionConfig.actionType));
227
- console.debug("[".concat(actionConfig.actionType, "] action args, data"), args, data);
228
- stoped = false;
229
- return [4 /*yield*/, actionInstrance.run(__assign(__assign(__assign({}, actionConfig), { args: args, data: data }), key), renderer, event, mergeData)];
230
- case 7:
231
- actionResult = _d.sent();
243
+ data = actionData !== undefined ? actionData : mergeData;
244
+ (_s = console.group) === null || _s === void 0 ? void 0 : _s.call(console, "run action ".concat(action.actionType));
245
+ console.debug("[".concat(action.actionType, "] action args, data"), args, data);
246
+ stopped = false;
247
+ return [4 /*yield*/, actionInstrance.run(__assign(__assign(__assign({}, action), { args: args, data: action.actionType === 'reload' ? actionData : data }), key), renderer, event, mergeData)];
248
+ case 5:
249
+ actionResult = _u.sent();
232
250
  // 二次确认弹窗如果取消,则终止后续动作
233
- if ((actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType) === 'confirmDialog' && !actionResult) {
234
- stoped = true;
251
+ if ((action === null || action === void 0 ? void 0 : action.actionType) === 'confirmDialog' && !actionResult) {
252
+ stopped = true;
235
253
  }
236
- console.debug("[".concat(actionConfig.actionType, "] action end event"), event);
237
- (_c = console.groupEnd) === null || _c === void 0 ? void 0 : _c.call(console);
254
+ stopPropagation = false;
255
+ if (!action.stopPropagation) return [3 /*break*/, 7];
256
+ return [4 /*yield*/, evalExpressionWithConditionBuilder(action.stopPropagation, mergeData, false)];
257
+ case 6:
258
+ stopPropagation = _u.sent();
259
+ _u.label = 7;
260
+ case 7:
261
+ console.debug("[".concat(action.actionType, "] action end event"), event);
262
+ (_t = console.groupEnd) === null || _t === void 0 ? void 0 : _t.call(console);
238
263
  // 阻止原有动作执行
239
264
  preventDefault && event.preventDefault();
240
265
  // 阻止后续动作执行
241
- (stopPropagation || stoped) && event.stopPropagation();
266
+ (stopPropagation || stopped) && event.stopPropagation();
242
267
  return [2 /*return*/];
243
268
  }
244
269
  });
@@ -3,15 +3,13 @@ import { RendererEvent } from '../utils/renderer-event';
3
3
  import { RendererAction, ListenerAction, ListenerContext } from './Action';
4
4
  export interface IAjaxAction extends ListenerAction {
5
5
  action: 'ajax';
6
- args: {
7
- api: Api;
8
- messages?: {
9
- success: string;
10
- failed: string;
11
- };
12
- options?: Record<string, any>;
13
- [propName: string]: any;
6
+ api: Api;
7
+ messages?: {
8
+ success: string;
9
+ failed: string;
14
10
  };
11
+ options?: Record<string, any>;
12
+ [propName: string]: any;
15
13
  }
16
14
  /**
17
15
  * 发送请求动作
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.1.1
2
+ * amis-core v3.3.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -23,39 +23,41 @@ var AjaxAction = /** @class */ (function () {
23
23
  this.fetcherType = fetcherType;
24
24
  }
25
25
  AjaxAction.prototype.run = function (action, renderer, event) {
26
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
26
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
27
27
  return __awaiter(this, void 0, void 0, function () {
28
- var env, result, responseData, msg, e_1, result;
29
- var _1;
30
- return __generator(this, function (_2) {
31
- switch (_2.label) {
28
+ var env, silent, messages, result, responseData, msg, e_1, result;
29
+ var _o;
30
+ return __generator(this, function (_p) {
31
+ switch (_p.label) {
32
32
  case 0:
33
33
  if (!((_a = renderer.props.env) === null || _a === void 0 ? void 0 : _a.fetcher)) {
34
34
  throw new Error('env.fetcher is required!');
35
35
  }
36
36
  if (this.fetcherType === 'download' && action.actionType === 'download') {
37
- if ((_b = action.args) === null || _b === void 0 ? void 0 : _b.api) {
38
- action.args.api.responseType = 'blob';
37
+ if (action.api) {
38
+ action.api.responseType = 'blob';
39
39
  }
40
40
  }
41
41
  env = event.context.env;
42
- _2.label = 1;
42
+ silent = (_b = action === null || action === void 0 ? void 0 : action.options) === null || _b === void 0 ? void 0 : _b.silent;
43
+ messages = (_c = action === null || action === void 0 ? void 0 : action.api) === null || _c === void 0 ? void 0 : _c.messages;
44
+ _p.label = 1;
43
45
  case 1:
44
- _2.trys.push([1, 3, , 4]);
45
- return [4 /*yield*/, env.fetcher((_c = action.args) === null || _c === void 0 ? void 0 : _c.api, (_d = action.data) !== null && _d !== void 0 ? _d : {}, (_f = (_e = action.args) === null || _e === void 0 ? void 0 : _e.options) !== null && _f !== void 0 ? _f : {})];
46
+ _p.trys.push([1, 3, , 4]);
47
+ return [4 /*yield*/, env.fetcher(action === null || action === void 0 ? void 0 : action.api, (_d = action.data) !== null && _d !== void 0 ? _d : {}, (_e = action === null || action === void 0 ? void 0 : action.options) !== null && _e !== void 0 ? _e : {})];
46
48
  case 2:
47
- result = _2.sent();
49
+ result = _p.sent();
48
50
  responseData = !isEmpty(result.data) || result.ok
49
51
  ? normalizeApiResponseData(result.data)
50
52
  : null;
51
53
  // 记录请求返回的数据
52
- event.setData(createObject(event.data, __assign(__assign({}, responseData), (_1 = { responseData: responseData }, _1[action.outputVar || 'responseResult'] = __assign(__assign({}, responseData), { responseData: responseData, responseStatus: result.status, responseMsg: result.msg }), _1))));
53
- if (!((_h = (_g = action.args) === null || _g === void 0 ? void 0 : _g.options) === null || _h === void 0 ? void 0 : _h.silent)) {
54
+ event.setData(createObject(event.data, __assign(__assign({}, responseData), (_o = { responseData: responseData }, _o[action.outputVar || 'responseResult'] = __assign(__assign({}, responseData), { responseData: responseData, responseStatus: result.status, responseMsg: result.msg }), _o))));
55
+ if (!silent) {
54
56
  if (!result.ok) {
55
- throw new ServerError((_q = (_m = (_l = (_k = (_j = action.args) === null || _j === void 0 ? void 0 : _j.api) === null || _k === void 0 ? void 0 : _k.messages) === null || _l === void 0 ? void 0 : _l.failed) !== null && _m !== void 0 ? _m : (_p = (_o = action.args) === null || _o === void 0 ? void 0 : _o.messages) === null || _p === void 0 ? void 0 : _p.failed) !== null && _q !== void 0 ? _q : result.msg, result);
57
+ throw new ServerError((_h = (_f = messages === null || messages === void 0 ? void 0 : messages.failed) !== null && _f !== void 0 ? _f : (_g = action.messages) === null || _g === void 0 ? void 0 : _g.failed) !== null && _h !== void 0 ? _h : result.msg, result);
56
58
  }
57
59
  else {
58
- msg = (_y = (_x = (_u = (_t = (_s = (_r = action.args) === null || _r === void 0 ? void 0 : _r.api) === null || _s === void 0 ? void 0 : _s.messages) === null || _t === void 0 ? void 0 : _t.success) !== null && _u !== void 0 ? _u : (_w = (_v = action.args) === null || _v === void 0 ? void 0 : _v.messages) === null || _w === void 0 ? void 0 : _w.success) !== null && _x !== void 0 ? _x : result.msg) !== null && _y !== void 0 ? _y : result.defaultMsg;
60
+ msg = (_m = (_l = (_j = messages === null || messages === void 0 ? void 0 : messages.success) !== null && _j !== void 0 ? _j : (_k = action.messages) === null || _k === void 0 ? void 0 : _k.success) !== null && _l !== void 0 ? _l : result.msg) !== null && _m !== void 0 ? _m : result.defaultMsg;
59
61
  msg &&
60
62
  env.notify('success', msg, result.msgTimeout !== undefined
61
63
  ? {
@@ -67,8 +69,8 @@ var AjaxAction = /** @class */ (function () {
67
69
  }
68
70
  return [2 /*return*/, result.data];
69
71
  case 3:
70
- e_1 = _2.sent();
71
- if (!((_0 = (_z = action.args) === null || _z === void 0 ? void 0 : _z.options) === null || _0 === void 0 ? void 0 : _0.silent)) {
72
+ e_1 = _p.sent();
73
+ if (!silent) {
72
74
  if (e_1.type === 'ServerError') {
73
75
  result = e_1.response;
74
76
  env.notify('error', e_1.message, result.msgTimeout !== undefined
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.1.1
2
+ * amis-core v3.3.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v3.1.1
2
+ * amis-core v3.3.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,9 +1,8 @@
1
1
  import { RendererEvent } from '../utils/renderer-event';
2
2
  import { RendererAction, ListenerAction, ListenerContext } from './Action';
3
3
  export interface ICmptAction extends ListenerAction {
4
- actionType: 'setValue' | 'static' | 'nonstatic' | 'show' | 'visibility' | 'hidden' | 'enabled' | 'disabled' | 'usability' | 'reload';
4
+ actionType: string;
5
5
  args: {
6
- /** actionType为setValue时,目标变量的path */
7
6
  path?: string;
8
7
  value?: string | {
9
8
  [key: string]: string;