amis-core 3.5.2 → 3.6.0

package/esm/actions/SwitchAction.js

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

package/esm/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -16,10 +16,10 @@ var ToastAction = /** @class */ (function () {
         var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_f) {
-                if (!((_a = renderer.props.env) === null || _a === void 0 ? void 0 : _a.notify)) {
+                if (!((_a = event.context.env) === null || _a === void 0 ? void 0 : _a.notify)) {
                     throw new Error('env.notify is required!');
                 }
-                (_c = (_b = event.context.env).notify) === null || _c === void 0 ? void 0 : _c.call(_b, ((_d = action.args) === null || _d === void 0 ? void 0 : _d.msgType) || 'info', String((_e = action.args) === null || _e === void 0 ? void 0 : _e.msg), action.args);
+                (_c = (_b = event.context.env) === null || _b === void 0 ? void 0 : _b.notify) === null || _c === void 0 ? void 0 : _c.call(_b, ((_d = action.args) === null || _d === void 0 ? void 0 : _d.msgType) || 'info', String((_e = action.args) === null || _e === void 0 ? void 0 : _e.msg), action.args);
                 return [2 /*return*/];
             });
         });

package/esm/components/CustomStyle.js

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

package/esm/components/ErrorBoundary.d.ts

@@ -0,0 +1,20 @@
+/**
+ * @file ErrorBoundary
+ * @description 捕获发生在其子组件树任何位置的 JavaScript 错误，并打印这些错误
+ * @author wibetter
+ */
+import React from 'react';
+interface ErrorBoundaryProps {
+    customErrorMsg?: string;
+    fallback?: () => void;
+    children: any;
+}
+interface ErrorBoundaryStates {
+    hasError: boolean;
+}
+export default class ErrorBoundary extends React.Component<ErrorBoundaryProps, ErrorBoundaryStates> {
+    constructor(props: any);
+    componentDidCatch(error: any, errorInfo: any): void;
+    render(): any;
+}
+export {};

package/esm/components/ErrorBoundary.js

