amis-core 2.1.1-beta.2 → 2.2.0

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.1.1-beta.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -27,6 +27,7 @@ var findIndex = require('lodash/findIndex');
 var isPlainObject = require('lodash/isPlainObject');
 var normalizeOptions = require('../utils/normalizeOptions.js');
 var optionValueCompare = require('../utils/optionValueCompare.js');
+var lodash = require('lodash');
 var keyToPath = require('../utils/keyToPath.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -147,6 +148,9 @@ function registerOptionsControl(config) {
                         .then(function () { return _this.normalizeValue(); });
                 }
             }
+            else if (!lodash.isEqual(props.value, prevProps.value) && props.formInited) {
+                this.normalizeValue();
+            }
             if (prevProps.value !== props.value || (formItem === null || formItem === void 0 ? void 0 : formItem.expressionsInOptions)) {
                 formItem === null || formItem === void 0 ? void 0 : formItem.syncOptions(undefined, props.data);
             }
@@ -222,21 +226,40 @@ function registerOptionsControl(config) {
         };
         // 当前值，跟设置预期的值格式不一致时自动转换。
         FormOptionsItem.prototype.normalizeValue = function () {
-            var _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, value = _a.value, multiple = _a.multiple, formItem = _a.formItem, valueField = _a.valueField; _a.enableNodePath; _a.pathSeparator; var onChange = _a.onChange;
-            if (!formItem || joinValues !== false || !formItem.options.length) {
+            var _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, value = _a.value, multiple = _a.multiple, formItem = _a.formItem, valueField = _a.valueField, delimiter = _a.delimiter; _a.enableNodePath; _a.pathSeparator; var onChange = _a.onChange;
+            if (!formItem || !formItem.options.length) {
                 return;
             }
-            if (extractValue === false &&
+            if (joinValues !== false) {
+                // 只处理多选且值为 array 的情况，因为理应为分隔符隔开的字符串
+                if (!(multiple && Array.isArray(value)))
+                    return;
+                var selectedOptions = formItem.getSelectedOptions(value);
+                onChange === null || onChange === void 0 ? void 0 : onChange((multiple
+                    ? selectedOptions.concat()
+                    : selectedOptions.length
+                        ? [selectedOptions[0]]
+                        : [])
+                    .map(function (selectedOption) {
+                    return typeof selectedOption === 'string' ||
+                        typeof selectedOption === 'number'
+                        ? selectedOption
+                        : selectedOption[valueField || 'value'];
+                })
+                    .join(delimiter || ','));
+            }
+            else if (extractValue === false &&
                 (typeof value === 'string' || typeof value === 'number')) {
                 var selectedOptions = formItem.getSelectedOptions(value);
                 onChange === null || onChange === void 0 ? void 0 : onChange(multiple ? selectedOptions.concat() : selectedOptions[0]);
             }
             else if (extractValue === true &&
                 value &&
-                !((Array.isArray(value) &&
+                !((multiple &&
+                    Array.isArray(value) &&
                     value.every(function (val) { return typeof val === 'string' || typeof val === 'number'; })) ||
-                    typeof value === 'string' ||
-                    typeof value === 'number')) {
+                    (!multiple &&
+                        (typeof value === 'string' || typeof value === 'number')))) {
                 var selectedOptions = formItem
                     .getSelectedOptions(value)
                     .map(function (selectedOption) { return selectedOption[valueField || 'value']; });
@@ -492,12 +515,12 @@ function registerOptionsControl(config) {
             if (idx === void 0) { idx = -1; }
             if (skipForm === void 0) { skipForm = false; }
             return tslib.__awaiter(this, void 0, void 0, function () {
-                var _a, addControls, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, model, createBtnLabel, env, __, parent, ctx, result, _b, payload, e_1, isPrevented, options;
+                var _a, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, model, createBtnLabel, env, __, parent, ctx, result, _b, payload, e_1, isPrevented, options;
                 var _c;
                 return tslib.__generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
-                            _a = this.props, addControls = _a.addControls, disabled = _a.disabled, labelField = _a.labelField, onOpenDialog = _a.onOpenDialog, optionLabel = _a.optionLabel, addApi = _a.addApi, source = _a.source, data = _a.data, valueField = _a.valueField, model = _a.formItem, createBtnLabel = _a.createBtnLabel, env = _a.env, __ = _a.translate;
+                            _a = this.props, addControls = _a.addControls, addDialog = _a.addDialog, disabled = _a.disabled, labelField = _a.labelField, onOpenDialog = _a.onOpenDialog, optionLabel = _a.optionLabel, addApi = _a.addApi, source = _a.source, data = _a.data, valueField = _a.valueField, model = _a.formItem, createBtnLabel = _a.createBtnLabel, env = _a.env, __ = _a.translate;
                             // 禁用或者没有配置 name
                             if (disabled || !model) {
                                 return [2 /*return*/];
@@ -522,10 +545,7 @@ function registerOptionsControl(config) {
                             if (!skipForm) return [3 /*break*/, 1];
                             _b = ctx;
                             return [3 /*break*/, 3];
-                        case 1: return [4 /*yield*/, onOpenDialog({
-                                type: 'dialog',
-                                title: createBtnLabel || "\u65B0\u589E".concat(optionLabel || '选项'),
-                                body: {
+                        case 1: return [4 /*yield*/, onOpenDialog(tslib.__assign(tslib.__assign({ type: 'dialog', title: createBtnLabel || "\u65B0\u589E".concat(optionLabel || '选项') }, addDialog), { body: {
                                     type: 'form',
                                     api: addApi,
                                     controls: tslib.__spreadArray([
@@ -540,8 +560,7 @@ function registerOptionsControl(config) {
                                             value: parent
                                         }
                                     ], (addControls || []), true)
-                                }
-                            }, ctx)];
+                                } }), ctx)];
                         case 2:
                             _b = _d.sent();
                             _d.label = 3;
@@ -618,11 +637,11 @@ function registerOptionsControl(config) {
             if (origin === void 0) { origin = value; }
             if (skipForm === void 0) { skipForm = false; }
             return tslib.__awaiter(this, void 0, void 0, function () {
-                var _a, editControls, disabled, labelField, onOpenDialog, editApi, env, source, data, model, optionLabel, __, result, _b, payload, e_2, isPrevented, indexes;
+                var _a, editControls, editDialog, disabled, labelField, onOpenDialog, editApi, env, source, data, model, optionLabel, __, result, _b, payload, e_2, isPrevented, indexes;
                 return tslib.__generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            _a = this.props, editControls = _a.editControls, disabled = _a.disabled, labelField = _a.labelField, onOpenDialog = _a.onOpenDialog, editApi = _a.editApi, env = _a.env, source = _a.source, data = _a.data, model = _a.formItem, optionLabel = _a.optionLabel, __ = _a.translate;
+                            _a = this.props, editControls = _a.editControls, editDialog = _a.editDialog, disabled = _a.disabled, labelField = _a.labelField, onOpenDialog = _a.onOpenDialog, editApi = _a.editApi, env = _a.env, source = _a.source, data = _a.data, model = _a.formItem, optionLabel = _a.optionLabel, __ = _a.translate;
                             if (disabled || !model) {
                                 return [2 /*return*/];
                             }
@@ -639,17 +658,13 @@ function registerOptionsControl(config) {
                             if (!skipForm) return [3 /*break*/, 1];
                             _b = value;
                             return [3 /*break*/, 3];
-                        case 1: return [4 /*yield*/, onOpenDialog({
-                                type: 'dialog',
-                                title: __('Options.editLabel', {
+                        case 1: return [4 /*yield*/, onOpenDialog(tslib.__assign(tslib.__assign({ type: 'dialog', title: __('Options.editLabel', {
                                     label: optionLabel || __('Options.label')
-                                }),
-                                body: {
+                                }) }, editDialog), { body: {
                                     type: 'form',
                                     api: editApi,
                                     controls: editControls
-                                }
-                            }, object.createObject(data, value))];
+                                } }), object.createObject(data, value))];
                         case 2:
                             _b = _c.sent();
                             _c.label = 3;
@@ -705,11 +720,11 @@ function registerOptionsControl(config) {
         };
         FormOptionsItem.prototype.handleOptionDelete = function (value) {
             return tslib.__awaiter(this, void 0, void 0, function () {
-                var _a, deleteConfirmText, disabled, data, deleteApi, env, model, source, valueField, __, ctx, confirmed, _b, isPrevented, result, options, indexes, e_3;
+                var _a, deleteConfirmText, disabled, data, deleteApi, onDelete, env, model, source, valueField, __, ctx, confirmed, _b, isPrevented, result, options, indexes, e_3;
                 return tslib.__generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            _a = this.props, deleteConfirmText = _a.deleteConfirmText, disabled = _a.disabled, data = _a.data, deleteApi = _a.deleteApi, env = _a.env, model = _a.formItem, source = _a.source, valueField = _a.valueField, __ = _a.translate;
+                            _a = this.props, deleteConfirmText = _a.deleteConfirmText, disabled = _a.disabled, data = _a.data, deleteApi = _a.deleteApi, onDelete = _a.onDelete, env = _a.env, model = _a.formItem, source = _a.source, valueField = _a.valueField, __ = _a.translate;
                             if (disabled || !model) {
                                 return [2 /*return*/];
                             }
@@ -735,10 +750,8 @@ function registerOptionsControl(config) {
                             }
                             _c.label = 5;
                         case 5:
-                            _c.trys.push([5, 7, , 8]);
-                            if (!deleteApi) {
-                                throw new Error(__('Options.deleteAPI'));
-                            }
+                            _c.trys.push([5, 8, , 9]);
+                            if (!deleteApi) return [3 /*break*/, 7];
                             return [4 /*yield*/, env.fetcher(deleteApi, ctx, {
                                     method: 'delete'
                                 })];
@@ -746,8 +759,15 @@ function registerOptionsControl(config) {
                             result = _c.sent();
                             if (!result.ok) {
                                 env.notify('error', result.msg || __('deleteFailed'));
+                                return [2 /*return*/];
+                            }
+                            _c.label = 7;
+                        case 7:
+                            // 由外部代码实现删除逻辑
+                            if (onDelete) {
+                                onDelete(ctx);
                             }
-                            else if (source) {
+                            if (source) {
                                 this.reload();
                             }
                             else {
@@ -757,13 +777,13 @@ function registerOptionsControl(config) {
                                     model.setOptions(helper.spliceTree(options, indexes, 1), this.changeOptionValue, data);
                                 }
                             }
-                            return [3 /*break*/, 8];
-                        case 7:
+                            return [3 /*break*/, 9];
+                        case 8:
                             e_3 = _c.sent();
                             console.error(e_3);
                             env.notify('error', e_3.message);
-                            return [3 /*break*/, 8];
-                        case 8: return [2 /*return*/];
+                            return [3 /*break*/, 9];
+                        case 9: return [2 /*return*/];
                     }
                 });
             });

package/lib/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.1.1-beta.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/lib/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.1.1-beta.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/lib/renderers/wrapControl.d.ts

@@ -48,8 +48,390 @@ export interface ControlProps {
     onChange?: (value: any, name: string, submit: boolean) => void;
     store: IIRendererStore;
 }
-export declare function wrapControl<T extends React.ComponentType<React.ComponentProps<T> & ControlProps>>(ComposedComponent: T): (((import("react").ComponentType<any> & hoistNonReactStatic.NonReactStatics<import("react").ComponentType<any>, {}>) & {
+export declare function wrapControl<T extends React.ComponentType<React.ComponentProps<T> & ControlProps>>(ComposedComponent: T): {
+    new (props: Omit<any, "rootStore"> | Readonly<Omit<any, "rootStore">>): {
+        render(): JSX.Element;
+        context: any;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        forceUpdate(callback?: (() => void) | undefined): void;
+        readonly props: Readonly<Omit<any, "rootStore">> & Readonly<{
+            children?: React.ReactNode;
+        }>;
+        state: Readonly<{}>;
+        refs: {
+            [key: string]: React.ReactInstance;
+        };
+        componentDidMount?(): void;
+        shouldComponentUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): boolean;
+        componentWillUnmount?(): void;
+        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<any, "rootStore">>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Omit<any, "rootStore">>, prevState: Readonly<{}>, snapshot?: any): void;
+        componentWillMount?(): void;
+        UNSAFE_componentWillMount?(): void;
+        componentWillReceiveProps?(nextProps: Readonly<Omit<any, "rootStore">>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<any, "rootStore">>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): void;
+    };
+    new (props: Omit<any, "rootStore">, context: any): {
+        render(): JSX.Element;
+        context: any;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        forceUpdate(callback?: (() => void) | undefined): void;
+        readonly props: Readonly<Omit<any, "rootStore">> & Readonly<{
+            children?: React.ReactNode;
+        }>;
+        state: Readonly<{}>;
+        refs: {
+            [key: string]: React.ReactInstance;
+        };
+        componentDidMount?(): void;
+        shouldComponentUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): boolean;
+        componentWillUnmount?(): void;
+        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<any, "rootStore">>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Omit<any, "rootStore">>, prevState: Readonly<{}>, snapshot?: any): void;
+        componentWillMount?(): void;
+        UNSAFE_componentWillMount?(): void;
+        componentWillReceiveProps?(nextProps: Readonly<Omit<any, "rootStore">>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<any, "rootStore">>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): void;
+    };
+    displayName: string;
+    contextType: React.Context<{
+        storeType: string;
+    } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+        readonly fetcher: any;
+        readonly notify: any;
+        readonly isCancel: (value: any) => boolean;
+        readonly __: import("..").TranslateFn<any>;
+        getStoreById(id: string): {
+            id: string;
+            path: string;
+            storeType: string;
+            disposed: boolean;
+            parentId: string;
+            childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
+        } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+            readonly parentStore: any;
+            readonly __: any;
+            readonly hasChildren: boolean;
+            readonly children: any[];
+        } & {
+            onChildStoreDispose(child: any): void;
+            syncProps(props: any, prevProps: any, list?: string[]): void;
+            dispose: (callback?: (() => void) | undefined) => void;
+            addChildId: (id: string) => void;
+            removeChildId: (id: string) => void;
+        } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+            id: import("mobx-state-tree").ISimpleType<string>;
+            path: import("mobx-state-tree").IType<string | undefined, string, string>;
+            storeType: import("mobx-state-tree").ISimpleType<string>;
+            disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+            parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
+            childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
+        }, {
+            readonly parentStore: any;
+            readonly __: any;
+            readonly hasChildren: boolean;
+            readonly children: any[];
+        } & {
+            onChildStoreDispose(child: any): void;
+            syncProps(props: any, prevProps: any, list?: string[]): void;
+            dispose: (callback?: (() => void) | undefined) => void;
+            addChildId: (id: string) => void;
+            removeChildId: (id: string) => void;
+        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
+        readonly stores: {
+            [propName: string]: {
+                id: string;
+                path: string;
+                storeType: string;
+                disposed: boolean;
+                parentId: string;
+                childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
+            } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+                readonly parentStore: any;
+                readonly __: any;
+                readonly hasChildren: boolean;
+                readonly children: any[];
+            } & {
+                onChildStoreDispose(child: any): void;
+                syncProps(props: any, prevProps: any, list?: string[]): void;
+                dispose: (callback?: (() => void) | undefined) => void;
+                addChildId: (id: string) => void;
+                removeChildId: (id: string) => void;
+            } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+                id: import("mobx-state-tree").ISimpleType<string>;
+                path: import("mobx-state-tree").IType<string | undefined, string, string>;
+                storeType: import("mobx-state-tree").ISimpleType<string>;
+                disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+                parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
+                childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
+            }, {
+                readonly parentStore: any;
+                readonly __: any;
+                readonly hasChildren: boolean;
+                readonly children: any[];
+            } & {
+                onChildStoreDispose(child: any): void;
+                syncProps(props: any, prevProps: any, list?: string[]): void;
+                dispose: (callback?: (() => void) | undefined) => void;
+                addChildId: (id: string) => void;
+                removeChildId: (id: string) => void;
+            }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
+        };
+    } & {
+        addStore(store: {
+            [propName: string]: any;
+            storeType: string;
+            id: string;
+            path: string;
+            parentId?: string | undefined;
+        }): {
+            id: string;
+            path: string;
+            storeType: string;
+            disposed: boolean;
+            parentId: string;
+            childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
+        } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+            readonly parentStore: any;
+            readonly __: any;
+            readonly hasChildren: boolean;
+            readonly children: any[];
+        } & {
+            onChildStoreDispose(child: any): void;
+            syncProps(props: any, prevProps: any, list?: string[]): void;
+            dispose: (callback?: (() => void) | undefined) => void;
+            addChildId: (id: string) => void;
+            removeChildId: (id: string) => void;
+        } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+            id: import("mobx-state-tree").ISimpleType<string>;
+            path: import("mobx-state-tree").IType<string | undefined, string, string>;
+            storeType: import("mobx-state-tree").ISimpleType<string>;
+            disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+            parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
+            childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
+        }, {
+            readonly parentStore: any;
+            readonly __: any;
+            readonly hasChildren: boolean;
+            readonly children: any[];
+        } & {
+            onChildStoreDispose(child: any): void;
+            syncProps(props: any, prevProps: any, list?: string[]): void;
+            dispose: (callback?: (() => void) | undefined) => void;
+            addChildId: (id: string) => void;
+            removeChildId: (id: string) => void;
+        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
+        removeStore(store: {
+            id: string;
+            path: string;
+            storeType: string;
+            disposed: boolean;
+            parentId: string;
+            childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
+        } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+            readonly parentStore: any;
+            readonly __: any;
+            readonly hasChildren: boolean;
+            readonly children: any[];
+        } & {
+            onChildStoreDispose(child: any): void;
+            syncProps(props: any, prevProps: any, list?: string[]): void;
+            dispose: (callback?: (() => void) | undefined) => void;
+            addChildId: (id: string) => void;
+            removeChildId: (id: string) => void;
+        } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+            id: import("mobx-state-tree").ISimpleType<string>;
+            path: import("mobx-state-tree").IType<string | undefined, string, string>;
+            storeType: import("mobx-state-tree").ISimpleType<string>;
+            disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+            parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
+            childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
+        }, {
+            readonly parentStore: any;
+            readonly __: any;
+            readonly hasChildren: boolean;
+            readonly children: any[];
+        } & {
+            onChildStoreDispose(child: any): void;
+            syncProps(props: any, prevProps: any, list?: string[]): void;
+            dispose: (callback?: (() => void) | undefined) => void;
+            addChildId: (id: string) => void;
+            removeChildId: (id: string) => void;
+        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
+    } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+        storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
+    }, {
+        readonly fetcher: any;
+        readonly notify: any;
+        readonly isCancel: (value: any) => boolean;
+        readonly __: import("..").TranslateFn<any>;
+        getStoreById(id: string): {
+            id: string;
+            path: string;
+            storeType: string;
+            disposed: boolean;
+            parentId: string;
+            childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
+        } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+            readonly parentStore: any;
+            readonly __: any;
+            readonly hasChildren: boolean;
+            readonly children: any[];
+        } & {
+            onChildStoreDispose(child: any): void;
+            syncProps(props: any, prevProps: any, list?: string[]): void;
+            dispose: (callback?: (() => void) | undefined) => void;
+            addChildId: (id: string) => void;
+            removeChildId: (id: string) => void;
+        } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+            id: import("mobx-state-tree").ISimpleType<string>;
+            path: import("mobx-state-tree").IType<string | undefined, string, string>;
+            storeType: import("mobx-state-tree").ISimpleType<string>;
+            disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+            parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
+            childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
+        }, {
+            readonly parentStore: any;
+            readonly __: any;
+            readonly hasChildren: boolean;
+            readonly children: any[];
+        } & {
+            onChildStoreDispose(child: any): void;
+            syncProps(props: any, prevProps: any, list?: string[]): void;
+            dispose: (callback?: (() => void) | undefined) => void;
+            addChildId: (id: string) => void;
+            removeChildId: (id: string) => void;
+        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
+        readonly stores: {
+            [propName: string]: {
+                id: string;
+                path: string;
+                storeType: string;
+                disposed: boolean;
+                parentId: string;
+                childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
+            } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+                readonly parentStore: any;
+                readonly __: any;
+                readonly hasChildren: boolean;
+                readonly children: any[];
+            } & {
+                onChildStoreDispose(child: any): void;
+                syncProps(props: any, prevProps: any, list?: string[]): void;
+                dispose: (callback?: (() => void) | undefined) => void;
+                addChildId: (id: string) => void;
+                removeChildId: (id: string) => void;
+            } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+                id: import("mobx-state-tree").ISimpleType<string>;
+                path: import("mobx-state-tree").IType<string | undefined, string, string>;
+                storeType: import("mobx-state-tree").ISimpleType<string>;
+                disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+                parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
+                childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
+            }, {
+                readonly parentStore: any;
+                readonly __: any;
+                readonly hasChildren: boolean;
+                readonly children: any[];
+            } & {
+                onChildStoreDispose(child: any): void;
+                syncProps(props: any, prevProps: any, list?: string[]): void;
+                dispose: (callback?: (() => void) | undefined) => void;
+                addChildId: (id: string) => void;
+                removeChildId: (id: string) => void;
+            }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
+        };
+    } & {
+        addStore(store: {
+            [propName: string]: any;
+            storeType: string;
+            id: string;
+            path: string;
+            parentId?: string | undefined;
+        }): {
+            id: string;
+            path: string;
+            storeType: string;
+            disposed: boolean;
+            parentId: string;
+            childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
+        } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+            readonly parentStore: any;
+            readonly __: any;
+            readonly hasChildren: boolean;
+            readonly children: any[];
+        } & {
+            onChildStoreDispose(child: any): void;
+            syncProps(props: any, prevProps: any, list?: string[]): void;
+            dispose: (callback?: (() => void) | undefined) => void;
+            addChildId: (id: string) => void;
+            removeChildId: (id: string) => void;
+        } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+            id: import("mobx-state-tree").ISimpleType<string>;
+            path: import("mobx-state-tree").IType<string | undefined, string, string>;
+            storeType: import("mobx-state-tree").ISimpleType<string>;
+            disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+            parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
+            childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
+        }, {
+            readonly parentStore: any;
+            readonly __: any;
+            readonly hasChildren: boolean;
+            readonly children: any[];
+        } & {
+            onChildStoreDispose(child: any): void;
+            syncProps(props: any, prevProps: any, list?: string[]): void;
+            dispose: (callback?: (() => void) | undefined) => void;
+            addChildId: (id: string) => void;
+            removeChildId: (id: string) => void;
+        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
+        removeStore(store: {
+            id: string;
+            path: string;
+            storeType: string;
+            disposed: boolean;
+            parentId: string;
+            childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
+        } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+            readonly parentStore: any;
+            readonly __: any;
+            readonly hasChildren: boolean;
+            readonly children: any[];
+        } & {
+            onChildStoreDispose(child: any): void;
+            syncProps(props: any, prevProps: any, list?: string[]): void;
+            dispose: (callback?: (() => void) | undefined) => void;
+            addChildId: (id: string) => void;
+            removeChildId: (id: string) => void;
+        } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+            id: import("mobx-state-tree").ISimpleType<string>;
+            path: import("mobx-state-tree").IType<string | undefined, string, string>;
+            storeType: import("mobx-state-tree").ISimpleType<string>;
+            disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+            parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
+            childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
+        }, {
+            readonly parentStore: any;
+            readonly __: any;
+            readonly hasChildren: boolean;
+            readonly children: any[];
+        } & {
+            onChildStoreDispose(child: any): void;
+            syncProps(props: any, prevProps: any, list?: string[]): void;
+            dispose: (callback?: (() => void) | undefined) => void;
+            addChildId: (id: string) => void;
+            removeChildId: (id: string) => void;
+        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
+    }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
+    ComposedComponent: React.ComponentType<any>;
+} & hoistNonReactStatic.NonReactStatics<any, {}> & {
     ComposedComponent: any;
-}) & hoistNonReactStatic.NonReactStatics<import("react").ComponentType<any>, {}>) & {
+} & hoistNonReactStatic.NonReactStatics<T, {}> & {
     ComposedComponent: T;
 };

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.1.1-beta.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.1.1-beta.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */