amis-core 6.0.0 → 6.1.0

package/lib/Scoped.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -15,6 +15,7 @@ var hoistNonReactStatic = require('hoist-non-react-statics');
 var amisFormula = require('amis-formula');
 require('moment');
 var object = require('./utils/object.js');
+var tokenize = require('./utils/tokenize.js');
 var isPureVariable = require('./utils/isPureVariable.js');
 var getVariable = require('./utils/getVariable.js');
 var dataMapping = require('./utils/dataMapping.js');
@@ -39,13 +40,13 @@ require('./utils/icon.js');
 require('./utils/image.js');
 require('lodash/isEqual');
 var rendererEvent = require('./utils/renderer-event.js');
-require('lodash/cloneDeep');
 require('./utils/resize-sensor.js');
 require('react-overlays/useRootClose');
 require('react-dom');
 require('./utils/SimpleMap.js');
 require('lodash/mapValues');
 require('lodash/camelCase');
+require('lodash/cloneDeep');
 require('lodash/map');
 require('lodash/isEmpty');
 require('lodash/kebabCase');
@@ -97,6 +98,43 @@ function filterTarget(target, data) {
     }
     return tpl.filter(target, data, '| raw');
 }
+/**
+ * 分割目标，如果里面有表达式，不要跟表达式里面的逗号冲突。
+ * @param target
+ * @returns
+ */
+function splitTarget(target) {
+    try {
+        var ast = tokenize.memoParse(target);
+        var pos_1 = [];
+        ast.body.forEach(function (item) {
+            // 不要处理表达式里面的东西。
+            if (item.type === 'raw') {
+                var parts = item.value.split(',');
+                if (parts.length > 1) {
+                    parts.pop();
+                    var start_1 = item.start.index;
+                    parts.forEach(function (part) {
+                        pos_1.push(start_1 + part.length);
+                        start_1 += part.length + 1;
+                    });
+                }
+            }
+        });
+        if (pos_1.length) {
+            var parts = [];
+            pos_1.reduceRight(function (arr, index) {
+                arr.unshift(target.slice(index + 1));
+                target = target.slice(0, index);
+                return arr;
+            }, parts);
+            parts.unshift(target);
+            return parts;
+        }
+    }
+    catch (e) { }
+    return [target];
+}
 var rootScopedContext = createScopedTools('');
 var ScopedContext = React__default["default"].createContext(rootScopedContext);
 function createScopedTools(path, parent, env, rendererType) {
@@ -241,7 +279,7 @@ function createScopedTools(path, parent, env, rendererType) {
         },
         reload: function (target, ctx) {
             var scoped = this;
-            var targets = typeof target === 'string' ? target.split(/\s*,\s*/) : target;
+            var targets = typeof target === 'string' ? splitTarget(target) : target;
             targets.forEach(function (name) {
                 var idx2 = name.indexOf('?');
                 var query = null;
@@ -277,7 +315,7 @@ function createScopedTools(path, parent, env, rendererType) {
         },
         send: function (receive, values) {
             var scoped = this;
-            var receives = typeof receive === 'string' ? receive.split(/\s*,\s*/) : receive;
+            var receives = typeof receive === 'string' ? splitTarget(receive) : receive;
             // todo 没找到做提示！
             receives.forEach(function (name) {
                 var askIdx = name.indexOf('?');
@@ -313,8 +351,7 @@ function createScopedTools(path, parent, env, rendererType) {
             var scoped = this;
             if (typeof target === 'string') {
                 // 过滤已经关掉的，当用户 close 配置多个弹框 name 时会出现这种情况
-                target
-                    .split(/\s*,\s*/)
+                splitTarget(target)
                     .map(function (name) { return scoped.getComponentByName(name); })
                     .filter(function (component) { return component && component.props.show; })
                     .forEach(closeDialog);
@@ -444,3 +481,4 @@ exports.HocScoped = HocScoped;
 exports.ScopedContext = ScopedContext;
 exports["default"] = HocScoped;
 exports.filterTarget = filterTarget;
+exports.splitTarget = splitTarget;

package/lib/StatusScoped.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/WithRootStore.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/WithStore.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -108,9 +108,7 @@ function HocStoreFactory(renderer) {
                     helper.isObjectShallowModified(state, this.state) && this.setState(state);
                     // 需要重新监听
                     (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
-                    this.unReaction = mobx.reaction(function () { return JSON.stringify(filterSchema.getExprProperties(props, store.data)); }, function () {
-                        return _this.setState(tslib.__assign({}, filterSchema.getExprProperties(_this.props, store.data)));
-                    });
+                    this.unReaction = mobx.reaction(function () { return filterSchema.getExprProperties(_this.props, store.data); }, function (exprProps) { return _this.setState(exprProps); });
                 }
                 var shouldSync = (_b = renderer.shouldSyncSuperStore) === null || _b === void 0 ? void 0 : _b.call(renderer, store, props, prevProps);
                 if (shouldSync === false) {
@@ -155,7 +153,7 @@ function HocStoreFactory(renderer) {
                             // 目前主要的问题是，如果 combo 中表单项名字和 combo 本身的名字一样，会导致里面的值会被覆盖成数组
                             ((_c = props.store) === null || _c === void 0 ? void 0 : _c.storeType) === 'ComboStore'
                                 ? undefined
-                                : helper.syncDataFromSuper(props.data, props.data.__super, prevProps.data.__super, store, false)), props.updatePristineAfterStoreDataReInit === false);
+                                : helper.syncDataFromSuper(store.data, props.data.__super, prevProps.data.__super, store, false)), props.updatePristineAfterStoreDataReInit === false);
                     }
                     else {
                         store.initData(object.createObject(props.scope, props.data), props.updatePristineAfterStoreDataReInit === false);

package/lib/actions/Action.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/AjaxAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/BreakAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/BroadcastAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/CmptAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/ContinueAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/CopyAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/CustomAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -32,7 +32,6 @@ require('../utils/image.js');
 require('lodash/isEqual');
 var Action = require('./Action.js');
 require('lodash/debounce');
-require('lodash/cloneDeep');
 require('../utils/resize-sensor.js');
 require('react');
 require('react-overlays/useRootClose');
@@ -40,6 +39,7 @@ require('react-dom');
 require('../utils/SimpleMap.js');
 require('lodash/mapValues');
 require('lodash/camelCase');
+require('lodash/cloneDeep');
 require('lodash/map');
 require('lodash/isEmpty');
 require('lodash/kebabCase');

package/lib/actions/DialogAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/DrawerAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/EmailAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/LinkAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -24,15 +24,20 @@ var LinkAction = /** @class */ (function () {
     LinkAction.prototype.run = function (action, renderer, event) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var urlObj;
+            var apiParams, urlObj;
             return tslib.__generator(this, function (_j) {
                 if (!((_a = event.context.env) === null || _a === void 0 ? void 0 : _a.jumpTo)) {
                     throw new Error('env.jumpTo is required!');
                 }
+                apiParams = tslib.__assign(tslib.__assign({}, ((_c = (_b = action.args) === null || _b === void 0 ? void 0 : _b.params) !== null && _c !== void 0 ? _c : {})), ((_d = action.data) !== null && _d !== void 0 ? _d : {}));
+                if ((action === null || action === void 0 ? void 0 : action.actionType) === 'link' && (apiParams === null || apiParams === void 0 ? void 0 : apiParams.targetType)) {
+                    // link动作新增打开方式targetType，buildApi不需要该参数
+                    delete apiParams.targetType;
+                }
                 urlObj = api.buildApi({
-                    url: (((_b = action.args) === null || _b === void 0 ? void 0 : _b.url) || ((_c = action.args) === null || _c === void 0 ? void 0 : _c.link)),
+                    url: (((_e = action.args) === null || _e === void 0 ? void 0 : _e.url) || ((_f = action.args) === null || _f === void 0 ? void 0 : _f.link)),
                     method: 'get'
-                }, tslib.__assign(tslib.__assign({}, ((_e = (_d = action.args) === null || _d === void 0 ? void 0 : _d.params) !== null && _e !== void 0 ? _e : {})), ((_f = action.data) !== null && _f !== void 0 ? _f : {})), {
+                }, apiParams, {
                     autoAppend: true
                 });
                 (_g = event.context.env) === null || _g === void 0 ? void 0 : _g.jumpTo(urlObj.url, tslib.__assign({ actionType: action.actionType, type: 'button' }, action.args), (_h = action.data) !== null && _h !== void 0 ? _h : {});

package/lib/actions/LoopAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/PageAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/ParallelAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/StatusAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/SwitchAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/actions/ToastAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/components/CustomStyle.d.ts

@@ -1,11 +1,10 @@
-import type { RendererEnv } from '../env';
 import { type InsertCustomStyle } from '../utils/style-helper';
 interface CustomStyleProps {
     config: {
         wrapperCustomStyle?: any;
         componentId?: string;
     } & InsertCustomStyle;
-    env: RendererEnv;
+    [propName: string]: any;
 }
 export declare const styleIdCount: Map<any, any>;
 export default function (props: CustomStyleProps): null;

package/lib/components/CustomStyle.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -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,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/components/LazyComponent.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/components/Overlay.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -36,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');
@@ -97,6 +97,7 @@ var Position = /** @class */ (function (_super) {
             arrowOffsetTop: null
         };
         _this._lastTarget = null;
+        _this.componentId = helper.uuid();
         return _this;
     }
     Position.prototype.updatePosition = function (target) {
@@ -108,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) {
@@ -149,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(); });
@@ -168,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,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -35,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');
@@ -112,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))); // 干脆过滤掉来自弹框里面的点击
@@ -158,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,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/envOverwrite.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/factory.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -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);
         }