@@ -0,0 +1,41 @@
+/**
+ * amis-core v3.6.0
+ * Copyright 2018-2023 fex
+ */
+
+import { __extends } from 'tslib';
+import React from 'react';
+
+var ErrorBoundary = /** @class */ (function (_super) {
+    __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 (React.createElement("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.Component));
+
+export { ErrorBoundary as default };

package/esm/components/LazyComponent.js

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

package/esm/components/Overlay.js

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

package/esm/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/esm/components/PopOver.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
-import { __extends, __rest, __assign } from 'tslib';
+import { __extends, __rest, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import { findDOMNode } from 'react-dom';
 import { themeable } from '../theme.js';
@@ -18,7 +18,7 @@ import 'moment';
 import '../utils/debug.js';
 import '../utils/errors.js';
 import '../utils/tpl.js';
-import { preventDefault, camel } from '../utils/helper.js';
+import { preventDefault, camel, autobind } from '../utils/helper.js';
 import '../utils/filter.js';
 import 'lodash/isObject';
 import 'lodash/isString';
@@ -57,6 +57,7 @@ var PopOver = /** @class */ (function (_super) {
             yOffset: 0
         };
         _this.wrapperRef = React.createRef();
+        _this.isRootClosed = false;
         return _this;
     }
     PopOver.prototype.componentDidMount = function () {
@@ -71,6 +72,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();
@@ -80,6 +89,42 @@ var PopOver = /** @class */ (function (_super) {
         if (this.wrapperRef && this.wrapperRef.current) {
             this.wrapperRef.current.removeEventListener('touchmove', 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;
@@ -118,6 +163,24 @@ var PopOver = /** @class */ (function (_super) {
         overlay: false,
         placement: 'auto'
     };
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [MouseEvent]),
+        __metadata("design:returntype", void 0)
+    ], PopOver.prototype, "handleRootMouseDownCapture", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [MouseEvent]),
+        __metadata("design:returntype", void 0)
+    ], PopOver.prototype, "handleRootMouseUpCapture", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [MouseEvent]),
+        __metadata("design:returntype", void 0)
+    ], PopOver.prototype, "handleRootMouseUp", null);
     return PopOver;
 }(React.PureComponent));
 var PopOver$1 = themeable(PopOver);

package/esm/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/esm/env.js

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

package/esm/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/esm/envOverwrite.js

@@ -1,10 +1,10 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
-import { __values } from 'tslib';
-import { findObjectsWithKey } from './utils/helper.js';
+import { JSONValueMap } from './utils/helper.js';
+import isPlainObject from 'lodash/isPlainObject';
 
 /**
  * @file 用于在移动端或不同语言环境下使用不同配置
@@ -15,41 +15,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 = findObjectsWithKey(schema, locale);
-        try {
-            for (var schemaNodes_1 = __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];
-            }
+    return JSONValueMap(schema, function (value) {
+        if (!isPlainObject(value)) {
+            return value;
         }
-        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; }
+        if (locale && value[locale]) {
+            var newValue = Object.assign({}, value, value[locale]);
+            delete newValue[locale];
+            return newValue;
         }
-    }
-    if (isMobile) {
-        var schemaNodes = findObjectsWithKey(schema, 'mobile');
-        try {
-            for (var schemaNodes_2 = __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'];
-            }
+        else if (isMobile && value.mobile) {
+            var newValue = Object.assign({}, value, value.mobile);
+            delete newValue.mobile;
+            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; }
-        }
-    }
+    }, true);
 };
 
 export { envOverwrite };

package/esm/factory.js

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

package/esm/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/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -24,7 +24,7 @@ export { DebugWrapper, JsonView, debug, disableDebug, enableDebug, traceProps, w
 export { calculatePosition, getContainer, getStyleNumber, ownerDocument, renderTextByKeyword } from './utils/dom.js';
 export { ServerError } from './utils/errors.js';
 export { escapeHtml } from './utils/escapeHtml.js';
-export { filterClassNameObject, getExprProperties } from './utils/filter-schema.js';
+export { filterClassNameObject, getExprProperties, hasExprPropertiesChanged } from './utils/filter-schema.js';
 import './utils/filter.js';
 export { formatDuration } from './utils/formatDuration.js';
 export { FormulaExec, formulaExec, isExpression, isNeedFormula, registerFormulaExec, replaceExpression } from './utils/formula.js';
@@ -112,6 +112,7 @@ export { AsyncEvaluator, Evaluator, evaluate, evaluateForAsync, extendsFilters,
 export { default as LazyComponent } from './components/LazyComponent.js';
 export { default as Overlay } from './components/Overlay.js';
 export { default as PopOver } from './components/PopOver.js';
+export { default as ErrorBoundary } from './components/ErrorBoundary.js';
 export { FormRenderer } from './renderers/Form.js';
 export { RENDERER_TRANSMISSION_OMIT_PROPS } from './SchemaRenderer.js';
 export { default as CustomStyle } from './components/CustomStyle.js';
@@ -140,7 +141,7 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = 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 = {}; }
@@ -199,7 +200,7 @@ function AMISRenderer(_a) {
         props.mobileUI = env.isMobile();
     }
     // 根据环境覆盖 schema，这个要在最前面做，不然就无法覆盖 validations
-    envOverwrite(schema, locale);
+    schema = envOverwrite(schema, locale);
     schema = replaceText(schema, options.replaceText, env.replaceTextIgnoreKeys);
     return (React.createElement(EnvContext.Provider, { value: env },
         React.createElement(ScopedRootRenderer, __assign({}, props, { schema: schema, pathPrefix: pathPrefix, rootStore: store, env: env, theme: theme, locale: locale, translate: translate }))));

package/esm/locale.js

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

package/esm/polyfills.js

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

package/esm/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;