amis-core 6.14.0-beta.0 → 6.14.0-beta.10

package/lib/renderers/Item.d.ts

@@ -1,13 +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 { AMISApi, AMISClassName, AMISRemarkBase, AMISSchemaBase, AMISTemplate, AMISVariableName } from '../schema';
 export type LabelAlign = 'right' | 'left' | 'top' | 'inherit';
-export interface FormBaseControlWithoutSize {
+export interface AMISFormItemBase extends AMISSchemaBase {
     /**
      * 描述标题, 当值为 false 时不展示
      */
@@ -27,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;
     /**
      * 当修改完的时候是否提交表单。
      */
@@ -68,15 +68,15 @@ export interface FormBaseControlWithoutSize {
     /**
      * 描述内容，支持 Html 片段。
      */
-    description?: string;
+    description?: AMISTemplate;
     /**
      * @deprecated 用 description 代替
      */
-    desc?: string;
+    desc?: AMISTemplate;
     /**
      * 配置描述上的 className
      */
-    descriptionClassName?: ClassName;
+    descriptionClassName?: AMISClassName;
     /**
      * 配置当前表单项展示模式
      */
@@ -294,10 +294,11 @@ export interface FormBaseControlWithoutSize {
     /**
      * 远端校验表单项接口
      */
-    validateApi?: string | BaseApiObject;
+    validateApi?: AMISApi;
     /**
      * 自动填充，当选项被选择的时候，将选项中的其他值同步设置到表单内。
      *
+     * 支持配置 api，配置 api 后将额外请求外部接口完成填充，同时支持自动填充与用户选择填充两种模式。
      */
     autoFill?: {
         [propName: string]: string;
@@ -313,7 +314,7 @@ export interface FormBaseControlWithoutSize {
         /**
          * 自动填充 api
          */
-        api?: BaseApi;
+        api?: AMISApi;
         /**
          * 是否展示数据格式错误提示，默认为不展示
          * @default true
@@ -322,13 +323,17 @@ export interface FormBaseControlWithoutSize {
         /**
          * 填充时的数据映射
          */
-        fillMappinng?: {
+        fillMapping?: {
             [propName: string]: any;
         };
         /**
          * 触发条件，默认为 change
          */
         trigger?: 'change' | 'focus' | 'blur';
+        /**
+         * 是否支持多选
+         */
+        multiple?: boolean;
         /**
          * 弹窗方式，当为参照录入时用可以配置
          */
@@ -348,7 +353,9 @@ export interface FormBaseControlWithoutSize {
         /**
          * 参照录入时的过滤条件
          */
-        filter?: any;
+        filter?: AMISFormBase;
+        labelField?: string;
+        nameField?: string;
     };
     /**
      * @default fillIfNotSet
@@ -357,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;
@@ -619,7 +627,7 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
     static layoutRenderers: {
         [propsName: string]: (props: FormItemProps, renderControl: () => JSX.Element | null) => JSX.Element;
     };
-    render(): JSX.Element | null;
+    render(): React.JSX.Element | null;
 }
 export declare const detectProps: string[];
 export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (Control: FormControlComponent) => {
@@ -656,7 +664,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
         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;
@@ -668,15 +676,13 @@ 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; /**
-             * 是否只读
-             */
+            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>;
@@ -688,15 +694,13 @@ 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; /**
-             * 是否只读
-             */
+            removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         readonly stores: {
             [propName: string]: {
@@ -710,15 +714,13 @@ 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; /**
-                 * 是否只读
-                 */
+                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>;
@@ -730,115 +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; /**
-                 * 是否只读
-                 */
+                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>;
     }, {
         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;
@@ -850,15 +768,13 @@ 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; /**
-             * 是否只读
-             */
+            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>;
@@ -870,15 +786,13 @@ 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; /**
-             * 是否只读
-             */
+            removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         readonly stores: {
             [propName: string]: {
@@ -892,15 +806,13 @@ 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; /**
-                 * 是否只读
-                 */
+                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>;
@@ -912,108 +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; /**
-                 * 是否只读
-                 */
+                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/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.0
+ * amis-core v6.14.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -65,11 +65,15 @@ var FormItemWrap = /** @class */ (function (_super) {
         _this.initedOptionFilled = false;
         _this.initedApiFilled = false;
         _this.toDispose = [];
-        _this.syncApiAutoFill = debounce__default["default"](function (term, forceLoad, skipIfExits) {
-            if (skipIfExits === void 0) { skipIfExits = false; }
-            return tslib.__awaiter(_this, void 0, void 0, function () {
+        _this.syncApiAutoFill = debounce__default["default"](function (term_1, forceLoad_1) {
+            var args_1 = [];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                args_1[_i - 2] = arguments[_i];
+            }
+            return tslib.__awaiter(_this, tslib.__spreadArray([term_1, forceLoad_1], tslib.__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 tslib.__generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -140,11 +144,7 @@ var FormItemWrap = /** @class */ (function (_super) {
             initAutoFill !== false &&
                 mobxStateTree.isAlive(model) &&
                 _this.syncApiAutoFill((_a = model.tmpValue) !== null && _a !== void 0 ? _a : '', false, initAutoFill === 'fillIfNotSet');
-            _this.toDispose.push(mobx.reaction(function () { return JSON.stringify(model.tmpValue); }, function () {
-                return _this.mounted &&
-                    _this.initedApiFilled &&
-                    _this.syncApiAutoFill(model.tmpValue);
-            }));
+            _this.toDispose.push(mobx.reaction(function () { return JSON.stringify(model.tmpValue); }, function () { return _this.mounted && _this.handleAutoFill('change'); }));
             _this.toDispose.push(mobx.reaction(function () { return JSON.stringify(model.getSelectedOptions(model.tmpValue)); }, function () {
                 return _this.mounted &&
                     _this.initedOptionFilled &&
@@ -161,12 +161,24 @@ var FormItemWrap = /** @class */ (function (_super) {
         this.target = ReactDOM.findDOMNode(this);
     };
     FormItemWrap.prototype.componentDidUpdate = function (prevProps) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         var props = this.props;
         var model = props.formItem;
-        if (api.isEffectiveApi((_a = props.autoFill) === null || _a === void 0 ? void 0 : _a.api, props.data) &&
+        if (model &&
+            api.isEffectiveApi((_a = props.autoFill) === null || _a === void 0 ? void 0 : _a.api, props.data) &&
             api.isApiOutdated((_b = prevProps.autoFill) === null || _b === void 0 ? void 0 : _b.api, (_c = props.autoFill) === null || _c === void 0 ? void 0 : _c.api, prevProps.data, props.data)) {
-            this.syncApiAutoFill(model === null || model === void 0 ? void 0 : model.tmpValue, true);
+            // 判断是否是因为自身值之外的值变化引起的，如果是则强制刷新
+            var checkIfCausedByOtherVariables = false;
+            if (((_d = props.autoFill) === null || _d === void 0 ? void 0 : _d.api) !== ((_e = prevProps.autoFill) === null || _e === void 0 ? void 0 : _e.api)) {
+                checkIfCausedByOtherVariables = true;
+            }
+            else {
+                var api$1 = (_f = props.autoFill) === null || _f === void 0 ? void 0 : _f.api;
+                var tmData = {};
+                object.setVariable(tmData, model.name, model.tmpValue);
+                checkIfCausedByOtherVariables = api.isApiOutdated(api$1, api$1, object.extendObject(prevProps.data, tmData), object.extendObject(props.data, tmData));
+            }
+            this.syncApiAutoFill(model.tmpValue, checkIfCausedByOtherVariables);
         }
     };
     FormItemWrap.prototype.componentWillUnmount = function () {
@@ -198,7 +210,7 @@ var FormItemWrap = /** @class */ (function (_super) {
     FormItemWrap.prototype.handleAutoFill = function (type) {
         var _this = this;
         var _a = this.props, autoFill = _a.autoFill, formItem = _a.formItem, data = _a.data;
-        var trigger = autoFill.trigger, mode = autoFill.mode;
+        var _b = autoFill || {}, trigger = _b.trigger, mode = _b.mode;
         if (trigger === type && mode === 'popOver') {
             // 参照录入 popOver形式
             formItem === null || formItem === void 0 ? void 0 : formItem.openPopOver(this.buildAutoFillSchema(), data, function (confirmed, result) {
@@ -916,7 +928,7 @@ var FormItemWrap = /** @class */ (function (_super) {
 // 白名单形式，只有这些属性发生变化，才会往下更新。
 // 除非配置  strictMode
 var detectProps = [
-    'formPristine',
+    'formPristine', // 这个千万不能干掉。
     'formInited',
     'addable',
     'addButtonClassName',
@@ -1031,8 +1043,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;
@@ -1053,10 +1065,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 = tslib.__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 = tslib.__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 (_J$X_(React__default["default"].Fragment, null,
@@ -1065,17 +1077,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(helper.ucFirst(controlSize))] = config.sizeMutable !== false &&
+                                _b["Form-control--withSize Form-control--size".concat(helper.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)),