amis-core 3.6.4 → 6.1.0

package/lib/components/CustomStyle.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -12,7 +12,7 @@ var styleHelper = require('../utils/style-helper.js');
 
 var styleIdCount = new Map();
 function CustomStyle (props) {
-    var config = props.config, env = props.env;
+    var config = props.config, env = props.env, data = props.data;
     var themeCss = config.themeCss, classNames = config.classNames, id = config.id, defaultData = config.defaultData, wrapperCustomStyle = config.wrapperCustomStyle;
     if (!themeCss && !wrapperCustomStyle) {
         return null;
@@ -36,24 +36,37 @@ function CustomStyle (props) {
     React.useEffect(function () {
         var _a, _b;
         if (themeCss && id) {
-            styleHelper.insertCustomStyle(themeCss, classNames, id, defaultData, env === null || env === void 0 ? void 0 : env.customStyleClassPrefix, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
+            styleHelper.insertCustomStyle({
+                themeCss: themeCss,
+                classNames: classNames,
+                id: id,
+                defaultData: defaultData,
+                customStyleClassPrefix: env === null || env === void 0 ? void 0 : env.customStyleClassPrefix,
+                doc: (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument,
+                data: data
+            });
         }
         return function () {
             var _a, _b;
             if (id && !styleIdCount.get(id)) {
-                styleHelper.removeCustomStyle('', id, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
+                styleHelper.removeCustomStyle('', id, (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument, data);
             }
         };
     }, [themeCss, id]);
     React.useEffect(function () {
         var _a, _b;
         if (wrapperCustomStyle && id) {
-            styleHelper.insertEditCustomStyle(wrapperCustomStyle, id, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
+            styleHelper.insertEditCustomStyle({
+                customStyle: wrapperCustomStyle,
+                id: id,
+                doc: (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument,
+                data: data
+            });
         }
         return function () {
             var _a, _b;
             if (id && !styleIdCount.get(id)) {
-                styleHelper.removeCustomStyle('wrapperCustomStyle', id, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
+                styleHelper.removeCustomStyle('wrapperCustomStyle', id, (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument, data);
             }
         };
     }, [wrapperCustomStyle, id]);

package/lib/components/ErrorBoundary.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -13,10 +13,11 @@ var cx = require('classnames');
 var ReactDOM = require('react-dom');
 var React = require('react');
 require('../utils/api.js');
+require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
-require('amis-formula');
 require('lodash/isPlainObject');
+require('amis-formula');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');
 require('moment');
@@ -35,12 +36,12 @@ require('../utils/image.js');
 require('lodash/isEqual');
 require('../actions/Action.js');
 require('lodash/debounce');
-require('lodash/cloneDeep');
 var resizeSensor = require('../utils/resize-sensor.js');
 var RootClose = require('../utils/RootClose.js');
 require('../utils/SimpleMap.js');
 require('lodash/mapValues');
 require('lodash/camelCase');
+require('lodash/cloneDeep');
 require('lodash/map');
 require('lodash/isEmpty');
 require('lodash/kebabCase');
@@ -96,6 +97,7 @@ var Position = /** @class */ (function (_super) {
             arrowOffsetTop: null
         };
         _this._lastTarget = null;
+        _this.componentId = helper.uuid();
         return _this;
     }
     Position.prototype.updatePosition = function (target) {
@@ -107,7 +109,7 @@ var Position = /** @class */ (function (_super) {
             var parentPopover = (_a = target === null || target === void 0 ? void 0 : target.closest) === null || _a === void 0 ? void 0 : _a.call(target, '[role=popover]');
             if (!this.parentPopover && parentPopover) {
                 this.parentPopover = parentPopover;
-                this.parentPopover.setAttribute(SubPopoverDisplayedID, true);
+                this.parentPopover.setAttribute(SubPopoverDisplayedID + '-' + this.componentId, true);
             }
         }
         if (!target) {
@@ -148,9 +150,11 @@ var Position = /** @class */ (function (_super) {
     };
     Position.prototype.componentWillUnmount = function () {
         var _a;
+        // 一个 PopOver 关闭时，需把挂载父 PopOver 的标记去掉
+        // 这里可能会存在多个子 PopOver 的情况，所以需要加上 componentId
         if (this.parentPopover &&
-            this.parentPopover.getAttribute(SubPopoverDisplayedID)) {
-            this.parentPopover.removeAttribute(SubPopoverDisplayedID);
+            this.parentPopover.getAttribute(SubPopoverDisplayedID + '-' + this.componentId)) {
+            this.parentPopover.removeAttribute(SubPopoverDisplayedID + '-' + this.componentId);
             this.parentPopover = null;
         }
         (_a = this.resizeDispose) === null || _a === void 0 ? void 0 : _a.forEach(function (fn) { return fn(); });
@@ -167,9 +171,8 @@ var Position = /** @class */ (function (_super) {
         return React.cloneElement(child, tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, props), arrowPosition), (child.props.offset ? { offset: child.props.offset } : {})), { 
             // FIXME: Don't forward `positionLeft` and `positionTop` via both props
             // and `props.style`.
-            positionLeft: positionLeft, positionTop: positionTop, className: cx__default["default"](className, child.props.className), style: tslib.__assign(tslib.__assign({}, child.props.style), { left: positionLeft, top: positionTop }) }));
+            positionLeft: positionLeft, positionTop: positionTop, className: cx__default["default"](className, child.props.className), style: tslib.__assign(tslib.__assign({}, child.props.style), { left: positionLeft, top: positionTop }), componentId: this.componentId }));
     };
-    // setState: (state: any) => void;
     Position.defaultProps = {
         containerPadding: 0,
         placement: 'right',

package/lib/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -12,10 +12,11 @@ var React = require('react');
 var ReactDOM = require('react-dom');
 var theme = require('../theme.js');
 require('../utils/api.js');
+require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
-require('amis-formula');
 require('lodash/isPlainObject');
+require('amis-formula');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');
 require('moment');
@@ -34,12 +35,12 @@ require('../utils/image.js');
 require('lodash/isEqual');
 require('../actions/Action.js');
 require('lodash/debounce');
-require('lodash/cloneDeep');
 require('../utils/resize-sensor.js');
 require('react-overlays/useRootClose');
 require('../utils/SimpleMap.js');
 require('lodash/mapValues');
 require('lodash/camelCase');
+require('lodash/cloneDeep');
 require('lodash/map');
 require('lodash/isEmpty');
 require('lodash/kebabCase');
@@ -111,7 +112,9 @@ var PopOver = /** @class */ (function (_super) {
             closeOnOutside &&
             target &&
             this.wrapperRef.current &&
-            !this.wrapperRef.current.getAttribute(Overlay.SubPopoverDisplayedID) &&
+            !this.wrapperRef.current
+                .getAttributeNames()
+                .find(function (n) { return n.startsWith(Overlay.SubPopoverDisplayedID); }) &&
             ((!this.wrapperRef.current.contains(target) &&
                 !target.closest('[role=dialog]')) ||
                 (target.matches(".".concat(ns, "Modal")) && target === this.wrapperRef.current))); // 干脆过滤掉来自弹框里面的点击
@@ -157,7 +160,7 @@ var PopOver = /** @class */ (function (_super) {
         });
     };
     PopOver.prototype.render = function () {
-        var _a = this.props; _a.placement; var activePlacement = _a.activePlacement, positionTop = _a.positionTop, positionLeft = _a.positionLeft; _a.arrowOffsetLeft; _a.arrowOffsetTop; var style = _a.style, children = _a.children; _a.offset; var overlay = _a.overlay, onHide = _a.onHide, ns = _a.classPrefix, cx = _a.classnames, className = _a.className, rest = tslib.__rest(_a, ["placement", "activePlacement", "positionTop", "positionLeft", "arrowOffsetLeft", "arrowOffsetTop", "style", "children", "offset", "overlay", "onHide", "classPrefix", "classnames", "className"]);
+        var _a = this.props; _a.placement; var activePlacement = _a.activePlacement, positionTop = _a.positionTop, positionLeft = _a.positionLeft; _a.arrowOffsetLeft; _a.arrowOffsetTop; var style = _a.style, children = _a.children; _a.offset; var overlay = _a.overlay, onHide = _a.onHide, ns = _a.classPrefix, cx = _a.classnames, className = _a.className; _a.componentId; var rest = tslib.__rest(_a, ["placement", "activePlacement", "positionTop", "positionLeft", "arrowOffsetLeft", "arrowOffsetTop", "style", "children", "offset", "overlay", "onHide", "classPrefix", "classnames", "className", "componentId"]);
         var _b = this.state, xOffset = _b.xOffset, yOffset = _b.yOffset;
         var outerStyle = tslib.__assign(tslib.__assign({ display: 'block' }, style), { top: positionTop + yOffset, left: positionLeft + xOffset });
         var placements = typeof activePlacement === 'string' ? activePlacement.split('-') : [];

package/lib/env.d.ts

@@ -86,6 +86,10 @@ export interface RendererEnv {
      * 是否开启 amis 调试
      */
     enableAMISDebug?: boolean;
+    /**
+     * 是否开启 testid 定位
+     */
+    enableTestid?: boolean;
     /**
      * 替换文本，用于实现 URL 替换、语言替换等
      */

package/lib/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -162,6 +162,19 @@ var defaultOptions = {
             action.blank === false ? (window.location.href = to) : window.open(to);
             return;
         }
+        // link动作新增了targetType属性，默认是内容区打开(page),在新窗口打开(blank);在当前页签打开(self)
+        if ((action === null || action === void 0 ? void 0 : action.actionType) === 'link' &&
+            ['blank', 'self'].includes(action === null || action === void 0 ? void 0 : action.targetType)) {
+            if (action.targetType === 'self') {
+                // 当前页签打开，需要刷新页面
+                window.history.pushState(null, '', to);
+                location.reload();
+            }
+            else {
+                window.open(to);
+            }
+            return;
+        }
         if (/^https?:\/\//.test(to)) {
             window.location.replace(to);
         }

package/lib/index.d.ts

@@ -19,7 +19,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, filterTarget } from './Scoped';
+import Scoped, { ScopedContext, filterTarget, splitTarget } from './Scoped';
 import type { ScopedComponentType, IScopedContext } from './Scoped';
 import { classnames, getClassPrefix, setDefaultTheme, theme, getTheme, themeable, makeClassnames } from './theme';
 import type { ClassNamesFn, ThemeProps } from './theme';
@@ -50,5 +50,5 @@ 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, 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, ErrorBoundary, addSchemaFilter, OptionsControlProps, FormOptionsControl, FormControlProps, FormBaseControl, extendDefaultEnv, addRootWrapper, RendererConfig, styleMap, RENDERER_TRANSMISSION_OMIT_PROPS, ScopedComponentType, IItem, IColumn, IRow, IColumn2, IRow2, OnEventProps, FormSchemaBase, filterTarget, CustomStyle, enableDebug, disableDebug };
+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, ErrorBoundary, addSchemaFilter, OptionsControlProps, FormOptionsControl, FormControlProps, FormBaseControl, extendDefaultEnv, addRootWrapper, RendererConfig, styleMap, RENDERER_TRANSMISSION_OMIT_PROPS, ScopedComponentType, IItem, IColumn, IRow, IColumn2, IRow2, OnEventProps, FormSchemaBase, filterTarget, splitTarget, CustomStyle, enableDebug, disableDebug };
 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.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -15,8 +15,10 @@ require('./renderers/register.js');
 var api = require('./utils/api.js');
 var attachmentAdpator = require('./utils/attachmentAdpator.js');
 var autobind = require('./utils/autobind.js');
+var browser = require('./utils/browser.js');
 var ColorScale = require('./utils/ColorScale.js');
 var columnsSplit = require('./utils/columnsSplit.js');
+var concatData = require('./utils/concatData.js');
 var dataMapping = require('./utils/dataMapping.js');
 var DataSchema = require('./utils/DataSchema.js');
 var DataScope = require('./utils/DataScope.js');
@@ -39,6 +41,7 @@ var image = require('./utils/image.js');
 var isPureVariable = require('./utils/isPureVariable.js');
 var jsonSchema2AmisSchema = require('./utils/json-schema-2-amis-schema.js');
 var keyToPath = require('./utils/keyToPath.js');
+var labelToString = require('./utils/labelToString.js');
 var makeSorter = require('./utils/makeSorter.js');
 var normalizeLink = require('./utils/normalizeLink.js');
 var normalizeOptions = require('./utils/normalizeOptions.js');
@@ -133,7 +136,7 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '3.6.4';
+var version = '6.1.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -192,8 +195,12 @@ function AMISRenderer(_a) {
         props.mobileUI = env$1.isMobile();
     }
     // 根据环境覆盖 schema，这个要在最前面做，不然就无法覆盖 validations
-    schema = envOverwrite.envOverwrite(schema, locale$1);
-    schema = replaceText.replaceText(schema, options.replaceText, env$1.replaceTextIgnoreKeys);
+    schema = React__default["default"].useMemo(function () {
+        schema = envOverwrite.envOverwrite(schema, locale$1);
+        // todo 和 envOverwrite 一起处理，减少循环次数
+        schema = replaceText.replaceText(schema, options.replaceText, env$1.replaceTextIgnoreKeys);
+        return schema;
+    }, [schema, locale$1]);
     return (_J$X_(env.EnvContext.Provider, { value: env$1 },
         _J$X_(Root["default"], tslib.__assign({}, props, { schema: schema, pathPrefix: pathPrefix, rootStore: store, env: env$1, theme: theme$1, locale: locale$1, translate: translate }))));
 }
@@ -231,8 +238,10 @@ exports.wrapFetcher = api.wrapFetcher;
 exports.attachmentAdpator = attachmentAdpator.attachmentAdpator;
 exports.autobindMethod = autobind.autobindMethod;
 exports.bind = autobind.bind;
+exports.chromeVersion = browser.chromeVersion;
 exports.ColorScale = ColorScale.ColorScale;
 exports.columnsSplit = columnsSplit.columnsSplit;
+exports.concatData = concatData.concatData;
 exports.dataMapping = dataMapping.dataMapping;
 exports.resolveMapping = dataMapping.resolveMapping;
 exports.resolveMappingObject = dataMapping.resolveMappingObject;
@@ -273,10 +282,12 @@ exports.handleAction = handleAction.handleAction;
 exports.JSONTraverse = helper.JSONTraverse;
 exports.JSONValueMap = helper.JSONValueMap;
 exports.SkipOperation = helper.SkipOperation;
+exports.TEST_ID_KEY = helper.TEST_ID_KEY;
 exports.ValidateError = helper.ValidateError;
 exports.__uri = helper.__uri;
 exports.anyChanged = helper.anyChanged;
 exports.autobind = helper.autobind;
+exports.buildTestId = helper.buildTestId;
 exports.buildTrackExpression = helper.buildTrackExpression;
 exports.bulkBindFunctions = helper.bulkBindFunctions;
 exports.camel = helper.camel;
@@ -304,6 +315,7 @@ exports.getPropValue = helper.getPropValue;
 exports.getRange = helper.getRange;
 exports.getScrollParent = helper.getScrollParent;
 exports.getScrollbarWidth = helper.getScrollbarWidth;
+exports.getTestId = helper.getTestId;
 exports.getTree = helper.getTree;
 exports.getTreeAncestors = helper.getTreeAncestors;
 exports.getTreeDepth = helper.getTreeDepth;
@@ -370,6 +382,7 @@ exports.toDataURL = image.toDataURL;
 exports.isPureVariable = isPureVariable.isPureVariable;
 exports.JSONSchme2AMisSchema = jsonSchema2AmisSchema.JSONSchme2AMisSchema;
 exports.keyToPath = keyToPath.keyToPath;
+exports.labelToString = labelToString.labelToString;
 exports.makeSorter = makeSorter.makeSorter;
 exports.normalizeLink = normalizeLink.normalizeLink;
 exports.normalizeOptions = normalizeOptions.normalizeOptions;
@@ -408,6 +421,7 @@ exports.scrollPosition = scrollPosition.scrollPosition;
 exports.SimpleMap = SimpleMap.SimpleMap;
 exports.string2regExp = string2regExp.string2regExp;
 exports.buildStyle = style.buildStyle;
+exports.memoParse = tokenize.memoParse;
 exports.tokenize = tokenize.tokenize;
 exports.register = tplBuiltin.register;
 exports.asyncFilter = tpl.asyncFilter;
@@ -462,6 +476,7 @@ exports.setDefaultLocale = locale.setDefaultLocale;
 exports.Scoped = Scoped.HocScoped;
 exports.ScopedContext = Scoped.ScopedContext;
 exports.filterTarget = Scoped.filterTarget;
+exports.splitTarget = Scoped.splitTarget;
 exports.classnames = theme.classnames;
 exports.getClassPrefix = theme.getClassPrefix;
 exports.getTheme = theme.getTheme;

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/renderers/Form.d.ts

@@ -341,15 +341,16 @@ export default class Form extends React.Component<FormProps, object> {
     silentReload(target?: string, query?: any): void;
     initInterval(value: any): any;
     isValidated(): boolean;
-    validate(forceValidate?: boolean, throwErrors?: boolean, toastErrors?: boolean): Promise<boolean>;
+    validate(forceValidate?: boolean, throwErrors?: boolean, toastErrors?: boolean, skipFlush?: boolean): Promise<boolean>;
     setErrors(errors: {
         [propName: string]: string;
     }, tag?: string): void;
     clearErrors(): void;
     getValues(): any;
     setValues(value: any, replace?: boolean): void;
-    submit(fn?: (values: object) => Promise<any>, throwErrors?: boolean): Promise<any>;
-    flush(): void;
+    submit(fn?: (values: object) => Promise<any>, throwErrors?: boolean, skipFlush?: boolean): Promise<any>;
+    flushing: boolean;
+    flush(): Promise<void>;
     reset(): void;
     addHook(fn: () => any, type?: 'validate' | 'init' | 'flush'): () => void;
     removeHook(fn: () => any, type?: string): void;