@jetlinks-web/components 2.6.24 → 2.6.27

package/es/ProLayout/SiderMenu/BaseMenu.js

@@ -1,4 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { isVNode as _isVNode } from "vue";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
@@ -11,6 +12,9 @@ import IconFont from '../../Icon';
 import { regular } from '@jetlinks-web/utils';
 import { Menu } from 'ant-design-vue/es/';
 import { createFromIconfontCN } from '@ant-design/icons-vue';
+function _isSlot(s) {
+  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
+}
 export var baseMenuProps = _objectSpread(_objectSpread({}, defaultSettingProps), {}, {
   prefixCls: {
     type: String,
@@ -114,7 +118,8 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
   });
   _defineProperty(this, "getSubMenuOrItem", function (item) {
     var _item$meta, _item$meta2, _item$meta7, _item$meta8;
-    if (Array.isArray(item.children) && item.children.length > 0 && !(item !== null && item !== void 0 && (_item$meta = item.meta) !== null && _item$meta !== void 0 && _item$meta.hideInMenu) && !(item !== null && item !== void 0 && (_item$meta2 = item.meta) !== null && _item$meta2 !== void 0 && _item$meta2.hideChildrenInMenu)) {
+    if (Array.isArray(item.children) && item.children.length > 0 && !(item === null || item === void 0 ? void 0 : (_item$meta = item.meta) === null || _item$meta === void 0 ? void 0 : _item$meta.hideInMenu) && !(item === null || item === void 0 ? void 0 : (_item$meta2 = item.meta) === null || _item$meta2 === void 0 ? void 0 : _item$meta2.hideChildrenInMenu)) {
+      var _slot;
       var _item$meta3, _item$meta4, _item$meta5, _item$meta6;
       if (_this.props.subMenuItemRender) {
         var subMenuItemRender = withCtx(_this.props.subMenuItemRender, _this.ctx);
@@ -127,13 +132,21 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
         prefixCls = _this$props.prefixCls,
         locale = _this$props.locale;
       var menuTitle = locale && locale((_item$meta3 = item.meta) === null || _item$meta3 === void 0 ? void 0 : _item$meta3.title) || ((_item$meta4 = item.meta) === null || _item$meta4 === void 0 ? void 0 : _item$meta4.title);
-      var defaultTitle = (_item$meta5 = item.meta) !== null && _item$meta5 !== void 0 && _item$meta5.icon ? _createVNode("span", {
+      var defaultTitle = ((_item$meta5 = item.meta) === null || _item$meta5 === void 0 ? void 0 : _item$meta5.icon) ? _createVNode("span", {
         "class": "".concat(prefixCls, "-menu-item")
       }, [_createVNode("span", {
         "class": "".concat(prefixCls, "-menu-item-title")
-      }, [menuTitle])]) : _createVNode("span", {
+      }, _isSlot(menuTitle) ? menuTitle : {
+        default: function _default() {
+          return [menuTitle];
+        }
+      })]) : _createVNode("span", {
         "class": "".concat(prefixCls, "-menu-item")
-      }, [menuTitle]);
+      }, _isSlot(menuTitle) ? menuTitle : {
+        default: function _default() {
+          return [menuTitle];
+        }
+      });
       return _createVNode(Menu.SubMenu, {
         "title": defaultTitle,
         "key": item.path,
@@ -142,9 +155,9 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
           "iconUrl": _this.props.iconfontUrl,
           "icon": (_item$meta6 = item.meta) === null || _item$meta6 === void 0 ? void 0 : _item$meta6.icon
         }, null)
-      }, {
+      }, _isSlot(_slot = _this.getNavMenuItems(item.children)) ? _slot : {
         default: function _default() {
-          return [_this.getNavMenuItems(item.children)];
+          return [_slot];
         }
       });
     }
@@ -161,14 +174,15 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
       "disabled": (_item$meta7 = item.meta) === null || _item$meta7 === void 0 ? void 0 : _item$meta7.disabled,
       "danger": (_item$meta8 = item.meta) === null || _item$meta8 === void 0 ? void 0 : _item$meta8.danger,
       "key": item.path
-    }, {
+    }, _isSlot(title) ? title : {
       default: function _default() {
         return [title];
       }
     });
   });
   _defineProperty(this, "getMenuItem", function (item) {
-    var _item$meta9, _item$meta0, _item$meta1, _item$meta10, _item$meta11;
+    var _slot2;
+    var _item$meta9, _item$meta10, _item$meta11, _item$meta12, _item$meta13;
     var meta = _objectSpread({}, item.meta);
     var target = meta.target || null;
     var hasUrl = regular.isUrl(item.path);
@@ -187,22 +201,30 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
       locale = _this$props2.locale;
     var icon = ((_item$meta9 = item.meta) === null || _item$meta9 === void 0 ? void 0 : _item$meta9.icon) && _createVNode(LazyIcon, {
       "iconUrl": _this.props.iconfontUrl,
-      "icon": (_item$meta0 = item.meta) === null || _item$meta0 === void 0 ? void 0 : _item$meta0.icon
+      "icon": (_item$meta10 = item.meta) === null || _item$meta10 === void 0 ? void 0 : _item$meta10.icon
     }, null) || undefined;
-    var menuTitle = locale && locale((_item$meta1 = item.meta) === null || _item$meta1 === void 0 ? void 0 : _item$meta1.title) || ((_item$meta10 = item.meta) === null || _item$meta10 === void 0 ? void 0 : _item$meta10.title);
-    var defaultTitle = (_item$meta11 = item.meta) !== null && _item$meta11 !== void 0 && _item$meta11.icon ? _createVNode(CustomTag, _objectSpread(_objectSpread(_objectSpread({}, attrs), props), {}, {
+    var menuTitle = locale && locale((_item$meta11 = item.meta) === null || _item$meta11 === void 0 ? void 0 : _item$meta11.title) || ((_item$meta12 = item.meta) === null || _item$meta12 === void 0 ? void 0 : _item$meta12.title);
+    var defaultTitle = ((_item$meta13 = item.meta) === null || _item$meta13 === void 0 ? void 0 : _item$meta13.icon) ? _createVNode(CustomTag, _objectSpread(_objectSpread(_objectSpread({}, attrs), props), {}, {
       "class": "".concat(prefixCls, "-menu-item")
     }), {
       default: function _default() {
         return [icon, _createVNode("span", {
           "class": "".concat(prefixCls, "-menu-item-title")
-        }, [menuTitle])];
+        }, _isSlot(menuTitle) ? menuTitle : {
+          default: function _default() {
+            return [menuTitle];
+          }
+        })];
       }
     }) : _createVNode(CustomTag, _objectSpread(_objectSpread(_objectSpread({}, attrs), props), {}, {
       "class": "".concat(prefixCls, "-menu-item")
-    }), {
+    }), _isSlot(_slot2 = _createVNode("span", null, _isSlot(menuTitle) ? menuTitle : {
+      default: function _default() {
+        return [menuTitle];
+      }
+    })) ? _slot2 : {
       default: function _default() {
-        return [_createVNode("span", null, [menuTitle])];
+        return [_slot2];
       }
     });
     return [defaultTitle, icon];
@@ -240,6 +262,7 @@ export default defineComponent({
       emit('click', args);
     };
     return function () {
+      var _slot3;
       return _createVNode(Menu, _objectSpread({
         "key": "Menu",
         "inlineIndent": 16,
@@ -250,9 +273,9 @@ export default defineComponent({
         "onOpenChange": handleOpenChange,
         "onSelect": handleSelect,
         "onClick": handleClick
-      }, props.menuProps), {
+      }, props.menuProps), _isSlot(_slot3 = menuUtil.getNavMenuItems(props.menuData)) ? _slot3 : {
         default: function _default() {
-          return [menuUtil.getNavMenuItems(props.menuData)];
+          return [_slot3];
         }
       });
     };

package/es/ProLayout/SiderMenu/SiderMenu.js

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { createVNode as _createVNode, createTextVNode as _createTextVNode, Fragment as _Fragment } from "vue";
+import { createVNode as _createVNode, resolveDirective as _resolveDirective, createTextVNode as _createTextVNode, isVNode as _isVNode, Fragment as _Fragment } from "vue";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { LayoutSider as Sider, Menu, Tooltip } from 'ant-design-vue/es/';
 import BaseMenu, { baseMenuProps } from './BaseMenu';
@@ -10,6 +10,9 @@ import IconFont from '../../Icon';
 import { useRouteContext } from '../RouteContext';
 import { computed, unref } from 'vue';
 import "../typings";
+function _isSlot(s) {
+  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
+}
 export var siderMenuProps = _objectSpread(_objectSpread(_objectSpread({}, defaultSettingProps), baseMenuProps), {}, {
   logo: {
     type: [Object, String, Function],
@@ -142,7 +145,11 @@ export var defaultRenderLogoAndTitle = function defaultRenderLogoAndTitle(props)
   if (layout === 'mix' && renderFunction === false) {
     return null;
   }
-  var titleDom = _createVNode("h1", null, [title]);
+  var titleDom = _createVNode("h1", null, _isSlot(title) ? title : {
+    default: function _default() {
+      return [title];
+    }
+  });
   if (renderKey === 'menuHeaderRender') {
     return null;
   }
@@ -152,7 +159,11 @@ export var defaultRenderLogoAndTitle = function defaultRenderLogoAndTitle(props)
     return renderFunction(logoDom, props.collapsed ? null : titleDom, props);
   }
   if (Array.isArray(renderFunction)) {
-    return _createVNode(_Fragment, null, [renderFunction]);
+    return _createVNode(_Fragment, null, _isSlot(renderFunction) ? renderFunction : {
+      default: function _default() {
+        return [renderFunction];
+      }
+    });
   }
   return _createVNode("a", null, [logoDom, props.collapsed ? null : titleDom]);
 };
@@ -164,6 +175,7 @@ export var defaultRenderCollapsedButton = function defaultRenderCollapsedButton(
   }, null);
 };
 var SiderMenu = function SiderMenu(props) {
+  var _slot;
   var collapsed = props.collapsed,
     siderWidth = props.siderWidth,
     breakpoint = props.breakpoint,
@@ -264,9 +276,17 @@ var SiderMenu = function SiderMenu(props) {
         "onClick": props.layout !== 'mix' ? props.onMenuHeaderClick : undefined,
         "id": "logo",
         "style": props === null || props === void 0 ? void 0 : props.logoStyle
-      }, [headerDom]), extraDom && _createVNode("div", {
+      }, _isSlot(headerDom) ? headerDom : {
+        default: function _default() {
+          return [headerDom];
+        }
+      }), extraDom && _createVNode("div", {
         "class": _defineProperty(_defineProperty({}, "".concat(baseClassName, "-extra"), true), "".concat(baseClassName, "-extra-no-logo"), !headerDom)
-      }, [extraDom]), _createVNode("div", {
+      }, _isSlot(extraDom) ? extraDom : {
+        default: function _default() {
+          return [extraDom];
+        }
+      }), _createVNode("div", {
         "class": "".concat(baseClassName, "-body"),
         "style": "flex: 1; overflow: hidden auto;"
       }, [props.layoutType !== LayoutType.CARD ? menuContentRender && menuContentRender(props, defaultMenuDom) || defaultMenuDom : null]), _createVNode("div", {
@@ -283,17 +303,17 @@ var SiderMenu = function SiderMenu(props) {
             props.onCollapse(!props.collapsed);
           }
         }
+      }, _isSlot(_slot = _createVNode(Menu.Item, {
+        "key": 'collapsed-button',
+        "class": "".concat(baseClassName, "-collapsed-button"),
+        "title": false
       }, {
         default: function _default() {
-          return [_createVNode(Menu.Item, {
-            "key": 'collapsed-button',
-            "class": "".concat(baseClassName, "-collapsed-button"),
-            "title": false
-          }, {
-            default: function _default() {
-              return [collapsedButtonRender && typeof collapsedButtonRender === 'function' ? collapsedButtonRender(collapsed) : collapsedButtonRender];
-            }
-          })];
+          return [collapsedButtonRender && typeof collapsedButtonRender === 'function' ? collapsedButtonRender(collapsed) : collapsedButtonRender];
+        }
+      })) ? _slot : {
+        default: function _default() {
+          return [_slot];
         }
       }) : null])];
     }