amis-core 3.5.2 → 3.5.3

package/esm/Root.js

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

package/esm/RootRenderer.d.ts

@@ -30,5 +30,5 @@ export declare class RootRenderer extends React.Component<RootRendererProps> {
     renderError(): React.ReactNode;
     renderDialog(): React.ReactNode;
     renderDrawer(): React.ReactNode;
-    render(): React.JSX.Element;
+    render(): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
 }

package/esm/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.5.3
  * Copyright 2018-2023 fex
  */
 
@@ -318,7 +318,7 @@ var RootRenderer = /** @class */ (function (_super) {
         var _a = this.props, pathPrefix = _a.pathPrefix, schema = _a.schema, render = _a.render, rest = __rest(_a, ["pathPrefix", "schema", "render"]);
         var store = this.store;
         if (store.runtimeError) {
-            this.renderRuntimeError();
+            return this.renderRuntimeError();
         }
         return (React.createElement(React.Fragment, null,
             render(pathPrefix, schema, __assign(__assign({}, rest), { topStore: this.store, data: this.store.downStream, context: store.context, onAction: this.handleAction })),

package/esm/SchemaRenderer.js

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

package/esm/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.5.3
  * Copyright 2018-2023 fex
  */
 
@@ -236,7 +236,7 @@ function createScopedTools(path, parent, env, rendererType) {
                     }
                 }
                 else {
-                    var component = scoped.getComponentByName(name);
+                    var component = scoped.getComponentByName(name) || scoped.getComponentById(name);
                     component &&
                         component.reload &&
                         component.reload(subPath, query, ctx);

package/esm/StatusScoped.js

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

package/esm/WithRootStore.js

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

package/esm/WithStore.js

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

package/esm/actions/Action.js

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

package/esm/actions/AjaxAction.js

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

package/esm/actions/BreakAction.js

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

package/esm/actions/BroadcastAction.js

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

package/esm/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.5.3
  * Copyright 2018-2023 fex
  */
 
@@ -21,32 +21,17 @@ var CmptAction = /** @class */ (function () {
     CmptAction.prototype.run = function (action, renderer, event) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         return __awaiter(this, void 0, void 0, function () {
-            var key, dataMergeMode, component, msg, beforeSetData, path, res, result, e_1;
+            var key, dataMergeMode, path, beforeSetData, res, component, msg, result, e_1;
             var _t, _u;
             return __generator(this, function (_v) {
                 switch (_v.label) {
                     case 0:
                         key = action.componentId || action.componentName;
                         dataMergeMode = action.dataMergeMode || 'merge';
-                        component = key
-                            ? (_a = event.context.scoped) === null || _a === void 0 ? void 0 : _a[action.componentId ? 'getComponentById' : 'getComponentByName'](key)
-                            : null;
-                        if (key && !component) {
-                            msg = '尝试执行一个不存在的目标组件动作，请检查目标组件非隐藏状态，且正确指定了componentId或componentName';
-                            if (action.ignoreError === false) {
-                                throw Error(msg);
-                            }
-                            else {
-                                console.warn(msg);
-                            }
-                        }
-                        if (!(action.actionType === 'setValue')) return [3 /*break*/, 3];
+                        path = (_a = action.args) === null || _a === void 0 ? void 0 : _a.path;
+                        if (!(action.actionType === 'setValue' && path && typeof path === 'string')) return [3 /*break*/, 2];
                         beforeSetData = (_c = (_b = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _b === void 0 ? void 0 : _b.env) === null || _c === void 0 ? void 0 : _c.beforeSetData;
-                        path = (_d = action.args) === null || _d === void 0 ? void 0 : _d.path;
-                        if (!(path &&
-                            typeof path === 'string' &&
-                            beforeSetData &&
-                            typeof beforeSetData === 'function')) return [3 /*break*/, 2];
+                        if (!(beforeSetData && typeof beforeSetData === 'function')) return [3 /*break*/, 2];
                         return [4 /*yield*/, beforeSetData(renderer, action, event)];
                     case 1:
                         res = _v.sent();
@@ -55,22 +40,36 @@ var CmptAction = /** @class */ (function () {
                         }
                         _v.label = 2;
                     case 2:
-                        if (component === null || component === void 0 ? void 0 : component.setData) {
-                            return [2 /*return*/, component === null || component === void 0 ? void 0 : component.setData((_e = action.args) === null || _e === void 0 ? void 0 : _e.value, dataMergeMode === 'override', (_f = action.args) === null || _f === void 0 ? void 0 : _f.index, (_g = action.args) === null || _g === void 0 ? void 0 : _g.condition)];
+                        component = key
+                            ? (_d = event.context.scoped) === null || _d === void 0 ? void 0 : _d[action.componentId ? 'getComponentById' : 'getComponentByName'](key)
+                            : renderer;
+                        // 如果key指定来，但是没找到组件，则报错
+                        if (key && !component) {
+                            msg = '尝试执行一个不存在的目标组件动作，请检查目标组件非隐藏状态，且正确指定了componentId或componentName';
+                            if (action.ignoreError === false) {
+                                throw Error(msg);
+                            }
+                            else {
+                                console.warn(msg);
+                            }
                         }
-                        else {
-                            return [2 /*return*/, (_j = component === null || component === void 0 ? void 0 : (_h = component.props).onChange) === null || _j === void 0 ? void 0 : _j.call(_h, (_k = action.args) === null || _k === void 0 ? void 0 : _k.value)];
+                        if (action.actionType === 'setValue') {
+                            if (component === null || component === void 0 ? void 0 : component.setData) {
+                                return [2 /*return*/, component === null || component === void 0 ? void 0 : component.setData((_e = action.args) === null || _e === void 0 ? void 0 : _e.value, dataMergeMode === 'override', (_f = action.args) === null || _f === void 0 ? void 0 : _f.index, (_g = action.args) === null || _g === void 0 ? void 0 : _g.condition)];
+                            }
+                            else {
+                                return [2 /*return*/, (_j = component === null || component === void 0 ? void 0 : (_h = component.props).onChange) === null || _j === void 0 ? void 0 : _j.call(_h, (_k = action.args) === null || _k === void 0 ? void 0 : _k.value)];
+                            }
                         }
-                    case 3:
                         // 刷新
                         if (action.actionType === 'reload') {
                             return [2 /*return*/, (_l = component === null || component === void 0 ? void 0 : component.reload) === null || _l === void 0 ? void 0 : _l.call(component, undefined, action.data, undefined, undefined, dataMergeMode === 'override', action.args)];
                         }
-                        _v.label = 4;
-                    case 4:
-                        _v.trys.push([4, 6, , 7]);
+                        _v.label = 3;
+                    case 3:
+                        _v.trys.push([3, 5, , 6]);
                         return [4 /*yield*/, ((_m = component === null || component === void 0 ? void 0 : component.doAction) === null || _m === void 0 ? void 0 : _m.call(component, action, action.args, true))];
-                    case 5:
+                    case 4:
                         result = _v.sent();
                         if (['validate', 'submit'].includes(action.actionType)) {
                             event.setData(createObject(event.data, (_t = {},
@@ -82,7 +81,7 @@ var CmptAction = /** @class */ (function () {
                                 _t)));
                         }
                         return [2 /*return*/, result];
-                    case 6:
+                    case 5:
                         e_1 = _v.sent();
                         event.setData(createObject(event.data, (_u = {},
                             _u[action.outputVar || "".concat(action.actionType, "Result")] = {
@@ -91,8 +90,8 @@ var CmptAction = /** @class */ (function () {
                                 payload: (_s = (_r = component === null || component === void 0 ? void 0 : component.props) === null || _r === void 0 ? void 0 : _r.store) === null || _s === void 0 ? void 0 : _s.data
                             },
                             _u)));
-                        return [3 /*break*/, 7];
-                    case 7: return [2 /*return*/];
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
                 }
             });
         });

package/esm/actions/ContinueAction.js

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

package/esm/actions/CopyAction.js

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

package/esm/actions/CustomAction.js

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

package/esm/actions/DialogAction.js

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

package/esm/actions/DrawerAction.js

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

package/esm/actions/EmailAction.js

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

package/esm/actions/LinkAction.js

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

package/esm/actions/LoopAction.js

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

package/esm/actions/PageAction.js

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

package/esm/actions/ParallelAction.js

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

package/esm/actions/StatusAction.js

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

package/esm/actions/SwitchAction.js

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

package/esm/actions/ToastAction.js

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

package/esm/components/CustomStyle.js

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

package/esm/components/LazyComponent.js

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

package/esm/components/Overlay.js

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

package/esm/components/PopOver.js

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

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.5.3
  * 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.5.3
  * 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.5.3
  * Copyright 2018-2023 fex
  */
 

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.5.3
  * Copyright 2018-2023 fex
  */
 
@@ -140,7 +140,7 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = getClassPrefix();
 // @ts-ignore
-var version = '3.5.2';
+var version = '3.5.3';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -199,7 +199,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.5.3
  * Copyright 2018-2023 fex
  */
 

package/esm/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.5.3
  * 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;