@jetlinks-web/components 2.6.23 → 2.6.26

package/lib/ProLayout/PageContainer/index.js

@@ -19,6 +19,9 @@ require("ant-design-vue/lib/_util/vue-types");
 var _defaultSettings = require("../defaultSettings");
 var _LocaleReciver = require("../../LocaleReciver");
 var _excluded = ["title", "tabList", "tabActiveKey", "content", "pageHeaderRender", "header", "extraContent", "prefixedClassName", "prefixCls", "fixedHeader", "showBack"];
+function _isSlot(s) {
+  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0, _vue.isVNode)(s);
+}
 var pageHeaderTabConfig = exports.pageHeaderTabConfig = {
   /**
    * @name tabs 的列表
@@ -154,6 +157,7 @@ var renderFooter = function renderFooter(props) {
     }, [item.tab]);
   };
   if (tabList && tabList.length) {
+    var _slot;
     return (0, _vue.createVNode)(_lib.Tabs, (0, _objectSpread2.default)({
       "class": "page-container-tabs",
       "activeKey": tabActiveKey,
@@ -163,14 +167,14 @@ var renderFooter = function renderFooter(props) {
         }
       },
       "tabBarExtraContent": tabBarExtraContent
-    }, tabProps), {
+    }, tabProps), _isSlot(_slot = tabList.map(function (item) {
+      return (0, _vue.createVNode)(_lib.Tabs.TabPane, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+        "tab": tabPane(item),
+        "key": item.key
+      }), null);
+    })) ? _slot : {
       default: function _default() {
-        return [tabList.map(function (item) {
-          return (0, _vue.createVNode)(_lib.Tabs.TabPane, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
-            "tab": tabPane(item),
-            "key": item.key
-          }), null);
-        })];
+        return [_slot];
       }
     });
   }

package/lib/ProLayout/SiderMenu/BaseMenu.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.baseMenuProps = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _vue = require("vue");
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _vue = require("vue");
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _defaultSettings = require("../defaultSettings");
 var _RouteContext = require("../RouteContext");
@@ -17,6 +17,9 @@ var _Icon = _interopRequireDefault(require("../../Icon"));
 var _utils = require("@jetlinks-web/utils");
 var _lib = require("ant-design-vue/lib/");
 var _iconsVue = require("@ant-design/icons-vue/lib/icons");
+function _isSlot(s) {
+  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0, _vue.isVNode)(s);
+}
 var baseMenuProps = exports.baseMenuProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _defaultSettings.defaultSettingProps), {}, {
   prefixCls: {
     type: String,
@@ -120,7 +123,8 @@ var MenuUtil = /*#__PURE__*/(0, _createClass2.default)(function MenuUtil(_props,
   });
   (0, _defineProperty2.default)(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 = (0, _vue.withCtx)(_this.props.subMenuItemRender, _this.ctx);
@@ -133,13 +137,21 @@ var MenuUtil = /*#__PURE__*/(0, _createClass2.default)(function MenuUtil(_props,
         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 ? (0, _vue.createVNode)("span", {
+      var defaultTitle = ((_item$meta5 = item.meta) === null || _item$meta5 === void 0 ? void 0 : _item$meta5.icon) ? (0, _vue.createVNode)("span", {
         "class": "".concat(prefixCls, "-menu-item")
       }, [(0, _vue.createVNode)("span", {
         "class": "".concat(prefixCls, "-menu-item-title")
-      }, [menuTitle])]) : (0, _vue.createVNode)("span", {
+      }, _isSlot(menuTitle) ? menuTitle : {
+        default: function _default() {
+          return [menuTitle];
+        }
+      })]) : (0, _vue.createVNode)("span", {
         "class": "".concat(prefixCls, "-menu-item")
-      }, [menuTitle]);
+      }, _isSlot(menuTitle) ? menuTitle : {
+        default: function _default() {
+          return [menuTitle];
+        }
+      });
       return (0, _vue.createVNode)(_lib.Menu.SubMenu, {
         "title": defaultTitle,
         "key": item.path,
@@ -148,9 +160,9 @@ var MenuUtil = /*#__PURE__*/(0, _createClass2.default)(function MenuUtil(_props,
           "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];
         }
       });
     }
@@ -167,14 +179,15 @@ var MenuUtil = /*#__PURE__*/(0, _createClass2.default)(function MenuUtil(_props,
       "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];
       }
     });
   });
   (0, _defineProperty2.default)(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 = (0, _objectSpread2.default)({}, item.meta);
     var target = meta.target || null;
     var hasUrl = _utils.regular.isUrl(item.path);
@@ -193,22 +206,30 @@ var MenuUtil = /*#__PURE__*/(0, _createClass2.default)(function MenuUtil(_props,
       locale = _this$props2.locale;
     var icon = ((_item$meta9 = item.meta) === null || _item$meta9 === void 0 ? void 0 : _item$meta9.icon) && (0, _vue.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 ? (0, _vue.createVNode)(CustomTag, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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) ? (0, _vue.createVNode)(CustomTag, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, attrs), props), {}, {
       "class": "".concat(prefixCls, "-menu-item")
     }), {
       default: function _default() {
         return [icon, (0, _vue.createVNode)("span", {
           "class": "".concat(prefixCls, "-menu-item-title")
-        }, [menuTitle])];
+        }, _isSlot(menuTitle) ? menuTitle : {
+          default: function _default() {
+            return [menuTitle];
+          }
+        })];
       }
     }) : (0, _vue.createVNode)(CustomTag, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, attrs), props), {}, {
       "class": "".concat(prefixCls, "-menu-item")
-    }), {
+    }), _isSlot(_slot2 = (0, _vue.createVNode)("span", null, _isSlot(menuTitle) ? menuTitle : {
+      default: function _default() {
+        return [menuTitle];
+      }
+    })) ? _slot2 : {
       default: function _default() {
-        return [(0, _vue.createVNode)("span", null, [menuTitle])];
+        return [_slot2];
       }
     });
     return [defaultTitle, icon];
