amis-core 3.0.0 → 3.1.0

package/lib/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.0.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -23,12 +23,13 @@ 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;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var component, dataMergeMode, visibility, usability, beforeSetData, path, res;
+            var key, component, dataMergeMode, visibility, usability, beforeSetData, path, res;
             return tslib.__generator(this, function (_p) {
                 switch (_p.label) {
                     case 0:
-                        component = action.componentId && renderer.props.$schema.id !== action.componentId
-                            ? (_a = event.context.scoped) === null || _a === void 0 ? void 0 : _a.getComponentById(action.componentId)
+                        key = action.componentId || action.componentName;
+                        component = key && renderer.props.$schema[action.componentId ? 'id' : 'name'] !== key
+                            ? (_a = event.context.scoped) === null || _a === void 0 ? void 0 : _a[action.componentId ? 'getComponentById' : 'getComponentByName'](key)
                             : renderer;
                         dataMergeMode = action.dataMergeMode || 'merge';
                         // 显隐&状态控制
@@ -36,16 +37,16 @@ var CmptAction = /** @class */ (function () {
                             visibility = action.actionType === 'visibility'
                                 ? (_b = action.args) === null || _b === void 0 ? void 0 : _b.value
                                 : action.actionType === 'show';
-                            return [2 /*return*/, renderer.props.topStore.setVisible(action.componentId, visibility)];
+                            return [2 /*return*/, renderer.props.statusStore.setVisible(key, visibility)];
                         }
                         else if (['static', 'nonstatic'].includes(action.actionType)) {
-                            return [2 /*return*/, renderer.props.topStore.setStatic(action.componentId, action.actionType === 'static')];
+                            return [2 /*return*/, renderer.props.statusStore.setStatic(key, action.actionType === 'static')];
                         }
                         else if (['enabled', 'disabled', 'usability'].includes(action.actionType)) {
                             usability = action.actionType === 'usability'
                                 ? !((_c = action.args) === null || _c === void 0 ? void 0 : _c.value)
                                 : action.actionType === 'disabled';
-                            return [2 /*return*/, renderer.props.topStore.setDisable(action.componentId, usability)];
+                            return [2 /*return*/, renderer.props.statusStore.setDisable(key, usability)];
                         }
                         if (!(action.actionType === 'setValue')) return [3 /*break*/, 3];
                         beforeSetData = (_e = (_d = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _d === void 0 ? void 0 : _d.env) === null || _e === void 0 ? void 0 : _e.beforeSetData;

package/lib/actions/ContinueAction.js

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

package/lib/actions/CopyAction.js

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

package/lib/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.0.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -8,7 +8,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-require('../utils/api.js');
+var api = require('../utils/api.js');
 require('../utils/ColorScale.js');
 require('react');
 require('lodash/chunk');
@@ -21,7 +21,7 @@ require('../utils/debug.js');
 require('react-dom');
 require('../utils/errors.js');
 require('../utils/tpl.js');
-var helper = require('../utils/helper.js');
+require('../utils/helper.js');
 require('classnames');
 require('../utils/filter.js');
 require('lodash/isObject');
@@ -62,7 +62,7 @@ var CustomAction = /** @class */ (function () {
                     case 0:
                         scriptFunc = (_b = (_a = action.args) === null || _a === void 0 ? void 0 : _a.script) !== null && _b !== void 0 ? _b : action.script;
                         if (typeof scriptFunc === 'string') {
-                            scriptFunc = helper.promisify(new Function('context', 'doAction', 'event', scriptFunc));
+                            scriptFunc = api.str2AsyncFunction(scriptFunc, 'context', 'doAction', 'event');
                         }
                         return [4 /*yield*/, (scriptFunc === null || scriptFunc === void 0 ? void 0 : scriptFunc.call(null, renderer, function (action) { return Action.runActions(action, renderer, event); }, event, action))];
                     case 1:

package/lib/actions/DialogAction.d.ts

@@ -1,4 +1,4 @@
-import { SchemaNode } from '../types';
+import { Schema, SchemaNode } from '../types';
 import { RendererEvent } from '../utils/renderer-event';
 import { RendererAction, ListenerAction, ListenerContext } from './Action';
 export interface IAlertAction extends ListenerAction {
@@ -23,6 +23,20 @@ export interface IDialogAction extends ListenerAction {
     };
     dialog?: SchemaNode;
 }
+export interface IConfirmDialogAction extends ListenerAction {
+    actionType: 'confirmDialog';
+    args: {
+        msg: string;
+        title: string;
+        body?: Schema;
+        closeOnEsc?: boolean;
+        size?: '' | 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'full';
+        confirmText?: string;
+        cancelText?: string;
+        confirmBtnLevel?: string;
+        cancelBtnLevel?: string;
+    };
+}
 /**
  * 打开弹窗动作
  *
@@ -56,5 +70,5 @@ export declare class AlertAction implements RendererAction {
  * confirm确认提示动作
  */
 export declare class ConfirmAction implements RendererAction {
-    run(action: IConfirmAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<any>;
+    run(action: IConfirmDialogAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<any>;
 }

package/lib/actions/DialogAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.0.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -9,6 +9,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var Action = require('./Action.js');
+var index = require('../index.js');
 
 /**
  * 打开弹窗动作
@@ -91,14 +92,25 @@ var ConfirmAction = /** @class */ (function () {
     function ConfirmAction() {
     }
     ConfirmAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var confirmed;
-            return tslib.__generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0: return [4 /*yield*/, ((_b = (_a = event.context.env).confirm) === null || _b === void 0 ? void 0 : _b.call(_a, (_c = action.args) === null || _c === void 0 ? void 0 : _c.msg, (_d = action.args) === null || _d === void 0 ? void 0 : _d.title))];
+            var content, confirmed;
+            return tslib.__generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        content = ((_a = action.args) === null || _a === void 0 ? void 0 : _a.body)
+                            ? index.render(action.args.body)
+                            : action.args.msg;
+                        return [4 /*yield*/, ((_c = (_b = event.context.env).confirm) === null || _c === void 0 ? void 0 : _c.call(_b, content, action.args.title, {
+                                closeOnEsc: action.args.closeOnEsc,
+                                size: action.args.size,
+                                confirmText: action.args.confirmText,
+                                cancelText: action.args.cancelText,
+                                confirmBtnLevel: action.args.confirmBtnLevel,
+                                cancelBtnLevel: action.args.cancelBtnLevel
+                            }))];
                     case 1:
-                        confirmed = _e.sent();
+                        confirmed = _d.sent();
                         return [2 /*return*/, confirmed];
                 }
             });

package/lib/actions/DrawerAction.js

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

package/lib/actions/EmailAction.js

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

package/lib/actions/LinkAction.js

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

package/lib/actions/LoopAction.js

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

package/lib/actions/PageAction.js

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

package/lib/actions/ParallelAction.js

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

package/lib/actions/SwitchAction.js

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

package/lib/actions/ToastAction.js

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

package/lib/components/CustomStyle.d.ts

@@ -0,0 +1,13 @@
+import type { RendererEnv } from '../env';
+import type { CustomStyleClassName } from '../utils/style-helper';
+interface CustomStyleProps {
+    config: {
+        themeCss: any;
+        classNames: CustomStyleClassName[];
+        id?: string;
+        defaultData?: any;
+    };
+    env: RendererEnv;
+}
+export default function (props: CustomStyleProps): null;
+export {};

package/lib/components/CustomStyle.js

@@ -0,0 +1,22 @@
+/**
+ * amis-core v3.1.0
+ * Copyright 2018-2023 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var styleHelper = require('../utils/style-helper.js');
+
+function CustomStyle (props) {
+    var _a = props.config, themeCss = _a.themeCss, classNames = _a.classNames, id = _a.id, defaultData = _a.defaultData;
+    React.useEffect(function () {
+        var _a;
+        styleHelper.insertCustomStyle(themeCss, classNames, id, defaultData, (_a = props.env) === null || _a === void 0 ? void 0 : _a.customStyleClassPrefix);
+    }, [props.config.themeCss]);
+    return null;
+}
+
+exports["default"] = CustomStyle;

package/lib/components/LazyComponent.d.ts

@@ -19,7 +19,7 @@ export interface LazyComponentState {
 }
 export default class LazyComponent extends React.Component<LazyComponentProps, LazyComponentState> {
     static defaultProps: {
-        placeholder: JSX.Element;
+        placeholder: React.JSX.Element;
         unMountOnHidden: boolean;
         partialVisibility: boolean;
     };

package/lib/components/LazyComponent.js

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

package/lib/components/Overlay.d.ts

@@ -39,6 +39,6 @@ export default class Overlay extends React.Component<OverlayProps, OverlayState>
     componentDidUpdate(prevProps: OverlayProps): void;
     onHiddenListener(node: HTMLElement): void;
     getContainerSelector(): Element | null;
-    render(): JSX.Element | null;
+    render(): React.JSX.Element | null;
 }
 export {};

package/lib/components/Overlay.js

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

package/lib/components/PopOver.d.ts

@@ -50,14 +50,14 @@ export declare class PopOver extends React.PureComponent<PopOverPorps, PopOverSt
     componentDidUpdate(): void;
     componentWillUnmount(): void;
     mayUpdateOffset(): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 declare const _default: {
     new (props: Omit<PopOverPorps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<PopOverPorps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;

package/lib/components/PopOver.js

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

package/lib/env.d.ts

@@ -40,6 +40,14 @@ export interface RendererEnv {
      */
     watchRouteChange?: (fn: () => void) => () => void;
     tracker: (eventTrack: EventTrack, props?: PlainObject) => void;
+    /**
+     * 捕获amis执行中的错误信息
+     */
+    errorCatcher?: (error: any, errorInfo: any) => void;
+    /**
+     * 自定义样式前缀
+     */
+    customStyleClassPrefix?: string;
     rendererResolver?: (path: string, schema: Schema, props: any) => null | RendererConfig;
     copy?: (contents: string, format?: any) => void;
     getModalContainer?: () => HTMLElement;
@@ -86,7 +94,7 @@ export declare function withRendererEnv<T extends React.ComponentType<React.Comp
     }) | Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {
         env?: RendererEnv | undefined;
     }>): {
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {
             env?: RendererEnv | undefined;
@@ -129,7 +137,7 @@ export declare function withRendererEnv<T extends React.ComponentType<React.Comp
     new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {
         env?: RendererEnv | undefined;
     }, context: any): {
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {
             env?: RendererEnv | undefined;

package/lib/env.js

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

package/lib/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.0.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -20,10 +20,6 @@ var isMobile = ((_b = (_a = window).matchMedia) === null || _b === void 0 ? void
 // 这里不能用 addSchemaFilter 是因为还需要更深层的替换，比如 select 里的 options
 var envOverwrite = function (schema, locale) {
     var e_1, _a, e_2, _b;
-    if (schema.mobile && isMobile) {
-        Object.assign(schema, schema.mobile);
-        delete schema.mobile;
-    }
     if (locale) {
         var schemaNodes = helper.findObjectsWithKey(schema, locale);
         try {

package/lib/factory.d.ts

@@ -5,6 +5,7 @@ import { ThemeProps } from './theme';
 import { LocaleProps } from './locale';
 import type { RendererEnv } from './env';
 import { OnEventProps, RendererEvent } from './utils/renderer-event';
+import { StatusScopedProps } from './StatusScoped';
 export interface TestFunc {
     (path: string, schema?: Schema, resolveRenderer?: (path: string, schema?: Schema, props?: any) => null | RendererConfig): boolean;
 }
@@ -20,7 +21,7 @@ export interface RendererBasicConfig {
     isFormItem?: boolean;
     autoVar?: boolean;
 }
-export interface RendererProps extends ThemeProps, LocaleProps, OnEventProps {
+export interface RendererProps extends ThemeProps, LocaleProps, OnEventProps, StatusScopedProps {
     render: (region: string, node: SchemaNode, props?: PlainObject) => JSX.Element;
     env: RendererEnv;
     $path: string;
@@ -72,7 +73,7 @@ export declare function filterSchema(schema: Schema, render: RendererConfig, pro
 export declare function Renderer(config: RendererBasicConfig): <T extends RendererComponent>(component: T) => T;
 export declare function registerRenderer(config: RendererConfig): RendererConfig;
 export declare function unRegisterRenderer(config: RendererConfig | string): void;
-export declare function loadRenderer(schema: Schema, path: string): JSX.Element;
+export declare function loadRenderer(schema: Schema, path: string): React.JSX.Element;
 export declare const defaultOptions: RenderOptions;
 export declare const stores: {
     [propName: string]: IRendererStore;

package/lib/factory.js

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

package/lib/index.d.ts

@@ -17,7 +17,7 @@ import { RegisterStore } from './store';
 import type { IColumn, IColumn2, IRow, IRow2 } from './store';
 import { setDefaultLocale, getDefaultLocale, makeTranslator, register as registerLocale, extendLocale, removeLocaleData, localeable } from './locale';
 import type { LocaleProps, TranslateFn } from './locale';
-import Scoped, { ScopedContext } from './Scoped';
+import Scoped, { ScopedContext, filterTarget } from './Scoped';
 import type { ScopedComponentType, IScopedContext } from './Scoped';
 import { classnames, getClassPrefix, setDefaultTheme, theme, getTheme, themeable, makeClassnames } from './theme';
 import type { ClassNamesFn, ThemeProps } from './theme';
@@ -43,6 +43,8 @@ import type { OnEventProps } from './utils/index';
 import { valueMap as styleMap } from './utils/style-helper';
 import { RENDERER_TRANSMISSION_OMIT_PROPS } from './SchemaRenderer';
 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, 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 };
+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 };
 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.0.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -102,6 +102,8 @@ var Overlay = require('./components/Overlay.js');
 var PopOver = require('./components/PopOver.js');
 var Form = require('./renderers/Form.js');
 var SchemaRenderer = require('./SchemaRenderer.js');
+var CustomStyle = require('./components/CustomStyle.js');
+var StatusScoped = require('./StatusScoped.js');
 var stripNumber = require('./utils/stripNumber.js');
 var iRenderer = require('./store/iRenderer.js');
 var service = require('./store/service.js');
@@ -130,35 +132,52 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
  */
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '3.0.0';
+var version = '3.1.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
     if (pathPrefix === void 0) { pathPrefix = ''; }
+    return (React__default["default"].createElement(AMISRenderer, tslib.__assign({}, props, { schema: schema, pathPrefix: pathPrefix, options: options })));
+}
+function AMISRenderer(_a) {
+    var schema = _a.schema, options = _a.options, pathPrefix = _a.pathPrefix, props = tslib.__rest(_a, ["schema", "options", "pathPrefix"]);
     var locale$1 = props.locale || locale.getDefaultLocale();
     // 兼容 locale 的不同写法
-    locale$1 = locale$1.replace('_', '-');
-    locale$1 = locale$1 === 'en' ? 'en-US' : locale$1;
-    locale$1 = locale$1 === 'zh' ? 'zh-CN' : locale$1;
-    locale$1 = locale$1 === 'cn' ? 'zh-CN' : locale$1;
-    var translate = props.translate || locale.makeTranslator(locale$1);
-    var store = factory.stores[options.session || 'global'];
-    // 根据环境覆盖 schema，这个要在最前面做，不然就无法覆盖 validations
-    envOverwrite.envOverwrite(schema, locale$1);
-    if (!store) {
-        options = tslib.__assign(tslib.__assign(tslib.__assign({}, factory.defaultOptions), options), { fetcher: options.fetcher
-                ? api.wrapFetcher(options.fetcher, options.tracker)
-                : factory.defaultOptions.fetcher, confirm: helper.promisify(options.confirm || factory.defaultOptions.confirm || window.confirm), locale: locale$1, translate: translate });
-        if (options.enableAMISDebug) {
-            // 因为里面还有 render
-            setTimeout(function () {
-                debug.enableDebug();
-            }, 10);
+    locale$1 =
+        locale$1 === 'en'
+            ? 'en-US'
+            : locale$1 === 'zh' || locale$1 === 'cn'
+                ? 'zh-CN'
+                : locale$1.replace('_', '-');
+    var translate = React__default["default"].useCallback(function () {
+        var fn = props.translate || locale.makeTranslator(locale$1);
+        return fn.apply(null, arguments);
+    }, [locale$1, props.translate]);
+    var store = React__default["default"].useMemo(function () {
+        var store = factory.stores[options.session || 'global'];
+        if (!store) {
+            options = tslib.__assign(tslib.__assign(tslib.__assign({}, factory.defaultOptions), options), { fetcher: options.fetcher
+                    ? api.wrapFetcher(options.fetcher, options.tracker)
+                    : factory.defaultOptions.fetcher, confirm: helper.promisify(options.confirm || factory.defaultOptions.confirm || window.confirm), locale: locale$1, translate: translate });
+            if (options.enableAMISDebug) {
+                // 因为里面还有 render
+                setTimeout(function () {
+                    debug.enableDebug();
+                }, 10);
+            }
+            store = index.RendererStore.create({}, options);
+            factory.stores[options.session || 'global'] = store;
         }
-        store = index.RendererStore.create({}, options);
-        factory.stores[options.session || 'global'] = store;
-    }
-    window.amisStore = store; // 为了方便 debug.
+        else {
+            // 更新 env
+            var env_1 = mobxStateTree.getEnv(store);
+            Object.assign(env_1, tslib.__assign(tslib.__assign({}, options), { fetcher: options.fetcher
+                    ? api.wrapFetcher(options.fetcher, options.tracker)
+                    : env_1.fetcher, confirm: options.confirm ? helper.promisify(options.confirm) : env_1.confirm, locale: locale$1, translate: translate }));
+        }
+        window.amisStore = store; // 为了方便 debug.
+        return store;
+    }, Object.keys(options).concat(Object.values(options)).concat(locale$1));
     var env$1 = mobxStateTree.getEnv(store);
     var theme$1 = props.theme || options.theme || 'cxd';
     if (theme$1 === 'default') {
@@ -173,6 +192,8 @@ function render(schema, props, options, pathPrefix) {
     if (options.useMobileUI !== false) {
         props.useMobileUI = true;
     }
+    // 根据环境覆盖 schema，这个要在最前面做，不然就无法覆盖 validations
+    envOverwrite.envOverwrite(schema, locale$1);
     schema = replaceText.replaceText(schema, options.replaceText, env$1.replaceTextIgnoreKeys);
     return (React__default["default"].createElement(env.EnvContext.Provider, { value: env$1 },
         React__default["default"].createElement(Root["default"], tslib.__assign({}, props, { schema: schema, pathPrefix: pathPrefix, rootStore: store, env: env$1, theme: theme$1, locale: locale$1, translate: translate }))));
@@ -218,6 +239,7 @@ exports.resolveMappingObject = dataMapping.resolveMappingObject;
 exports.DataSchema = DataSchema.DataSchema;
 exports.DataScope = DataScope.DataScope;
 exports.filterDate = date.filterDate;
+exports.normalizeDate = date.normalizeDate;
 exports.parseDuration = date.parseDuration;
 exports.relativeValueRe = date.relativeValueRe;
 exports.DebugWrapper = debug.DebugWrapper;
@@ -338,8 +360,10 @@ exports.normalizeLink = normalizeLink.normalizeLink;
 exports.normalizeOptions = normalizeOptions.normalizeOptions;
 exports.cloneObject = object.cloneObject;
 exports.createObject = object.createObject;
+exports.createObjectFromChain = object.createObjectFromChain;
 exports.deleteVariable = object.deleteVariable;
 exports.extendObject = object.extendObject;
+exports.extractObjectChain = object.extractObjectChain;
 exports.isObject = object.isObject;
 exports.pickValues = object.pickValues;
 exports.setVariable = object.setVariable;
@@ -366,7 +390,6 @@ exports.scrollPosition = scrollPosition.scrollPosition;
 exports.SimpleMap = SimpleMap.SimpleMap;
 exports.string2regExp = string2regExp.string2regExp;
 exports.buildStyle = style.buildStyle;
-exports.asyncTokenize = tokenize.asyncTokenize;
 exports.tokenize = tokenize.tokenize;
 exports.register = tplBuiltin.register;
 exports.asyncFilter = tpl.asyncFilter;
@@ -411,6 +434,7 @@ exports.removeLocaleData = locale.removeLocaleData;
 exports.setDefaultLocale = locale.setDefaultLocale;
 exports.Scoped = Scoped.HocScoped;
 exports.ScopedContext = Scoped.ScopedContext;
+exports.filterTarget = Scoped.filterTarget;
 exports.classnames = theme.classnames;
 exports.getClassPrefix = theme.getClassPrefix;
 exports.getTheme = theme.getTheme;
@@ -483,6 +507,8 @@ exports.Overlay = Overlay["default"];
 exports.PopOver = PopOver["default"];
 exports.FormRenderer = Form.FormRenderer;
 exports.RENDERER_TRANSMISSION_OMIT_PROPS = SchemaRenderer.RENDERER_TRANSMISSION_OMIT_PROPS;
+exports.CustomStyle = CustomStyle["default"];
+exports.StatusScoped = StatusScoped.StatusScoped;
 exports.stripNumber = stripNumber.stripNumber;
 exports.iRendererStore = iRenderer.iRendererStore;
 exports.ServiceStore = service.ServiceStore;

package/lib/locale.d.ts

@@ -5,7 +5,7 @@ interface LocaleConfig {
     [propsName: string]: string;
 }
 export declare function register(name: string, config: LocaleConfig): void;
-export declare function extendLocale(name: string, config: LocaleConfig): void;
+export declare function extendLocale(name: string, config: LocaleConfig, cover?: boolean): void;
 /** 删除语料数据 */
 export declare function removeLocaleData(name: string, key: Array<string> | string): void;
 export declare function makeTranslator(locale?: string): TranslateFn;
@@ -24,7 +24,7 @@ export declare function localeable<T extends React.ComponentType<React.Component
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof LocaleProps>> & {
             locale?: string | undefined;