@jetlinks-web/components 2.6.20 → 2.6.22

package/lib/ProLayout/Basic/BasicLayout.js

@@ -14,17 +14,14 @@ var _SiderMenu = _interopRequireWildcard(require("../SiderMenu/SiderMenu"));
 var _defaultSettings = require("../defaultSettings");
 var _TopHeader = require("../TopHeader");
 var _Header = _interopRequireWildcard(require("./Header"));
-var _useConfigInject2 = _interopRequireDefault(require("ant-design-vue/es/_util/hooks/useConfigInject"));
+var _useConfigInject2 = _interopRequireDefault(require("ant-design-vue/lib/_util/hooks/useConfigInject"));
 var _lodashEs = require("lodash");
 var _RouteContext = require("../RouteContext");
 var _util = require("../util");
-var _es = require("ant-design-vue/es");
+var _lib = require("ant-design-vue/lib/");
 var _excluded = ["pure", "onCollapse", "onOpenKeys", "onSelect", "onMenuClick"];
 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 basicLayoutProps = exports.basicLayoutProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _defaultSettings.defaultSettingProps), _SiderMenu.siderMenuProps), _TopHeader.baseHeaderProps), _Header.headerViewProps), {}, {
   pure: Boolean,
   loading: Boolean,
@@ -255,17 +252,16 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
         return (_slots$default = slots.default) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
       }
       if (props.layoutType === _defaultSettings.LayoutType.LIST) {
-        var _slot;
         var _slots$default2;
         return (0, _vue.createVNode)(_vue.Fragment, null, [(0, _vue.createVNode)("div", {
           "class": className.value
-        }, [(0, _vue.createVNode)(_es.Layout, {
+        }, [(0, _vue.createVNode)(_lib.Layout, {
           "style": (0, _objectSpread2.default)({
             minHeight: '100vh'
           }, attrs.style || {})
         }, {
           default: function _default() {
-            return [headerDom.value, (0, _vue.createVNode)(_es.Layout, {
+            return [headerDom.value, (0, _vue.createVNode)(_lib.Layout, {
               "style": genLayoutStyle,
               "class": prefixCls.value
             }, {
@@ -282,13 +278,13 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
                   "onSelect": onSelect,
                   "onOpenKeys": onOpenKeys,
                   "onMenuClick": onMenuClick
-                }), null), (0, _vue.createVNode)(_es.Layout, null, _isSlot(_slot = (0, _vue.createVNode)(_es.LayoutContent, null, {
+                }), null), (0, _vue.createVNode)(_lib.Layout, null, {
                   default: function _default() {
-                    return [(_slots$default2 = slots.default) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)];
-                  }
-                })) ? _slot : {
-                  default: function _default() {
-                    return [_slot];
+                    return [(0, _vue.createVNode)(_lib.LayoutContent, null, {
+                      default: function _default() {
+                        return [(_slots$default2 = slots.default) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)];
+                      }
+                    })];
                   }
                 })];
               }
@@ -299,7 +295,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
         var _slots$default3;
         return (0, _vue.createVNode)("div", {
           "class": className.value
-        }, [(0, _vue.createVNode)(_es.Layout, {
+        }, [(0, _vue.createVNode)(_lib.Layout, {
           "style": (0, _objectSpread2.default)({
             minHeight: '100vh'
           }, attrs.style || {})
@@ -319,12 +315,12 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
               "onSelect": onSelect,
               "onOpenKeys": onOpenKeys,
               "onMenuClick": onMenuClick
-            }), null), (0, _vue.createVNode)(_es.Layout, {
+            }), null), (0, _vue.createVNode)(_lib.Layout, {
               "style": genLayoutStyle,
               "class": prefixCls.value
             }, {
               default: function _default() {
-                return [headerDom.value, (0, _vue.createVNode)(_es.LayoutContent, null, {
+                return [headerDom.value, (0, _vue.createVNode)(_lib.LayoutContent, null, {
                   default: function _default() {
                     return [(_slots$default3 = slots.default) === null || _slots$default3 === void 0 ? void 0 : _slots$default3.call(slots)];
                   }
@@ -335,10 +331,9 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
         })]);
       } else {
         var _slots$default4;
-        var _slot2, _slot3;
         return (0, _vue.createVNode)(_vue.Fragment, null, [(0, _vue.createVNode)("div", {
           "class": className.value
-        }, [(0, _vue.createVNode)(_es.Layout, null, {
+        }, [(0, _vue.createVNode)(_lib.Layout, null, {
           default: function _default() {
             return [(0, _vue.createVNode)(_SiderMenu.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
               "logo": logoRender || restProps.logo,
@@ -355,41 +350,41 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
               "onOpenKeys": onOpenKeys,
               "onMenuClick": onMenuClick,
               "onAppMenuClick": onAppMenuClick
-            }), null), (0, _vue.createVNode)(_es.Layout, null, {
+            }), null), (0, _vue.createVNode)(_lib.Layout, null, {
               default: function _default() {
-                return [(0, _vue.createVNode)(_es.Layout.Header, {
+                return [(0, _vue.createVNode)(_lib.Layout.Header, {
                   "style": (0, _objectSpread2.default)({
                     background: 'transparent',
                     padding: 0,
                     height: '40px'
                   }, props.pageHeaderStyle || {})
-                }, _isSlot(_slot2 = (0, _vue.createVNode)(_es.Tabs, {
-                  "hide-add": true,
-                  "type": "editable-card",
-                  "class": "history-tabs",
-                  "id": 'history-route-tabs',
-                  "tabBarStyle": {
-                    margin: 0
-                  },
-                  "onTabClick": onTabClick,
-                  "onEdit": onTabEdit,
-                  "activeKey": props.historyActive,
-                  "onChange": onTabChange
                 }, {
                   default: function _default() {
-                    return [historyRender ? historyRender() : props.historyRoutes.map(function (item) {
-                      return (0, _vue.createVNode)(_es.Tabs.TabPane, {
-                        "key": item.name,
-                        "tab": item.label,
-                        "closable": true
-                      }, null);
+                    return [(0, _vue.createVNode)(_lib.Tabs, {
+                      "hide-add": true,
+                      "type": "editable-card",
+                      "class": "history-tabs",
+                      "id": "history-route-tabs",
+                      "tabBarStyle": {
+                        margin: 0
+                      },
+                      "onTabClick": onTabClick,
+                      "onEdit": onTabEdit,
+                      "activeKey": props.historyActive,
+                      "onChange": onTabChange
+                    }, {
+                      default: function _default() {
+                        return [historyRender ? historyRender() : props.historyRoutes.map(function (item) {
+                          return (0, _vue.createVNode)(_lib.Tabs.TabPane, {
+                            "key": item.name,
+                            "tab": item.label,
+                            "closable": true
+                          }, null);
+                        })];
+                      }
                     })];
                   }
-                })) ? _slot2 : {
-                  default: function _default() {
-                    return [_slot2];
-                  }
-                }), (0, _vue.createVNode)(_es.LayoutContent, {
+                }), (0, _vue.createVNode)(_lib.LayoutContent, {
                   "style": {
                     flex: '1 1 0',
                     overflow: 'auto'
@@ -398,17 +393,17 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
                   default: function _default() {
                     return [(_slots$default4 = slots.default) === null || _slots$default4 === void 0 ? void 0 : _slots$default4.call(slots)];
                   }
-                }), (0, _vue.createVNode)(_es.Layout.Footer, {
+                }), (0, _vue.createVNode)(_lib.Layout.Footer, {
                   "style": (0, _objectSpread2.default)({
                     padding: '11px 24px'
                   }, props.pageFooterStyle || {})
-                }, _isSlot(_slot3 = (0, _vue.createVNode)(_es.Breadcrumb, {
-                  "routes": breadcrumb.value.routes
                 }, {
-                  itemRender: breadcrumb.value.itemRender
-                })) ? _slot3 : {
                   default: function _default() {
-                    return [_slot3];
+                    return [(0, _vue.createVNode)(_lib.Breadcrumb, {
+                      "routes": breadcrumb.value.routes
+                    }, {
+                      itemRender: breadcrumb.value.itemRender
+                    })];
                   }
                 })];
               }

package/lib/ProLayout/Basic/Header.js

@@ -9,13 +9,10 @@ var _vue = require("vue");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _TopHeader = require("../TopHeader");
-var _vueTypes = _interopRequireDefault(require("ant-design-vue/es/_util/vue-types"));
+var _vueTypes = _interopRequireDefault(require("ant-design-vue/lib/_util/vue-types"));
 var _RouteContext = require("../RouteContext");
-var _es = require("ant-design-vue/es");
+var _lib = require("ant-design-vue/lib/");
 var _defaultSettings = require("../defaultSettings");
-function _isSlot(s) {
-  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0, _vue.isVNode)(s);
-}
 var headerViewProps = exports.headerViewProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _TopHeader.baseHeaderProps), {}, {
   headerRender: {
     type: [Object, Function, Boolean],
@@ -83,14 +80,13 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
       return 0;
     });
     return function () {
-      var _slot;
-      return (0, _vue.createVNode)(_vue.Fragment, null, [needFixedHeader.value && (0, _vue.createVNode)(_es.Layout.Header, {
+      return (0, _vue.createVNode)(_vue.Fragment, null, [needFixedHeader.value && (0, _vue.createVNode)(_lib.Layout.Header, {
         "style": {
           height: "".concat(headerHeight.value, "px"),
           lineHeight: "".concat(headerHeight.value, "px"),
           background: 'transparent'
         }
-      }, null), (0, _vue.createVNode)(_es.Layout.Header, {
+      }, null), (0, _vue.createVNode)(_lib.Layout.Header, {
         "style": {
           padding: 0,
           height: "".concat(headerHeight.value, "px"),
@@ -100,9 +96,9 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
           right: right.value
         },
         "class": className.value
-      }, _isSlot(_slot = renderContent()) ? _slot : {
+      }, {
         default: function _default() {
-          return [_slot];
+          return [renderContent()];
         }
       })]);
     };

package/lib/ProLayout/PageContainer/index.js

@@ -10,18 +10,15 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _type = require("ant-design-vue/es/_util/type");
-var _es = require("ant-design-vue/es");
-var _pageHeader = require("ant-design-vue/es/page-header");
+var _type = require("ant-design-vue/lib/_util/type");
+var _lib = require("ant-design-vue/lib/");
+var _pageHeader = require("ant-design-vue/lib/page-header");
 var _RouteContext = require("../RouteContext");
 var _util = require("../util");
-require("ant-design-vue/es/_util/vue-types");
+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 的列表
@@ -157,8 +154,7 @@ var renderFooter = function renderFooter(props) {
     }, [item.tab]);
   };
   if (tabList && tabList.length) {
-    var _slot;
-    return (0, _vue.createVNode)(_es.Tabs, (0, _objectSpread2.default)({
+    return (0, _vue.createVNode)(_lib.Tabs, (0, _objectSpread2.default)({
       "class": "page-container-tabs",
       "activeKey": tabActiveKey,
       "onChange": function onChange(key) {
@@ -167,14 +163,14 @@ var renderFooter = function renderFooter(props) {
         }
       },
       "tabBarExtraContent": tabBarExtraContent
-    }, tabProps), _isSlot(_slot = tabList.map(function (item) {
-      return (0, _vue.createVNode)(_es.Tabs.TabPane, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
-        "tab": tabPane(item),
-        "key": item.key
-      }), null);
-    })) ? _slot : {
+    }, tabProps), {
       default: function _default() {
-        return [_slot];
+        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);
+        })];
       }
     });
   }
@@ -235,7 +231,7 @@ var ProPageHeader = function ProPageHeader(props) {
   var backProps = {};
   if (showBack) {
     // @ts-ignore
-    backProps.backIcon = (0, _vue.createVNode)(_es.Button, null, {
+    backProps.backIcon = (0, _vue.createVNode)(_lib.Button, null, {
       default: function _default() {
         return [contextLocale.value.pageContainer.back];
       }
@@ -250,7 +246,7 @@ var ProPageHeader = function ProPageHeader(props) {
   } : {};
   return (0, _vue.createVNode)("div", {
     "class": "".concat(prefixedClassName, "-wrap")
-  }, [(0, _vue.createVNode)(_es.PageHeader, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  }, [(0, _vue.createVNode)(_lib.PageHeader, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     "style": styles
   }, backProps), restProps), {}, {
     "title": pageHeaderTitle,
@@ -315,7 +311,7 @@ var PageContainer = (0, _vue.defineComponent)({
       }, [(_slots$default = slots.default) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)]) : (0, _vue.createVNode)("div", {
         "class": classNames.value,
         "style": (0, _objectSpread2.default)({}, attrs.style || {})
-      }, [fixedHeader && headerDom.value ? (0, _vue.createVNode)(_es.Affix, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, affixProps.value), {}, {
+      }, [fixedHeader && headerDom.value ? (0, _vue.createVNode)(_lib.Affix, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, affixProps.value), {}, {
         "offsetTop": value.hasHeader && value.fixedHeader ? value.headerHeight : 0
       }), {
         default: function _default() {
@@ -323,7 +319,7 @@ var PageContainer = (0, _vue.defineComponent)({
         }
       }) : headerDom.value, (0, _vue.createVNode)("div", {
         "class": "".concat(prefixedClassName.value, "-grid-content")
-      }, [loading.value ? (0, _vue.createVNode)(_es.Spin, null, null) : slots.default ? (0, _vue.createVNode)("div", null, [(0, _vue.createVNode)("div", {
+      }, [loading.value ? (0, _vue.createVNode)(_lib.Spin, null, null) : slots.default ? (0, _vue.createVNode)("div", null, [(0, _vue.createVNode)("div", {
         "class": "".concat(prefixedClassName.value, "-children-content ").concat(childrenFullHeight.value ? 'children-full-height' : ''),
         "style": (0, _objectSpread2.default)({}, props.contentStyle || {})
       }, [slots.default()]), value.hasFooterToolbar && (0, _vue.createVNode)("div", {

package/lib/ProLayout/SiderMenu/BaseMenu.js

@@ -6,21 +6,17 @@ 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");
 var _Icon = _interopRequireDefault(require("../../Icon"));
 var _utils = require("@jetlinks-web/utils");
-var _es = require("ant-design-vue/es");
+var _lib = require("ant-design-vue/lib/");
 var _iconsVue = require("@ant-design/icons-vue/lib/icons");
-require("ant-design-vue/es/_util/vue-types");
-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,
@@ -124,8 +120,7 @@ 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 ? 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;
+    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)) {
       var _item$meta3, _item$meta4, _item$meta5, _item$meta6;
       if (_this.props.subMenuItemRender) {
         var subMenuItemRender = (0, _vue.withCtx)(_this.props.subMenuItemRender, _this.ctx);
@@ -138,22 +133,14 @@ 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 ? void 0 : _item$meta5.icon) ? (0, _vue.createVNode)("span", {
+      var defaultTitle = (_item$meta5 = item.meta) !== null && _item$meta5 !== void 0 && _item$meta5.icon ? (0, _vue.createVNode)("span", {
         "class": "".concat(prefixCls, "-menu-item")
       }, [(0, _vue.createVNode)("span", {
         "class": "".concat(prefixCls, "-menu-item-title")
-      }, _isSlot(menuTitle) ? menuTitle : {
-        default: function _default() {
-          return [menuTitle];
-        }
-      })]) : (0, _vue.createVNode)("span", {
+      }, [menuTitle])]) : (0, _vue.createVNode)("span", {
         "class": "".concat(prefixCls, "-menu-item")
-      }, _isSlot(menuTitle) ? menuTitle : {
-        default: function _default() {
-          return [menuTitle];
-        }
-      });
-      return (0, _vue.createVNode)(_es.Menu.SubMenu, {
+      }, [menuTitle]);
+      return (0, _vue.createVNode)(_lib.Menu.SubMenu, {
         "title": defaultTitle,
         "key": item.path,
         "popupClassName": "".concat(prefixCls, "-menu-popup"),
@@ -161,9 +148,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 [_slot];
+          return [_this.getNavMenuItems(item.children)];
         }
       });
     }
@@ -176,18 +163,17 @@ var MenuUtil = /*#__PURE__*/(0, _createClass2.default)(function MenuUtil(_props,
       item: item,
       title: title,
       icon: icon
-    }) || (0, _vue.createVNode)(_es.Menu.Item, {
+    }) || (0, _vue.createVNode)(_lib.Menu.Item, {
       "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 _slot2;
     var _item$meta9, _item$meta10, _item$meta11, _item$meta12, _item$meta13;
     var meta = (0, _objectSpread2.default)({}, item.meta);
     var target = meta.target || null;
@@ -210,27 +196,19 @@ var MenuUtil = /*#__PURE__*/(0, _createClass2.default)(function MenuUtil(_props,
       "icon": (_item$meta10 = item.meta) === null || _item$meta10 === void 0 ? void 0 : _item$meta10.icon
     }, null) || undefined;
     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), {}, {
+    var defaultTitle = (_item$meta13 = item.meta) !== null && _item$meta13 !== 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")
-        }, _isSlot(menuTitle) ? menuTitle : {
-          default: function _default() {
-            return [menuTitle];
-          }
-        })];
+        }, [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 [_slot2];
+        return [(0, _vue.createVNode)("span", null, [menuTitle])];
       }
     });
     return [defaultTitle, icon];
@@ -268,8 +246,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
       emit('click', args);
     };
     return function () {
-      var _slot3;
-      return (0, _vue.createVNode)(_es.Menu, (0, _objectSpread2.default)({
+      return (0, _vue.createVNode)(_lib.Menu, (0, _objectSpread2.default)({
         "key": "Menu",
         "inlineIndent": 16,
         "mode": props.mode,
@@ -279,9 +256,9 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
         "onOpenChange": handleOpenChange,
         "onSelect": handleSelect,
         "onClick": handleClick
-      }, props.menuProps), _isSlot(_slot3 = menuUtil.getNavMenuItems(props.menuData)) ? _slot3 : {
+      }, props.menuProps), {
         default: function _default() {
-          return [_slot3];
+          return [menuUtil.getNavMenuItems(props.menuData)];
         }
       });
     };

package/lib/ProLayout/SiderMenu/SiderMenu.js

@@ -10,18 +10,15 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _vue = require("vue");
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _es = require("ant-design-vue/es");
+var _lib = require("ant-design-vue/lib/");
 var _BaseMenu = _interopRequireWildcard(require("./BaseMenu"));
 var _defaultSettings = require("../defaultSettings");
-var _vueTypes = _interopRequireDefault(require("ant-design-vue/es/_util/vue-types"));
+var _vueTypes = _interopRequireDefault(require("ant-design-vue/lib/_util/vue-types"));
 var _Icon = _interopRequireDefault(require("../../Icon"));
 var _RouteContext = require("../RouteContext");
 require("../typings");
 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],
@@ -105,7 +102,7 @@ var defaultRenderLogo = exports.defaultRenderLogo = function defaultRenderLogo(l
     return logo();
   }
   if (typeof logo === 'string') {
-    return application.length ? (0, _vue.createVNode)(_es.Tooltip, {
+    return application.length ? (0, _vue.createVNode)(_lib.Tooltip, {
       "placement": "rightTop",
       "color": "#fff",
       "arrowPointAtCenter": true
@@ -154,11 +151,7 @@ var defaultRenderLogoAndTitle = exports.defaultRenderLogoAndTitle = function def
   if (layout === 'mix' && renderFunction === false) {
     return null;
   }
-  var titleDom = (0, _vue.createVNode)("h1", null, _isSlot(title) ? title : {
-    default: function _default() {
-      return [title];
-    }
-  });
+  var titleDom = (0, _vue.createVNode)("h1", null, [title]);
   if (renderKey === 'menuHeaderRender') {
     return null;
   }
@@ -168,11 +161,7 @@ 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, _isSlot(renderFunction) ? renderFunction : {
-      default: function _default() {
-        return [renderFunction];
-      }
-    });
+    return (0, _vue.createVNode)(_vue.Fragment, null, [renderFunction]);
   }
   return (0, _vue.createVNode)("a", null, [logoDom, props.collapsed ? null : titleDom]);
 };
@@ -184,7 +173,6 @@ var defaultRenderCollapsedButton = exports.defaultRenderCollapsedButton = functi
   }, null);
 };
 var SiderMenu = function SiderMenu(props) {
-  var _slot;
   var collapsed = props.collapsed,
     siderWidth = props.siderWidth,
     breakpoint = props.breakpoint,
@@ -260,7 +248,7 @@ var SiderMenu = function SiderMenu(props) {
       minWidth: "".concat(sSideWidth.value, "px"),
       transition: "background-color 0.3s, min-width 0.3s, max-width 0.3s cubic-bezier(0.645, 0.045, 0.355, 1)"
     }
-  }, null), (0, _vue.createVNode)(_es.LayoutSider, {
+  }, null), (0, _vue.createVNode)(_lib.LayoutSider, {
     "collapsible": true,
     "trigger": null,
     "collapsed": collapsed,
@@ -285,22 +273,14 @@ var SiderMenu = function SiderMenu(props) {
         "onClick": props.layout !== 'mix' ? props.onMenuHeaderClick : undefined,
         "id": "logo",
         "style": props === null || props === void 0 ? void 0 : props.logoStyle
-      }, _isSlot(headerDom) ? headerDom : {
-        default: function _default() {
-          return [headerDom];
-        }
-      }), extraDom && (0, _vue.createVNode)("div", {
+      }, [headerDom]), extraDom && (0, _vue.createVNode)("div", {
         "class": (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(baseClassName, "-extra"), true), "".concat(baseClassName, "-extra-no-logo"), !headerDom)
-      }, _isSlot(extraDom) ? extraDom : {
-        default: function _default() {
-          return [extraDom];
-        }
-      }), (0, _vue.createVNode)("div", {
+      }, [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", {
         "class": "".concat(baseClassName, "-links")
-      }, [linksRender ? linksRender() : collapsedButtonRender !== false ? (0, _vue.createVNode)(_es.Menu, {
+      }, [linksRender ? linksRender() : collapsedButtonRender !== false ? (0, _vue.createVNode)(_lib.Menu, {
         "class": "".concat(baseClassName, "-link-menu"),
         "inlineIndent": 16,
         "theme": theme,
@@ -312,17 +292,17 @@ var SiderMenu = function SiderMenu(props) {
             props.onCollapse(!props.collapsed);
           }
         }
-      }, _isSlot(_slot = (0, _vue.createVNode)(_es.Menu.Item, {
-        "key": 'collapsed-button',
-        "class": "".concat(baseClassName, "-collapsed-button"),
-        "title": false
       }, {
         default: function _default() {
-          return [collapsedButtonRender && typeof collapsedButtonRender === 'function' ? collapsedButtonRender(collapsed) : collapsedButtonRender];
-        }
-      })) ? _slot : {
-        default: function _default() {
-          return [_slot];
+          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];
+            }
+          })];
         }
       }) : null])];
     }

package/lib/ProLayout/TopHeader/index.js

@@ -5,21 +5,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.topNavHeaderProps = exports.baseHeaderProps = exports.TopNavHeader = void 0;
-var _vue = require("vue");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _vue = require("vue");
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _vcResizeObserver = _interopRequireDefault(require("ant-design-vue/es/vc-resize-observer"));
+var _vcResizeObserver = _interopRequireDefault(require("ant-design-vue/lib/vc-resize-observer"));
 var _SiderMenu = require("../SiderMenu/SiderMenu");
-var _vueTypes = _interopRequireDefault(require("ant-design-vue/es/_util/vue-types"));
+var _vueTypes = _interopRequireDefault(require("ant-design-vue/lib/_util/vue-types"));
 var _defaultSettings = require("../defaultSettings");
 var _RouteContext = require("../RouteContext");
 var _BaseMenu = _interopRequireDefault(require("../SiderMenu/BaseMenu"));
 var _util = require("../util");
 var _excluded = ["rightContentRender"];
-function _isSlot(s) {
-  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0, _vue.isVNode)(s);
-}
 var baseHeaderProps = exports.baseHeaderProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _defaultSettings.defaultSettingProps), {}, {
   prefixCls: _vueTypes.default.string.def('ant-pro'),
   collapsed: _vueTypes.default.looseBool,
@@ -146,11 +143,7 @@ var TopNavHeader = exports.TopNavHeader = function TopNavHeader(props) {
     "class": "".concat(prefixCls, "-logo"),
     "key": "logo",
     "id": "logo"
-  }, _isSlot(headerDom) ? headerDom : {
-    default: function _default() {
-      return [headerDom];
-    }
-  })]), (0, _vue.createVNode)("div", {
+  }, [headerDom])]), (0, _vue.createVNode)("div", {
     "style": {
       flex: 1
     },

package/lib/ProLayout/defaultSettings.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.defaultSettings = exports.defaultSettingProps = exports.LayoutType = void 0;
 require("vue");
-var _vueTypes = _interopRequireDefault(require("ant-design-vue/es/_util/vue-types"));
+var _vueTypes = _interopRequireDefault(require("ant-design-vue/lib/_util/vue-types"));
 var defaultSettings = exports.defaultSettings = {
   theme: 'light',
   layout: 'mix',