amis-core 3.5.2 → 3.6.0

package/lib/components/ErrorBoundary.js

@@ -0,0 +1,52 @@
+/**
+ * amis-core v3.6.0
+ * Copyright 2018-2023 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var React = require('react');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
+var ErrorBoundary = /** @class */ (function (_super) {
+    tslib.__extends(ErrorBoundary, _super);
+    function ErrorBoundary(props) {
+        var _this = _super.call(this, props) || this;
+        _this.state = { hasError: false };
+        return _this;
+    }
+    ErrorBoundary.prototype.componentDidCatch = function (error, errorInfo) {
+        var customErrorMsg = this.props.customErrorMsg;
+        if (customErrorMsg) {
+            console.warn(customErrorMsg);
+        }
+        console.warn('错误对象：', error);
+        console.warn('错误信息：', errorInfo);
+        this.setState({
+            hasError: true
+        });
+    };
+    ErrorBoundary.prototype.render = function () {
+        var fallback = this.props.fallback;
+        if (this.state.hasError) {
+            if (fallback) {
+                return fallback();
+            }
+            // 默认渲染错误信息
+            return (_J$X_("div", { className: "renderer-error-boundary" }, "\u6E32\u67D3\u53D1\u751F\u9519\u8BEF\uFF0C\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F\u8BF7\u67E5\u770B\u63A7\u5236\u53F0\u8F93\u51FA\u3002"));
+        }
+        return this.props.children;
+    };
+    return ErrorBoundary;
+}(React__default["default"].Component));
+
+exports["default"] = ErrorBoundary;

package/lib/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/PopOver.d.ts

@@ -46,9 +46,13 @@ export declare class PopOver extends React.PureComponent<PopOverProps, PopOverSt
     };
     parent: HTMLElement;
     wrapperRef: React.RefObject<HTMLDivElement>;
+    isRootClosed: boolean;
     componentDidMount(): void;
     componentDidUpdate(): void;
     componentWillUnmount(): void;
+    handleRootMouseDownCapture(e: MouseEvent): void;
+    handleRootMouseUpCapture(e: MouseEvent): void;
+    handleRootMouseUp(e: MouseEvent): void;
     mayUpdateOffset(): void;
     render(): React.JSX.Element;
 }

package/lib/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -66,6 +66,7 @@ var PopOver = /** @class */ (function (_super) {
             yOffset: 0
         };
         _this.wrapperRef = React__default["default"].createRef();
+        _this.isRootClosed = false;
         return _this;
     }
     PopOver.prototype.componentDidMount = function () {
@@ -80,6 +81,14 @@ var PopOver = /** @class */ (function (_super) {
                 capture: false
             });
         }
