@jetlinks-web/components 2.0.2-4 → 2.0.2-6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. package/es/CheckButton/CheckButton.js +1 -1
  2. package/es/ConfigProvider/index.js +1 -1
  3. package/es/FullPage/FullPage.js +1 -1
  4. package/es/Icon/icon.js +1 -2
  5. package/es/ProLayout/Basic/BasicLayout.js +11 -7
  6. package/es/ProLayout/Basic/Header.js +7 -3
  7. package/es/ProLayout/PageContainer/index.js +14 -8
  8. package/es/ProLayout/SiderMenu/BaseMenu.js +37 -14
  9. package/es/ProLayout/SiderMenu/SiderMenu.js +34 -14
  10. package/es/ProLayout/TopHeader/index.js +10 -2
  11. package/es/ProLayout/util.js +5 -5
  12. package/es/ProTable/index.js +140 -135
  13. package/es/Scrollbar/Scrollbar.js +212 -100
  14. package/es/Scrollbar/Thumb.js +189 -10
  15. package/es/Scrollbar/scrollbarProps.js +100 -0
  16. package/es/Scrollbar/thumbProps.js +10 -0
  17. package/es/Search/Advanced/SaveHistory.js +1 -1
  18. package/es/Search/Item.js +1 -1
  19. package/es/Search/Search.js +1 -1
  20. package/lib/CheckButton/CheckButton.js +1 -1
  21. package/lib/FullPage/FullPage.js +1 -1
  22. package/lib/Icon/icon.js +1 -1
  23. package/lib/ProLayout/Basic/BasicLayout.js +10 -6
  24. package/lib/ProLayout/Basic/Header.js +6 -2
  25. package/lib/ProLayout/PageContainer/index.js +11 -7
  26. package/lib/ProLayout/SiderMenu/BaseMenu.js +36 -14
  27. package/lib/ProLayout/SiderMenu/SiderMenu.js +34 -14
  28. package/lib/ProLayout/TopHeader/index.js +8 -1
  29. package/lib/ProLayout/util.js +5 -5
  30. package/lib/ProTable/index.js +139 -134
  31. package/lib/Scrollbar/Scrollbar.js +211 -105
  32. package/lib/Scrollbar/Thumb.js +188 -15
  33. package/lib/Scrollbar/scrollbarProps.js +106 -0
  34. package/lib/Scrollbar/thumbProps.js +16 -0
  35. package/lib/Search/Advanced/SaveHistory.js +1 -1
  36. package/lib/Search/Item.js +1 -1
  37. package/lib/Search/Search.js +1 -1
  38. package/package.json +4 -4
@@ -20,7 +20,7 @@
20
20
  } */
21
21
  import { defineComponent as _defineComponent } from 'vue';
22
22
  import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, toDisplayString as _toDisplayString, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
23
- const _withScopeId = n => (_pushScopeId("data-v-1712538744740"), n = n(), _popScopeId(), n);
23
+ const _withScopeId = n => (_pushScopeId("data-v-1712542098760"), n = n(), _popScopeId(), n);
24
24
  const _hoisted_1 = ["onClick"];
25
25
  import { computed, ref, watch } from 'vue';
26
26
  import { isArray } from '@jetlinks-web/utils';
@@ -1,5 +1,5 @@
1
- import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
1
  import { createVNode as _createVNode } from "vue";
2
+ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
3
3
  import { defineComponent, provide, reactive, h } from 'vue';
4
4
  import { configProps } from './context';
5
5
  import { ComponentsEnum, MAPConfig } from '@jetlinks-web/constants';
@@ -6,7 +6,7 @@
6
6
  } */
7
7
  import { defineComponent as _defineComponent } from 'vue';
8
8
  import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
9
- const _withScopeId = n => (_pushScopeId("data-v-1712538745509"), n = n(), _popScopeId(), n);
9
+ const _withScopeId = n => (_pushScopeId("data-v-1712542098694"), n = n(), _popScopeId(), n);
10
10
  const _hoisted_1 = { class: "full-page-warp-content" };
