amis-core 2.0.0 → 2.1.0

package/esm/index.js

@@ -1,16 +1,16 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 
 export { classPrefix, render } from './index2.js';
 export { FormItem, FormItemWrap, registerFormItem } from './renderers/Item.js';
-export { buildApi, clearApiCache, getApiCache, isApiOutdated, isEffectiveApi, isSameApi, isValidApi, jsonpFetcher, normalizeApi, normalizeApiResponseData, responseAdaptor, setApiCache, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher } from './utils/api.js';
+export { buildApi, clearApiCache, getApiCache, isApiOutdated, isApiOutdatedWithData, isEffectiveApi, isSameApi, isValidApi, jsFetcher, jsonpFetcher, normalizeApi, normalizeApiResponseData, responseAdaptor, setApiCache, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher } from './utils/api.js';
 export { attachmentAdpator } from './utils/attachmentAdpator.js';
 export { autobindMethod, bind } from './utils/autobind.js';
 export { ColorScale } from './utils/ColorScale.js';
 export { columnsSplit } from './utils/columnsSplit.js';
-export { dataMapping, resolveMapping } from './utils/dataMapping.js';
+export { dataMapping, resolveMapping, resolveMappingObject } from './utils/dataMapping.js';
 export { DataSchema } from './utils/DataSchema.js';
 export { DataScope } from './utils/DataScope.js';
 export { filterDate, parseDuration, relativeValueRe } from './utils/date.js';
@@ -29,7 +29,7 @@ export { string2regExp } from './utils/string2regExp.js';
 export { keyToPath } from './utils/keyToPath.js';
 import * as helper from './utils/helper.js';
 export { helper as utils };
-export { JSONTraverse, SkipOperation, __uri, anyChanged, autobind, bulkBindFunctions, camel, chainEvents, chainFunctions, convertArrayValueToMoment, detectPropValueChanged, difference, eachTree, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeIndex, flattenTree, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, rmUndefined, someTree, sortArray, spliceTree, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter } from './utils/helper.js';
+export { JSONTraverse, SkipOperation, __uri, anyChanged, autobind, bulkBindFunctions, camel, chainEvents, chainFunctions, convertArrayValueToMoment, detectPropValueChanged, difference, eachTree, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeIndex, flattenTree, flattenTreeWithLeafNodes, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, rmUndefined, someTree, sortArray, spliceTree, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter } from './utils/helper.js';
 export { highlight } from './utils/highlight.js';
 export { generateIcon } from './utils/icon.js';
 export { getImageDimensions, toDataURL } from './utils/image.js';

package/esm/index2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -8,7 +8,7 @@ import { stores, defaultOptions } from './factory.js';
 export { Renderer, addSchemaFilter, clearStoresCache, extendDefaultEnv, filterSchema, getRendererByName, getRenderers, registerRenderer, resolveRenderer, unRegisterRenderer, updateEnv } from './factory.js';
 import './renderers/builtin.js';
 import { wrapFetcher } from './utils/api.js';
-export { buildApi, clearApiCache, getApiCache, isApiOutdated, isEffectiveApi, isSameApi, isValidApi, jsonpFetcher, normalizeApi, normalizeApiResponseData, responseAdaptor, setApiCache, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher } from './utils/api.js';
+export { buildApi, clearApiCache, getApiCache, isApiOutdated, isApiOutdatedWithData, isEffectiveApi, isSameApi, isValidApi, jsFetcher, jsonpFetcher, normalizeApi, normalizeApiResponseData, responseAdaptor, setApiCache, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher } from './utils/api.js';
 export { ColorScale } from './utils/ColorScale.js';
 import React from 'react';
 import 'lodash/chunk';
