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

package/esm/renderers/Item.d.ts

@@ -1,14 +1,13 @@
-/// <reference types="lodash" />
 import React from 'react';
 import hoistNonReactStatic from 'hoist-non-react-statics';
 import { IFormItemStore, IFormStore } from '../store/form';
 import { RendererProps, TestFunc, RendererConfig } from '../factory';
-import { FormHorizontal, FormSchemaBase } from './Form';
-import { ActionObject, BaseApi, BaseApiObject, BaseSchemaWithoutType, ClassName, DataChangeReason, Schema } from '../types';
+import { AMISFormBase, FormHorizontal, FormSchemaBase } from './Form';
+import { ActionObject, ClassName, DataChangeReason, Schema } from '../types';
 import { IScopedContext } from '../Scoped';
-import { BaseFormSchema } from 'amis/src/Schema';
+import { AMISApi, AMISClassName, AMISRemarkBase, AMISSchemaBase, AMISTemplate, AMISVariableName } from '../schema';
 export type LabelAlign = 'right' | 'left' | 'top' | 'inherit';
-export interface FormBaseControlWithoutSize {
+export interface AMISFormItemBase extends AMISSchemaBase {
     /**
      * 描述标题, 当值为 false 时不展示
      */
@@ -28,27 +27,27 @@ export interface FormBaseControlWithoutSize {
     /**
      * 配置 label className
      */
-    labelClassName?: string;
+    labelClassName?: AMISClassName;
     /**
      * 字段名，表单提交时的 key，支持多层级，用.连接，如： a.b.c
      */
-    name?: string;
+    name?: AMISVariableName;
     /**
      * 额外的字段名，当为范围组件时可以用来将另外一个值打平出来
      */
-    extraName?: string;
+    extraName?: AMISVariableName;
     /**
      * 显示一个小图标, 鼠标放上去的时候显示提示内容
      */
-    remark?: any;
+    remark?: AMISRemarkBase;
     /**
      * 显示一个小图标, 鼠标放上去的时候显示提示内容, 这个小图标跟 label 在一起
      */
-    labelRemark?: any;
+    labelRemark?: AMISRemarkBase;
     /**
      * 输入提示，聚焦的时候显示
      */
-    hint?: string;
+    hint?: AMISTemplate;
     /**
      * 当修改完的时候是否提交表单。
      */
@@ -69,15 +68,15 @@ export interface FormBaseControlWithoutSize {
     /**
      * 描述内容，支持 Html 片段。
      */
-    description?: string;
+    description?: AMISTemplate;
     /**
      * @deprecated 用 description 代替
      */
-    desc?: string;
+    desc?: AMISTemplate;
     /**
      * 配置描述上的 className
      */
-    descriptionClassName?: ClassName;
+    descriptionClassName?: AMISClassName;
     /**
      * 配置当前表单项展示模式
      */
@@ -295,7 +294,7 @@ export interface FormBaseControlWithoutSize {
     /**
      * 远端校验表单项接口
      */
-    validateApi?: string | BaseApiObject;
+    validateApi?: AMISApi;
     /**
      * 自动填充，当选项被选择的时候，将选项中的其他值同步设置到表单内。
      *
@@ -315,7 +314,7 @@ export interface FormBaseControlWithoutSize {
         /**
          * 自动填充 api
          */
-        api?: BaseApi;
+        api?: AMISApi;
         /**
          * 是否展示数据格式错误提示，默认为不展示
          * @default true
@@ -354,7 +353,7 @@ export interface FormBaseControlWithoutSize {
         /**
          * 参照录入时的过滤条件
          */
-        filter?: BaseFormSchema;
+        filter?: AMISFormBase;
         labelField?: string;
         nameField?: string;
     };
@@ -365,12 +364,13 @@ export interface FormBaseControlWithoutSize {
     initAutoFill?: boolean | 'fillIfNotSet';
     row?: number;
 }
-export interface FormBaseControl extends BaseSchemaWithoutType, FormBaseControlWithoutSize {
+export interface AMISFormItem extends AMISFormItemBase {
     /**
      * 表单项大小
      */
     size?: 'xs' | 'sm' | 'md' | 'lg' | 'full';
 }
+export type FormBaseControl = AMISFormItem;
 export interface FormItemBasicConfig extends Partial<RendererConfig> {
     type?: string;
     wrap?: boolean;
@@ -661,13 +661,10 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
     contextType: React.Context<{
         storeType: string;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        /**
-         * label自定义宽度，默认单位为px
-         */
         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;
@@ -679,11 +676,11 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             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<{
@@ -697,11 +694,11 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             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>>;
@@ -717,11 +714,11 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 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<{
@@ -735,108 +732,31 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 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("..").IStoreNode;
+        removeStore(store: import("..").IStoreNode): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
     }, {
-        /**
-         * label自定义宽度，默认单位为px
-         */
         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;
@@ -848,11 +768,11 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             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<{
@@ -866,11 +786,11 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             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>>;
@@ -886,11 +806,11 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 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<{
@@ -904,98 +824,24 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 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("..").IStoreNode;
+        removeStore(store: import("..").IStoreNode): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
     ComposedComponent: React.ComponentType<any>;
 } & hoistNonReactStatic.NonReactStatics<any, {}> & {

package/esm/renderers/Item.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v6.14.0-beta.8
+ * amis-core v7.0.0-next.0
  * Copyright 2018-2025 fex
  */
 
-import { __assign, __extends, __awaiter, __generator, __read, __rest, __decorate, __metadata, __spreadArray } from 'tslib';
+import { __assign, __extends, __awaiter, __spreadArray, __read, __generator, __rest, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import hoistNonReactStatic from 'hoist-non-react-statics';
 import { reaction } from 'mobx';
@@ -15,7 +15,7 @@ import { HocStoreFactory } from '../WithStore.js';
 import { wrapControl } from './wrapControl.js';
 import debounce from 'lodash/debounce';
 import { isEffectiveApi, isApiOutdated } from '../utils/api.js';
-import { findDOMNode } from 'react-dom';
+import { findDomCompat } from '../utils/findDomCompat.js';
 import '../utils/index.js';
 import Overlay from '../components/Overlay.js';
 import PopOver from '../components/PopOver.js';
@@ -48,11 +48,15 @@ var FormItemWrap = /** @class */ (function (_super) {
         _this.initedOptionFilled = false;
         _this.initedApiFilled = false;
         _this.toDispose = [];
-        _this.syncApiAutoFill = debounce(function (term, forceLoad, skipIfExits) {
-            if (skipIfExits === void 0) { skipIfExits = false; }
-            return __awaiter(_this, void 0, void 0, function () {
+        _this.syncApiAutoFill = debounce(function (term_1, forceLoad_1) {
+            var args_1 = [];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                args_1[_i - 2] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([term_1, forceLoad_1], __read(args_1), false), void 0, function (term, forceLoad, skipIfExits) {
                 var _a, autoFill, onBulkChange, formItem, data_1, itemName, ctx, result, e_1;
                 var _b, _c, _d;
+                if (skipIfExits === void 0) { skipIfExits = false; }
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -137,7 +141,7 @@ var FormItemWrap = /** @class */ (function (_super) {
     }
     FormItemWrap.prototype.componentDidMount = function () {
         this.mounted = true;
-        this.target = findDOMNode(this);
+        this.target = findDomCompat(this);
     };
     FormItemWrap.prototype.componentDidUpdate = function (prevProps) {
         var _a, _b, _c, _d, _e, _f;
@@ -907,7 +911,7 @@ var FormItemWrap = /** @class */ (function (_super) {
 // 白名单形式，只有这些属性发生变化，才会往下更新。
 // 除非配置  strictMode
 var detectProps = [
-    'formPristine',
+    'formPristine', // 这个千万不能干掉。
     'formInited',
     'addable',
     'addButtonClassName',
@@ -1022,8 +1026,8 @@ function asFormItem(config) {
                     return _this;
                 }
                 class_1.prototype.shouldComponentUpdate = function (nextProps) {
-                    var _a;
-                    if (((_a = config.shouldComponentUpdate) === null || _a === void 0 ? void 0 : _a.call(config, this.props, nextProps)) ||
+                    var _b;
+                    if (((_b = config.shouldComponentUpdate) === null || _b === void 0 ? void 0 : _b.call(config, this.props, nextProps)) ||
                         nextProps.strictMode === false ||
                         config.strictMode === false) {
                         return true;
@@ -1044,10 +1048,10 @@ function asFormItem(config) {
                     return this.props.data;
                 };
                 class_1.prototype.renderControl = function () {
-                    var _a;
-                    var _b = this.props, 
+                    var _b;
+                    var _c = this.props, 
                     // 这里解构，不可轻易删除，避免被rest传到子组件
-                    inputClassName = _b.inputClassName, model = _b.formItem, cx = _b.classnames, children = _b.children, type = _b.type, size = _b.size, defaultSize = _b.defaultSize, mobileUI = _b.mobileUI, rest = __rest(_b, ["inputClassName", "formItem", "classnames", "children", "type", "size", "defaultSize", "mobileUI"]);
+                    inputClassName = _c.inputClassName, model = _c.formItem, cx = _c.classnames, children = _c.children, type = _c.type, size = _c.size, defaultSize = _c.defaultSize, mobileUI = _c.mobileUI, rest = __rest(_c, ["inputClassName", "formItem", "classnames", "children", "type", "size", "defaultSize", "mobileUI"]);
                     var isRuleSize = size && ['xs', 'sm', 'md', 'lg', 'full'].includes(size);
                     var controlSize = isRuleSize ? size : defaultSize;
                     return (React.createElement(React.Fragment, null,
@@ -1056,17 +1060,17 @@ function asFormItem(config) {
                             // 获取不到最新的因为做了限制，只有表单项目 name 关联的数值变化才更新
                             getData: this.getData, mobileUI: mobileUI, onOpenDialog: this.handleOpenDialog, size: config.sizeMutable !== false ? undefined : size, onFocus: this.handleFocus, onBlur: this.handleBlur, type: type, classnames: cx, ref: supportRef ? this.refFn : undefined, forwardedRef: supportRef ? undefined : this.refFn, formItem: model, style: {
                                 width: !isRuleSize && size ? size : undefined
-                            }, className: cx("Form-control", (_a = {
+                            }, className: cx("Form-control", (_b = {
                                     'is-inline': !!rest.inline && !mobileUI,
                                     'is-error': model && !model.valid,
                                     'is-full': size === 'full',
                                     'is-thin': config.thin
                                 },
-                                _a["Form-control--withSize Form-control--size".concat(ucFirst(controlSize))] = config.sizeMutable !== false &&
+                                _b["Form-control--withSize Form-control--size".concat(ucFirst(controlSize))] = config.sizeMutable !== false &&
                                     typeof controlSize === 'string' &&
                                     !!controlSize &&
                                     controlSize !== 'full',
-                                _a), model === null || model === void 0 ? void 0 : model.errClassNames, getItemInputClassName(this.props)) }))));
+                                _b), model === null || model === void 0 ? void 0 : model.errClassNames, getItemInputClassName(this.props)) }))));
                 };
                 return class_1;
             }(FormItemWrap)),

package/esm/renderers/Options.d.ts

@@ -3,20 +3,21 @@
  * List、ButtonGroup 等等
  */
 import { Api, PlainObject, ActionObject, OptionProps } from '../types';
-import { FormControlProps, FormItemBasicConfig, FormBaseControl } from './Item';
+import { FormControlProps, FormItemBasicConfig, AMISFormItem } from './Item';
 export type OptionsControlComponent = React.ComponentType<FormControlProps>;
 import React from 'react';
-import type { BaseApi, Option } from '../types';
+import type { Option } from '../types';
+import { AMISOptions, AMISApi, AMISExpression, AMISDialogSchemaBase, AMISTemplate, AMISSchema } from '../schema';
 export { Option };
-export interface FormOptionsControlSelf {
+export interface AMISFormItemWithOptions extends AMISFormItem {
     /**
      * 选项集合
      */
-    options?: Array<Option> | string[] | PlainObject;
+    options?: AMISOptions | string[] | PlainObject;
     /**
      * 可用来通过 API 拉取 options。
      */
-    source?: BaseApi;
+    source?: AMISApi;
     /**
      * 默认选择选项第一个值。
      */
@@ -26,7 +27,7 @@ export interface FormOptionsControlSelf {
      *
      * @deprecated 建议用 source 接口的 sendOn
      */
-    initFetchOn?: string;
+    initFetchOn?: AMISExpression;
     /**
      * 配置 source 接口初始拉不拉取。
      *
@@ -73,21 +74,21 @@ export interface FormOptionsControlSelf {
      */
     deferField?: string;
     /**
-     * 延时加载的 API，当选项中有 defer: true 的选项时，点开会通过此接口扩充。
+     * 延时加载的 API，当选项中有 defer: true 的选项时，点开会通过此接口扩展。
      */
-    deferApi?: BaseApi;
+    deferApi?: AMISApi;
     /**
      * 添加时调用的接口
      */
-    addApi?: BaseApi;
+    addApi?: AMISApi;
     /**
      * 新增时的表单项。
      */
-    addControls?: Array<PlainObject>;
+    addControls?: Array<AMISSchema>;
     /**
      * 控制新增弹框设置项
      */
-    addDialog?: PlainObject;
+    addDialog?: AMISDialogSchemaBase;
     /**
      * 是否可以新增
      */
@@ -103,15 +104,15 @@ export interface FormOptionsControlSelf {
     /**
      * 编辑时调用的 API
      */
-    editApi?: BaseApi;
+    editApi?: AMISApi;
     /**
      * 选项修改的表单项
      */
-    editControls?: Array<PlainObject>;
+    editControls?: Array<AMISSchema>;
     /**
      * 控制编辑弹框设置项
      */
-    editDialog?: PlainObject;
+    editDialog?: AMISDialogSchemaBase;
     /**
      * 是否可删除
      */
@@ -119,17 +120,17 @@ export interface FormOptionsControlSelf {
     /**
      * 选项删除 API
      */
-    deleteApi?: BaseApi;
+    deleteApi?: AMISApi;
     /**
      * 选项删除提示文字。
      */
-    deleteConfirmText?: string;
+    deleteConfirmText?: AMISTemplate;
     /**
      * source从数据域取值时，数据域值变化后是否自动清空
      */
     clearValueOnSourceChange?: boolean;
 }
-export interface FormOptionsControl extends FormOptionsControlSelf, FormBaseControl {
+export interface FormOptionsControl extends AMISFormItemWithOptions {
 }
 export interface OptionsBasicConfig extends FormItemBasicConfig {
     autoLoadOptionsFromSource?: boolean;