amis-core 6.14.0-beta.8 → 7.0.0-next.0

package/lib/renderers/wrapControl.d.ts

@@ -49,7 +49,7 @@ 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>>(config: Omit<FormItemConfig, 'component'>, ComposedComponent: T): {
+export declare function wrapControl<T extends React.ComponentType<React.ComponentProps<T> & ControlProps>>(config: Omit<FormItemConfig, 'component'>, ComposedComponent: T): ({
     new (props: Omit<any, "rootStore">): {
         ref: any;
         getWrappedInstance(): any;
@@ -83,7 +83,7 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
         readonly fetcher: any;
         readonly notify: any;
         readonly isCancel: (value: any) => boolean;
-        readonly __: import("..").TranslateFn<any>;
+        readonly __: import("..").TranslateFn;
         getStoreById(id: string): {
             id: string;
             path: string;
@@ -95,11 +95,11 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
             readonly parentStore: any;
             readonly __: any;
             readonly hasChildren: boolean;
-            readonly children: any[];
+            readonly children: Array<any>;
         } & {
             onChildStoreDispose(child: any): void;
-            syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void;
+            syncProps(props: any, prevProps: any, list?: Array<string>): void;
+            dispose: (callback?: () => void) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -113,11 +113,11 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
             readonly parentStore: any;
             readonly __: any;
             readonly hasChildren: boolean;
-            readonly children: any[];
+            readonly children: Array<any>;
         } & {
             onChildStoreDispose(child: any): void;
-            syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void;
+            syncProps(props: any, prevProps: any, list?: Array<string>): void;
+            dispose: (callback?: () => void) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -133,11 +133,11 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
                 readonly parentStore: any;
                 readonly __: any;
                 readonly hasChildren: boolean;
-                readonly children: any[];
+                readonly children: Array<any>;
             } & {
                 onChildStoreDispose(child: any): void;
-                syncProps(props: any, prevProps: any, list?: string[]): void;
-                dispose: (callback?: (() => void) | undefined) => void;
+                syncProps(props: any, prevProps: any, list?: Array<string>): void;
+                dispose: (callback?: () => void) => void;
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -151,103 +151,31 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
                 readonly parentStore: any;
                 readonly __: any;
                 readonly hasChildren: boolean;
-                readonly children: any[];
+                readonly children: Array<any>;
             } & {
                 onChildStoreDispose(child: any): void;
-                syncProps(props: any, prevProps: any, list?: string[]): void;
-                dispose: (callback?: (() => void) | undefined) => void;
+                syncProps(props: any, prevProps: any, list?: Array<string>): void;
+                dispose: (callback?: () => void) => 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;
+            parentId?: string;
+            [propName: string]: any;
+        }): import("../store").IStoreNode;
+        removeStore(store: import("../store").IStoreNode): 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>;
+        readonly __: import("..").TranslateFn;
         getStoreById(id: string): {
             id: string;
             path: string;
@@ -259,11 +187,11 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
             readonly parentStore: any;
             readonly __: any;
             readonly hasChildren: boolean;
-            readonly children: any[];
+            readonly children: Array<any>;
         } & {
             onChildStoreDispose(child: any): void;
-            syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void;
+            syncProps(props: any, prevProps: any, list?: Array<string>): void;
+            dispose: (callback?: () => void) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -277,11 +205,11 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
             readonly parentStore: any;
             readonly __: any;
             readonly hasChildren: boolean;
-            readonly children: any[];
+            readonly children: Array<any>;
         } & {
             onChildStoreDispose(child: any): void;
-            syncProps(props: any, prevProps: any, list?: string[]): void;
-            dispose: (callback?: (() => void) | undefined) => void;
+            syncProps(props: any, prevProps: any, list?: Array<string>): void;
+            dispose: (callback?: () => void) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -297,11 +225,11 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
                 readonly parentStore: any;
                 readonly __: any;
                 readonly hasChildren: boolean;
-                readonly children: any[];
+                readonly children: Array<any>;
             } & {
                 onChildStoreDispose(child: any): void;
-                syncProps(props: any, prevProps: any, list?: string[]): void;
-                dispose: (callback?: (() => void) | undefined) => void;
+                syncProps(props: any, prevProps: any, list?: Array<string>): void;
+                dispose: (callback?: () => void) => void;
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -315,100 +243,28 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
                 readonly parentStore: any;
                 readonly __: any;
                 readonly hasChildren: boolean;
-                readonly children: any[];
+                readonly children: Array<any>;
             } & {
                 onChildStoreDispose(child: any): void;
-                syncProps(props: any, prevProps: any, list?: string[]): void;
-                dispose: (callback?: (() => void) | undefined) => void;
+                syncProps(props: any, prevProps: any, list?: Array<string>): void;
+                dispose: (callback?: () => void) => 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;
+            parentId?: string;
+            [propName: string]: any;
+        }): import("../store").IStoreNode;
+        removeStore(store: import("../store").IStoreNode): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
     ComposedComponent: React.ComponentType<any>;
 } & hoistNonReactStatic.NonReactStatics<any, {}> & {
     ComposedComponent: any;
-} & hoistNonReactStatic.NonReactStatics<T, {}> & {
+} & hoistNonReactStatic.NonReactStatics<T, {}>) & {
     ComposedComponent: T;
 };

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.8
+ * amis-core v7.0.0-next.0
  * Copyright 2018-2025 fex
  */
 
