amis-core 3.6.2 → 6.0.0

package/esm/Root.js

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

package/esm/RootRenderer.js

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

package/esm/SchemaRenderer.js

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

package/esm/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -17,6 +17,7 @@ import { dataMapping } from './utils/dataMapping.js';
 import './utils/filter.js';
 import { findTree, eachTree, qsparse, qsstringify, parseQuery, autobind } from './utils/helper.js';
 import './utils/api.js';
+import './utils/browser.js';
 import './utils/ColorScale.js';
 import 'lodash/chunk';
 import './utils/DataSchema.js';

package/esm/StatusScoped.js

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

package/esm/WithRootStore.js

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

package/esm/WithStore.js

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

package/esm/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -182,9 +182,9 @@ var runActions = function (actions, renderer, event) { return __awaiter(void 0,
 // 执行动作，与原有动作处理打通
 var runAction = function (actionInstrance, actionConfig, renderer, event) { return __awaiter(void 0, void 0, void 0, function () {
     var additional, action, mergeData, expression, isStop, preventDefault, key, api, cmptFlag, targetComponent, args, afterMappingData, actionData, data, stopped, actionResult, stopPropagation;
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-    return __generator(this, function (_v) {
-        switch (_v.label) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+    return __generator(this, function (_w) {
+        switch (_w.label) {
             case 0:
                 additional = {
                     event: event
@@ -192,7 +192,7 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 action = __assign({}, actionConfig);
                 action.args = __assign({}, actionConfig.args);
                 // __rendererData默认为renderer.props.data，兼容表单项值变化时的data读取
-                if (!event.data.__rendererData) {
+                if (!((_a = event.data) === null || _a === void 0 ? void 0 : _a.__rendererData)) {
                     additional = {
                         event: event,
                         __rendererData: renderer.props.data // 部分组件交互后会有更新，如果想要获取那部分数据，可以通过事件数据获取
@@ -201,13 +201,13 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 mergeData = createObject(createObject(renderer.props.data.__super
                     ? createObject(renderer.props.data.__super, additional)
                     : additional, renderer.props.data), event.data);
-                expression = (_a = action.expression) !== null && _a !== void 0 ? _a : action.execOn;
+                expression = (_b = action.expression) !== null && _b !== void 0 ? _b : action.execOn;
                 isStop = false;
                 if (!expression) return [3 /*break*/, 2];
                 return [4 /*yield*/, evalExpressionWithConditionBuilder(expression, mergeData, true)];
             case 1:
-                isStop = !(_v.sent());
-                _v.label = 2;
+                isStop = !(_w.sent());
+                _w.label = 2;
             case 2:
                 if (isStop) {
                     return [2 /*return*/];
@@ -216,8 +216,8 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 if (!action.preventDefault) return [3 /*break*/, 4];
                 return [4 /*yield*/, evalExpressionWithConditionBuilder(action.preventDefault, mergeData, false)];
             case 3:
-                preventDefault = _v.sent();
-                _v.label = 4;
+                preventDefault = _w.sent();
+                _w.label = 4;
             case 4:
                 key = {
                     componentId: dataMapping(action.componentId, mergeData),
@@ -225,25 +225,25 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 };
                 // 兼容args包裹的用法
                 if (action.actionType === 'dialog') {
-                    action.dialog = __assign({}, ((_b = action.dialog) !== null && _b !== void 0 ? _b : (_c = action.args) === null || _c === void 0 ? void 0 : _c.dialog));
-                    (_d = action.args) === null || _d === void 0 ? true : delete _d.dialog;
+                    action.dialog = __assign({}, ((_c = action.dialog) !== null && _c !== void 0 ? _c : (_d = action.args) === null || _d === void 0 ? void 0 : _d.dialog));
+                    (_e = action.args) === null || _e === void 0 ? true : delete _e.dialog;
                 }
                 else if (action.actionType === 'drawer') {
-                    action.drawer = __assign({}, ((_e = action.drawer) !== null && _e !== void 0 ? _e : (_f = action.args) === null || _f === void 0 ? void 0 : _f.drawer));
-                    (_g = action.args) === null || _g === void 0 ? true : delete _g.drawer;
+                    action.drawer = __assign({}, ((_f = action.drawer) !== null && _f !== void 0 ? _f : (_g = action.args) === null || _g === void 0 ? void 0 : _g.drawer));
+                    (_h = action.args) === null || _h === void 0 ? true : delete _h.drawer;
                 }
                 else if (['ajax', 'download'].includes(action.actionType)) {
-                    api = (_h = action.api) !== null && _h !== void 0 ? _h : (_j = action.args) === null || _j === void 0 ? void 0 : _j.api;
+                    api = (_j = action.api) !== null && _j !== void 0 ? _j : (_k = action.args) === null || _k === void 0 ? void 0 : _k.api;
                     action.api = typeof api === 'string' ? api : __assign({}, api);
-                    action.options = __assign({}, ((_k = action.options) !== null && _k !== void 0 ? _k : (_l = action.args) === null || _l === void 0 ? void 0 : _l.options));
-                    action.messages = __assign({}, ((_m = action.messages) !== null && _m !== void 0 ? _m : (_o = action.args) === null || _o === void 0 ? void 0 : _o.messages));
-                    (_p = action.args) === null || _p === void 0 ? true : delete _p.api;
-                    (_q = action.args) === null || _q === void 0 ? true : delete _q.options;
-                    (_r = action.args) === null || _r === void 0 ? true : delete _r.messages;
+                    action.options = __assign({}, ((_l = action.options) !== null && _l !== void 0 ? _l : (_m = action.args) === null || _m === void 0 ? void 0 : _m.options));
+                    action.messages = __assign({}, ((_o = action.messages) !== null && _o !== void 0 ? _o : (_p = action.args) === null || _p === void 0 ? void 0 : _p.messages));
+                    (_q = action.args) === null || _q === void 0 ? true : delete _q.api;
+                    (_r = action.args) === null || _r === void 0 ? true : delete _r.options;
+                    (_s = action.args) === null || _s === void 0 ? true : delete _s.messages;
                 }
                 cmptFlag = key.componentId || key.componentName;
                 targetComponent = cmptFlag
-                    ? (_s = event.context.scoped) === null || _s === void 0 ? void 0 : _s[action.componentId ? 'getComponentById' : 'getComponentByName'](cmptFlag)
+                    ? (_t = event.context.scoped) === null || _t === void 0 ? void 0 : _t[action.componentId ? 'getComponentById' : 'getComponentByName'](cmptFlag)
                     : renderer;
                 args = dataMapping(action.args, mergeData, function (key) {
                     var _a;
@@ -251,7 +251,11 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                         ajax: ['adaptor', 'responseAdaptor', 'requestAdaptor', 'responseData']
                     };
                     var cmptIgnoreMap = {
-                        'input-table': ['condition']
+                        'input-table': ['condition'],
+                        'table': ['condition'],
+                        'table2': ['condition'],
+                        'crud': ['condition'],
+                        'combo': ['condition']
                     };
                     var curCmptType = (_a = targetComponent === null || targetComponent === void 0 ? void 0 : targetComponent.props) === null || _a === void 0 ? void 0 : _a.type;
                     var curActionType = action.actionType;
@@ -266,12 +270,12 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                     !['ajax', 'download', 'dialog', 'drawer'].includes(action.actionType) // 避免非法配置影响对actionData的判断，导致动作配置中的数据映射失败
                     ? actionData
                     : mergeData;
-                (_t = console.group) === null || _t === void 0 ? void 0 : _t.call(console, "run action ".concat(action.actionType));
+                (_u = console.group) === null || _u === void 0 ? void 0 : _u.call(console, "run action ".concat(action.actionType));
                 console.debug("[".concat(action.actionType, "] action args, data"), args, data);
                 stopped = false;
                 return [4 /*yield*/, actionInstrance.run(__assign(__assign(__assign({}, action), { args: args, data: action.actionType === 'reload' ? actionData : data }), key), renderer, event, mergeData)];
             case 5:
-                actionResult = _v.sent();
+                actionResult = _w.sent();
                 // 二次确认弹窗如果取消，则终止后续动作
                 if ((action === null || action === void 0 ? void 0 : action.actionType) === 'confirmDialog' && !actionResult) {
                     stopped = true;
@@ -281,11 +285,11 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 if (!action.stopPropagation) return [3 /*break*/, 7];
                 return [4 /*yield*/, evalExpressionWithConditionBuilder(action.stopPropagation, mergeData, false)];
             case 6:
-                stopPropagation = _v.sent();
-                _v.label = 7;
+                stopPropagation = _w.sent();
+                _w.label = 7;
             case 7:
                 console.debug("[".concat(action.actionType, "] action end event"), event);
-                (_u = console.groupEnd) === null || _u === void 0 ? void 0 : _u.call(console);
+                (_v = console.groupEnd) === null || _v === void 0 ? void 0 : _v.call(console);
                 // 阻止原有动作执行
                 preventDefault && event.preventDefault();
                 // 阻止后续动作执行

package/esm/actions/AjaxAction.js

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

package/esm/actions/BreakAction.js

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

package/esm/actions/BroadcastAction.js

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

package/esm/actions/CmptAction.js

@@ -1,11 +1,12 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
 import { __awaiter, __generator } from 'tslib';
 import '../utils/helper.js';
 import { registerAction } from './Action.js';
+import { getRendererByName } from '../factory.js';
 import { createObject } from '../utils/object.js';
 
 /**
@@ -19,12 +20,12 @@ var CmptAction = /** @class */ (function () {
     function CmptAction() {
     }
     CmptAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
         return __awaiter(this, void 0, void 0, function () {
-            var key, dataMergeMode, path, beforeSetData, res, component, msg, result, e_1;
-            var _t, _u;
-            return __generator(this, function (_v) {
-                switch (_v.label) {
+            var key, dataMergeMode, path, beforeSetData, res, component, msg, _5, dispatchEvent_1, data, valid, e_1, result, e_2;
+            var _6, _7, _8, _9, _10;
+            return __generator(this, function (_11) {
+                switch (_11.label) {
                     case 0:
                         key = action.componentId || action.componentName;
                         dataMergeMode = action.dataMergeMode || 'merge';
@@ -34,11 +35,11 @@ var CmptAction = /** @class */ (function () {
                         if (!(beforeSetData && typeof beforeSetData === 'function')) return [3 /*break*/, 2];
                         return [4 /*yield*/, beforeSetData(renderer, action, event)];
                     case 1:
-                        res = _v.sent();
+                        res = _11.sent();
                         if (res === false) {
                             return [2 /*return*/];
                         }
-                        _v.label = 2;
+                        _11.label = 2;
                     case 2:
                         component = key
                             ? (_d = event.context.scoped) === null || _d === void 0 ? void 0 : _d[action.componentId ? 'getComponentById' : 'getComponentByName'](key)
@@ -65,33 +66,71 @@ var CmptAction = /** @class */ (function () {
                         if (action.actionType === 'reload') {
                             return [2 /*return*/, (_l = component === null || component === void 0 ? void 0 : component.reload) === null || _l === void 0 ? void 0 : _l.call(component, undefined, action.data, undefined, undefined, dataMergeMode === 'override', action.args)];
                         }
-                        _v.label = 3;
+                        if (!(action.actionType === 'validateFormItem' &&
+                            ((_o = getRendererByName((_m = component === null || component === void 0 ? void 0 : component.props) === null || _m === void 0 ? void 0 : _m.type)) === null || _o === void 0 ? void 0 : _o.isFormItem))) return [3 /*break*/, 7];
+                        _5 = (component === null || component === void 0 ? void 0 : component.props) || {}, dispatchEvent_1 = _5.dispatchEvent, data = _5.data;
+                        _11.label = 3;
                     case 3:
-                        _v.trys.push([3, 5, , 6]);
-                        return [4 /*yield*/, ((_m = component === null || component === void 0 ? void 0 : component.doAction) === null || _m === void 0 ? void 0 : _m.call(component, action, action.args, true))];
+                        _11.trys.push([3, 5, , 6]);
+                        return [4 /*yield*/, ((_q = component === null || component === void 0 ? void 0 : (_p = component.props).onValidate) === null || _q === void 0 ? void 0 : _q.call(_p))];
                     case 4:
-                        result = _v.sent();
-                        if (['validate', 'submit'].includes(action.actionType)) {
-                            event.setData(createObject(event.data, (_t = {},
-                                _t[action.outputVar || "".concat(action.actionType, "Result")] = {
+                        valid = _11.sent();
+                        if (valid) {
+                            event.setData(createObject(event.data, (_6 = {},
+                                _6[action.outputVar || "".concat(action.actionType, "Result")] = {
                                     error: '',
-                                    payload: (_o = result === null || result === void 0 ? void 0 : result.__payload) !== null && _o !== void 0 ? _o : (_q = (_p = component === null || component === void 0 ? void 0 : component.props) === null || _p === void 0 ? void 0 : _p.store) === null || _q === void 0 ? void 0 : _q.data,
-                                    responseData: result === null || result === void 0 ? void 0 : result.__response
+                                    value: (_s = (_r = component === null || component === void 0 ? void 0 : component.props) === null || _r === void 0 ? void 0 : _r.formItem) === null || _s === void 0 ? void 0 : _s.value
                                 },
-                                _t)));
+                                _6)));
+                            dispatchEvent_1 && dispatchEvent_1('formItemValidateSucc', data);
                         }
-                        return [2 /*return*/, result];
+                        else {
+                            event.setData(createObject(event.data, (_7 = {},
+                                _7[action.outputVar || "".concat(action.actionType, "Result")] = {
+                                    error: (((_u = (_t = component === null || component === void 0 ? void 0 : component.props) === null || _t === void 0 ? void 0 : _t.formItem) === null || _u === void 0 ? void 0 : _u.errors) || []).join(','),
+                                    value: (_w = (_v = component === null || component === void 0 ? void 0 : component.props) === null || _v === void 0 ? void 0 : _v.formItem) === null || _w === void 0 ? void 0 : _w.value
+                                },
+                                _7)));
+                            dispatchEvent_1 && dispatchEvent_1('formItemValidateError', data);
+                        }
+                        return [3 /*break*/, 6];
                     case 5:
-                        e_1 = _v.sent();
-                        event.setData(createObject(event.data, (_u = {},
-                            _u[action.outputVar || "".concat(action.actionType, "Result")] = {
-                                error: e_1.message,
-                                errors: e_1.name === 'ValidateError' ? e_1.detail : e_1,
-                                payload: (_s = (_r = component === null || component === void 0 ? void 0 : component.props) === null || _r === void 0 ? void 0 : _r.store) === null || _s === void 0 ? void 0 : _s.data
+                        e_1 = _11.sent();
+                        event.setData(createObject(event.data, (_8 = {},
+                            _8[action.outputVar || "".concat(action.actionType, "Result")] = {
+                                error: e_1.message || '未知错误',
+                                value: (_y = (_x = component === null || component === void 0 ? void 0 : component.props) === null || _x === void 0 ? void 0 : _x.formItem) === null || _y === void 0 ? void 0 : _y.value
                             },
-                            _u)));
+                            _8)));
+                        dispatchEvent_1 && dispatchEvent_1('formItemValidateError', data);
                         return [3 /*break*/, 6];
                     case 6: return [2 /*return*/];
+                    case 7:
+                        _11.trys.push([7, 9, , 10]);
+                        return [4 /*yield*/, ((_z = component === null || component === void 0 ? void 0 : component.doAction) === null || _z === void 0 ? void 0 : _z.call(component, action, action.args, true))];
+                    case 8:
+                        result = _11.sent();
+                        if (['validate', 'submit'].includes(action.actionType)) {
+                            event.setData(createObject(event.data, (_9 = {},
+                                _9[action.outputVar || "".concat(action.actionType, "Result")] = {
+                                    error: '',
+                                    payload: (_0 = result === null || result === void 0 ? void 0 : result.__payload) !== null && _0 !== void 0 ? _0 : (_2 = (_1 = component === null || component === void 0 ? void 0 : component.props) === null || _1 === void 0 ? void 0 : _1.store) === null || _2 === void 0 ? void 0 : _2.data,
+                                    responseData: result === null || result === void 0 ? void 0 : result.__response
+                                },
+                                _9)));
+                        }
+                        return [2 /*return*/, result];
+                    case 9:
+                        e_2 = _11.sent();
+                        event.setData(createObject(event.data, (_10 = {},
+                            _10[action.outputVar || "".concat(action.actionType, "Result")] = {
+                                error: e_2.message,
+                                errors: e_2.name === 'ValidateError' ? e_2.detail : e_2,
+                                payload: (_4 = (_3 = component === null || component === void 0 ? void 0 : component.props) === null || _3 === void 0 ? void 0 : _3.store) === null || _4 === void 0 ? void 0 : _4.data
+                            },
+                            _10)));
+                        return [3 /*break*/, 10];
+                    case 10: return [2 /*return*/];
                 }
             });
         });

package/esm/actions/ContinueAction.js

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

package/esm/actions/CopyAction.js

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

package/esm/actions/CustomAction.js

@@ -1,15 +1,16 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
 import { __awaiter, __generator } from 'tslib';
 import { str2AsyncFunction } from '../utils/api.js';
+import '../utils/browser.js';
 import '../utils/ColorScale.js';
 import 'react';
 import 'lodash/chunk';
-import 'amis-formula';
 import 'lodash/isPlainObject';
+import 'amis-formula';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
 import 'moment';

package/esm/actions/DialogAction.js

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

package/esm/actions/DrawerAction.js

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

package/esm/actions/EmailAction.js

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

package/esm/actions/LinkAction.js

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

package/esm/actions/LoopAction.js

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

package/esm/actions/PageAction.js

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

package/esm/actions/ParallelAction.js

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

package/esm/actions/StatusAction.js

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

package/esm/actions/SwitchAction.js

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

package/esm/actions/ToastAction.js

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

package/esm/components/CustomStyle.js

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

package/esm/components/ErrorBoundary.js

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

package/esm/components/LazyComponent.js

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

package/esm/components/Overlay.d.ts

@@ -4,6 +4,7 @@
  * @author fex
  */
 import React from 'react';
+export declare const SubPopoverDisplayedID = "data-sub-popover-displayed";
 interface OverlayProps {
     placement?: string;
     show?: boolean;
@@ -36,7 +37,7 @@ export default class Overlay extends React.Component<OverlayProps, OverlayState>
     position: any;
     positionRef: (position: any) => void;
     updatePosition(): void;
-    componentDidUpdate(prevProps: OverlayProps): void;
+    componentDidUpdate(prevProps: OverlayProps, prevState: OverlayState): void;
     onHiddenListener(node: HTMLElement): void;
     getContainerSelector(): Element | null;
     render(): React.JSX.Element | null;

package/esm/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -9,10 +9,11 @@ import cx from 'classnames';
 import ReactDOM, { findDOMNode } from 'react-dom';
 import React, { cloneElement } from 'react';
 import '../utils/api.js';
+import '../utils/browser.js';
 import '../utils/ColorScale.js';
 import 'lodash/chunk';
-import 'amis-formula';
 import 'lodash/isPlainObject';
+import 'amis-formula';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
 import 'moment';
@@ -50,6 +51,7 @@ import '../utils/Animation.js';
  * @description
  * @author fex
  */
+var SubPopoverDisplayedID = 'data-sub-popover-displayed';
 function onScroll(elem, callback) {
     var handler = function () {
         requestAnimationFrame(callback);
@@ -88,8 +90,16 @@ var Position = /** @class */ (function (_super) {
     }
     Position.prototype.updatePosition = function (target) {
         var _this = this;
-        var _a;
+        var _a, _b;
         this._lastTarget = target;
+        /** 标记宿主元素的PopOver祖先，用于后续判断PopOver 是否可以 root close */
+        if (target) {
+            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);
+            }
+        }
         if (!target) {
             return this.setState({
                 positionLeft: 0,
@@ -103,7 +113,7 @@ var Position = /** @class */ (function (_super) {
         var container = getContainer(this.props.container, ownerDocument(this).body);
         if ((!this.watchedTarget || this.watchedTarget !== target) &&
             getComputedStyle(target, 'position') !== 'static') {
-            (_a = this.resizeDispose) === null || _a === void 0 ? void 0 : _a.forEach(function (fn) { return fn(); });
+            (_b = this.resizeDispose) === null || _b === void 0 ? void 0 : _b.forEach(function (fn) { return fn(); });
             this.watchedTarget = target;
             this.resizeDispose = [
                 watchTargetSizeChange !== false
@@ -128,6 +138,11 @@ var Position = /** @class */ (function (_super) {
     };
     Position.prototype.componentWillUnmount = function () {
         var _a;
+        if (this.parentPopover &&
+            this.parentPopover.getAttribute(SubPopoverDisplayedID)) {
+            this.parentPopover.removeAttribute(SubPopoverDisplayedID);
+            this.parentPopover = null;
+        }
         (_a = this.resizeDispose) === null || _a === void 0 ? void 0 : _a.forEach(function (fn) { return fn(); });
     };
     Position.prototype.render = function () {
@@ -169,7 +184,7 @@ var Overlay = /** @class */ (function (_super) {
         var _a;
         (_a = this.position) === null || _a === void 0 ? void 0 : _a.maybeUpdatePosition(true);
     };
-    Overlay.prototype.componentDidUpdate = function (prevProps) {
+    Overlay.prototype.componentDidUpdate = function (prevProps, prevState) {
         var props = this.props;
         if (prevProps.show !== props.show && props.show) {
             this.setState({ exited: false });
@@ -257,4 +272,4 @@ var Overlay = /** @class */ (function (_super) {
     return Overlay;
 }(React.Component));
 
-export { Overlay as default };
+export { SubPopoverDisplayedID, Overlay as default };