amis-ui 2.7.2 → 2.8.0

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */
 
@@ -25,6 +25,7 @@ function InputJSONSchemaObject(props) {
     var _a, _b;
     var cx = props.classnames, value = props.value, onChange = props.onChange, disabled = props.disabled, __ = props.translate, renderKey = props.renderKey, collapsable = props.collapsable, renderValue = props.renderValue;
     var buildMembers = React__default["default"].useCallback(function (schema, value) {
+        var e_1, _a;
         var members = [];
         var required = Array.isArray(schema.required) ? schema.required : [];
         Object.keys(schema.properties || {}).forEach(function (key) {
@@ -51,9 +52,18 @@ function InputJSONSchemaObject(props) {
                 });
             }
         };
-        for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-            var key = keys_1[_i];
-            _loop_1(key);
+        try {
+            for (var keys_1 = tslib.__values(keys), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
+                var key = keys_1_1.value;
+                _loop_1(key);
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (keys_1_1 && !keys_1_1.done && (_a = keys_1.return)) _a.call(keys_1);
+            }
+            finally { if (e_1) throw e_1.error; }
         }
         if (!members.length) {
             members.push({
@@ -67,10 +77,10 @@ function InputJSONSchemaObject(props) {
         }
         return members;
     }, []);
-    var _c = React__default["default"].useState(buildMembers(props.schema, props.value)), members = _c[0], setMembers = _c[1];
+    var _c = tslib.__read(React__default["default"].useState(buildMembers(props.schema, props.value)), 2), members = _c[0], setMembers = _c[1];
     var membersRef = React__default["default"].useRef();
     membersRef.current = members;
-    var _d = React__default["default"].useState(collapsable ? true : false), collapsed = _d[0], setCollapsed = _d[1];
+    var _d = tslib.__read(React__default["default"].useState(collapsable ? true : false), 2), collapsed = _d[0], setCollapsed = _d[1];
     var toggleCollapsed = function () {
         setCollapsed(!collapsed);
     };
@@ -112,6 +122,7 @@ function InputJSONSchemaObject(props) {
         setMembers(buildMembers(props.schema, props.value));
     }, [JSON.stringify(props.schema)]);
     React__default["default"].useEffect(function () {
+        var e_2, _a;
         var value = props.value;
         var m = membersRef.current.concat();
         var keys = Object.keys(value || {});
@@ -128,9 +139,18 @@ function InputJSONSchemaObject(props) {
                 });
             }
         };
-        for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
-            var key = keys_2[_i];
-            _loop_2(key);
+        try {
+            for (var keys_2 = tslib.__values(keys), keys_2_1 = keys_2.next(); !keys_2_1.done; keys_2_1 = keys_2.next()) {
+                var key = keys_2_1.value;
+                _loop_2(key);
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (keys_2_1 && !keys_2_1.done && (_a = keys_2.return)) _a.call(keys_2);
+            }
+            finally { if (e_2) throw e_2.error; }
         }
         if (m.length !== membersRef.current.length) {
             setMembers(m);

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

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

package/lib/components/menu/MenuContext.js

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

package/lib/components/menu/MenuItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */
 
@@ -87,9 +87,9 @@ var MenuItem = /** @class */ (function (_super) {
                 _b['Nav-Menu-item-icon-svg-collapsed'] = isCollapsedNode,
                 _b))
         })) : null) : null;
