amis-core 2.9.0 → 3.1.0

package/lib/factory.d.ts

@@ -4,7 +4,8 @@ import { fetcherResult, SchemaNode, Schema, PlainObject } from './types';
 import { ThemeProps } from './theme';
 import { LocaleProps } from './locale';
 import type { RendererEnv } from './env';
-import { OnEventProps } from './utils/renderer-event';
+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;
@@ -35,6 +36,7 @@ export interface RendererProps extends ThemeProps, LocaleProps, OnEventProps {
     style?: {
         [propName: string]: any;
     };
+    onBroadcast?: (type: string, rawEvent: RendererEvent<any>, ctx: any) => any;
     [propName: string]: any;
 }
 export type RendererComponent = React.ComponentType<RendererProps> & {
@@ -71,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 v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -147,11 +147,11 @@ var defaultOptions = {
         }
     },
     isCancel: function () {
-        console.error('Please implement isCancel. see https://baidu.gitee.io/amis/docs/start/getting-started#%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97');
+        console.error('Please implement isCancel. see https://aisuda.bce.baidu.com/amis/zh-CN/start/getting-started#%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97');
         return false;
     },
     updateLocation: function () {
-        console.error('Please implement updateLocation. see https://baidu.gitee.io/amis/docs/start/getting-started#%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97');
+        console.error('Please implement updateLocation. see https://aisuda.bce.baidu.com/amis/zh-CN/start/getting-started#%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97');
     },
     jumpTo: function (to, action) {
         if (to === 'goBack') {

package/lib/index.d.ts

@@ -14,10 +14,11 @@ export * from './types';
 export * from './store';
 import * as utils from './utils/helper';
 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 type { IScopedContext } 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';
 declare const classPrefix: string | undefined;
@@ -37,7 +38,13 @@ import LazyComponent from './components/LazyComponent';
 import Overlay from './components/Overlay';
 import PopOver from './components/PopOver';
 import { FormRenderer } from './renderers/Form';
-import type { FormHorizontal } from './renderers/Form';
+import type { FormHorizontal, FormSchemaBase } from './renderers/Form';
+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 };
+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 v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -101,6 +101,9 @@ var LazyComponent = require('./components/LazyComponent.js');
 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');
@@ -129,35 +132,52 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
  */
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '2.9.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') {
@@ -172,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 }))));
@@ -217,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;
@@ -227,6 +250,7 @@ exports.calculatePosition = dom.calculatePosition;
 exports.getContainer = dom.getContainer;
 exports.getStyleNumber = dom.getStyleNumber;
 exports.ownerDocument = dom.ownerDocument;
+exports.renderTextByKeyword = dom.renderTextByKeyword;
 exports.ServerError = errors.ServerError;
 exports.escapeHtml = escapeHtml.escapeHtml;
 exports.getExprProperties = filterSchema.getExprProperties;
@@ -259,6 +283,7 @@ exports.filterTree = helper.filterTree;
 exports.findIndex = helper.findIndex;
 exports.findObjectsWithKey = helper.findObjectsWithKey;
 exports.findTree = helper.findTree;
+exports.findTreeAll = helper.findTreeAll;
 exports.findTreeIndex = helper.findTreeIndex;
 exports.flattenTree = helper.flattenTree;
 exports.flattenTreeWithLeafNodes = helper.flattenTreeWithLeafNodes;
@@ -293,6 +318,7 @@ exports.isUnfolded = helper.isUnfolded;
 exports.isVisible = helper.isVisible;
 exports.lcFirst = helper.lcFirst;
 exports.loadScript = helper.loadScript;
+exports.loadStyle = helper.loadStyle;
 exports.makeColumnClassBuild = helper.makeColumnClassBuild;
 exports.makeHorizontalDeeper = helper.makeHorizontalDeeper;
 exports.mapObject = helper.mapObject;
@@ -334,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;
@@ -356,6 +384,7 @@ exports.resizeSensor = resizeSensor.resizeSensor;
 exports.resolveVariable = resolveVariable.resolveVariable;
 exports.resolveVariableAndFilter = resolveVariableAndFilter.resolveVariableAndFilter;
 exports.resolveVariableAndFilterForAsync = resolveVariableAndFilterForAsync.resolveVariableAndFilterForAsync;
+exports.setFormulaEvalErrorHandler = resolveVariableAndFilterForAsync.setFormulaEvalErrorHandler;
 exports.RootClose = RootClose.RootClose;
 exports.scrollPosition = scrollPosition.scrollPosition;
 exports.SimpleMap = SimpleMap.SimpleMap;
@@ -363,6 +392,7 @@ exports.string2regExp = string2regExp.string2regExp;
 exports.buildStyle = style.buildStyle;
 exports.tokenize = tokenize.tokenize;
 exports.register = tplBuiltin.register;
+exports.asyncFilter = tpl.asyncFilter;
 exports.evalExpression = tpl.evalExpression;
 exports.evalExpressionWithConditionBuilder = tpl.evalExpressionWithConditionBuilder;
 exports.evalJS = tpl.evalJS;
@@ -382,12 +412,16 @@ exports.decodeEntity = decodeEntity.decodeEntity;
 exports.addStyle = styleHelper.addStyle;
 exports.findOrCreactStyle = styleHelper.findOrCreactStyle;
 exports.formatStyle = styleHelper.formatStyle;
+exports.getValueByPath = styleHelper.getValueByPath;
+exports.inheritValueMap = styleHelper.inheritValueMap;
 exports.insertCustomStyle = styleHelper.insertCustomStyle;
 exports.insertStyle = styleHelper.insertStyle;
+exports.styleMap = styleHelper.valueMap;
 exports.valueMap = styleHelper.valueMap;
 exports.getConditionComputers = resolveCondition.getConditionComputers;
 exports.registerConditionComputer = resolveCondition.registerConditionComputer;
 exports.resolveCondition = resolveCondition.resolveCondition;
+exports.setConditionComputeErrorHandler = resolveCondition.setConditionComputeErrorHandler;
 exports.animation = Animation["default"];
 exports.RegisterStore = index.RegisterStore;
 exports.RendererStore = index.RendererStore;
@@ -400,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;
@@ -471,6 +506,9 @@ exports.LazyComponent = LazyComponent["default"];
 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 v2.9.0
+ * amis-core v3.1.0
  * 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

@@ -120,7 +120,7 @@ export interface FormSchemaBase {
     /**
      * Form 用来保存数据的 api。
      *
-     * 详情：https://baidu.gitee.io/amis/docs/components/form/index#%E8%A1%A8%E5%8D%95%E6%8F%90%E4%BA%A4
+     * 详情：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/index#%E8%A1%A8%E5%8D%95%E6%8F%90%E4%BA%A4
      */
     api?: string | BaseApiObject;
     /**
@@ -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 {