amis-core 3.0.0 → 3.1.1

package/lib/index.js

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

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.0.0
+ * amis-core v3.1.1
  * Copyright 2018-2023 fex
  */
 
@@ -27,8 +27,15 @@ function register(name, config) {
     // 修改为扩展，防止已注册的语料被覆盖
     extendLocale(name, config);
 }
-function extendLocale(name, config) {
-    locales[name] = tslib.__assign(tslib.__assign({}, (locales[name] || {})), config);
+function extendLocale(name, config, cover) {
+    if (cover === void 0) { cover = true; }
+    if (cover) {
+        // 覆盖式扩展语料
+        locales[name] = tslib.__assign(tslib.__assign({}, (locales[name] || {})), config);
+    }
+    else {
+        locales[name] = tslib.__assign(tslib.__assign({}, config), (locales[name] || {}));
+    }
 }
 /** 删除语料数据 */
 function removeLocaleData(name, key) {

package/lib/renderers/Form.d.ts

@@ -326,6 +326,7 @@ export default class Form extends React.Component<FormProps, object> {
     componentDidMount(): void;
     componentDidUpdate(prevProps: FormProps): void;
     componentWillUnmount(): void;
+    dispatchInited(value: any): Promise<any>;
     blockRouting(): any;
     beforePageUnload(e: any): any;
     onInit(): Promise<void>;
@@ -368,7 +369,7 @@ export default class Form extends React.Component<FormProps, object> {
     }, region?: string, otherProps?: Partial<FormProps>): React.ReactNode;
     renderChildren(children: Array<any>, region: string, otherProps?: Partial<FormProps>): React.ReactNode;
     renderChild(control: SchemaNode, key?: any, otherProps?: Partial<FormProps>, region?: string): React.ReactNode;
-    renderBody(): JSX.Element;
+    renderBody(): React.JSX.Element;
     render(): JSX.Element;
 }
 export declare class FormRenderer extends Form {