-        var labelNode = label && typeof label === 'string' ? (React__default["default"].createElement("span", { className: cx("Nav-Menu-item-label", (_c = {},
+        var labelNode = label && (typeof label === 'string' || Array.isArray(label)) ? (React__default["default"].createElement("span", { className: cx("Nav-Menu-item-label", (_c = {},
                 _c['Nav-Menu-item-label-collapsed'] = isCollapsedNode,
-                _c)), title: isCollapsedNode ? '' : label, style: this.getDynamicStyle(!!iconNode) }, isCollapsedNode ? label.slice(0, 1) : label)) : React__default["default"].isValidElement(label) ? (React__default["default"].cloneElement(label, {
+                _c)), title: isCollapsedNode || Array.isArray(label) ? '' : label, style: this.getDynamicStyle(!!iconNode) }, isCollapsedNode ? label.slice(0, 1) : label)) : React__default["default"].isValidElement(label) ? (React__default["default"].cloneElement(label, {
             className: cx('Nav-Menu-item-label', (_f = label === null || label === void 0 ? void 0 : label.props) === null || _f === void 0 ? void 0 : _f.className, (_d = {},
                 _d['Nav-Menu-item-label-collapsed'] = isCollapsedNode,
                 _d['Nav-Menu-item-label-subTitle'] = !isCollapsedNode,
@@ -115,11 +115,11 @@ var MenuItem = /** @class */ (function (_super) {
         var _b = this.props, className = _b.className, tooltipClassName = _b.tooltipClassName, cx = _b.classnames, label = _b.label, disabled = _b.disabled, disabledTip = _b.disabledTip, tooltipContainer = _b.tooltipContainer, tooltipTrigger = _b.tooltipTrigger, depth = _b.depth, hidden = _b.hidden;
         var _c = this.context, collapsed = _c.collapsed, mode = _c.mode, stacked = _c.stacked, themeColor = _c.themeColor, direction = _c.direction;
         var showToolTip = stacked && mode === 'inline' && collapsed && depth === 1;
-        // 多套一层div 是因为disabled情况下 RcItem触发不了tooltipwrapper的事件
+        // 多套一层ul 是因为disabled情况下 RcItem触发不了tooltipwrapper的事件
         return hidden ? null : (React__default["default"].createElement(TooltipWrapper["default"], { tooltipClassName: cx('Nav-Menu-item-tooltip', tooltipClassName, (_a = {},
                 _a['Nav-Menu-item-tooltip-dark'] = themeColor === 'dark',
                 _a)), placement: direction === 'rtl' ? 'left' : 'right', tooltip: disabled ? disabledTip : showToolTip ? label : '', container: tooltipContainer, trigger: tooltipTrigger, rootClose: true },
-            React__default["default"].createElement("div", { className: cx('Nav-Menu-item-tooltip-wrap') },
+            React__default["default"].createElement("ul", { className: cx('Nav-Menu-item-tooltip-wrap') },
                 React__default["default"].createElement(RcMenu.Item, tslib.__assign({}, pick__default["default"](this.props, this.internalProps), { className: cx(className) }), this.renderMenuItem()))));
     };
     MenuItem.defaultProps = {

package/lib/components/menu/SubMenu.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */
 
@@ -26,7 +26,6 @@ var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
  * @description 导航子菜单
  * @author fex
  */
-var CaretIcon = icons.getIcon('caret');
 var DragIcon = icons.getIcon('drag-bar');
 var SubMenu = /** @class */ (function (_super) {
     tslib.__extends(SubMenu, _super);
@@ -101,10 +100,10 @@ var SubMenu = /** @class */ (function (_super) {
                 _b['Menu-item-icon-svg-collapsed'] = isCollapsedNode,
                 _b))
         })) : null) : null;
-        var labelNode = label && typeof label === 'string' ? (React__default["default"].createElement("span", { className: cx('Nav-Menu-item-label', (_c = {},
+        var labelNode = label && (typeof label === 'string' || Array.isArray(label)) ? (React__default["default"].createElement("span", { className: cx('Nav-Menu-item-label', (_c = {},
                 _c['Nav-Menu-item-label-collapsed'] = isCollapsedNode,
                 _c['Nav-Menu-item-label-subTitle'] = !isCollapsedNode,
-                _c)), title: isCollapsedNode ? '' : label, style: this.getDynamicStyle(!!iconNode) }, label)) : React__default["default"].isValidElement(label) ? (React__default["default"].cloneElement(label, {
+                _c)), title: isCollapsedNode || Array.isArray(label) ? '' : label, style: this.getDynamicStyle(!!iconNode) }, isCollapsedNode ? label.slice(0, 1) : label)) : React__default["default"].isValidElement(label) ? (React__default["default"].cloneElement(label, {
             className: cx('Nav-Menu-item-label', (_f = label === null || label === void 0 ? void 0 : label.props) === null || _f === void 0 ? void 0 : _f.className, (_d = {},
                 _d['Nav-Menu-item-label-collapsed'] = isCollapsedNode,
                 _d['Nav-Menu-item-label-subTitle'] = !isCollapsedNode,
@@ -119,7 +118,7 @@ var SubMenu = /** @class */ (function (_super) {
                 iconNode,
                 labelNode,
                 !stacked ? (React__default["default"].createElement("span", { key: "expand-toggle", className: cx('Nav-Menu-submenu-arrow') },
-                    React__default["default"].createElement(CaretIcon, null))) : null));
+                    React__default["default"].createElement(icons.Icon, { icon: "right-arrow-bold", className: "icon" }))) : null));
         };
         return (React__default["default"].createElement("div", { className: cx('Nav-Menu-item-wrap') },
             React__default["default"].createElement(Badge.Badge, { classnames: cx, badge: badge ? tslib.__assign(tslib.__assign({}, badge), { className: badgeClassName }) : null, data: amisCore.createObject(defaultData, link) },