+        // 从弹窗中处理复制过来的，如果要修改，请同步修改
+        // 因为 overlay 功能其实是用 postion: fixed 来实现的
+        // 目的是加一个蒙层监听蒙层点击然后关闭弹窗。意图就是 closeOnOutside
+        // 但是如果上层有个 translateZ 之类的样式就会影响 fixed 的定位，导致功能失效
+        // 所以这里兜底加了个 closeOnOutside 的功能
+        document.body.addEventListener('mousedown', this.handleRootMouseDownCapture, true);
+        document.body.addEventListener('mouseup', this.handleRootMouseUpCapture, true);
+        document.body.addEventListener('mouseup', this.handleRootMouseUp);
     };
     PopOver.prototype.componentDidUpdate = function () {
         this.mayUpdateOffset();
@@ -89,6 +98,42 @@ var PopOver = /** @class */ (function (_super) {
         if (this.wrapperRef && this.wrapperRef.current) {
             this.wrapperRef.current.removeEventListener('touchmove', helper.preventDefault);
         }
+        document.body.removeEventListener('mouseup', this.handleRootMouseUp);
+        document.body.removeEventListener('mousedown', this.handleRootMouseDownCapture, true);
+        document.body.removeEventListener('mouseup', this.handleRootMouseUpCapture, true);
+    };
+    PopOver.prototype.handleRootMouseDownCapture = function (e) {
+        var target = e.target;
+        var _a = this.props, closeOnOutside = _a.overlay, ns = _a.classPrefix;
+        var isLeftButton = (e.button === 1 && window.event !== null) || e.button === 0;
+        this.isRootClosed = !!(isLeftButton &&
+            closeOnOutside &&
+            target &&
+            this.wrapperRef.current &&
+            ((!this.wrapperRef.current.contains(target) &&
+                !target.closest('[role=dialog]')) ||
+                (target.matches(".".concat(ns, "Modal")) && target === this.wrapperRef.current))); // 干脆过滤掉来自弹框里面的点击
+    };
+    PopOver.prototype.handleRootMouseUpCapture = function (e) {
+        // mousedown 的时候不在弹窗里面，则不需要判断了
+        if (!this.isRootClosed) {
+            return;
+        }
+        // 再判断 mouseup 的时候是不是在弹窗里面
+        this.handleRootMouseDownCapture(e);
+    };
+    PopOver.prototype.handleRootMouseUp = function (e) {
+        var onHide = this.props.onHide;
+        if (this.isRootClosed && !e.defaultPrevented) {
+            // 因为原来 overlay 是不会让别的部分还有点击事件的，所以这里要阻止默认事件
+            // 参考：https://stackoverflow.com/questions/8643739/cancel-click-event-in-the-mouseup-event-handler
+            var captureClick_1 = function (e) {
+                e.stopPropagation();
+                window.removeEventListener('click', captureClick_1, true);
+            };
+            window.addEventListener('click', captureClick_1, true);
+            onHide === null || onHide === void 0 ? void 0 : onHide();
+        }
     };
     PopOver.prototype.mayUpdateOffset = function () {
         var offset;
@@ -127,6 +172,24 @@ var PopOver = /** @class */ (function (_super) {
         overlay: false,
         placement: 'auto'
     };
+    tslib.__decorate([
+        helper.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [MouseEvent]),
+        tslib.__metadata("design:returntype", void 0)
+    ], PopOver.prototype, "handleRootMouseDownCapture", null);
+    tslib.__decorate([
+        helper.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [MouseEvent]),
+        tslib.__metadata("design:returntype", void 0)
+    ], PopOver.prototype, "handleRootMouseUpCapture", null);
+    tslib.__decorate([
+        helper.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [MouseEvent]),
+        tslib.__metadata("design:returntype", void 0)
+    ], PopOver.prototype, "handleRootMouseUp", null);
     return PopOver;
 }(React__default["default"].PureComponent));
 var PopOver$1 = theme.themeable(PopOver);

package/lib/env.d.ts

