amis-ui 2.7.2 → 2.7.3-beta.0

package/lib/components/Spinner.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 
@@ -113,13 +113,9 @@ var Spinner = /** @class */ (function (_super) {
         return _this;
     }
     Spinner.prototype.componentDidUpdate = function () {
-        var _a, _b, _c;
+        var _a, _b;
         var showLoading = ((_a = this.props.loadingConfig) === null || _a === void 0 ? void 0 : _a.show) === true ||
             typeof ((_b = this.props.loadingConfig) === null || _b === void 0 ? void 0 : _b.show) === 'undefined';
-        var root = (_c = this.props.loadingConfig) === null || _c === void 0 ? void 0 : _c.root;
-        if (!this.parent && root) {
-            this.parent = document.querySelector(root);
-        }
         if (this.parent && showLoading) {
             if (this.props.show) {
                 this.loadingTriggered = true;
@@ -149,39 +145,39 @@ var Spinner = /** @class */ (function (_super) {
         var isCustomIcon = icon && React__default["default"].isValidElement(icon);
         var timeout = { enter: delay, exit: 0 };
         var showOverlay = (loadingConfig === null || loadingConfig === void 0 ? void 0 : loadingConfig.root) || overlay;
-        return (React__default["default"].createElement(Transition__default["default"], { mountOnEnter: true, unmountOnExit: true, in: this.state.spinning, timeout: timeout }, function (status) {
-            var _a, _b, _c;
-            return (React__default["default"].createElement(React__default["default"].Fragment, null,
-                showOverlay ? (React__default["default"].createElement("div", { className: cx("Spinner-overlay", fadeStyles[status]) })) : null,
-                React__default["default"].createElement("div", { "data-testid": "spinner", className: cx("Spinner", tip && (_a = {},
-                        _a["Spinner-tip--".concat(tipPlacement)] = [
-                            'top',
-                            'right',
-                            'bottom',
-                            'left'
-                        ].includes(tipPlacement),
-                        _a), (_b = {}, _b["Spinner--overlay"] = showOverlay, _b), fadeStyles[status], className) },
-                    React__default["default"].createElement("div", { className: cx("Spinner-icon", (_c = {},
-                            _c["Spinner-icon--".concat(size)] = ['lg', 'sm'].includes(size),
-                            _c["Spinner-icon--default"] = !icon,
-                            _c["Spinner-icon--simple"] = !isCustomIcon && icon,
-                            _c["Spinner-icon--custom"] = isCustomIcon,
-                            _c), spinnerClassName) }, icon ? (isCustomIcon ? (icon) : icons.hasIcon(icon) ? (React__default["default"].createElement(icons.Icon, { icon: icon, className: "icon" })) : (amisCore.generateIcon(cx, icon, 'icon'))) : null),
-                    tip ? React__default["default"].createElement("span", { className: cx("Spinner-tip") }, tip) : '')));
-        }));
+        return (React__default["default"].createElement(React__default["default"].Fragment, null,
+            this.state.showMarker && (React__default["default"].createElement("span", { className: cx('Spinner-mark'), ref: this.spinnerRef })),
+            React__default["default"].createElement(Transition__default["default"], { mountOnEnter: true, unmountOnExit: true, in: this.state.spinning, timeout: timeout }, function (status) {
+                var _a, _b, _c;
+                return (React__default["default"].createElement(React__default["default"].Fragment, null,
+                    showOverlay ? (React__default["default"].createElement("div", { className: cx("Spinner-overlay", fadeStyles[status]) })) : null,
+                    React__default["default"].createElement("div", { "data-testid": "spinner", className: cx("Spinner", tip && (_a = {},
+                            _a["Spinner-tip--".concat(tipPlacement)] = [
+                                'top',
+                                'right',
+                                'bottom',
+                                'left'
+                            ].includes(tipPlacement),
+                            _a), (_b = {}, _b["Spinner--overlay"] = showOverlay, _b), fadeStyles[status], className) },
+                        React__default["default"].createElement("div", { className: cx("Spinner-icon", (_c = {},
+                                _c["Spinner-icon--".concat(size)] = ['lg', 'sm'].includes(size),
+                                _c["Spinner-icon--default"] = !icon,
+                                _c["Spinner-icon--simple"] = !isCustomIcon && icon,
+                                _c["Spinner-icon--custom"] = isCustomIcon,
+                                _c), spinnerClassName) }, icon ? (isCustomIcon ? (icon) : icons.hasIcon(icon) ? (React__default["default"].createElement(icons.Icon, { icon: icon, className: "icon" })) : (amisCore.generateIcon(cx, icon, 'icon'))) : null),
+                        tip ? React__default["default"].createElement("span", { className: cx("Spinner-tip") }, tip) : '')));
+            })));
     };
     Spinner.prototype.render = function () {
-        var _a = this.props, cx = _a.classnames, loadingConfig = _a.loadingConfig;
+        var loadingConfig = this.props.loadingConfig;
         var spinnerBody = this.renderBody();
         var root = loadingConfig === null || loadingConfig === void 0 ? void 0 : loadingConfig.root;
-        var doms = root ? document.querySelectorAll(root) : null;
-        if (doms === null || doms === void 0 ? void 0 : doms.length) {
+        var dom = root ? document.querySelector(root) : null;
+        if (dom) {
             // TODO: 找到准确的 元素
-            return ReactDOM__default["default"].createPortal(spinnerBody, doms[doms.length - 1]);
+            return ReactDOM__default["default"].createPortal(spinnerBody, dom);
         }
-        return (React__default["default"].createElement(React__default["default"].Fragment, null,
-            this.state.showMarker && (React__default["default"].createElement("span", { className: cx('Spinner-mark'), ref: this.spinnerRef })),
-            spinnerBody));
+        return spinnerBody;
     };
     Spinner.defaultProps = {
         show: true,

package/lib/components/Steps.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Switch.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/TableSelection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Tabs.d.ts

@@ -166,6 +166,7 @@ export declare class Tabs extends React.Component<TabsProps, any> {
      * 监听导航上的滚动事件
      */
     handleWheel(e: WheelEvent): void;
+    generateTabKey(hash: any, eventKey: any, index: number): string;
     renderNav(child: any, index: number, showClose: boolean): JSX.Element | undefined;
     renderTab(child: any, index: number): React.DetailedReactHTMLElement<any, HTMLElement> | undefined;
     renderArrow(type: 'left' | 'right'): JSX.Element | null | undefined;

package/lib/components/Tabs.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 
@@ -135,10 +135,11 @@ var Tabs = /** @class */ (function (_super) {
                     var _a, _b;
                     return ({
                         eventKey: (_a = item === null || item === void 0 ? void 0 : item.props) === null || _a === void 0 ? void 0 : _a.eventKey,
-                        title: (_b = item === null || item === void 0 ? void 0 : item.props) === null || _b === void 0 ? void 0 : _b.title
+                        // 这里 title 可能是 React.ReactNode，只对比 string
+                        title: typeof ((_b = item === null || item === void 0 ? void 0 : item.props) === null || _b === void 0 ? void 0 : _b.title) === 'string' ? item.props.title : ''
                     });
                 })
-                : this.props.children
+                : []
         }, {
             activeKey: preProps.activeKey,
             children: Array.isArray(preProps.children)
@@ -146,10 +147,10 @@ var Tabs = /** @class */ (function (_super) {
                     var _a, _b;
                     return ({
                         eventKey: (_a = item === null || item === void 0 ? void 0 : item.props) === null || _a === void 0 ? void 0 : _a.eventKey,
-                        title: (_b = item === null || item === void 0 ? void 0 : item.props) === null || _b === void 0 ? void 0 : _b.title
+                        title: typeof ((_b = item === null || item === void 0 ? void 0 : item.props) === null || _b === void 0 ? void 0 : _b.title) === 'string' ? item.props.title : ''
                     });
                 })
-                : preProps.children
+                : []
         });
         // 判断是否是由滚动触发的数据更新，如果是则不需要再次判断容器与内容的关系
         if (!this.scroll && !this.draging && isTabsModified) {
@@ -346,13 +347,17 @@ var Tabs = /** @class */ (function (_super) {
         this.checkArrowStatus();
         this.scroll = true;
     };
+    // 处理 hash 作为 key 时重复的问题
+    Tabs.prototype.generateTabKey = function (hash, eventKey, index) {
+        return (hash === eventKey ? 'hash-' : '') + (eventKey !== null && eventKey !== void 0 ? eventKey : index);
+    };
     Tabs.prototype.renderNav = function (child, index, showClose) {
         var _this = this;
         if (!child) {
             return;
         }
         var _a = this.props, cx = _a.classnames, activeKeyProp = _a.activeKey, mode = _a.mode, closable = _a.closable; _a.draggable; var showTip = _a.showTip, showTipClassName = _a.showTipClassName, editable = _a.editable;
-        var _b = child.props, eventKey = _b.eventKey, disabled = _b.disabled, icon = _b.icon, iconPosition = _b.iconPosition, title = _b.title, toolbar = _b.toolbar, tabClassName = _b.tabClassName, tabClosable = _b.closable;
+        var _b = child.props, eventKey = _b.eventKey, disabled = _b.disabled, icon = _b.icon, iconPosition = _b.iconPosition, title = _b.title, toolbar = _b.toolbar, tabClassName = _b.tabClassName, tabClosable = _b.closable, hash = _b.hash;
         var _c = this.state, editingIndex = _c.editingIndex, editInputText = _c.editInputText;
         var activeKey = activeKeyProp === undefined && index === 0 ? eventKey : activeKeyProp;
         var iconElement = amisCore.generateIcon(cx, icon, 'Icon');
@@ -369,7 +374,7 @@ var Tabs = /** @class */ (function (_super) {
                 " ",
                 title))) : (title),
             React__default["default"].isValidElement(toolbar) ? toolbar : null))));
-        return (React__default["default"].createElement("li", { className: cx('Tabs-link', activeKey === eventKey ? 'is-active' : '', disabled ? 'is-disabled' : '', tabClassName), key: eventKey !== null && eventKey !== void 0 ? eventKey : index, onClick: function () { return (disabled ? '' : _this.handleSelect(eventKey)); }, onDoubleClick: function () {
+        return (React__default["default"].createElement("li", { className: cx('Tabs-link', activeKey === eventKey ? 'is-active' : '', disabled ? 'is-disabled' : '', tabClassName), key: this.generateTabKey(hash, eventKey, index), onClick: function () { return (disabled ? '' : _this.handleSelect(eventKey)); }, onDoubleClick: function () {
                 editable && _this.handleStartEdit(index, title);
             } },
             showTip ? (React__default["default"].createElement(TooltipWrapper["default"], { placement: "top", tooltip: title, trigger: "hover", tooltipClassName: showTipClassName }, link)) : (link),
@@ -389,10 +394,10 @@ var Tabs = /** @class */ (function (_super) {
         if (!child) {
             return;
         }
-        var _a = this.props, activeKeyProp = _a.activeKey, classnames = _a.classnames;
-        var eventKey = child.props.eventKey;
+        var _a = (child === null || child === void 0 ? void 0 : child.props) || {}, hash = _a.hash, eventKey = _a.eventKey;
+        var _b = this.props, activeKeyProp = _b.activeKey, classnames = _b.classnames;
         var activeKey = activeKeyProp === undefined && index === 0 ? eventKey : activeKeyProp;
-        return React__default["default"].cloneElement(child, tslib.__assign(tslib.__assign({}, child.props), { key: eventKey, classnames: classnames, activeKey: activeKey }));
+        return React__default["default"].cloneElement(child, tslib.__assign(tslib.__assign({}, child.props), { key: this.generateTabKey(hash, eventKey, index), classnames: classnames, activeKey: activeKey }));
     };
     Tabs.prototype.renderArrow = function (type) {
         var _this = this;

package/lib/components/TabsTransfer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/TabsTransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Tag.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Textarea.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Timeline.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/TimelineItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Tinymce.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/TitleBar.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Toast.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Tooltip.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/TooltipWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Transfer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/TransferDropDown.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/TransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/TransferSearch.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Tree.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/TreeSelection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/UserTabSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/WithRemoteConfig.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/calendar/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/calendar/CalendarContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/calendar/DaysView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/calendar/MonthsView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/calendar/QuartersView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/calendar/TimeView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/calendar/YearsView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/condition-builder/Expression.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/condition-builder/Field.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/condition-builder/Formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/condition-builder/Func.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/condition-builder/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/condition-builder/GroupOrItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/condition-builder/InputSwitch.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/condition-builder/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/condition-builder/Value.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/condition-builder/config.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/condition-builder/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/formula/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/formula/FuncList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/formula/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/formula/VariableList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/formula/plugin.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/icons.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 
@@ -244,7 +244,7 @@ function Icon(_a) {
             var svgStr = style.getPropertyValue('content');
             var svg = /(<svg.*<\/svg>)/.exec(svgStr);
             if (svg) {
-                var svgHTML = svg[0].replaceAll('\\"', '"');
+                var svgHTML = svg[0].replace(/\\"/g, '"');
                 if (dom.svgHTMLClone !== svgHTML) {
                     dom.innerHTML = svgHTML;
                     // 存储svg，不直接用innerHTML是防止<circle />渲染后变成<circle></circle>的情况

package/lib/components/json-schema/Array.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/json-schema/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/json-schema/Object.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/json-schema/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/menu/MenuContext.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/menu/MenuItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.7.3-beta.0
  * Copyright 2018-2023 fex
  */