amis-core 2.9.0 → 3.0.0

package/esm/utils/tpl-builtin.js

@@ -1,13 +1,13 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
+import { __awaiter, __generator } from 'tslib';
 export { getFilters, registerFilter, registerFunction } from 'amis-formula';
 import 'moment';
-import 'tslib';
 import 'lodash/isPlainObject';
-import { tokenize } from './tokenize.js';
+import { tokenize, asyncTokenize } from './tokenize.js';
 export { tokenize } from './tokenize.js';
 import './filter.js';
 
@@ -38,6 +38,7 @@ function matchSynatax(str) {
     return false;
 }
 function register() {
+    var _this = this;
     return {
         name: 'builtin',
         test: function (str) { return typeof str === 'string' && matchSynatax(str); },
@@ -52,6 +53,20 @@ function register() {
             catch (e) {
                 return "error: ".concat(e.message);
             }
+        },
+        asyncCompile: function (str, data, defaultFilter) {
+            if (defaultFilter === void 0) { defaultFilter = '| html'; }
+            return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    try {
+                        return [2 /*return*/, asyncTokenize(str, data, defaultFilter)];
+                    }
+                    catch (e) {
+                        return [2 /*return*/, "error: ".concat(e.message)];
+                    }
+                    return [2 /*return*/];
+                });
+            });
         }
     };
 }

package/esm/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -55,7 +55,8 @@ function register() {
     return {
         name: 'lodash',
         test: function (str) { return !!~str.indexOf('<%'); },
-        compile: function (str, data) { return lodashCompile(str, data); }
+        compile: function (str, data) { return lodashCompile(str, data); },
+        asyncCompile: function (str, data) { return lodashCompile(str, data); }
     };
 }
 

package/esm/utils/tpl.d.ts

@@ -2,9 +2,11 @@ export interface Enginer {
     test: (tpl: string) => boolean;
     removeEscapeToken?: (tpl: string) => string;
     compile: (tpl: string, data: object, ...rest: Array<any>) => string;
+    asyncCompile: (tpl: string, data: object, ...rest: Array<any>) => Promise<string>;
 }
 export declare function registerTplEnginer(name: string, enginer: Enginer): void;
 export declare function filter(tpl?: any, data?: object, ...rest: Array<any>): string;