@@ -25,7 +25,7 @@ export { evalExpression, evalJS, filter, registerTplEnginer, setCustomEvalExpres
 import { promisify } from './utils/helper.js';
 import * as helper from './utils/helper.js';
 export { helper as utils };
-export { JSONTraverse, SkipOperation, __uri, anyChanged, autobind, bulkBindFunctions, camel, chainEvents, chainFunctions, convertArrayValueToMoment, detectPropValueChanged, difference, eachTree, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeIndex, flattenTree, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, rmUndefined, someTree, sortArray, spliceTree, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter } from './utils/helper.js';
+export { JSONTraverse, SkipOperation, __uri, anyChanged, autobind, bulkBindFunctions, camel, chainEvents, chainFunctions, convertArrayValueToMoment, detectPropValueChanged, difference, eachTree, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeIndex, flattenTree, flattenTreeWithLeafNodes, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, rmUndefined, someTree, sortArray, spliceTree, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter } from './utils/helper.js';
 import 'classnames';
 import './utils/filter.js';
 import 'lodash/isObject';
@@ -72,7 +72,6 @@ import './actions/PageAction.js';
 export { FormItem, FormItemWrap, registerFormItem } from './renderers/Item.js';
 import 'mobx';
 import 'lodash/findIndex';
-import 'lodash/merge';
 import ScopedRootRenderer from './Root.js';
 export { addRootWrapper } from './Root.js';
 import { envOverwrite } from './envOverwrite.js';

package/esm/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/@restart/hooks/esm/useCommittedRef.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/@restart/hooks/esm/useEventCallback.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/dom-helpers/esm/addEventListener.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/dom-helpers/esm/canUseDOM.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/dom-helpers/esm/contains.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/dom-helpers/esm/listen.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/dom-helpers/esm/ownerDocument.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/dom-helpers/esm/removeEventListener.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/object-assign/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/checkPropTypes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/factoryWithThrowingShims.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/factoryWithTypeCheckers.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/lib/ReactPropTypesSecret.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/lib/has.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/node_modules/react-is/cjs/react-is.development.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/node_modules/react-is/cjs/react-is.production.min.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/node_modules/react-is/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/react-overlays/esm/Portal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/react-overlays/esm/ownerDocument.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/react-overlays/esm/safeFindDOMNode.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/react-overlays/esm/useRootClose.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/react-overlays/esm/useWaitForDOMRef.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/warning/warning.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/renderers/Form.d.ts

@@ -220,7 +220,7 @@ export interface FormProps extends RendererProps, Omit<FormSchemaBase, 'mode' |
     lazyLoad?: boolean;
     simpleMode?: boolean;
     onInit?: (values: object, props: any) => any;
-    onReset?: (values: object) => void;
+    onReset?: (values: object, action?: any) => void;
     onSubmit?: (values: object, action: any) => any;
     onChange?: (values: object, diff: object, props: any) => any;
     onFailed?: (reason: string, errors: any) => any;
@@ -305,6 +305,7 @@ export default class Form extends React.Component<FormProps, object> {
     emitChange(submit: boolean): Promise<void>;
     handleBulkChange(values: Object, submit: boolean): void;
     handleFormSubmit(e: React.UIEvent<any>): false | Promise<any>;
+    handleReset(action: any): (data: any) => void;
     handleAction(e: React.UIEvent<any> | void, action: ActionObject, data: object, throwErrors?: boolean, delegate?: IScopedContext): Promise<any>;
     handleQuery(query: any): void;
     handleDialogConfirm(values: object[], action: ActionObject, ctx: any, targets: Array<any>): void;

package/esm/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -423,6 +423,12 @@ var Form = /** @class */ (function (_super) {
             type: 'submit'
         }, this.props.store.data);
     };
+    Form.prototype.handleReset = function (action) {
+        var onReset = this.props.onReset;
+        return function (data) {
+            onReset && onReset(data, action);
+        };
+    };
     Form.prototype.handleAction = function (e, action, data, throwErrors, delegate) {
         if (throwErrors === void 0) { throwErrors = false; }
         return __awaiter(this, void 0, void 0, function () {
@@ -472,10 +478,10 @@ var Form = /** @class */ (function (_super) {
                             action.actionType === 'clear-and-submit') {
                             store.setCurrentAction(action);
                             if (action.actionType === 'reset-and-submit') {
-                                store.reset(onReset);
+                                store.reset(this.handleReset(action));
                             }
                             else if (action.actionType === 'clear-and-submit') {
-                                store.clear(onReset);
+                                store.clear(this.handleReset(action));
                             }
                             return [2 /*return*/, this.submit(function (values) {
                                     var _a;
@@ -582,8 +588,8 @@ var Form = /** @class */ (function (_super) {
                                     if (onFinished && onFinished(values, action) === false) {
                                         return values;
                                     }
-                                    resetAfterSubmit && store.reset(onReset);
-                                    clearAfterSubmit && store.clear(onReset);
+                                    resetAfterSubmit && store.reset(_this.handleReset(action));
+                                    clearAfterSubmit && store.clear(_this.handleReset(action));
                                     clearPersistDataAfterSubmit && store.clearLocalPersistData();
                                     if (action.redirect || redirect) {
                                         var finalRedirect = filter(action.redirect || redirect, store.data);
@@ -890,7 +896,7 @@ var Form = /** @class */ (function (_super) {
         return (React.createElement(WrapperComponent, { className: cx("Form", "Form--".concat(mode || 'normal'), columnCount ? "Form--column Form--column-".concat(columnCount) : null, className), onSubmit: this.handleFormSubmit, noValidate: true },
             React.createElement("input", { type: "submit", style: { display: 'none' } }),
             debug ? (React.createElement("pre", null,
-                React.createElement("code", null, JSON.stringify(store.data, null, 2)))) : null,
+                React.createElement("code", { className: cx('Form--debug') }, JSON.stringify(store.data, null, 2)))) : null,
             render('spinner', { type: 'spinner' }, {
                 overlay: true,
                 show: store.loading

package/esm/renderers/Item.d.ts

@@ -299,13 +299,14 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
     lastSearchTerm: any;
     target: HTMLElement;
     constructor(props: FormItemProps);
+    componentDidUpdate(prevProps: FormItemProps): void;
     componentDidMount(): void;
     componentWillUnmount(): void;
     handleFocus(e: any): void;
     handleBlur(e: any): void;
     handleAutoFill(type: string): void;
     updateAutoFillData(context: any): void;
-    syncAutoFill: import("lodash").DebouncedFunc<(term: any) => void>;
+    syncAutoFill: import("lodash").DebouncedFunc<(term: any, reload?: boolean) => void>;
     buildSchema(): JSX.Element | {
         type: any;
         className: string;
@@ -387,9 +388,7 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
 export declare const detectProps: string[];
 export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (Control: FormControlComponent) => {
     new (props: Omit<any, "rootStore"> | Readonly<Omit<any, "rootStore">>): {
-        render(): JSX.Element; /**
-         * label自定义宽度，默认单位为px
-         */
+        render(): JSX.Element;
         context: any;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
@@ -414,9 +413,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
         UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): void;
     };
     new (props: Omit<any, "rootStore">, context: any): {
-        render(): JSX.Element; /**
-         * label自定义宽度，默认单位为px
-         */
+        render(): JSX.Element;
         context: any;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
@@ -443,8 +440,6 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
     displayName: string;
     contextType: React.Context<{
         storeType: string;
-        visibleState: any;
-        disableState: any;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
         readonly fetcher: any;
         readonly notify: any;
@@ -607,15 +602,8 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
-        setVisible(id: string, value: boolean): void;
-        setDisable(id: string, value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
-    } & {
-        visibleState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-        disableState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>; /**
-         * 显示一个小图标, 鼠标放上去的时候显示提示内容, 这个小图标跟 label 在一起
-         */
     }, {
         readonly fetcher: any;
         readonly notify: any;
@@ -778,8 +766,6 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
-        setVisible(id: string, value: boolean): void;
-        setDisable(id: string, value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
     ComposedComponent: React.ComponentType<any>;
 } & hoistNonReactStatic.NonReactStatics<any, {}> & {

package/esm/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -14,7 +14,7 @@ import { filter } from '../utils/tpl.js';
 import { HocStoreFactory } from '../WithStore.js';
 import { wrapControl } from './wrapControl.js';
 import debouce from 'lodash/debounce';
-import { isEffectiveApi } from '../utils/api.js';
+import { isEffectiveApi, isApiOutdated } from '../utils/api.js';
 import { findDOMNode } from 'react-dom';
 import '../utils/ColorScale.js';
 import 'lodash/chunk';
@@ -52,8 +52,8 @@ var FormItemWrap = /** @class */ (function (_super) {
     function FormItemWrap(props) {
         var _this = _super.call(this, props) || this;
         _this.reaction = [];
-        _this.syncAutoFill = debouce(function (term) {
-            (function (term) { return __awaiter(_this, void 0, void 0, function () {
+        _this.syncAutoFill = debouce(function (term, reload) {
+            (function (term, reload) { return __awaiter(_this, void 0, void 0, function () {
                 var _a, autoFill, onBulkChange, formItem, data, itemName, ctx, result;
                 var _b;
                 var _c, _d;
@@ -73,15 +73,15 @@ var FormItemWrap = /** @class */ (function (_super) {
                             ctx = createObject(data, (_b = {},
                                 _b[itemName || ''] = term,
                                 _b));
-                            if (!(onBulkChange &&
+                            if (!((onBulkChange &&
                                 isEffectiveApi(autoFill.api, ctx) &&
-                                this.lastSearchTerm !== term)) return [3 /*break*/, 3];
+                                this.lastSearchTerm !== term) ||
+                                reload)) return [3 /*break*/, 3];
                             return [4 /*yield*/, (formItem === null || formItem === void 0 ? void 0 : formItem.loadAutoUpdateData(autoFill.api, ctx, !!((_c = autoFill.api) === null || _c === void 0 ? void 0 : _c.silent)))];
                         case 2:
                             result = _e.sent();
-                            if (!result)
-                                return [2 /*return*/];
-                            this.lastSearchTerm = (_d = getVariable(result, itemName)) !== null && _d !== void 0 ? _d : term;
+                            this.lastSearchTerm =
+                                (_d = (result && getVariable(result, itemName))) !== null && _d !== void 0 ? _d : term;
                             if (autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) {
                                 result = dataMapping(autoFill.fillMapping, result);
                             }
@@ -90,7 +90,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         case 3: return [2 /*return*/];
                     }
                 });
-            }); })(term).catch(function (e) { return console.error(e); });
+            }); })(term, reload).catch(function (e) { return console.error(e); });
         }, 250, {
             trailing: true,
             leading: false
@@ -105,6 +105,15 @@ var FormItemWrap = /** @class */ (function (_super) {
         }
         return _this;
     }
+    FormItemWrap.prototype.componentDidUpdate = function (prevProps) {
+        var _a, _b, _c;
+        var props = this.props;
+        var model = props.formItem;
+        if (isEffectiveApi((_a = props.autoFill) === null || _a === void 0 ? void 0 : _a.api, props.data) &&
+            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.syncAutoFill(model === null || model === void 0 ? void 0 : model.tmpValue, true);
+        }
+    };
     FormItemWrap.prototype.componentDidMount = function () {
         this.target = findDOMNode(this);
     };
@@ -726,7 +735,8 @@ var detectProps = [
     'minLength',
     'maxLength',
     'embed',
-    'displayMode'
+    'displayMode',
+    'revealPassword'
 ];
 function asFormItem(config) {
     return function (Control) {

package/esm/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -14,15 +14,16 @@ import 'amis-formula';
 import 'moment';
 import { createObject, setVariable } from '../utils/object.js';
 import { isPureVariable } from '../utils/isPureVariable.js';
+import { getVariable } from '../utils/getVariable.js';
 import { resolveVariableAndFilter } from '../utils/resolveVariableAndFilter.js';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/filter.js';
 import { filter } from '../utils/tpl.js';
 import findIndex from 'lodash/findIndex';
 import isPlainObject from 'lodash/isPlainObject';
-import merge from 'lodash/merge';
 import { normalizeOptions } from '../utils/normalizeOptions.js';
 import { optionValueCompare } from '../utils/optionValueCompare.js';
+import { keyToPath } from '../utils/keyToPath.js';
 
 var detectProps = detectProps$1.concat([
     'value',
@@ -137,7 +138,7 @@ function registerOptionsControl(config) {
                 }
             }
             if (prevProps.value !== props.value || (formItem === null || formItem === void 0 ? void 0 : formItem.expressionsInOptions)) {
-                formItem.syncOptions(undefined, props.data);
+                formItem === null || formItem === void 0 ? void 0 : formItem.syncOptions(undefined, props.data);
             }
         };
         FormOptionsItem.prototype.componentWillUnmount = function () {
@@ -194,9 +195,16 @@ function registerOptionsControl(config) {
                         })
                     }
                     : createObject(__assign(__assign({}, data), { ancestors: getTreeAncestors(formItem.filteredOptions, selectedOptions[0], true) }), selectedOptions[0]));
-                Object.keys(toSync_1).forEach(function (key) {
-                    if (isPlainObject(toSync_1[key]) && isPlainObject(data[key])) {
-                        toSync_1[key] = merge({}, data[key], toSync_1[key]);
+                Object.keys(autoFill).forEach(function (key) {
+                    var keys = keyToPath(key);
+                    // 如果左边的 key 是一个路径
+                    // 这里不希望直接把原始对象都给覆盖没了
+                    // 而是保留原始的对象，只修改指定的属性
+                    if (keys.length > 1 && isPlainObject(data[keys[0]])) {
+                        var obj = __assign({}, data[keys[0]]);
+                        var value = getVariable(toSync_1, key);
+                        toSync_1[keys[0]] = obj;
+                        setVariable(toSync_1, key, value);
                     }
                 });
                 onBulkChange(toSync_1);

package/esm/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/esm/renderers/wrapControl.d.ts

@@ -102,8 +102,6 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
     displayName: string;
     contextType: React.Context<{
         storeType: string;
-        visibleState: any;
-        disableState: any;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
         readonly fetcher: any;
         readonly notify: any;
@@ -266,13 +264,8 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
-        setVisible(id: string, value: boolean): void;
-        setDisable(id: string, value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
-    } & {
-        visibleState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-        disableState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     }, {
         readonly fetcher: any;
         readonly notify: any;
@@ -435,8 +428,6 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
-        setVisible(id: string, value: boolean): void;
-        setDisable(id: string, value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
     ComposedComponent: React.ComponentType<any>;
 } & hoistNonReactStatic.NonReactStatics<any, {}> & {

package/esm/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.0
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -213,8 +213,7 @@ function wrapControl(ComposedComponent) {
                 }
                 else if (model) {
                     var valueByName = getVariable(props.data, model.name);
-                    if (valueByName !== undefined &&
-                        isEqual(props.defaultValue, prevProps.defaultValue)) {
+                    if (isEqual(props.defaultValue, prevProps.defaultValue)) {
                         // value 非公式表达式时，name 值优先，若 defaultValue 主动变动时，则使用 defaultValue
                         if (
                         // 然后才是查看关联的 name 属性值是否变化

package/esm/store/app.d.ts

@@ -82,7 +82,10 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
     toggleOffScreen(): void;
     setPages(pages: any): void;
     rewrite(to: string, env: RendererEnv): void;
-    setActivePage(page: any, env: RendererEnv, params?: any): void;
+    setActivePage(page: any, env: RendererEnv & {
+        showFullBreadcrumbPath?: boolean;
+        showBreadcrumbHomePath?: boolean;
+    }, params?: any): void;
     updateActivePage(env: RendererEnv): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export declare type IAppStore = Instance<typeof AppStore>;