amis-core 3.6.2 → 6.0.0

package/esm/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -8,10 +8,11 @@ import React from 'react';
 import { findDOMNode } from 'react-dom';
 import { themeable } from '../theme.js';
 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';
@@ -42,6 +43,7 @@ import '../utils/validations.js';
 import '../utils/resolveCondition.js';
 import 'mobx';
 import '../utils/Animation.js';
+import { SubPopoverDisplayedID } from './Overlay.js';
 
 /**
  * @file PopOver
@@ -101,6 +103,7 @@ var PopOver = /** @class */ (function (_super) {
             closeOnOutside &&
             target &&
             this.wrapperRef.current &&
+            !this.wrapperRef.current.getAttribute(SubPopoverDisplayedID) &&
             ((!this.wrapperRef.current.contains(target) &&
                 !target.closest('[role=dialog]')) ||
                 (target.matches(".".concat(ns, "Modal")) && target === this.wrapperRef.current))); // 干脆过滤掉来自弹框里面的点击
@@ -150,7 +153,7 @@ var PopOver = /** @class */ (function (_super) {
         var _b = this.state, xOffset = _b.xOffset, yOffset = _b.yOffset;
         var outerStyle = __assign(__assign({ display: 'block' }, style), { top: positionTop + yOffset, left: positionLeft + xOffset });
         var placements = typeof activePlacement === 'string' ? activePlacement.split('-') : [];
-        return (React.createElement("div", __assign({ ref: this.wrapperRef, className: cx("PopOver", className, "PopOver--".concat(camel(activePlacement)), placements[3] ? "PopOver--v-".concat(placements[3]) : ''), style: outerStyle }, rest),
+        return (React.createElement("div", __assign({ ref: this.wrapperRef, role: "popover", className: cx("PopOver", className, "PopOver--".concat(camel(activePlacement)), placements[3] ? "PopOver--v-".concat(placements[3]) : ''), style: outerStyle }, rest),
             overlay ? (React.createElement("div", { className: "".concat(ns, "PopOver-overlay"), onClick: onHide })) : null,
             children));
     };

package/esm/env.js

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

package/esm/envOverwrite.js

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

package/esm/factory.js

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

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -13,8 +13,10 @@ import { wrapFetcher } from './utils/api.js';
 export { buildApi, callStrFunction, clearApiCache, getApiCache, isApiOutdated, isApiOutdatedWithData, isEffectiveApi, isSameApi, isValidApi, jsFetcher, jsonpFetcher, normalizeApi, normalizeApiResponseData, responseAdaptor, setApiCache, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher } from './utils/api.js';
 export { attachmentAdpator } from './utils/attachmentAdpator.js';
 export { autobindMethod, bind } from './utils/autobind.js';
+export { chromeVersion } from './utils/browser.js';
 export { ColorScale } from './utils/ColorScale.js';
 export { columnsSplit } from './utils/columnsSplit.js';
+export { concatData } from './utils/concatData.js';
 export { dataMapping, resolveMapping, resolveMappingObject } from './utils/dataMapping.js';
 export { DataSchema } from './utils/DataSchema.js';
 export { DATASCHEMA_TYPE_MAP, DataScope } from './utils/DataScope.js';
@@ -141,7 +143,7 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = getClassPrefix();
 // @ts-ignore
-var version = '3.6.2';
+var version = '6.0.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }

package/esm/locale.js

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

package/esm/polyfills.js

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

package/esm/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -22,6 +22,7 @@ import '../utils/filter.js';
 import { isEffectiveApi, isApiOutdated } from '../utils/api.js';
 import LazyComponent from '../components/LazyComponent.js';
 import { isAlive } from 'mobx-state-tree';
+import '../utils/browser.js';
 import '../utils/ColorScale.js';
 import 'lodash/chunk';
 import '../utils/DataSchema.js';
@@ -610,119 +611,132 @@ var Form = /** @class */ (function (_super) {
                         else if (action.actionType === 'clear-and-submit') {
                             store.clear(this.handleReset(action));
                         }
-                        return [2 /*return*/, this.submit(function (values) {
+                        return [2 /*return*/, this.submit(function (values) { return __awaiter(_this, void 0, void 0, function () {
+                                var result, finnalAsyncApi_1;
                                 var _a;
-                                if (onSubmit && onSubmit(values, action) === false) {
-                                    return Promise.resolve(false);
-                                }
-                                // 走到这里代表校验成功了
-                                dispatchEvent_1('validateSucc', _this.props.data);
-                                if (target) {
-                                    _this.submitToTarget(filterTarget(target, values), values);
-                                    /** 可能配置页面跳转事件，页面路由变化导致persistKey不一致，无法清除持久化数据，所以提交成功事件之前先清理一下 */
-                                    clearPersistDataAfterSubmit && store.clearLocalPersistData();
-                                    dispatchEvent_1('submitSucc', createObject(_this.props.data, values));
-                                }
-                                else if (action.actionType === 'reload') {
-                                    action.target &&
-                                        _this.reloadTarget(filterTarget(action.target, values), values);
-                                }
-                                else if (action.actionType === 'dialog') {
-                                    store.openDialog(data, undefined, action.callback, delegate || _this.context);
-                                }
-                                else if (action.actionType === 'drawer') {
-                                    store.openDrawer(data);
-                                }
-                                else if (isEffectiveApi(action.api || api, values)) {
-                                    var finnalAsyncApi_1 = action.asyncApi || asyncApi;
-                                    isEffectiveApi(finnalAsyncApi_1, store.data) &&
-                                        store.updateData((_a = {},
-                                            _a[finishedField || 'finished'] = false,
-                                            _a));
-                                    return store
-                                        .saveRemote(action.api || api, values, {
-                                        successMessage: typeof saveSuccess === 'string'
-                                            ? filter(saveSuccess, store.data)
-                                            : undefined,
-                                        errorMessage: typeof saveFailed === 'string'
-                                            ? filter(saveFailed, store.data)
-                                            : undefined,
-                                        onSuccess: function (result) { return __awaiter(_this, void 0, void 0, function () {
-                                            var dispatcher, cbResult;
-                                            var _this = this;
-                                            return __generator(this, function (_a) {
-                                                switch (_a.label) {
-                                                    case 0:
-                                                        clearPersistDataAfterSubmit && store.clearLocalPersistData();
-                                                        return [4 /*yield*/, dispatchEvent_1('submitSucc', createObject(this.props.data, { result: result }))];
-                                                    case 1:
-                                                        dispatcher = _a.sent();
-                                                        if (!isEffectiveApi(finnalAsyncApi_1, store.data) ||
-                                                            store.data[finishedField || 'finished']) {
-                                                            return [2 /*return*/, {
-                                                                    cbResult: null,
-                                                                    dispatcher: dispatcher
-                                                                }];
-                                                        }
-                                                        cbResult = until(function () { return store.checkRemote(finnalAsyncApi_1, store.data); }, function (ret) { return ret && ret[finishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); }, checkInterval).then(function (value) {
-                                                            // 派发asyncApiFinished事件
-                                                            dispatchEvent_1('asyncApiFinished', store.data);
+                                var _this = this;
+                                return __generator(this, function (_b) {
+                                    switch (_b.label) {
+                                        case 0:
+                                            if (!onSubmit) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, onSubmit(values, action)];
+                                        case 1:
+                                            result = _b.sent();
+                                            if (result === false) {
+                                                return [2 /*return*/, Promise.resolve(false)];
+                                            }
+                                            _b.label = 2;
+                                        case 2:
+                                            // 走到这里代表校验成功了
+                                            dispatchEvent_1('validateSucc', this.props.data);
+                                            if (target) {
+                                                this.submitToTarget(filterTarget(target, values), values);
+                                                /** 可能配置页面跳转事件，页面路由变化导致persistKey不一致，无法清除持久化数据，所以提交成功事件之前先清理一下 */
+                                                clearPersistDataAfterSubmit && store.clearLocalPersistData();
+                                                dispatchEvent_1('submitSucc', createObject(this.props.data, values));
+                                            }
+                                            else if (action.actionType === 'reload') {
+                                                action.target &&
+                                                    this.reloadTarget(filterTarget(action.target, values), values);
+                                            }
+                                            else if (action.actionType === 'dialog') {
+                                                store.openDialog(data, undefined, action.callback, delegate || this.context);
+                                            }
+                                            else if (action.actionType === 'drawer') {
+                                                store.openDrawer(data);
+                                            }
+                                            else if (isEffectiveApi(action.api || api, values)) {
+                                                finnalAsyncApi_1 = action.asyncApi || asyncApi;
+                                                isEffectiveApi(finnalAsyncApi_1, store.data) &&
+                                                    store.updateData((_a = {},
+                                                        _a[finishedField || 'finished'] = false,
+                                                        _a));
+                                                return [2 /*return*/, store
+                                                        .saveRemote(action.api || api, values, {
+                                                        successMessage: typeof saveSuccess === 'string'
+                                                            ? filter(saveSuccess, store.data)
+                                                            : undefined,
+                                                        errorMessage: typeof saveFailed === 'string'
+                                                            ? filter(saveFailed, store.data)
+                                                            : undefined,
+                                                        onSuccess: function (result) { return __awaiter(_this, void 0, void 0, function () {
+                                                            var dispatcher, cbResult;
+                                                            var _this = this;
+                                                            return __generator(this, function (_a) {
+                                                                switch (_a.label) {
+                                                                    case 0:
+                                                                        clearPersistDataAfterSubmit && store.clearLocalPersistData();
+                                                                        return [4 /*yield*/, dispatchEvent_1('submitSucc', createObject(this.props.data, { result: result }))];
+                                                                    case 1:
+                                                                        dispatcher = _a.sent();
+                                                                        if (!isEffectiveApi(finnalAsyncApi_1, store.data) ||
+                                                                            store.data[finishedField || 'finished']) {
+                                                                            return [2 /*return*/, {
+                                                                                    cbResult: null,
+                                                                                    dispatcher: dispatcher
+                                                                                }];
+                                                                        }
+                                                                        cbResult = until(function () { return store.checkRemote(finnalAsyncApi_1, store.data); }, function (ret) { return ret && ret[finishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); }, checkInterval).then(function (value) {
+                                                                            // 派发asyncApiFinished事件
+                                                                            dispatchEvent_1('asyncApiFinished', store.data);
+                                                                        });
+                                                                        return [2 /*return*/, {
+                                                                                cbResult: cbResult,
+                                                                                dispatcher: dispatcher
+                                                                            }];
+                                                                }
+                                                            });
+                                                        }); },
+                                                        onFailed: function (result) { return __awaiter(_this, void 0, void 0, function () {
+                                                            var dispatcher;
+                                                            return __generator(this, function (_a) {
+                                                                switch (_a.label) {
+                                                                    case 0: return [4 /*yield*/, dispatchEvent_1('submitFail', createObject(this.props.data, { error: result }))];
+                                                                    case 1:
+                                                                        dispatcher = _a.sent();
+                                                                        return [2 /*return*/, {
+                                                                                dispatcher: dispatcher
+                                                                            }];
+                                                                }
+                                                            });
+                                                        }); }
+                                                    })
+                                                        .then(function (response) { return __awaiter(_this, void 0, void 0, function () {
+                                                        var feedback, confirmed;
+                                                        return __generator(this, function (_a) {
+                                                            switch (_a.label) {
+                                                                case 0:
+                                                                    onSaved && onSaved(values, response);
+                                                                    feedback = action.feedback || this.props.feedback;
+                                                                    if (!(feedback && isVisible(feedback, store.data))) return [3 /*break*/, 2];
+                                                                    return [4 /*yield*/, this.openFeedback(feedback, store.data)];
+                                                                case 1:
+                                                                    confirmed = _a.sent();
+                                                                    // 如果 feedback 配置了，取消就跳过原有逻辑。
+                                                                    if (feedback.skipRestOnCancel && !confirmed) {
+                                                                        throw new SkipOperation();
+                                                                    }
+                                                                    else if (feedback.skipRestOnConfirm && confirmed) {
+                                                                        throw new SkipOperation();
+                                                                    }
+                                                                    _a.label = 2;
+                                                                case 2: return [2 /*return*/, injectObjectChain(store.data, {
+                                                                        __payload: values,
+                                                                        __response: response
+                                                                    })];
+                                                            }
                                                         });
-                                                        return [2 /*return*/, {
-                                                                cbResult: cbResult,
-                                                                dispatcher: dispatcher
-                                                            }];
-                                                }
-                                            });
-                                        }); },
-                                        onFailed: function (result) { return __awaiter(_this, void 0, void 0, function () {
-                                            var dispatcher;
-                                            return __generator(this, function (_a) {
-                                                switch (_a.label) {
-                                                    case 0: return [4 /*yield*/, dispatchEvent_1('submitFail', createObject(this.props.data, { error: result }))];
-                                                    case 1:
-                                                        dispatcher = _a.sent();
-                                                        return [2 /*return*/, {
-                                                                dispatcher: dispatcher
-                                                            }];
-                                                }
-                                            });
-                                        }); }
-                                    })
-                                        .then(function (response) { return __awaiter(_this, void 0, void 0, function () {
-                                        var feedback, confirmed;
-                                        return __generator(this, function (_a) {
-                                            switch (_a.label) {
-                                                case 0:
-                                                    onSaved && onSaved(values, response);
-                                                    feedback = action.feedback || this.props.feedback;
-                                                    if (!(feedback && isVisible(feedback, store.data))) return [3 /*break*/, 2];
-                                                    return [4 /*yield*/, this.openFeedback(feedback, store.data)];
-                                                case 1:
-                                                    confirmed = _a.sent();
-                                                    // 如果 feedback 配置了，取消就跳过原有逻辑。
-                                                    if (feedback.skipRestOnCancel && !confirmed) {
-                                                        throw new SkipOperation();
-                                                    }
-                                                    else if (feedback.skipRestOnConfirm && confirmed) {
-                                                        throw new SkipOperation();
-                                                    }
-                                                    _a.label = 2;
-                                                case 2: return [2 /*return*/, injectObjectChain(store.data, {
-                                                        __payload: values,
-                                                        __response: response
-                                                    })];
+                                                    }); })];
                                             }
-                                        });
-                                    }); });
-                                }
-                                else {
-                                    clearPersistDataAfterSubmit && store.clearLocalPersistData();
-                                    // type为submit，但是没有配api以及target时，只派发事件
-                                    dispatchEvent_1('submitSucc', createObject(_this.props.data, values));
-                                }
-                                return Promise.resolve(null);
-                            }, throwErrors)
+                                            else {
+                                                clearPersistDataAfterSubmit && store.clearLocalPersistData();
+                                                // type为submit，但是没有配api以及target时，只派发事件
+                                                dispatchEvent_1('submitSucc', createObject(this.props.data, values));
+                                            }
+                                            return [2 /*return*/, Promise.resolve(null)];
+                                    }
+                                });
+                            }); }, throwErrors)
                                 .then(function (values) {
                                 // 有可能 onSubmit return false 了，那么后面的就不应该再执行了。
                                 if (values === false) {

package/esm/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.2
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -15,13 +15,15 @@ import { wrapControl } from './wrapControl.js';
 import debounce from 'lodash/debounce';
 import { isEffectiveApi, isApiOutdated } from '../utils/api.js';
 import { findDOMNode } from 'react-dom';
+import '../utils/browser.js';
 import '../utils/ColorScale.js';
 import 'lodash/chunk';
+import { getVariable } from '../utils/getVariable.js';
+import { createObject } from '../utils/object.js';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
 import 'moment';
-import { createObject } from '../utils/object.js';
 import 'amis-formula';
 import '../utils/debug.js';
 import '../utils/errors.js';
@@ -31,7 +33,6 @@ import '../utils/filter.js';
 import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
-import { getVariable } from '../utils/getVariable.js';
 import '../utils/image.js';
 import 'lodash/isEqual';
 import '../actions/Action.js';