+export declare function asyncFilter(tpl?: any, data?: object, ...rest: Array<any>): Promise<string>;
 export declare function setCustomEvalExpression(fn: (expression: string, data?: any) => boolean): void;
 export declare function evalExpression(expression: string, data?: object): boolean;
 /**

package/esm/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -34,6 +34,27 @@ function filter(tpl, data) {
     }
     return tpl;
 }
+function asyncFilter(tpl, data) {
+    if (data === void 0) { data = {}; }
+    var rest = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+        rest[_i - 2] = arguments[_i];
+    }
+    if (!tpl || typeof tpl !== 'string') {
+        return Promise.resolve('');
+    }
+    var keys = Object.keys(enginers);
+    for (var i = 0, len = keys.length; i < len; i++) {
+        var enginer = enginers[keys[i]];
+        if (enginer.test(tpl)) {
+            return enginer.asyncCompile.apply(enginer, __spreadArray([tpl, data], __read(rest), false));
+        }
+        else if (enginer.removeEscapeToken) {
+            tpl = enginer.removeEscapeToken(tpl);
+        }
+    }
+    return tpl;
+}
 // 缓存一下提升性能
 var EVAL_CACHE = {};
 var customEvalExpressionFn;
@@ -144,8 +165,9 @@ function evalJS(js, data) {
     registerTplEnginer(info.name, {
         test: info.test,
         compile: info.compile,
+        asyncCompile: info.asyncCompile,
         removeEscapeToken: info.removeEscapeToken
     });
 });
 
-export { evalExpression, evalExpressionWithConditionBuilder, evalJS, filter, registerTplEnginer, setCustomEvalExpression, setCustomEvalJs };
+export { asyncFilter, evalExpression, evalExpressionWithConditionBuilder, evalJS, filter, registerTplEnginer, setCustomEvalExpression, setCustomEvalJs };

package/esm/utils/uncontrollable.js

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

package/esm/utils/validations.d.ts

@@ -1,7 +1,10 @@
 export interface ValidateFn {
     (values: {
         [propsName: string]: any;
-    }, value: any, arg1?: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any): boolean;
+    }, value: any, arg1?: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any): boolean | {
+        error: boolean;
+        msg?: string;
+    };
 }
 export declare const validations: {
     [propsName: string]: ValidateFn;

package/esm/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -348,12 +348,16 @@ var validateMessages = {
     isVariableName: 'validate.isVariableName'
 };
 function validate(value, values, rules, messages, __) {
+    var _a;
     if (__ === void 0) { __ = function (str) { return str; }; }
     var errors = [];
-    rules &&
-        Object.keys(rules).forEach(function (ruleName) {
+    if (rules) {
+        var ruleNames = Object.keys(rules);
+        var length_1 = ruleNames.length;
+        for (var index = 0; index < length_1; index++) {
+            var ruleName = ruleNames[index];
             if (!rules[ruleName] && rules[ruleName] !== 0) {
-                return;
+                continue;
             }
             else if (typeof validations[ruleName] !== 'function') {
                 throw new Error('Validation `' + ruleName + '` not exists!');
@@ -365,19 +369,30 @@ function validate(value, values, rules, messages, __) {
                 }
                 return item;
             });
-            if (!fn.apply(void 0, __spreadArray([values, value], __read(args), false))) {
+            var validateRes = fn.apply(void 0, __spreadArray([values, value], __read(args), false));
+            // addRule 允许返回
+            //   {error: true, msg: '错误提示'}
+            // 格式的信息来灵活展示错误
+            var fnResErrorMsg = '';
+            if (typeof validateRes === 'object' &&
+                validateRes.error === true) {
+                fnResErrorMsg = (_a = validateRes === null || validateRes === void 0 ? void 0 : validateRes.msg) !== null && _a !== void 0 ? _a : '';
+            }
+            if (!validateRes || fnResErrorMsg) {
                 var msgRuleName = ruleName;
                 if (Array.isArray(value)) {
                     msgRuleName = "".concat(ruleName, "Array");
                 }
-                errors.push({
-                    rule: ruleName,
-                    msg: filter(__((messages && messages[ruleName]) ||
-                        validateMessages[msgRuleName] ||
-                        validateMessages[ruleName]), __assign({}, [''].concat(args)))
-                });
+                return [{
+                        rule: ruleName,
+                        msg: filter(__((messages && messages[ruleName]) ||
+                            fnResErrorMsg ||
+                            validateMessages[msgRuleName] ||
+                            validateMessages[ruleName]), __assign({}, [''].concat(args)))
+                    }];
             }
-        });
+        }
+    }
     return errors;
 }
 function validateObject(values, rules, messages, __) {

package/lib/Root.js

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

package/lib/RootRenderer.js

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

package/lib/SchemaRenderer.d.ts

@@ -8,6 +8,7 @@ interface SchemaRendererProps extends Partial<RendererProps> {
     $path: string;
     env: RendererEnv;
 }
+export declare const RENDERER_TRANSMISSION_OMIT_PROPS: string[];
 export declare class SchemaRenderer extends React.Component<SchemaRendererProps, any> {
     static displayName: string;
     static contextType: React.Context<IScopedContext>;

package/lib/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -35,7 +35,7 @@ var difference__default = /*#__PURE__*/_interopDefaultLegacy(difference);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var defaultOmitList = [
+var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'type',
     'name',
     '$ref',
@@ -60,7 +60,9 @@ var defaultOmitList = [
     'mode',
     'body',
     'id',
-    'inputOnly'
+    'inputOnly',
+    'label',
+    'renderLabel'
 ];
 var componentCache = new SimpleMap.SimpleMap();
 var SchemaRenderer = /** @class */ (function (_super) {
@@ -178,7 +180,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         if (subProps === void 0) { subProps = {}; }
         var _a = this.props; _a.schema; _a.$path; var env = _a.env, render = _a.render, rest = tslib.__rest(_a, ["schema", "$path", "env", "render"]);
         var $path = this.resolveRenderer(this.props).path;
-        var omitList = defaultOmitList.concat();
+        var omitList = RENDERER_TRANSMISSION_OMIT_PROPS.concat();
         if (this.renderer) {
             var Component = this.renderer.component;
             Component.propsList &&
@@ -351,4 +353,5 @@ var PlaceholderComponent = /** @class */ (function (_super) {
     return PlaceholderComponent;
 }(React__default["default"].Component));
 
+exports.RENDERER_TRANSMISSION_OMIT_PROPS = RENDERER_TRANSMISSION_OMIT_PROPS;
 exports.SchemaRenderer = SchemaRenderer;

package/lib/Scoped.js

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

package/lib/WithRootStore.js

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

package/lib/WithStore.js

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

package/lib/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -206,7 +206,13 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 _d.label = 6;
             case 6:
                 args = dataMapping.dataMapping(actionConfig.args, mergeData, function (key) {
-                    return ['adaptor', 'responseAdaptor', 'requestAdaptor', 'responseData'].includes(key);
+                    return [
+                        'adaptor',
+                        'responseAdaptor',
+                        'requestAdaptor',
+                        'responseData',
+                        'condition'
+                    ].includes(key);
                 });
                 afterMappingData = dataMapping.dataMapping(actionConfig.data, mergeData);
                 actionData = args && Object.keys(args).length

package/lib/actions/AjaxAction.js

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

package/lib/actions/BreakAction.js

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

package/lib/actions/BroadcastAction.js

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

package/lib/actions/CmptAction.js

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

package/lib/actions/ContinueAction.js

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

package/lib/actions/CopyAction.js

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

package/lib/actions/CustomAction.js

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

package/lib/actions/DialogAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -24,6 +24,10 @@ var DialogAction = /** @class */ (function () {
         var _a, _b, _c;
         return tslib.__awaiter(this, void 0, void 0, function () {
             return tslib.__generator(this, function (_d) {
+                // 防止editor preview模式下执行
+                if (action.$$id !== undefined) {
+                    return [2 /*return*/];
+                }
                 (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
                     actionType: 'dialog',
                     dialog: ((_c = action.args) === null || _c === void 0 ? void 0 : _c.dialog) || action.dialog,

package/lib/actions/DrawerAction.js

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

package/lib/actions/EmailAction.js

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

package/lib/actions/LinkAction.js

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

package/lib/actions/LoopAction.js

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

package/lib/actions/PageAction.js

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

package/lib/actions/ParallelAction.js

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

package/lib/actions/SwitchAction.js

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

package/lib/actions/ToastAction.js

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

package/lib/components/LazyComponent.js

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

package/lib/components/Overlay.d.ts

@@ -13,9 +13,9 @@ interface OverlayProps {
     shouldUpdatePosition?: boolean;
     rootClose?: boolean;
     onHide?(props: any, ...args: any[]): any;
-    container?: HTMLElement | (() => HTMLElement | null | undefined);
+    container?: HTMLElement | React.ReactNode | (() => HTMLElement | React.ReactNode | null | undefined);
     containerSelector?: string;
-    target?: React.ReactNode | Function;
+    target?: React.ReactNode | HTMLElement | Function;
     watchTargetSizeChange?: boolean;
     offset?: [number, number];
     onEnter?(node: HTMLElement): any;

package/lib/components/Overlay.js

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

package/lib/components/PopOver.js

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

package/lib/env.js

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

package/lib/envOverwrite.js

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

package/lib/factory.d.ts

@@ -4,7 +4,7 @@ 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';
 export interface TestFunc {
     (path: string, schema?: Schema, resolveRenderer?: (path: string, schema?: Schema, props?: any) => null | RendererConfig): boolean;
 }
@@ -35,6 +35,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> & {

package/lib/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.0.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 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,11 @@ 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';
 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, 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 declare function render(schema: Schema, props?: RootRenderProps, options?: RenderOptions, pathPrefix?: string): JSX.Element;