@@ -246,6 +267,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
       emit('click', args);
     };
     return function () {
+      var _slot3;
       return (0, _vue.createVNode)(_lib.Menu, (0, _objectSpread2.default)({
         "key": "Menu",
         "inlineIndent": 16,
@@ -256,9 +278,9 @@ var _default2 = exports.default = (0, _vue.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/lib/ProLayout/SiderMenu/SiderMenu.js

@@ -17,7 +17,11 @@ var _vueTypes = _interopRequireDefault(require("ant-design-vue/lib/_util/vue-typ
 var _Icon = _interopRequireDefault(require("../../Icon"));
 var _RouteContext = require("../RouteContext");
 require("../typings");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _isSlot(s) {
+  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0, _vue.isVNode)(s);
+}
 var siderMenuProps = exports.siderMenuProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _defaultSettings.defaultSettingProps), _BaseMenu.baseMenuProps), {}, {
   logo: {
     type: [Object, String, Function],
@@ -150,7 +154,11 @@ var defaultRenderLogoAndTitle = exports.defaultRenderLogoAndTitle = function def
   if (layout === 'mix' && renderFunction === false) {
     return null;
   }
-  var titleDom = (0, _vue.createVNode)("h1", null, [title]);
+  var titleDom = (0, _vue.createVNode)("h1", null, _isSlot(title) ? title : {
+    default: function _default() {
+      return [title];
+    }
+  });
   if (renderKey === 'menuHeaderRender') {
     return null;
   }
@@ -160,7 +168,11 @@ var defaultRenderLogoAndTitle = exports.defaultRenderLogoAndTitle = function def
     return renderFunction(logoDom, props.collapsed ? null : titleDom, props);
   }
   if (Array.isArray(renderFunction)) {
-    return (0, _vue.createVNode)(_vue.Fragment, null, [renderFunction]);
+    return (0, _vue.createVNode)(_vue.Fragment, null, _isSlot(renderFunction) ? renderFunction : {
+      default: function _default() {
+        return [renderFunction];
+      }
+    });
   }
   return (0, _vue.createVNode)("a", null, [logoDom, props.collapsed ? null : titleDom]);
 };
@@ -172,6 +184,7 @@ var defaultRenderCollapsedButton = exports.defaultRenderCollapsedButton = functi
   }, null);
 };
 var SiderMenu = function SiderMenu(props) {
+  var _slot;
   var collapsed = props.collapsed,
     siderWidth = props.siderWidth,
     breakpoint = props.breakpoint,
@@ -272,9 +285,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 && (0, _vue.createVNode)("div", {
+      }, _isSlot(headerDom) ? headerDom : {
+        default: function _default() {
+          return [headerDom];
+        }
+      }), extraDom && (0, _vue.createVNode)("div", {
         "class": (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(baseClassName, "-extra"), true), "".concat(baseClassName, "-extra-no-logo"), !headerDom)
-      }, [extraDom]), (0, _vue.createVNode)("div", {
+      }, _isSlot(extraDom) ? extraDom : {
+        default: function _default() {
+          return [extraDom];
+        }
+      }), (0, _vue.createVNode)("div", {
         "class": "".concat(baseClassName, "-body"),
         "style": "flex: 1; overflow: hidden auto;"
       }, [props.layoutType !== _defaultSettings.LayoutType.CARD ? menuContentRender && menuContentRender(props, defaultMenuDom) || defaultMenuDom : null]), (0, _vue.createVNode)("div", {
@@ -291,17 +312,17 @@ var SiderMenu = function SiderMenu(props) {
             props.onCollapse(!props.collapsed);
           }
         }
+      }, _isSlot(_slot = (0, _vue.createVNode)(_lib.Menu.Item, {
+        "key": 'collapsed-button',
+        "class": "".concat(baseClassName, "-collapsed-button"),
+        "title": false
       }, {
         default: function _default() {
-          return [(0, _vue.createVNode)(_lib.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])];
     }