amis-core 3.0.0 → 3.1.0

package/esm/index.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v3.0.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
-import { __assign } from 'tslib';
+import { __assign, __rest } from 'tslib';
 import { stores, defaultOptions } from './factory.js';
 export { Renderer, addSchemaFilter, clearStoresCache, extendDefaultEnv, filterSchema, getRendererByName, getRenderers, registerRenderer, resolveRenderer, unRegisterRenderer, updateEnv } from './factory.js';
 import './renderers/builtin.js';
@@ -17,7 +17,7 @@ export { columnsSplit } from './utils/columnsSplit.js';
 export { dataMapping, resolveMapping, resolveMappingObject } from './utils/dataMapping.js';
 export { DataSchema } from './utils/DataSchema.js';
 export { DataScope } from './utils/DataScope.js';
-export { filterDate, parseDuration, relativeValueRe } from './utils/date.js';
+export { filterDate, normalizeDate, parseDuration, relativeValueRe } from './utils/date.js';
 import { enableDebug } from './utils/debug.js';
 export { DebugWrapper, debug, enableDebug, warning } from './utils/debug.js';
 export { calculatePosition, getContainer, getStyleNumber, ownerDocument, renderTextByKeyword } from './utils/dom.js';
@@ -43,7 +43,7 @@ export { keyToPath } from './utils/keyToPath.js';
 export { makeSorter } from './utils/makeSorter.js';
 export { normalizeLink } from './utils/normalizeLink.js';
 export { normalizeOptions } from './utils/normalizeOptions.js';
-export { cloneObject, createObject, deleteVariable, extendObject, isObject, pickValues, setVariable } from './utils/object.js';
+export { cloneObject, createObject, createObjectFromChain, deleteVariable, extendObject, extractObjectChain, isObject, pickValues, setVariable } from './utils/object.js';
 export { offset } from './utils/offset.js';
 export { offsetParent } from './utils/offsetParent.js';
 export { matchOptionValue, optionValueCompare } from './utils/optionValueCompare.js';
@@ -61,7 +61,7 @@ export { scrollPosition } from './utils/scrollPosition.js';
 export { SimpleMap } from './utils/SimpleMap.js';
 export { string2regExp } from './utils/string2regExp.js';
 export { buildStyle } from './utils/style.js';
-export { asyncTokenize, tokenize } from './utils/tokenize.js';
+export { tokenize } from './utils/tokenize.js';
 export { register } from './utils/tpl-builtin.js';
 export { asyncFilter, evalExpression, evalExpressionWithConditionBuilder, evalJS, filter, registerTplEnginer, setCustomEvalExpression, setCustomEvalJs } from './utils/tpl.js';
 export { uncontrollable } from './utils/uncontrollable.js';
@@ -76,7 +76,7 @@ export { RegisterStore, RendererStore } from './store/index.js';
 import { getEnv } from 'mobx-state-tree';
 import { getDefaultLocale, makeTranslator } from './locale.js';
 export { extendLocale, getDefaultLocale, localeable, makeTranslator, register as registerLocale, removeLocaleData, setDefaultLocale } from './locale.js';
-export { HocScoped as Scoped, ScopedContext } from './Scoped.js';
+export { HocScoped as Scoped, ScopedContext, filterTarget } from './Scoped.js';
 import { getClassPrefix, getTheme } from './theme.js';
 export { classnames, getClassPrefix, getTheme, makeClassnames, setDefaultTheme, theme, themeable } from './theme.js';
 import './actions/LoopAction.js';
@@ -110,6 +110,8 @@ export { default as Overlay } from './components/Overlay.js';
 export { default as PopOver } from './components/PopOver.js';
 export { FormRenderer } from './renderers/Form.js';
 export { RENDERER_TRANSMISSION_OMIT_PROPS } from './SchemaRenderer.js';
+export { default as CustomStyle } from './components/CustomStyle.js';
+export { StatusScoped } from './StatusScoped.js';
 export { stripNumber } from './utils/stripNumber.js';
 export { iRendererStore } from './store/iRenderer.js';
 export { ServiceStore } from './store/service.js';
@@ -134,35 +136,52 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = 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.createElement(AMISRenderer, __assign({}, props, { schema: schema, pathPrefix: pathPrefix, options: options })));
+}
+function AMISRenderer(_a) {
+    var schema = _a.schema, options = _a.options, pathPrefix = _a.pathPrefix, props = __rest(_a, ["schema", "options", "pathPrefix"]);
     var locale = props.locale || getDefaultLocale();
     // 兼容 locale 的不同写法
-    locale = locale.replace('_', '-');
-    locale = locale === 'en' ? 'en-US' : locale;
-    locale = locale === 'zh' ? 'zh-CN' : locale;
-    locale = locale === 'cn' ? 'zh-CN' : locale;
-    var translate = props.translate || makeTranslator(locale);
-    var store = stores[options.session || 'global'];
-    // 根据环境覆盖 schema，这个要在最前面做，不然就无法覆盖 validations
-    envOverwrite(schema, locale);
-    if (!store) {
-        options = __assign(__assign(__assign({}, defaultOptions), options), { fetcher: options.fetcher
-                ? wrapFetcher(options.fetcher, options.tracker)
-                : defaultOptions.fetcher, confirm: promisify(options.confirm || defaultOptions.confirm || window.confirm), locale: locale, translate: translate });
-        if (options.enableAMISDebug) {
-            // 因为里面还有 render
-            setTimeout(function () {
-                enableDebug();
-            }, 10);
+    locale =
+        locale === 'en'
+            ? 'en-US'
+            : locale === 'zh' || locale === 'cn'
+                ? 'zh-CN'
+                : locale.replace('_', '-');
+    var translate = React.useCallback(function () {
+        var fn = props.translate || makeTranslator(locale);
+        return fn.apply(null, arguments);
+    }, [locale, props.translate]);
+    var store = React.useMemo(function () {
+        var store = stores[options.session || 'global'];
+        if (!store) {
+            options = __assign(__assign(__assign({}, defaultOptions), options), { fetcher: options.fetcher
+                    ? wrapFetcher(options.fetcher, options.tracker)
+                    : defaultOptions.fetcher, confirm: promisify(options.confirm || defaultOptions.confirm || window.confirm), locale: locale, translate: translate });
+            if (options.enableAMISDebug) {
+                // 因为里面还有 render
+                setTimeout(function () {
+                    enableDebug();
+                }, 10);
+            }
+            store = RendererStore.create({}, options);
+            stores[options.session || 'global'] = store;
         }
-        store = RendererStore.create({}, options);
-        stores[options.session || 'global'] = store;
-    }
-    window.amisStore = store; // 为了方便 debug.
+        else {
+            // 更新 env
+            var env_1 = getEnv(store);
+            Object.assign(env_1, __assign(__assign({}, options), { fetcher: options.fetcher
+                    ? wrapFetcher(options.fetcher, options.tracker)
+                    : env_1.fetcher, confirm: options.confirm ? promisify(options.confirm) : env_1.confirm, locale: locale, translate: translate }));
+        }
+        window.amisStore = store; // 为了方便 debug.
+        return store;
+    }, Object.keys(options).concat(Object.values(options)).concat(locale));
     var env = getEnv(store);
     var theme = props.theme || options.theme || 'cxd';
     if (theme === 'default') {
@@ -177,6 +196,8 @@ function render(schema, props, options, pathPrefix) {
     if (options.useMobileUI !== false) {
         props.useMobileUI = true;
     }
+    // 根据环境覆盖 schema，这个要在最前面做，不然就无法覆盖 validations
+    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.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/esm/locale.js

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

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