@@ -16,6 +16,7 @@ export interface WsObject {
     body?: any;
 }
 export interface RendererEnv {
+    forceSilenceInsideError?: boolean;
     session?: string;
     fetcher: (api: Api, data?: any, options?: object) => Promise<Payload>;
     isCancel: (val: any) => boolean;
@@ -63,6 +64,14 @@ export interface RendererEnv {
      */
     affixOffsetBottom?: number;
     richTextToken: string;
+    /**
+     * 默认的选址组件提供商，目前支持仅 baidu
+     */
+    locationPickerVendor?: string;
+    /**
+     * 选址组件的 ak
+     */
+    locationPickerAK?: string;
     loadRenderer: (schema: Schema, path: string, reRender: Function) => Promise<React.ElementType> | React.ElementType | JSX.Element | void;
     loadChartExtends?: () => void | Promise<void>;
     loadTinymcePlugin?: (tinymce: any) => void | Promise<void>;

package/lib/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/envOverwrite.d.ts

@@ -1,4 +1,4 @@
 /**
  * @file 用于在移动端或不同语言环境下使用不同配置
  */
-export declare const envOverwrite: (schema: any, locale?: string) => void;
+export declare const envOverwrite: (schema: any, locale?: string) => any;

package/lib/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -7,8 +7,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var helper = require('./utils/helper.js');
+var isPlainObject = require('lodash/isPlainObject');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var isPlainObject__default = /*#__PURE__*/_interopDefaultLegacy(isPlainObject);
 
 /**
  * @file 用于在移动端或不同语言环境下使用不同配置
@@ -19,41 +23,21 @@ var isMobile = ((_b = (_a = window).matchMedia) === null || _b === void 0 ? void
     : false;
 // 这里不能用 addSchemaFilter 是因为还需要更深层的替换，比如 select 里的 options
 var envOverwrite = function (schema, locale) {
-    var e_1, _a, e_2, _b;
-    if (locale) {
-        var schemaNodes = helper.findObjectsWithKey(schema, locale);
-        try {
-            for (var schemaNodes_1 = tslib.__values(schemaNodes), schemaNodes_1_1 = schemaNodes_1.next(); !schemaNodes_1_1.done; schemaNodes_1_1 = schemaNodes_1.next()) {
-                var schemaNode = schemaNodes_1_1.value;
-                Object.assign(schemaNode, schemaNode[locale]);
-                delete schemaNode[locale];
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (schemaNodes_1_1 && !schemaNodes_1_1.done && (_a = schemaNodes_1.return)) _a.call(schemaNodes_1);
-            }
-            finally { if (e_1) throw e_1.error; }
+    return helper.JSONValueMap(schema, function (value) {
+        if (!isPlainObject__default["default"](value)) {
+            return value;
         }
-    }
-    if (isMobile) {
-        var schemaNodes = helper.findObjectsWithKey(schema, 'mobile');
-        try {
-            for (var schemaNodes_2 = tslib.__values(schemaNodes), schemaNodes_2_1 = schemaNodes_2.next(); !schemaNodes_2_1.done; schemaNodes_2_1 = schemaNodes_2.next()) {
-                var schemaNode = schemaNodes_2_1.value;
-                Object.assign(schemaNode, schemaNode['mobile']);
-                delete schemaNode['mobile'];
-            }
+        if (locale && value[locale]) {
+            var newValue = Object.assign({}, value, value[locale]);
+            delete newValue[locale];
+            return newValue;
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (schemaNodes_2_1 && !schemaNodes_2_1.done && (_b = schemaNodes_2.return)) _b.call(schemaNodes_2);
-            }
-            finally { if (e_2) throw e_2.error; }
+        else if (isMobile && value.mobile) {
+            var newValue = Object.assign({}, value, value.mobile);
+            delete newValue.mobile;
+            return newValue;
         }
-    }
+    }, true);
 };
 
 exports.envOverwrite = envOverwrite;

package/lib/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/index.d.ts

@@ -39,6 +39,7 @@ import type { FilterContext } from 'amis-formula';
 import LazyComponent from './components/LazyComponent';
 import Overlay from './components/Overlay';
 import PopOver from './components/PopOver';
+import ErrorBoundary from './components/ErrorBoundary';
 import { FormRenderer } from './renderers/Form';
 import type { FormHorizontal, FormSchemaBase } from './renderers/Form';
 import { enableDebug, disableDebug } from './utils/index';
@@ -49,5 +50,5 @@ import type { IItem } from './store/list';
 import CustomStyle from './components/CustomStyle';
 import { StatusScoped } from './StatusScoped';
 export declare const version = "__buildVersion";
-export { clearStoresCache, updateEnv, Renderer, RendererProps, RenderOptions, RendererEnv, EnvContext, RegisterStore, FormItem, FormItemWrap, FormItemProps, OptionsControl, FormRenderer, FormHorizontal, utils, getRendererByName, registerRenderer, unRegisterRenderer, getRenderers, registerFormItem, getFormItemByName, registerOptionsControl, resolveRenderer, filterSchema, Scoped, ScopedContext, IScopedContext, StatusScoped, setDefaultTheme, theme, themeable, ThemeProps, getTheme, classPrefix, getClassPrefix, classnames, makeClassnames, getDefaultLocale, setDefaultLocale, registerLocale, makeTranslator, extendLocale, removeLocaleData, localeable, LocaleProps, TranslateFn, ClassNamesFn, parse, lexer, Evaluator, AsyncEvaluator, FilterContext, filters, getFilters, registerFilter, extendsFilters, registerFunction, evaluate, evaluateForAsync, LazyComponent, Overlay, PopOver, addSchemaFilter, OptionsControlProps, FormOptionsControl, FormControlProps, FormBaseControl, extendDefaultEnv, addRootWrapper, RendererConfig, styleMap, RENDERER_TRANSMISSION_OMIT_PROPS, ScopedComponentType, IItem, IColumn, IRow, IColumn2, IRow2, OnEventProps, FormSchemaBase, filterTarget, CustomStyle, enableDebug, disableDebug };
+export { clearStoresCache, updateEnv, Renderer, RendererProps, RenderOptions, RendererEnv, EnvContext, RegisterStore, FormItem, FormItemWrap, FormItemProps, OptionsControl, FormRenderer, FormHorizontal, utils, getRendererByName, registerRenderer, unRegisterRenderer, getRenderers, registerFormItem, getFormItemByName, registerOptionsControl, resolveRenderer, filterSchema, Scoped, ScopedContext, IScopedContext, StatusScoped, setDefaultTheme, theme, themeable, ThemeProps, getTheme, classPrefix, getClassPrefix, classnames, makeClassnames, getDefaultLocale, setDefaultLocale, registerLocale, makeTranslator, extendLocale, removeLocaleData, localeable, LocaleProps, TranslateFn, ClassNamesFn, parse, lexer, Evaluator, AsyncEvaluator, FilterContext, filters, getFilters, registerFilter, extendsFilters, registerFunction, evaluate, evaluateForAsync, LazyComponent, Overlay, PopOver, ErrorBoundary, addSchemaFilter, OptionsControlProps, FormOptionsControl, FormControlProps, FormBaseControl, extendDefaultEnv, addRootWrapper, RendererConfig, styleMap, RENDERER_TRANSMISSION_OMIT_PROPS, ScopedComponentType, IItem, IColumn, IRow, IColumn2, IRow2, OnEventProps, FormSchemaBase, filterTarget, CustomStyle, enableDebug, disableDebug };
 export declare function render(schema: Schema, props?: RootRenderProps, options?: RenderOptions, pathPrefix?: string): JSX.Element;

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -104,6 +104,7 @@ var amisFormula = require('amis-formula');
 var LazyComponent = require('./components/LazyComponent.js');
 var Overlay = require('./components/Overlay.js');
 var PopOver = require('./components/PopOver.js');
+var ErrorBoundary = require('./components/ErrorBoundary.js');
 var Form = require('./renderers/Form.js');
 var SchemaRenderer = require('./SchemaRenderer.js');
 var CustomStyle = require('./components/CustomStyle.js');
@@ -132,7 +133,7 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '3.5.2';
+var version = '3.6.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -191,7 +192,7 @@ function AMISRenderer(_a) {
         props.mobileUI = env$1.isMobile();
     }
     // 根据环境覆盖 schema，这个要在最前面做，不然就无法覆盖 validations
-    envOverwrite.envOverwrite(schema, locale$1);
+    schema = envOverwrite.envOverwrite(schema, locale$1);
     schema = replaceText.replaceText(schema, options.replaceText, env$1.replaceTextIgnoreKeys);
     return (_J$X_(env.EnvContext.Provider, { value: env$1 },
         _J$X_(Root["default"], tslib.__assign({}, props, { schema: schema, pathPrefix: pathPrefix, rootStore: store, env: env$1, theme: theme$1, locale: locale$1, translate: translate }))));
@@ -258,6 +259,7 @@ exports.ServerError = errors.ServerError;
 exports.escapeHtml = escapeHtml.escapeHtml;
 exports.filterClassNameObject = filterSchema.filterClassNameObject;
 exports.getExprProperties = filterSchema.getExprProperties;
+exports.hasExprPropertiesChanged = filterSchema.hasExprPropertiesChanged;
 exports.formatDuration = formatDuration.formatDuration;
 exports.FormulaExec = formula.FormulaExec;
 exports.formulaExec = formula.formulaExec;
@@ -530,6 +532,7 @@ Object.defineProperty(exports, 'registerFunction', {
 exports.LazyComponent = LazyComponent["default"];
 exports.Overlay = Overlay["default"];
 exports.PopOver = PopOver["default"];
+exports.ErrorBoundary = ErrorBoundary["default"];
 exports.FormRenderer = Form.FormRenderer;
 exports.RENDERER_TRANSMISSION_OMIT_PROPS = SchemaRenderer.RENDERER_TRANSMISSION_OMIT_PROPS;
 exports.CustomStyle = CustomStyle["default"];

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/Form.d.ts

@@ -265,6 +265,7 @@ export interface FormProps extends RendererProps, Omit<FormSchemaBase, 'mode' |
     onFailed?: (reason: string, errors: any) => any;
     onFinished: (values: object, action: any) => any;
     onValidate: (values: object, form: any) => any;
+    onValidChange?: (valid: boolean, props: any) => void;
     messages: {
         fetchSuccess?: string;
         fetchFailed?: string;
@@ -315,8 +316,7 @@ export default class Form extends React.Component<FormProps, object> {
         [propName: string]: Array<() => Promise<any>>;
     };
     asyncCancel: () => void;
-    disposeOnValidate: () => void;
-    disposeRulesValidate: () => void;
+    toDispose: Array<() => void>;
     shouldLoadInitApi: boolean;
     timer: ReturnType<typeof setTimeout>;
     mounted: boolean;
@@ -326,6 +326,12 @@ export default class Form extends React.Component<FormProps, object> {
     componentDidMount(): void;
     componentDidUpdate(prevProps: FormProps): void;
     componentWillUnmount(): void;
+    /** 获取表单联合校验的规则 */
+    getNormalizedRules(): {
+        message: any;
+        rule: string;
+        name?: string | string[] | undefined;
+    }[];
     dispatchInited(value: any): Promise<any>;
     blockRouting(): any;
     beforePageUnload(e: any): any;
@@ -335,7 +341,7 @@ export default class Form extends React.Component<FormProps, object> {
     silentReload(target?: string, query?: any): void;
     initInterval(value: any): any;
     isValidated(): boolean;
-    validate(forceValidate?: boolean, throwErrors?: boolean): Promise<boolean>;
+    validate(forceValidate?: boolean, throwErrors?: boolean, toastErrors?: boolean): Promise<boolean>;
     setErrors(errors: {
         [propName: string]: string;
     }, tag?: string): void;
@@ -349,7 +355,7 @@ export default class Form extends React.Component<FormProps, object> {
     removeHook(fn: () => any, type?: string): void;
     handleChange(value: any, name: string, submit: boolean, changePristine?: boolean): void;
     formItemDispatchEvent(type: string, data: any): any;
-    emitChange(submit: boolean): Promise<void>;
+    emitChange(submit: boolean, skipIfNothingChanges?: boolean): Promise<void>;
     handleBulkChange(values: Object, submit: boolean): void;
     handleFormSubmit(e: React.UIEvent<any>): any;
     handleReset(action: any): (data: any) => void;

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -56,7 +56,7 @@ require('uncontrollable');
 require('hoist-non-react-statics');
 require('../utils/validations.js');
 require('../utils/resolveCondition.js');
-require('mobx');
+var mobx = require('mobx');
 require('../utils/Animation.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -74,6 +74,7 @@ var Form = /** @class */ (function (_super) {
     function Form(props) {
         var _this = _super.call(this, props) || this;
         _this.hooks = {};
+        _this.toDispose = [];
         _this.shouldLoadInitApi = false;
         _this.lazyEmitChange = debounce__default["default"](_this.emitChange.bind(_this), 250, {
             trailing: true,
@@ -117,16 +118,23 @@ var Form = /** @class */ (function (_super) {
                 return form.items.forEach(function (item) { return item.unique && item.syncOptions(undefined, form.data); });
             });
         }
+        // withStore 里面与上层数据会做同步
+        // 这个时候变更的数据没有同步 onChange 出去，出现数据不一致的问题。
+        // https://github.com/baidu/amis/issues/8773
+        _this.toDispose.push(mobx.reaction(function () { return store.initedAt; }, function () {
+            store.inited && _this.emitChange(!!_this.props.submitOnChange, true);
+        }));
         return _this;
     }
     Form.prototype.componentDidMount = function () {
         var _this = this;
         var _a, _b;
-        var _c = this.props, initApi = _c.initApi, initFetch = _c.initFetch, initFetchOn = _c.initFetchOn, initAsyncApi = _c.initAsyncApi, initFinishedField = _c.initFinishedField, initCheckInterval = _c.initCheckInterval, store = _c.store, _d = _c.messages, fetchSuccess = _d.fetchSuccess, fetchFailed = _d.fetchFailed, onValidate = _c.onValidate, promptPageLeave = _c.promptPageLeave, env = _c.env, rules = _c.rules;
+        var _c = this.props, initApi = _c.initApi, initFetch = _c.initFetch, initFetchOn = _c.initFetchOn, initAsyncApi = _c.initAsyncApi, initFinishedField = _c.initFinishedField, initCheckInterval = _c.initCheckInterval, store = _c.store, _d = _c.messages, fetchSuccess = _d.fetchSuccess, fetchFailed = _d.fetchFailed, onValidate = _c.onValidate, onValidChange = _c.onValidChange, promptPageLeave = _c.promptPageLeave, env = _c.env;
+        var rules = this.getNormalizedRules();
         this.mounted = true;
         if (onValidate) {
             var finalValidate_1 = helper.promisify(onValidate);
-            this.disposeOnValidate = this.addHook(function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+            this.toDispose.push(this.addHook(function () { return tslib.__awaiter(_this, void 0, void 0, function () {
                 var result;
                 return tslib.__generator(this, function (_a) {
                     switch (_a.label) {
@@ -156,10 +164,14 @@ var Form = /** @class */ (function (_super) {
                             return [2 /*return*/];
                     }
                 });
-            }); });
+            }); }));
         }
-        if (Array.isArray(rules) && rules.length) {
-            this.disposeRulesValidate = this.addHook(function () {
+        // 表单校验结果发生变化时，触发 onValidChange
+        if (onValidChange) {
+            this.toDispose.push(mobx.reaction(function () { return store.valid; }, function (valid) { return onValidChange(valid, _this.props); }));
+        }
+        if (rules.length) {
+            this.toDispose.push(this.addHook(function () {
                 if (!store.valid) {
                     return;
                 }
@@ -167,7 +179,7 @@ var Form = /** @class */ (function (_super) {
                     return !tpl.evalExpression(item.rule, store.data) &&
                         store.addRestError(item.message, item.name);
                 });
-            });
+            }));
         }
         if (api.isEffectiveApi(initApi, store.data, initFetch, initFetchOn)) {
             store
@@ -215,11 +227,23 @@ var Form = /** @class */ (function (_super) {
         // this.lazyHandleChange.flush();
         this.lazyEmitChange.cancel();
         this.asyncCancel && this.asyncCancel();
-        this.disposeOnValidate && this.disposeOnValidate();
-        this.disposeRulesValidate && this.disposeRulesValidate();
+        this.toDispose.forEach(function (fn) { return fn(); });
+        this.toDispose = [];
         window.removeEventListener('beforeunload', this.beforePageUnload);
         (_a = this.unBlockRouting) === null || _a === void 0 ? void 0 : _a.call(this);
     };
+    /** 获取表单联合校验的规则 */
+    Form.prototype.getNormalizedRules = function () {
+        var _a = this.props, rules = _a.rules, __ = _a.translate;
+        if (!Array.isArray(rules) || rules.length < 1) {
+            return [];
+        }
+        return rules
+            .map(function (item) { return (tslib.__assign(tslib.__assign({}, item), (!item.message || typeof item.message !== 'string'
+            ? { message: __('Form.rules.message') }
+            : {}))); })
+            .filter(function (item) { return item.rule && typeof item.rule === 'string'; });
+    };
     Form.prototype.dispatchInited = function (value) {
         var _a;
         return tslib.__awaiter(this, void 0, void 0, function () {
@@ -367,22 +391,27 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.isValidated = function () {
         return this.props.store.validated;
     };
-    Form.prototype.validate = function (forceValidate, throwErrors) {
+    Form.prototype.validate = function (forceValidate, throwErrors, toastErrors) {
         if (throwErrors === void 0) { throwErrors = false; }
-        var _a = this.props, store = _a.store, dispatchEvent = _a.dispatchEvent, data = _a.data, messages = _a.messages, __ = _a.translate;
-        this.flush();
-        return store
-            .validate(this.hooks['validate'] || [], forceValidate, throwErrors, typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
-            ? __(tpl.filter(messages.validateFailed, store.data))
-            : undefined)
-            .then(function (result) {
-            if (result) {
-                dispatchEvent('validateSucc', data);
-            }
-            else {
-                dispatchEvent('validateError', data);
-            }
-            return result;
+        if (toastErrors === void 0) { toastErrors = true; }
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, store, dispatchEvent, data, messages, __, result;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, store = _a.store, dispatchEvent = _a.dispatchEvent, data = _a.data, messages = _a.messages, __ = _a.translate;
+                        this.flush();
+                        return [4 /*yield*/, store.validate(this.hooks['validate'] || [], forceValidate, throwErrors, toastErrors === false
+                                ? ''
+                                : typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
+                                    ? __(tpl.filter(messages.validateFailed, store.data))
+                                    : undefined)];
+                    case 1:
+                        result = _b.sent();
+                        dispatchEvent(result ? 'validateSucc' : 'validateError', data);
+                        return [2 /*return*/, result];
+                }
+            });
         });
     };
     Form.prototype.setErrors = function (errors, tag) {
@@ -466,9 +495,10 @@ var Form = /** @class */ (function (_super) {
         var dispatchEvent = this.props.dispatchEvent;
         return dispatchEvent(type, data);
     };
-    Form.prototype.emitChange = function (submit) {
+    Form.prototype.emitChange = function (submit, skipIfNothingChanges) {
+        if (skipIfNothingChanges === void 0) { skipIfNothingChanges = false; }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onChange, store, submitOnChange, dispatchEvent, data, changeProps, dispatcher;
+            var _a, onChange, store, submitOnChange, dispatchEvent, data, diff, changeProps, dispatcher;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -476,11 +506,11 @@ var Form = /** @class */ (function (_super) {
                         if (!mobxStateTree.isAlive(store)) {
                             return [2 /*return*/];
                         }
-                        changeProps = [
-                            store.data,
-                            helper.difference(store.data, store.pristine),
-                            this.props
-                        ];
+                        diff = helper.difference(store.data, store.pristine);
+                        if (skipIfNothingChanges && !Object.keys(diff).length) {
+                            return [2 /*return*/];
+                        }
+                        changeProps = [store.data, diff, this.props];
                         return [4 /*yield*/, dispatchEvent('change', object.createObject(data, store.data))];
                     case 1:
                         dispatcher = _b.sent();
@@ -1157,6 +1187,8 @@ var Form = /** @class */ (function (_super) {
         'onChange',
         'onFailed',
         'onFinished',
+        'onValidate',
+        'onValidChange',
         'onSaved',
         'canAccessSuperData',
         'lazyChange',