@@ -48,15 +48,14 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
     var result = hoistNonReactStatic__default["default"](WithRootStore.withRootStore(mobxReact.observer((_a = /** @class */ (function (_super) {
             tslib.__extends(class_1, _super);
             function class_1(props) {
-                var _this = this;
-                var _a, _b;
-                _this = _super.call(this, props) || this;
+                var _b, _c;
+                var _this = _super.call(this, props) || this;
                 _this.value = undefined;
                 _this.lazyEmitChange = debounce__default["default"](_this.emitChange.bind(_this), 250, {
                     trailing: true,
                     leading: false
                 });
-                var _c = _this.props, form = _c.formStore, formItem$1 = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, colIndex = _c.colIndex, rowIndex = _c.rowIndex, _d = _c.$schema, id = _d.id, type = _d.type, required = _d.required, validations$1 = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, extraName = _d.extraName, multiple = _d.multiple, delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label, pagination = _d.pagination;
+                var _d = _this.props, form = _d.formStore, formItem$1 = _d.formItem, rootStore = _d.rootStore, store = _d.store, onChange = _d.onChange, data = _d.data, inputGroupControl = _d.inputGroupControl, colIndex = _d.colIndex, rowIndex = _d.rowIndex, _e = _d.$schema, id = _e.id, type = _e.type, required = _e.required, validations$1 = _e.validations, validationErrors = _e.validationErrors, unique = _e.unique, value = _e.value, extraName = _e.extraName, multiple = _e.multiple, delimiter = _e.delimiter, valueField = _e.valueField, labelField = _e.labelField, joinValues = _e.joinValues, extractValue = _e.extractValue, selectFirst = _e.selectFirst, autoFill = _e.autoFill, clearValueOnHidden = _e.clearValueOnHidden, validateApi = _e.validateApi, minLength = _e.minLength, maxLength = _e.maxLength, validateOnChange = _e.validateOnChange, label = _e.label, pagination = _e.pagination;
                 _this.getValue = _this.getValue.bind(_this);
                 _this.setValue = _this.setValue.bind(_this);
                 _this.handleChange = _this.handleChange.bind(_this);
@@ -67,7 +66,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 _this.flushChange = _this.flushChange.bind(_this);
                 _this.renderChild = _this.renderChild.bind(_this);
                 var name = _this.props.$schema.name ||
-                    ((_a = ComposedComponent.defaultProps) === null || _a === void 0 ? void 0 : _a.name);
+                    ((_b = ComposedComponent.defaultProps) === null || _b === void 0 ? void 0 : _b.name);
                 // 如果 name 是表达式
                 // 扩充 each 用法
                 if (formula.isExpression(name)) {
@@ -96,7 +95,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 model.config(tslib.__assign(tslib.__assign({}, pick__default["default"](tslib.__assign(tslib.__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: props.required || required, unique: unique, value: value, isValueSchemaExp: valueIsExp && value.replace(/\s/g, '') !== "${".concat(name, "}"), rules: rules, messages: validationErrors, delimiter: delimiter, valueField: valueField, labelField: labelField, joinValues: joinValues, extractValue: extractValue, selectFirst: selectFirst, autoFill: autoFill, clearValueOnHidden: clearValueOnHidden, validateApi: validateApi, minLength: minLength, maxLength: maxLength, validateOnChange: validateOnChange, label: label, inputGroupControl: inputGroupControl, extraName: extraName, pagination: pagination }));
                 // issue 这个逻辑应该在 combo 里面自己实现。
                 if (_this.model.unique &&
-                    ((_b = form === null || form === void 0 ? void 0 : form.parentStore) === null || _b === void 0 ? void 0 : _b.storeType) === combo.ComboStore.name) {
+                    ((_c = form === null || form === void 0 ? void 0 : form.parentStore) === null || _c === void 0 ? void 0 : _c.storeType) === combo.ComboStore.name) {
                     var combo$1 = form.parentStore;
                     combo$1.bindUniuqueItem(model);
                 }
@@ -145,10 +144,10 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                     }
                 }
                 _this.reaction = mobx.reaction(function () { return model.validatedAt; }, function (validatedAt) {
-                    var _a, _b, _c, _d;
-                    (_b = (_a = _this.props).dispatchEvent) === null || _b === void 0 ? void 0 : _b.call(_a, model.valid
+                    var _b, _c, _d, _e;
+                    (_c = (_b = _this.props).dispatchEvent) === null || _c === void 0 ? void 0 : _c.call(_b, model.valid
                         ? 'formItemValidateSucc'
-                        : 'formItemValidateError', object.injectObjectChain((_d = (_c = _this.props.formStore) === null || _c === void 0 ? void 0 : _c.data) !== null && _d !== void 0 ? _d : _this.props.data, {
+                        : 'formItemValidateError', object.injectObjectChain((_e = (_d = _this.props.formStore) === null || _d === void 0 ? void 0 : _d.data) !== null && _e !== void 0 ? _e : _this.props.data, {
                         __errors: model.errors,
                         __formName: model.name,
                         __formValue: model.tmpValue,
@@ -159,7 +158,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
             }
             class_1.prototype.componentDidMount = function () {
                 var _this = this;
-                var _a = this.props, store = _a.store, form = _a.formStore, validate = _a.$schema.validate, addHook = _a.addHook;
+                var _b = this.props, store = _b.store, form = _b.formStore, validate = _b.$schema.validate, addHook = _b.addHook;
                 // 提交前先把之前的 lazyEmit 执行一下。
                 this.hook3 = function () { return _this.lazyEmitChange.flush(); };
                 addHook === null || addHook === void 0 ? void 0 : addHook(this.hook3, 'flush');
@@ -180,7 +179,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
             };
             class_1.prototype.componentDidUpdate = function (prevProps) {
                 var _this = this;
-                var _a, _b, _c;
+                var _b, _c, _d;
                 var props = this.props;
                 var model = this.model;
                 if (!model) {
@@ -249,11 +248,11 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                         model.changeTmpValue(curResult, 'formulaChanged');
                         if (model.extraName) {
                             var values = model.splitExtraValue(curResult);
-                            (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, values[0], model.name, false);
-                            (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, values[1], model.extraName, false);
+                            (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, values[0], model.name, false);
+                            (_c = props.onChange) === null || _c === void 0 ? void 0 : _c.call(props, values[1], model.extraName, false);
                         }
                         else {
-                            (_c = props.onChange) === null || _c === void 0 ? void 0 : _c.call(props, curResult, model.name, false);
+                            (_d = props.onChange) === null || _d === void 0 ? void 0 : _d.call(props, curResult, model.name, false);
                         }
                     }
                 }
@@ -287,18 +286,18 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 }
             };
             class_1.prototype.componentWillUnmount = function () {
-                var _a, _b, _c, _d, _e, _f, _g;
-                this.hook && ((_b = (_a = this.props).removeHook) === null || _b === void 0 ? void 0 : _b.call(_a, this.hook));
-                this.hook2 && ((_d = (_c = this.props).removeHook) === null || _d === void 0 ? void 0 : _d.call(_c, this.hook2));
-                this.hook3 && ((_f = (_e = this.props).removeHook) === null || _f === void 0 ? void 0 : _f.call(_e, this.hook3, 'flush'));
+                var _b, _c, _d, _e, _f, _g, _h;
+                this.hook && ((_c = (_b = this.props).removeHook) === null || _c === void 0 ? void 0 : _c.call(_b, this.hook));
+                this.hook2 && ((_e = (_d = this.props).removeHook) === null || _e === void 0 ? void 0 : _e.call(_d, this.hook2));
+                this.hook3 && ((_g = (_f = this.props).removeHook) === null || _g === void 0 ? void 0 : _g.call(_f, this.hook3, 'flush'));
                 // this.lazyEmitChange.flush();
                 this.lazyEmitChange.cancel();
-                (_g = this.reaction) === null || _g === void 0 ? void 0 : _g.call(this);
+                (_h = this.reaction) === null || _h === void 0 ? void 0 : _h.call(this);
                 this.disposeModel();
             };
             class_1.prototype.setInitialValue = function (value) {
                 var model = this.model;
-                var _a = this.props, form = _a.formStore, data = _a.data, canAccessSuperData = _a.canAccessSuperData, name = _a.name;
+                var _b = this.props, form = _b.formStore, data = _b.data, canAccessSuperData = _b.canAccessSuperData, name = _b.name;
                 var isExp = formula.isExpression(value);
                 if (isExp && value.replace(/\s/g, '') === "${".concat(name, "}")) {
                     console.warn('value 不要使用表达式关联自己');
@@ -328,8 +327,8 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                         : 'defaultValue');
             };
             class_1.prototype.disposeModel = function () {
-                var _a;
-                var _b = this.props, form = _b.formStore, formItem = _b.formItem, rootStore = _b.rootStore;
+                var _b;
+                var _c = this.props, form = _c.formStore, formItem = _c.formItem, rootStore = _c.rootStore;
                 if (this.model &&
                     this.model.unique &&
                     (form === null || form === void 0 ? void 0 : form.parentStore) &&
@@ -342,7 +341,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                         mobxStateTree.isAlive(formItem) &&
                         formItem.removeSubFormItem(this.model);
                     this.model.clearValueOnHidden &&
-                        ((_a = this.model.form) === null || _a === void 0 ? void 0 : _a.deleteValueByName(this.model.name, {
+                        ((_b = this.model.form) === null || _b === void 0 ? void 0 : _b.deleteValueByName(this.model.name, {
                             type: 'hide'
                         }));
                     mobxStateTree.isAlive(rootStore) && rootStore.removeStore(this.model);
@@ -351,7 +350,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
             };
             class_1.prototype.controlRef = function (control) {
                 var _this = this;
-                var _a = this.props, addHook = _a.addHook, removeHook = _a.removeHook, form = _a.formStore, formItemRef = _a.formItemRef;
+                var _b = this.props, addHook = _b.addHook, removeHook = _b.removeHook, form = _b.formStore, formItemRef = _b.formItemRef;
                 // 因为 control 有可能被 n 层 hoc 包裹。
                 while (control && control.getWrappedInstance) {
                     control = control.getWrappedInstance();
@@ -391,11 +390,11 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 }
             };
             class_1.prototype.checkValidate = function () {
-                var _a;
+                var _b;
                 if (!this.model)
                     return; // 如果 model 为 undefined 则直接返回
                 var validated = this.model.validated;
-                var _b = this.props, formSubmited = _b.formSubmited, validateOnChange = _b.validateOnChange;
+                var _c = this.props, formSubmited = _c.formSubmited, validateOnChange = _c.validateOnChange;
                 if (
                 // 如果配置了 minLength 或者 maxLength 就切成及时验证
                 // this.model.rules.minLength ||
@@ -405,18 +404,18 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                     this.validate();
                 }
                 else if (validateOnChange === false) {
-                    (_a = this.model) === null || _a === void 0 ? void 0 : _a.reset();
+                    (_b = this.model) === null || _b === void 0 ? void 0 : _b.reset();
                 }
             };
             class_1.prototype.validate = function () {
                 return tslib.__awaiter(this, void 0, void 0, function () {
-                    var _a, form, data, dispatchEvent, result, combo$1, group, validPromises, valid;
-                    return tslib.__generator(this, function (_b) {
-                        switch (_b.label) {
+                    var _b, form, data, dispatchEvent, result, combo$1, group, validPromises, valid;
+                    return tslib.__generator(this, function (_c) {
+                        switch (_c.label) {
                             case 0:
                                 if (!this.model)
                                     return [2 /*return*/];
-                                _a = this.props, form = _a.formStore, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                                _b = this.props, form = _b.formStore, data = _b.data, dispatchEvent = _b.dispatchEvent;
                                 if (!(this.model.unique &&
                                     (form === null || form === void 0 ? void 0 : form.parentStore) &&
                                     form.parentStore.storeType === combo.ComboStore.name)) return [3 /*break*/, 2];
@@ -427,12 +426,12 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                                 });
                                 return [4 /*yield*/, Promise.all(validPromises)];
                             case 1:
-                                result = _b.sent();
+                                result = _c.sent();
                                 return [3 /*break*/, 4];
                             case 2: return [4 /*yield*/, this.model.validate(data)];
                             case 3:
-                                result = [_b.sent()];
-                                _b.label = 4;
+                                result = [_c.sent()];
+                                _c.label = 4;
                             case 4:
                                 valid = !result.some(function (item) { return item === false; });
                                 return [2 /*return*/, valid];
@@ -446,7 +445,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
             class_1.prototype.handleChange = function (value, submitOnChange, changeImmediately) {
                 if (submitOnChange === void 0) { submitOnChange = this.props.$schema.submitOnChange; }
                 if (changeImmediately === void 0) { changeImmediately = false; }
-                var _a = this.props, form = _a.formStore, onChange = _a.onChange, _b = _a.$schema, type = _b.type, pipeOut = _b.pipeOut, conrolChangeImmediately = _b.changeImmediately, formInited = _a.formInited, data = _a.data;
+                var _b = this.props, form = _b.formStore, onChange = _b.onChange, _c = _b.$schema, type = _c.type, pipeOut = _c.pipeOut, conrolChangeImmediately = _c.changeImmediately, formInited = _b.formInited, data = _b.data;
                 if (!this.model ||
                     // todo 以后想办法不要強耦合类型。
                     ~[
@@ -475,7 +474,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
             };
             class_1.prototype.emitChange = function (submitOnChange) {
                 if (submitOnChange === void 0) { submitOnChange = this.props.$schema.submitOnChange; }
-                var _a = this.props, form = _a.formStore, onChange = _a.onChange, _b = _a.$schema, id = _b.id, label = _b.label, type = _b.type, onFormItemChange = _b.onChange, maxLength = _b.maxLength, minLength = _b.minLength, data = _a.data, env = _a.env, validateOnChange = _a.validateOnChange, formSubmited = _a.formSubmited;
+                var _b = this.props, form = _b.formStore, onChange = _b.onChange, _c = _b.$schema, id = _c.id, label = _c.label, type = _c.type, onFormItemChange = _c.onChange, maxLength = _c.maxLength, minLength = _c.minLength, data = _b.data, env = _b.env, validateOnChange = _b.validateOnChange, formSubmited = _b.formSubmited;
                 if (!this.model) {
                     return;
                 }
@@ -536,7 +535,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 this.checkValidate();
             };
             class_1.prototype.handleBlur = function (e) {
-                var _a = this.props, onBlur = _a.onBlur, validateOnBlur = _a.$schema.validateOnBlur;
+                var _b = this.props, onBlur = _b.onBlur, validateOnBlur = _b.$schema.validateOnBlur;
                 if (validateOnBlur && this.model) {
                     this.validate();
                 }
@@ -547,7 +546,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                     return;
                 }
                 var model = this.model;
-                var _a = this.props, form = _a.formStore, pipeOut = _a.$schema.pipeOut, onChange = _a.onChange, oldValue = _a.value, data = _a.data;
+                var _b = this.props, form = _b.formStore, pipeOut = _b.$schema.pipeOut, onChange = _b.onChange, oldValue = _b.value, data = _b.data;
                 if (pipeOut) {
                     value = api.callStrFunction.call(this, pipeOut, ['value', 'oldValue', 'data'], value, oldValue, data);
                 }
@@ -561,7 +560,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 }
             };
             class_1.prototype.getValue = function () {
-                var _a = this.props, formStore = _a.formStore, data = _a.data, control = _a.$schema;
+                var _b = this.props, formStore = _b.formStore, data = _b.data, control = _b.$schema;
                 var value = this.model ? this.model.tmpValue : control.value;
                 if (control.pipeIn) {
                     value = api.callStrFunction.call(this, control.pipeIn, ['value', 'store', 'data'], value, formStore, data);
@@ -570,29 +569,29 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
             };
             // 兼容老版本用法，新版本直接用 onChange 就可以。
             class_1.prototype.setValue = function (value, key) {
-                var _a;
+                var _b;
                 var onBulkChange = this.props.onBulkChange;
                 if (!key || (this.model && key === this.model.name)) {
                     this.handleChange(value);
                 }
                 else {
                     onBulkChange &&
-                        onBulkChange((_a = {},
-                            _a[key] = value,
-                            _a));
+                        onBulkChange((_b = {},
+                            _b[key] = value,
+                            _b));
                 }
             };
             class_1.prototype.renderChild = function (region, node, subProps) {
                 if (subProps === void 0) { subProps = {}; }
-                var _a = this.props, render = _a.render, data = _a.data, store = _a.store;
+                var _b = this.props, render = _b.render, data = _b.data, store = _b.store;
                 var model = this.model;
                 return render(region, node, tslib.__assign({ data: model
                         ? model.getMergedData(data || (store === null || store === void 0 ? void 0 : store.data))
                         : data || (store === null || store === void 0 ? void 0 : store.data) }, subProps));
             };
             class_1.prototype.render = function () {
-                var _a, _b, _c;
-                var _d = this.props, controlWidth = _d.controlWidth, disabled = _d.disabled, formMode = _d.formMode, control = _d.$schema, store = _d.store, data = _d.data, invisible = _d.invisible, defaultStatic = _d.defaultStatic;
+                var _b, _c, _d;
+                var _e = this.props, controlWidth = _e.controlWidth, disabled = _e.disabled, formMode = _e.formMode, control = _e.$schema, store = _e.store, data = _e.data, invisible = _e.invisible, defaultStatic = _e.defaultStatic;
                 if (invisible) {
                     return null;
                 }
@@ -601,16 +600,16 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 var injectedProps = {
                     defaultSize: controlWidth,
                     disabled: disabled !== null && disabled !== void 0 ? disabled : control.disabled,
-                    static: (_b = (_a = this.props.static) !== null && _a !== void 0 ? _a : control.static) !== null && _b !== void 0 ? _b : defaultStatic,
+                    static: (_c = (_b = this.props.static) !== null && _b !== void 0 ? _b : control.static) !== null && _c !== void 0 ? _c : defaultStatic,
                     formItem: this.model,
                     formMode: control.mode || formMode,
                     ref: this.controlRef,
                     data: data || (store === null || store === void 0 ? void 0 : store.data),
-                    name: (_c = model === null || model === void 0 ? void 0 : model.name) !== null && _c !== void 0 ? _c : control.name,
+                    name: (_d = model === null || model === void 0 ? void 0 : model.name) !== null && _d !== void 0 ? _d : control.name,
                     value: value,
                     changeMotivation: model === null || model === void 0 ? void 0 : model.changeMotivation,
                     defaultValue: control.value,
-                    formItemValue: value,
+                    formItemValue: value, // 为了兼容老版本的自定义组件
                     onChange: this.handleChange,
                     onBlur: this.handleBlur,
                     setValue: this.setValue,