11
11
  import { ref } from 'vue';
12
12
  import { useElementBounding } from '@vueuse/core';
package/es/Icon/icon.js CHANGED
@@ -1,6 +1,5 @@
1
1
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
- import { createVNode as _createVNode } from "vue";
3
- import { defineComponent, createVNode, watchEffect } from 'vue';
2
+ import { defineComponent, createVNode, watchEffect, createVNode as _createVNode } from 'vue';
4
3
  import * as aIcon from '@ant-design/icons-vue';
5
4
  import { createFromIconfontCN } from '@ant-design/icons-vue';
6
5
  import { useIcon } from '@jetlinks-web/hooks';
@@ -1,8 +1,8 @@
1
+ import { Fragment as _Fragment, createVNode as _createVNode, isVNode as _isVNode } from "vue";
1
2
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
2
3
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
4
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
5
  var _excluded = ["pure", "onCollapse", "onOpenKeys", "onSelect", "onMenuClick"];
5
- import { createVNode as _createVNode, Fragment as _Fragment } from "vue";
6
6
  import SiderMenu, { siderMenuProps } from '../SiderMenu/SiderMenu';
7
7
  import { computed, defineComponent, provide, reactive, watchEffect, toRefs, h } from 'vue';
8
8
  import { defaultSettingProps } from '../defaultSettings';
@@ -13,6 +13,9 @@ import { pick } from 'lodash-es';
13
13
  import { defaultRouteContext, routeContextInjectKey } from '../RouteContext';
14
14
  import { getMenuFirstChildren, getSlot } from '../util';
15
15
  import { Layout, LayoutContent } from 'ant-design-vue';
16
+ function _isSlot(s) {
17
+ return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
18
+ }
16
19
  export var basicLayoutProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultSettingProps), siderMenuProps), baseHeaderProps), headerViewProps), {}, {
17
20
  pure: Boolean,
18
21
  loading: Boolean,
@@ -172,6 +175,7 @@ export default defineComponent({
172
175
  }));
173
176
  provide(routeContextInjectKey, routeContext);
174
177
  return function () {
178
+ var _slot;
175
179
  var _slots$default, _slots$default2;
176
180
  var pure = props.pure,
177
181
  propsOnCollapse = props.onCollapse,
@@ -237,13 +241,13 @@ export default defineComponent({
237
241
  "onSelect": onSelect,
238
242
  "onOpenKeys": onOpenKeys,
239
243
  "onMenuClick": onMenuClick
240
- }), null), _createVNode(Layout, null, {
244
+ }), null), _createVNode(Layout, null, _isSlot(_slot = _createVNode(LayoutContent, null, {
241
245
  default: function _default() {
242
- return [_createVNode(LayoutContent, null, {
243
- default: function _default() {
244
- return [(_slots$default2 = slots.default) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)];
245
- }
246
- })];
246
+ return [(_slots$default2 = slots.default) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)];
247
+ }
248
+ })) ? _slot : {
249
+ default: function _default() {
250
+ return [_slot];
247
251
  }
248
252
  })];
249
253
  }
@@ -1,11 +1,14 @@
1
+ import { createVNode as _createVNode, Fragment as _Fragment, isVNode as _isVNode } from "vue";
1
2
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
3
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
3
- import { Fragment as _Fragment, createVNode as _createVNode } from "vue";
4
4
  import { baseHeaderProps, TopNavHeader } from '../TopHeader';
5
5
  import PropTypes from 'ant-design-vue/es/_util/vue-types';
6
6
  import { defineComponent, computed, toRefs } from 'vue';
7
7
  import { useRouteContext } from '../RouteContext';
8
8
  import { Layout } from 'ant-design-vue';
9
+ function _isSlot(s) {
10
+ return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
11
+ }
9
12
  export var headerViewProps = _objectSpread(_objectSpread({}, baseHeaderProps), {}, {
10
13
  headerRender: {
11
14
  type: [Object, Function, Boolean],
@@ -67,6 +70,7 @@ export default defineComponent({
67
70
  return needFixedHeader.value ? 0 : undefined;
68
71
  });
69
72
  return function () {
73
+ var _slot;
70
74
  return _createVNode(_Fragment, null, [needFixedHeader.value && _createVNode(Layout.Header, {
71
75
  "style": {
72
76
  height: "".concat(headerHeight.value, "px"),
@@ -83,9 +87,9 @@ export default defineComponent({
83
87
  right: right.value
84
88
  },
85
89
  "class": className.value
86
- }, {
90
+ }, _isSlot(_slot = renderContent()) ? _slot : {
87
91
  default: function _default() {
88
- return [renderContent()];
92
+ return [_slot];
89
93
  }
90
94
  })]);
91
95
  };
@@ -1,8 +1,10 @@
1
+ import { Fragment as _Fragment } from "vue";
1
2
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
+ import { createTextVNode as _createTextVNode } from "vue";
2
4
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
5
+ import { createVNode as _createVNode, isVNode as _isVNode } from "vue";
3
6
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
7
  var _excluded = ["title", "tabList", "tabActiveKey", "content", "pageHeaderRender", "header", "extraContent", "prefixedClassName", "prefixCls", "fixedHeader", "showBack"];
5
- import { Fragment as _Fragment, createTextVNode as _createTextVNode, createVNode as _createVNode } from "vue";
6
8
  import { withInstall } from 'ant-design-vue/es/_util/type';
7
9
  import { Affix, Spin, PageHeader, Tabs, Button } from 'ant-design-vue';
8
10
  import { defineComponent, unref, toRefs, computed } from 'vue';
@@ -11,6 +13,9 @@ import { useRouteContext } from '../RouteContext';
11
13
  import { getSlotVNode } from '../util';
12
14
  import 'ant-design-vue/es/_util/type';
13
15
  import './index.less';
16
+ function _isSlot(s) {
17
+ return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
18
+ }
14
19
  export var pageHeaderTabConfig = {
15
20
  /**
16
21
  * @name tabs 的列表
@@ -146,6 +151,7 @@ var renderFooter = function renderFooter(props) {
146
151
  }, [item.tab]);
147
152
  };
148
153
  if (tabList && tabList.length) {
154
+ var _slot;
149
155
  return _createVNode(Tabs, _objectSpread({
150
156
  "class": "page-container-tabs",
151
157
  "activeKey": tabActiveKey,
@@ -155,14 +161,14 @@ var renderFooter = function renderFooter(props) {
155
161
  }
156
162
  },
157
163
  "tabBarExtraContent": tabBarExtraContent
158
- }, tabProps), {
164
+ }, tabProps), _isSlot(_slot = tabList.map(function (item) {
165
+ return _createVNode(Tabs.TabPane, _objectSpread(_objectSpread({}, item), {}, {
166
+ "tab": tabPane(item),
167
+ "key": item.key
168
+ }), null);
169
+ })) ? _slot : {
159
170
  default: function _default() {
160
- return [tabList.map(function (item) {
161
- return _createVNode(Tabs.TabPane, _objectSpread(_objectSpread({}, item), {}, {
162
- "tab": tabPane(item),
163
- "key": item.key
164
- }), null);
165
- })];
171
+ return [_slot];
166
172
  }
167
173
  });
168
174
  }
@@ -1,9 +1,10 @@
1
1
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
2
+ import { isVNode as _isVNode } from "vue";
2
3
  import _createClass from "@babel/runtime/helpers/esm/createClass";
3
4
  import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
4
5
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
5
- import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
6
6
  import { createVNode as _createVNode } from "vue";
7
+ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
7
8
  import { defaultSettingProps } from '../defaultSettings';
8
9
  import { defineComponent, getCurrentInstance, isVNode, resolveComponent, watchEffect, withCtx } from 'vue';
9
10
  import { defaultPrefixCls } from '../RouteContext';
@@ -11,6 +12,9 @@ import IconFont from '../../Icon';
11
12
  import { regular } from '@jetlinks-web/utils';
12
13
  import { Menu } from 'ant-design-vue';
13
14
  import { createFromIconfontCN } from '@ant-design/icons-vue';
15
+ function _isSlot(s) {
16
+ return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
17
+ }
14
18
  export var baseMenuProps = _objectSpread(_objectSpread({}, defaultSettingProps), {}, {
15
19
  prefixCls: {
16
20
  type: String,
@@ -116,7 +120,8 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
116
120
  });
117
121
  _defineProperty(this, "getSubMenuOrItem", function (item) {
118
122
  var _item$meta, _item$meta2, _item$meta7, _item$meta8;
119
- 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)) {
123
+ 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)) {
124
+ var _slot;
120
125
  var _item$meta3, _item$meta4, _item$meta5, _item$meta6;
121
126
  if (_this.props.subMenuItemRender) {
122
127
  var subMenuItemRender = withCtx(_this.props.subMenuItemRender, _this.ctx);
@@ -129,13 +134,21 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
129
134
  prefixCls = _this$props.prefixCls,
130
135
  locale = _this$props.locale;
131
136
  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);
132
- var defaultTitle = (_item$meta5 = item.meta) !== null && _item$meta5 !== void 0 && _item$meta5.icon ? _createVNode("span", {
137
+ var defaultTitle = ((_item$meta5 = item.meta) === null || _item$meta5 === void 0 ? void 0 : _item$meta5.icon) ? _createVNode("span", {
133
138
  "class": "".concat(prefixCls, "-menu-item")
134
139
  }, [_createVNode("span", {
135
140
  "class": "".concat(prefixCls, "-menu-item-title")
136
- }, [menuTitle])]) : _createVNode("span", {
141
+ }, _isSlot(menuTitle) ? menuTitle : {
142
+ default: function _default() {
143
+ return [menuTitle];
144
+ }
145
+ })]) : _createVNode("span", {
137
146
  "class": "".concat(prefixCls, "-menu-item")
138
- }, [menuTitle]);
147
+ }, _isSlot(menuTitle) ? menuTitle : {
148
+ default: function _default() {
149
+ return [menuTitle];
150
+ }
151
+ });
139
152
  return _createVNode(Menu.SubMenu, {
140
153
  "title": defaultTitle,
141
154
  "key": item.path,
@@ -144,9 +157,9 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
144
157
  "iconUrl": _this.props.iconfontUrl,
145
158
  "icon": (_item$meta6 = item.meta) === null || _item$meta6 === void 0 ? void 0 : _item$meta6.icon
146
159
  }, null)
147
- }, {
160
+ }, _isSlot(_slot = _this.getNavMenuItems(item.children)) ? _slot : {
148
161
  default: function _default() {
149
- return [_this.getNavMenuItems(item.children)];
162
+ return [_slot];
150
163
  }
151
164
  });
152
165
  }
@@ -163,13 +176,14 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
163
176
  "disabled": (_item$meta7 = item.meta) === null || _item$meta7 === void 0 ? void 0 : _item$meta7.disabled,
164
177
  "danger": (_item$meta8 = item.meta) === null || _item$meta8 === void 0 ? void 0 : _item$meta8.danger,
165
178
  "key": item.path
166
- }, {
179
+ }, _isSlot(title) ? title : {
167
180
  default: function _default() {
168
181
  return [title];
169
182
  }
170
183
  });
171
184
  });
172
185
  _defineProperty(this, "getMenuItem", function (item) {
186
+ var _slot2;
173
187
  var _item$meta9, _item$meta10, _item$meta11, _item$meta12, _item$meta13;
174
188
  var meta = _objectSpread({}, item.meta);
175
189
  var target = meta.target || null;
@@ -192,19 +206,27 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
192
206
  "icon": (_item$meta10 = item.meta) === null || _item$meta10 === void 0 ? void 0 : _item$meta10.icon
193
207
  }, null) || undefined;
194
208
  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);
195
- var defaultTitle = (_item$meta13 = item.meta) !== null && _item$meta13 !== void 0 && _item$meta13.icon ? _createVNode(CustomTag, _objectSpread(_objectSpread(_objectSpread({}, attrs), props), {}, {
209
+ var defaultTitle = ((_item$meta13 = item.meta) === null || _item$meta13 === void 0 ? void 0 : _item$meta13.icon) ? _createVNode(CustomTag, _objectSpread(_objectSpread(_objectSpread({}, attrs), props), {}, {
196
210
  "class": "".concat(prefixCls, "-menu-item")
197
211
  }), {
198
212
  default: function _default() {
199
213
  return [icon, _createVNode("span", {
200
214
  "class": "".concat(prefixCls, "-menu-item-title")
201
- }, [menuTitle])];
215
+ }, _isSlot(menuTitle) ? menuTitle : {
216
+ default: function _default() {
217
+ return [menuTitle];
218
+ }
219
+ })];
202
220
  }
203
221
  }) : _createVNode(CustomTag, _objectSpread(_objectSpread(_objectSpread({}, attrs), props), {}, {
204
222
  "class": "".concat(prefixCls, "-menu-item")
205
- }), {
223
+ }), _isSlot(_slot2 = _createVNode("span", null, _isSlot(menuTitle) ? menuTitle : {
224
+ default: function _default() {
225
+ return [menuTitle];
226
+ }
227
+ })) ? _slot2 : {
206
228
  default: function _default() {
207
- return [_createVNode("span", null, [menuTitle])];
229
+ return [_slot2];
208
230
  }
209
231
  });
210
232
  return [defaultTitle, icon];
@@ -242,6 +264,7 @@ export default defineComponent({
242
264
  emit('click', args);
243
265
  };
244
266
  return function () {
267
+ var _slot3;
245
268
  return _createVNode(Menu, _objectSpread({
246
269
  "key": "Menu",
247
270
  "inlineIndent": 16,
@@ -252,9 +275,9 @@ export default defineComponent({
252
275
  "onOpenChange": handleOpenChange,
253
276
  "onSelect": handleSelect,
254
277
  "onClick": handleClick
255
- }, props.menuProps), {
278
+ }, props.menuProps), _isSlot(_slot3 = menuUtil.getNavMenuItems(props.menuData)) ? _slot3 : {
256
279
  default: function _default() {
257
- return [menuUtil.getNavMenuItems(props.menuData)];
280
+ return [_slot3];
258
281
  }
259
282
  });
260
283
  };
@@ -1,7 +1,7 @@
1
1
  import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
2
2
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
+ import { createVNode as _createVNode, isVNode as _isVNode, Fragment as _Fragment } from "vue";
3
4
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
- import { Fragment as _Fragment, createVNode as _createVNode } from "vue";
5
5
  import { LayoutSider as Sider, Menu } from 'ant-design-vue';
6
6
  import BaseMenu, { baseMenuProps } from './BaseMenu';
7
7
  import { defaultSettingProps } from '../defaultSettings';
@@ -9,6 +9,9 @@ import PropTypes from 'ant-design-vue/es/_util/vue-types';
9
9
  import IconFont from '../../Icon';
10
10
  import { useRouteContext } from '../RouteContext';
11
11
  import { computed, unref } from 'vue';
12
+ function _isSlot(s) {
13
+ return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
14
+ }
12
15
  export var siderMenuProps = _objectSpread(_objectSpread(_objectSpread({}, defaultSettingProps), baseMenuProps), {}, {
13
16
  logo: {
14
17
  type: [Object, String, Function],
@@ -106,7 +109,11 @@ export var defaultRenderLogoAndTitle = function defaultRenderLogoAndTitle(props)
106
109
  return null;
107
110
  }
108
111
  var logoDom = defaultRenderLogo(logo, logoStyle);
109
- var titleDom = _createVNode("h1", null, [title]);
112
+ var titleDom = _createVNode("h1", null, _isSlot(title) ? title : {
113
+ default: function _default() {
114
+ return [title];
115
+ }
116
+ });
110
117
  if (renderKey === 'menuHeaderRender') {
111
118
  return null;
112
119
  }
@@ -116,7 +123,11 @@ export var defaultRenderLogoAndTitle = function defaultRenderLogoAndTitle(props)
116
123
  return renderFunction(logoDom, props.collapsed ? null : titleDom, props);
117
124
  }
118
125
  if (Array.isArray(renderFunction)) {
119
- return _createVNode(_Fragment, null, [renderFunction]);
126
+ return _createVNode(_Fragment, null, _isSlot(renderFunction) ? renderFunction : {
127
+ default: function _default() {
128
+ return [renderFunction];
129
+ }
130
+ });
120
131
  }
121
132
  return _createVNode("a", null, [logoDom, props.collapsed ? null : titleDom]);
122
133
  };
@@ -128,6 +139,7 @@ export var defaultRenderCollapsedButton = function defaultRenderCollapsedButton(
128
139
  }, null);
129
140
  };
130
141
  var SiderMenu = function SiderMenu(props) {
142
+ var _slot;
131
143
  var collapsed = props.collapsed,
132
144
  siderWidth = props.siderWidth,
133
145
  breakpoint = props.breakpoint,
@@ -221,9 +233,17 @@ var SiderMenu = function SiderMenu(props) {
221
233
  "onClick": props.layout !== 'mix' ? props.onMenuHeaderClick : undefined,
222
234
  "id": "logo",
223
235
  "style": props === null || props === void 0 ? void 0 : props.logoStyle
224
- }, [headerDom]), extraDom && !props.collapsed && _createVNode("div", {
236
+ }, _isSlot(headerDom) ? headerDom : {
237
+ default: function _default() {
238
+ return [headerDom];
239
+ }
240
+ }), extraDom && !props.collapsed && _createVNode("div", {
225
241
  "class": _defineProperty(_defineProperty({}, "".concat(baseClassName, "-extra"), true), "".concat(baseClassName, "-extra-no-logo"), !headerDom)
226
- }, [extraDom]), _createVNode("div", {
242
+ }, _isSlot(extraDom) ? extraDom : {
243
+ default: function _default() {
244
+ return [extraDom];
245
+ }
246
+ }), _createVNode("div", {
227
247
  "style": "flex: 1; overflow: hidden auto;"
228
248
  }, [menuContentRender && menuContentRender(props, defaultMenuDom) || defaultMenuDom]), _createVNode("div", {
229
249
  "class": "".concat(baseClassName, "-links")
@@ -239,17 +259,17 @@ var SiderMenu = function SiderMenu(props) {
239
259
  props.onCollapse(!props.collapsed);
240
260
  }
241
261
  }
262
+ }, _isSlot(_slot = _createVNode(Menu.Item, {
263
+ "key": 'collapsed-button',
264
+ "class": "".concat(baseClassName, "-collapsed-button"),
265
+ "title": false
242
266
  }, {
243
267
  default: function _default() {
244
- return [_createVNode(Menu.Item, {
245
- "key": 'collapsed-button',
246
- "class": "".concat(baseClassName, "-collapsed-button"),
247
- "title": false
248
- }, {
249
- default: function _default() {
250
- return [collapsedButtonRender && typeof collapsedButtonRender === 'function' ? collapsedButtonRender(collapsed) : collapsedButtonRender];
251
- }
252
- })];
268
+ return [collapsedButtonRender && typeof collapsedButtonRender === 'function' ? collapsedButtonRender(collapsed) : collapsedButtonRender];
269
+ }
270
+ })) ? _slot : {
271
+ default: function _default() {
272
+ return [_slot];
253
273
  }
254
274
  }) : null])];
255
275
  }
@@ -1,8 +1,9 @@
1
+ import { isVNode as _isVNode } from "vue";
1
2
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
+ import { createVNode as _createVNode } from "vue";
2
4
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
3
5
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
6
  var _excluded = ["rightContentRender"];
5
- import { createVNode as _createVNode } from "vue";
6
7
  import { computed, ref } from 'vue';
7
8
  import { default as ResizeObserver } from 'ant-design-vue/es/vc-resize-observer';
8
9
  import { defaultRenderLogoAndTitle, siderMenuProps } from '../SiderMenu/SiderMenu';
@@ -11,6 +12,9 @@ import { defaultSettingProps } from '../defaultSettings';
11
12
  import { defaultPrefixCls, useRouteContext } from '../RouteContext';
12
13
  import BaseMenu from '../SiderMenu/BaseMenu';
13
14
  import { clearMenuItem } from '../util';
15
+ function _isSlot(s) {
16
+ return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
17
+ }
14
18
  export var baseHeaderProps = _objectSpread(_objectSpread({}, defaultSettingProps), {}, {
15
19
  prefixCls: PropTypes.string.def('ant-pro'),
16
20
  collapsed: PropTypes.looseBool,
@@ -123,7 +127,11 @@ export var TopNavHeader = function TopNavHeader(props) {
123
127
  "class": "".concat(prefixCls, "-logo"),
124
128
  "key": "logo",
125
129
  "id": "logo"
126
- }, [headerDom])]), _createVNode("div", {
130
+ }, _isSlot(headerDom) ? headerDom : {
131
+ default: function _default() {
132
+ return [headerDom];
133
+ }
134
+ })]), _createVNode("div", {
127
135
  "style": {
128
136
  flex: 1
129
137
  },
@@ -3,14 +3,14 @@ export function clearMenuItem(menusData) {
3
3
  return menusData.map(function (item) {
4
4
  var _finalItem$meta;
5
5
  var finalItem = _objectSpread({}, item);
6
- if ((_finalItem$meta = finalItem.meta) !== null && _finalItem$meta !== void 0 && _finalItem$meta.hideInMenu) {
6
+ if ((_finalItem$meta = finalItem.meta) === null || _finalItem$meta === void 0 ? void 0 : _finalItem$meta.hideInMenu) {
7
7
  return null;
8
8
  }
9
- if (finalItem && finalItem !== null && finalItem !== void 0 && finalItem.children) {
9
+ if (finalItem && (finalItem === null || finalItem === void 0 ? void 0 : finalItem.children)) {
10
10
  var _finalItem$meta2;
11
- if (!((_finalItem$meta2 = finalItem.meta) !== null && _finalItem$meta2 !== void 0 && _finalItem$meta2.hideChildInMenu) && finalItem.children.some(function (child) {
11
+ if (!((_finalItem$meta2 = finalItem.meta) === null || _finalItem$meta2 === void 0 ? void 0 : _finalItem$meta2.hideChildInMenu) && finalItem.children.some(function (child) {
12
12
  var _child$meta;
13
- return child && child.name && !((_child$meta = child.meta) !== null && _child$meta !== void 0 && _child$meta.hideInMenu);
13
+ return child && child.name && !((_child$meta = child.meta) === null || _child$meta === void 0 ? void 0 : _child$meta.hideInMenu);
14
14
  })) {
15
15
  return _objectSpread(_objectSpread({}, item), {}, {
16
16
  children: clearMenuItem(finalItem.children)
@@ -27,7 +27,7 @@ export function flatMap(menusData) {
27
27
  return menusData.map(function (item) {
28
28
  var _finalItem$meta3;
29
29
  var finalItem = _objectSpread({}, item);
30
- if (!finalItem.name || (_finalItem$meta3 = finalItem.meta) !== null && _finalItem$meta3 !== void 0 && _finalItem$meta3.hideInMenu) {
30
+ if (!finalItem.name || ((_finalItem$meta3 = finalItem.meta) === null || _finalItem$meta3 === void 0 ? void 0 : _finalItem$meta3.hideInMenu)) {
31
31
  return null;
32
32
  }
33
33
  if (finalItem.children) {