@jetlinks-web/components 2.6.21 → 2.6.23

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 (78) hide show
  1. package/es/AMap/Map.js +1 -2
  2. package/es/AutoComplete/AutoComplete.js +0 -1
  3. package/es/BadgeStatus/Badge.js +1 -2
  4. package/es/CardSelect/CardSelect.js +1 -2
  5. package/es/CheckButton/CheckButton.js +1 -2
  6. package/es/CheckButton/style/index.less +40 -40
  7. package/es/DragModal/DragModal.js +0 -1
  8. package/es/Echarts/Echarts.js +1 -2
  9. package/es/EditTable/EditTable.js +4 -6
  10. package/es/EditTable/FormItem.js +0 -1
  11. package/es/EditTable/Header.js +5 -3
  12. package/es/EditTable/components/ContextMenu/Menu.js +1 -2
  13. package/es/EditTable/components/Search/search.js +1 -2
  14. package/es/EditTable/components/Search/sort.js +1 -3
  15. package/es/EditTable/group.js +11 -12
  16. package/es/EditTable/hooks/useValidate.js +1 -1
  17. package/es/EditTable/style/index.less +41 -41
  18. package/es/FlameGraph/FlameGraph.js +5 -4
  19. package/es/FullPage/FullPage.js +1 -2
  20. package/es/LocaleProvider/index.js +1 -2
  21. package/es/PermissionButton/index.js +6 -7
  22. package/es/ProLayout/Basic/BasicLayout.js +34 -39
  23. package/es/ProLayout/Basic/Header.js +3 -7
  24. package/es/ProLayout/PageContainer/index.js +8 -12
  25. package/es/ProLayout/SiderMenu/BaseMenu.js +16 -39
  26. package/es/ProLayout/SiderMenu/SiderMenu.js +14 -34
  27. package/es/ProLayout/TopHeader/index.js +1 -9
  28. package/es/ProLayout/style/default.less +4 -4
  29. package/es/ProLayout/util.js +5 -5
  30. package/es/ProTable/Content.js +34 -18
  31. package/es/ProTable/style/ProTable.less +138 -138
  32. package/es/RadioButton/RadioButton.js +0 -1
  33. package/es/Search/Advanced/SaveHistory.js +1 -2
  34. package/es/Search/Item.js +1 -2
  35. package/es/Title/title.js +0 -1
  36. package/es/style/index.css +1 -1
  37. package/es/style/variable.less +4 -4
  38. package/lib/AMap/Map.js +1 -2
  39. package/lib/AutoComplete/AutoComplete.js +0 -1
  40. package/lib/BadgeStatus/Badge.js +1 -2
  41. package/lib/CardSelect/CardSelect.js +1 -2
  42. package/lib/CheckButton/CheckButton.js +1 -2
  43. package/lib/CheckButton/style/index.less +40 -40
  44. package/lib/DragModal/DragModal.js +0 -1
  45. package/lib/Echarts/Echarts.js +1 -2
  46. package/lib/EditTable/EditTable.js +4 -6
  47. package/lib/EditTable/FormItem.js +0 -1
  48. package/lib/EditTable/Header.js +5 -3
  49. package/lib/EditTable/components/ContextMenu/Menu.js +1 -2
  50. package/lib/EditTable/components/Search/search.js +1 -2
  51. package/lib/EditTable/components/Search/sort.js +1 -3
  52. package/lib/EditTable/group.js +11 -12
  53. package/lib/EditTable/hooks/useValidate.js +1 -1
  54. package/lib/EditTable/style/index.less +41 -41
  55. package/lib/FlameGraph/FlameGraph.js +5 -4
  56. package/lib/FullPage/FullPage.js +1 -2
  57. package/lib/Icon/icon.js +1 -2
  58. package/lib/LocaleProvider/index.js +1 -2
  59. package/lib/PermissionButton/index.js +6 -7
  60. package/lib/ProLayout/Basic/BasicLayout.js +34 -40
  61. package/lib/ProLayout/Basic/Header.js +2 -6
  62. package/lib/ProLayout/PageContainer/index.js +7 -11
  63. package/lib/ProLayout/SiderMenu/BaseMenu.js +17 -39
  64. package/lib/ProLayout/SiderMenu/SiderMenu.js +14 -35
  65. package/lib/ProLayout/TopHeader/index.js +2 -9
  66. package/lib/ProLayout/style/default.less +4 -4
  67. package/lib/ProLayout/util.js +5 -5
  68. package/lib/ProTable/Content.js +34 -18
  69. package/lib/ProTable/style/ProTable.less +138 -138
  70. package/lib/RadioButton/RadioButton.js +0 -1
  71. package/lib/Search/Advanced/SaveHistory.js +1 -2
  72. package/lib/Search/Item.js +1 -2
  73. package/lib/Title/title.js +0 -1
  74. package/lib/components.js +1 -2
  75. package/lib/index.js +1 -2
  76. package/lib/style/index.css +1 -1
  77. package/lib/style/variable.less +4 -4
  78. package/package.json +4 -4
@@ -1,4 +1,4 @@
1
- import { Fragment as _Fragment, createVNode as _createVNode, isVNode as _isVNode, resolveDirective as _resolveDirective } from "vue";
1
+ import { Fragment as _Fragment, createVNode as _createVNode } from "vue";
2
2
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
3
3
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
4
4
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
@@ -13,9 +13,6 @@ import { pick } from 'lodash-es';
13
13
  import { defaultRouteContext, routeContextInjectKey } from '../RouteContext';
14
14
  import { getMenuFirstChildren, getSlot } from '../util';
15
15
  import { Layout, LayoutContent, Breadcrumb, Tabs } from 'ant-design-vue/es/';
16
- function _isSlot(s) {
17
- return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
18
- }
19
16
  export var basicLayoutProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultSettingProps), siderMenuProps), baseHeaderProps), headerViewProps), {}, {
20
17
  pure: Boolean,
21
18
  loading: Boolean,
@@ -246,7 +243,6 @@ export default defineComponent({
246
243
  return (_slots$default = slots.default) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
247
244
  }
248
245
  if (props.layoutType === LayoutType.LIST) {
249
- var _slot;
250
246
  var _slots$default2;
251
247
  return _createVNode(_Fragment, null, [_createVNode("div", {
252
248
  "class": className.value
@@ -273,13 +269,13 @@ export default defineComponent({
273
269
  "onSelect": onSelect,
274
270
  "onOpenKeys": onOpenKeys,
275
271
  "onMenuClick": onMenuClick
276
- }), null), _createVNode(Layout, null, _isSlot(_slot = _createVNode(LayoutContent, null, {
272
+ }), null), _createVNode(Layout, null, {
277
273
  default: function _default() {
278
- return [(_slots$default2 = slots.default) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)];
279
- }
280
- })) ? _slot : {
281
- default: function _default() {
282
- return [_slot];
274
+ return [_createVNode(LayoutContent, null, {
275
+ default: function _default() {
276
+ return [(_slots$default2 = slots.default) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)];
277
+ }
278
+ })];
283
279
  }
284
280
  })];
285
281
  }
@@ -326,7 +322,6 @@ export default defineComponent({
326
322
  })]);
327
323
  } else {
328
324
  var _slots$default4;
329
- var _slot2, _slot3;
330
325
  return _createVNode(_Fragment, null, [_createVNode("div", {
331
326
  "class": className.value
332
327
  }, [_createVNode(Layout, null, {
@@ -354,32 +349,32 @@ export default defineComponent({
354
349
  padding: 0,
355
350
  height: '40px'
356
351
  }, props.pageHeaderStyle || {})
357
- }, _isSlot(_slot2 = _createVNode(Tabs, {
358
- "hide-add": true,
359
- "type": "editable-card",
360
- "class": "history-tabs",
361
- "id": 'history-route-tabs',
362
- "tabBarStyle": {
363
- margin: 0
364
- },
365
- "onTabClick": onTabClick,
366
- "onEdit": onTabEdit,
367
- "activeKey": props.historyActive,
368
- "onChange": onTabChange
369
352
  }, {
370
353
  default: function _default() {
371
- return [historyRender ? historyRender() : props.historyRoutes.map(function (item) {
372
- return _createVNode(Tabs.TabPane, {
373
- "key": item.name,
374
- "tab": item.label,
375
- "closable": true
376
- }, null);
354
+ return [_createVNode(Tabs, {
355
+ "hide-add": true,
356
+ "type": "editable-card",
357
+ "class": "history-tabs",
358
+ "id": "history-route-tabs",
359
+ "tabBarStyle": {
360
+ margin: 0
361
+ },
362
+ "onTabClick": onTabClick,
363
+ "onEdit": onTabEdit,
364
+ "activeKey": props.historyActive,
365
+ "onChange": onTabChange
366
+ }, {
367
+ default: function _default() {
368
+ return [historyRender ? historyRender() : props.historyRoutes.map(function (item) {
369
+ return _createVNode(Tabs.TabPane, {
370
+ "key": item.name,
371
+ "tab": item.label,
372
+ "closable": true
373
+ }, null);
374
+ })];
375
+ }
377
376
  })];
378
377
  }
379
- })) ? _slot2 : {
380
- default: function _default() {
381
- return [_slot2];
382
- }
383
378
  }), _createVNode(LayoutContent, {
384
379
  "style": {
385
380
  flex: '1 1 0',
@@ -393,13 +388,13 @@ export default defineComponent({
393
388
  "style": _objectSpread({
394
389
  padding: '11px 24px'
395
390
  }, props.pageFooterStyle || {})
396
- }, _isSlot(_slot3 = _createVNode(Breadcrumb, {
397
- "routes": breadcrumb.value.routes
398
391
  }, {
399
- itemRender: breadcrumb.value.itemRender
400
- })) ? _slot3 : {
401
392
  default: function _default() {
402
- return [_slot3];
393
+ return [_createVNode(Breadcrumb, {
394
+ "routes": breadcrumb.value.routes
395
+ }, {
396
+ itemRender: breadcrumb.value.itemRender
397
+ })];
403
398
  }
404
399
  })];
405
400
  }
@@ -1,4 +1,4 @@
1
- import { createVNode as _createVNode, Fragment as _Fragment, isVNode as _isVNode } from "vue";
1
+ import { createVNode as _createVNode, Fragment as _Fragment } from "vue";
2
2
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
3
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
4
  import { baseHeaderProps, TopNavHeader } from '../TopHeader';
@@ -7,9 +7,6 @@ import { defineComponent, computed, toRefs } from 'vue';
7
7
  import { useRouteContext } from '../RouteContext';
8
8
  import { Layout } from 'ant-design-vue/es/';
9
9
  import { LayoutType } from "../defaultSettings";
10
- function _isSlot(s) {
11
- return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
12
- }
13
10
  export var headerViewProps = _objectSpread(_objectSpread({}, baseHeaderProps), {}, {
14
11
  headerRender: {
15
12
  type: [Object, Function, Boolean],
@@ -77,7 +74,6 @@ export default defineComponent({
77
74
  return 0;
78
75
  });
79
76
  return function () {
80
- var _slot;
81
77
  return _createVNode(_Fragment, null, [needFixedHeader.value && _createVNode(Layout.Header, {
82
78
  "style": {
83
79
  height: "".concat(headerHeight.value, "px"),
@@ -94,9 +90,9 @@ export default defineComponent({
94
90
  right: right.value
95
91
  },
96
92
  "class": className.value
97
- }, _isSlot(_slot = renderContent()) ? _slot : {
93
+ }, {
98
94
  default: function _default() {
99
- return [_slot];
95
+ return [renderContent()];
100
96
  }
101
97
  })]);
102
98
  };
@@ -2,7 +2,7 @@ import { Fragment as _Fragment } from "vue";
2
2
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
3
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
4
4
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
5
- import { createVNode as _createVNode, isVNode as _isVNode } from "vue";
5
+ import { createVNode as _createVNode } from "vue";
6
6
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
7
7
  var _excluded = ["title", "tabList", "tabActiveKey", "content", "pageHeaderRender", "header", "extraContent", "prefixedClassName", "prefixCls", "fixedHeader", "showBack"];
8
8
  import { withInstall } from 'ant-design-vue/es/_util/type';
@@ -15,9 +15,6 @@ import "ant-design-vue/es/_util/type";
15
15
  import 'ant-design-vue/es/_util/vue-types';
16
16
  import { LayoutType } from "../defaultSettings";
17
17
  import { useLocaleReceiver } from "../../LocaleReciver";
18
- function _isSlot(s) {
19
- return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
20
- }
21
18
  export var pageHeaderTabConfig = {
22
19
  /**
23
20
  * @name tabs 的列表
@@ -153,7 +150,6 @@ var renderFooter = function renderFooter(props) {
153
150
  }, [item.tab]);
154
151
  };
155
152
  if (tabList && tabList.length) {
156
- var _slot;
157
153
  return _createVNode(Tabs, _objectSpread({
158
154
  "class": "page-container-tabs",
159
155
  "activeKey": tabActiveKey,
@@ -163,14 +159,14 @@ var renderFooter = function renderFooter(props) {
163
159
  }
164
160
  },
165
161
  "tabBarExtraContent": tabBarExtraContent
166
- }, tabProps), _isSlot(_slot = tabList.map(function (item) {
167
- return _createVNode(Tabs.TabPane, _objectSpread(_objectSpread({}, item), {}, {
168
- "tab": tabPane(item),
169
- "key": item.key
170
- }), null);
171
- })) ? _slot : {
162
+ }, tabProps), {
172
163
  default: function _default() {
173
- return [_slot];
164
+ return [tabList.map(function (item) {
165
+ return _createVNode(Tabs.TabPane, _objectSpread(_objectSpread({}, item), {}, {
166
+ "tab": tabPane(item),
167
+ "key": item.key
168
+ }), null);
169
+ })];
174
170
  }
175
171
  });
176
172
  }
@@ -1,5 +1,4 @@
1
1
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
2
- import { isVNode as _isVNode } from "vue";
3
2
  import _createClass from "@babel/runtime/helpers/esm/createClass";
4
3
  import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
5
4
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
@@ -12,9 +11,6 @@ import IconFont from '../../Icon';
12
11
  import { regular } from '@jetlinks-web/utils';
13
12
  import { Menu } from 'ant-design-vue/es/';
14
13
  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
- }
18
14
  export var baseMenuProps = _objectSpread(_objectSpread({}, defaultSettingProps), {}, {
19
15
  prefixCls: {
20
16
  type: String,
@@ -118,8 +114,7 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
118
114
  });
119
115
  _defineProperty(this, "getSubMenuOrItem", function (item) {
120
116
  var _item$meta, _item$meta2, _item$meta7, _item$meta8;
121
- 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)) {
122
- var _slot;
117
+ 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
118
  var _item$meta3, _item$meta4, _item$meta5, _item$meta6;
124
119
  if (_this.props.subMenuItemRender) {
125
120
  var subMenuItemRender = withCtx(_this.props.subMenuItemRender, _this.ctx);
@@ -132,21 +127,13 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
132
127
  prefixCls = _this$props.prefixCls,
133
128
  locale = _this$props.locale;
134
129
  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);
135
- var defaultTitle = ((_item$meta5 = item.meta) === null || _item$meta5 === void 0 ? void 0 : _item$meta5.icon) ? _createVNode("span", {
130
+ var defaultTitle = (_item$meta5 = item.meta) !== null && _item$meta5 !== void 0 && _item$meta5.icon ? _createVNode("span", {
136
131
  "class": "".concat(prefixCls, "-menu-item")
137
132
  }, [_createVNode("span", {
138
133
  "class": "".concat(prefixCls, "-menu-item-title")
139
- }, _isSlot(menuTitle) ? menuTitle : {
140
- default: function _default() {
141
- return [menuTitle];
142
- }
143
- })]) : _createVNode("span", {
134
+ }, [menuTitle])]) : _createVNode("span", {
144
135
  "class": "".concat(prefixCls, "-menu-item")
145
- }, _isSlot(menuTitle) ? menuTitle : {
146
- default: function _default() {
147
- return [menuTitle];
148
- }
149
- });
136
+ }, [menuTitle]);
150
137
  return _createVNode(Menu.SubMenu, {
151
138
  "title": defaultTitle,
152
139
  "key": item.path,
@@ -155,9 +142,9 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
155
142
  "iconUrl": _this.props.iconfontUrl,
156
143
  "icon": (_item$meta6 = item.meta) === null || _item$meta6 === void 0 ? void 0 : _item$meta6.icon
157
144
  }, null)
158
- }, _isSlot(_slot = _this.getNavMenuItems(item.children)) ? _slot : {
145
+ }, {
159
146
  default: function _default() {
160
- return [_slot];
147
+ return [_this.getNavMenuItems(item.children)];
161
148
  }
162
149
  });
163
150
  }
@@ -174,15 +161,14 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
174
161
  "disabled": (_item$meta7 = item.meta) === null || _item$meta7 === void 0 ? void 0 : _item$meta7.disabled,
175
162
  "danger": (_item$meta8 = item.meta) === null || _item$meta8 === void 0 ? void 0 : _item$meta8.danger,
176
163
  "key": item.path
177
- }, _isSlot(title) ? title : {
164
+ }, {
178
165
  default: function _default() {
179
166
  return [title];
180
167
  }
181
168
  });
182
169
  });
183
170
  _defineProperty(this, "getMenuItem", function (item) {
184
- var _slot2;
185
- var _item$meta9, _item$meta10, _item$meta11, _item$meta12, _item$meta13;
171
+ var _item$meta9, _item$meta0, _item$meta1, _item$meta10, _item$meta11;
186
172
  var meta = _objectSpread({}, item.meta);
187
173
  var target = meta.target || null;
188
174
  var hasUrl = regular.isUrl(item.path);
@@ -201,30 +187,22 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(_props, ctx) {
201
187
  locale = _this$props2.locale;
202
188
  var icon = ((_item$meta9 = item.meta) === null || _item$meta9 === void 0 ? void 0 : _item$meta9.icon) && _createVNode(LazyIcon, {
203
189
  "iconUrl": _this.props.iconfontUrl,
204
- "icon": (_item$meta10 = item.meta) === null || _item$meta10 === void 0 ? void 0 : _item$meta10.icon
190
+ "icon": (_item$meta0 = item.meta) === null || _item$meta0 === void 0 ? void 0 : _item$meta0.icon
205
191
  }, null) || undefined;
206
- 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);
207
- var defaultTitle = ((_item$meta13 = item.meta) === null || _item$meta13 === void 0 ? void 0 : _item$meta13.icon) ? _createVNode(CustomTag, _objectSpread(_objectSpread(_objectSpread({}, attrs), props), {}, {
192
+ 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);
193
+ var defaultTitle = (_item$meta11 = item.meta) !== null && _item$meta11 !== void 0 && _item$meta11.icon ? _createVNode(CustomTag, _objectSpread(_objectSpread(_objectSpread({}, attrs), props), {}, {
208
194
  "class": "".concat(prefixCls, "-menu-item")
209
195
  }), {
210
196
  default: function _default() {
211
197
  return [icon, _createVNode("span", {
212
198
  "class": "".concat(prefixCls, "-menu-item-title")
213
- }, _isSlot(menuTitle) ? menuTitle : {
214
- default: function _default() {
215
- return [menuTitle];
216
- }
217
- })];
199
+ }, [menuTitle])];
218
200
  }
219
201
  }) : _createVNode(CustomTag, _objectSpread(_objectSpread(_objectSpread({}, attrs), props), {}, {
220
202
  "class": "".concat(prefixCls, "-menu-item")
221
- }), _isSlot(_slot2 = _createVNode("span", null, _isSlot(menuTitle) ? menuTitle : {
222
- default: function _default() {
223
- return [menuTitle];
224
- }
225
- })) ? _slot2 : {
203
+ }), {
226
204
  default: function _default() {
227
- return [_slot2];
205
+ return [_createVNode("span", null, [menuTitle])];
228
206
  }
229
207
  });
230
208
  return [defaultTitle, icon];
@@ -262,7 +240,6 @@ export default defineComponent({
262
240
  emit('click', args);
263
241
  };
264
242
  return function () {
265
- var _slot3;
266
243
  return _createVNode(Menu, _objectSpread({
267
244
  "key": "Menu",
268
245
  "inlineIndent": 16,
@@ -273,9 +250,9 @@ export default defineComponent({
273
250
  "onOpenChange": handleOpenChange,
274
251
  "onSelect": handleSelect,
275
252
  "onClick": handleClick
276
- }, props.menuProps), _isSlot(_slot3 = menuUtil.getNavMenuItems(props.menuData)) ? _slot3 : {
253
+ }, props.menuProps), {
277
254
  default: function _default() {
278
- return [_slot3];
255
+ return [menuUtil.getNavMenuItems(props.menuData)];
279
256
  }
280
257
  });
281
258
  };
@@ -1,6 +1,6 @@
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, resolveDirective as _resolveDirective, createTextVNode as _createTextVNode, isVNode as _isVNode, Fragment as _Fragment } from "vue";
3
+ import { createVNode as _createVNode, createTextVNode as _createTextVNode, Fragment as _Fragment } from "vue";
4
4
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
5
5
  import { LayoutSider as Sider, Menu, Tooltip } from 'ant-design-vue/es/';
6
6
  import BaseMenu, { baseMenuProps } from './BaseMenu';
@@ -10,9 +10,6 @@ import IconFont from '../../Icon';
10
10
  import { useRouteContext } from '../RouteContext';
11
11
  import { computed, unref } from 'vue';
12
12
  import "../typings";
13
- function _isSlot(s) {
14
- return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
15
- }
16
13
  export var siderMenuProps = _objectSpread(_objectSpread(_objectSpread({}, defaultSettingProps), baseMenuProps), {}, {
17
14
  logo: {
18
15
  type: [Object, String, Function],
@@ -145,11 +142,7 @@ export var defaultRenderLogoAndTitle = function defaultRenderLogoAndTitle(props)
145
142
  if (layout === 'mix' && renderFunction === false) {
146
143
  return null;
147
144
  }
148
- var titleDom = _createVNode("h1", null, _isSlot(title) ? title : {
149
- default: function _default() {
150
- return [title];
151
- }
152
- });
145
+ var titleDom = _createVNode("h1", null, [title]);
153
146
  if (renderKey === 'menuHeaderRender') {
154
147
  return null;
155
148
  }
@@ -159,11 +152,7 @@ export var defaultRenderLogoAndTitle = function defaultRenderLogoAndTitle(props)
159
152
  return renderFunction(logoDom, props.collapsed ? null : titleDom, props);
160
153
  }
161
154
  if (Array.isArray(renderFunction)) {
162
- return _createVNode(_Fragment, null, _isSlot(renderFunction) ? renderFunction : {
163
- default: function _default() {
164
- return [renderFunction];
165
- }
166
- });
155
+ return _createVNode(_Fragment, null, [renderFunction]);
167
156
  }
168
157
  return _createVNode("a", null, [logoDom, props.collapsed ? null : titleDom]);
169
158
  };
@@ -175,7 +164,6 @@ export var defaultRenderCollapsedButton = function defaultRenderCollapsedButton(
175
164
  }, null);
176
165
  };
177
166
  var SiderMenu = function SiderMenu(props) {
178
- var _slot;
179
167
  var collapsed = props.collapsed,
180
168
  siderWidth = props.siderWidth,
181
169
  breakpoint = props.breakpoint,
@@ -276,17 +264,9 @@ var SiderMenu = function SiderMenu(props) {
276
264
  "onClick": props.layout !== 'mix' ? props.onMenuHeaderClick : undefined,
277
265
  "id": "logo",
278
266
  "style": props === null || props === void 0 ? void 0 : props.logoStyle
279
- }, _isSlot(headerDom) ? headerDom : {
280
- default: function _default() {
281
- return [headerDom];
282
- }
283
- }), extraDom && _createVNode("div", {
267
+ }, [headerDom]), extraDom && _createVNode("div", {
284
268
  "class": _defineProperty(_defineProperty({}, "".concat(baseClassName, "-extra"), true), "".concat(baseClassName, "-extra-no-logo"), !headerDom)
285
- }, _isSlot(extraDom) ? extraDom : {
286
- default: function _default() {
287
- return [extraDom];
288
- }
289
- }), _createVNode("div", {
269
+ }, [extraDom]), _createVNode("div", {
290
270
  "class": "".concat(baseClassName, "-body"),
291
271
  "style": "flex: 1; overflow: hidden auto;"
292
272
  }, [props.layoutType !== LayoutType.CARD ? menuContentRender && menuContentRender(props, defaultMenuDom) || defaultMenuDom : null]), _createVNode("div", {
@@ -303,17 +283,17 @@ var SiderMenu = function SiderMenu(props) {
303
283
  props.onCollapse(!props.collapsed);
304
284
  }
305
285
  }
306
- }, _isSlot(_slot = _createVNode(Menu.Item, {
307
- "key": 'collapsed-button',
308
- "class": "".concat(baseClassName, "-collapsed-button"),
309
- "title": false
310
286
  }, {
311
287
  default: function _default() {
312
- return [collapsedButtonRender && typeof collapsedButtonRender === 'function' ? collapsedButtonRender(collapsed) : collapsedButtonRender];
313
- }
314
- })) ? _slot : {
315
- default: function _default() {
316
- return [_slot];
288
+ return [_createVNode(Menu.Item, {
289
+ "key": 'collapsed-button',
290
+ "class": "".concat(baseClassName, "-collapsed-button"),
291
+ "title": false
292
+ }, {
293
+ default: function _default() {
294
+ return [collapsedButtonRender && typeof collapsedButtonRender === 'function' ? collapsedButtonRender(collapsed) : collapsedButtonRender];
295
+ }
296
+ })];
317
297
  }
318
298
  }) : null])];
319
299
  }
@@ -1,4 +1,3 @@
1
- import { isVNode as _isVNode } from "vue";
2
1
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
2
  import { createVNode as _createVNode } from "vue";
4
3
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -12,9 +11,6 @@ import { defaultSettingProps, LayoutType } from '../defaultSettings';
12
11
  import { defaultPrefixCls, useRouteContext } from '../RouteContext';
13
12
  import BaseMenu from '../SiderMenu/BaseMenu';
14
13
  import { clearMenuItem } from '../util';
15
- function _isSlot(s) {
16
- return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !_isVNode(s);
17
- }
18
14
  export var baseHeaderProps = _objectSpread(_objectSpread({}, defaultSettingProps), {}, {
19
15
  prefixCls: PropTypes.string.def('ant-pro'),
20
16
  collapsed: PropTypes.looseBool,
@@ -141,11 +137,7 @@ export var TopNavHeader = function TopNavHeader(props) {
141
137
  "class": "".concat(prefixCls, "-logo"),
142
138
  "key": "logo",
143
139
  "id": "logo"
144
- }, _isSlot(headerDom) ? headerDom : {
145
- default: function _default() {
146
- return [headerDom];
147
- }
148
- })]), _createVNode("div", {
140
+ }, [headerDom])]), _createVNode("div", {
149
141
  "style": {
150
142
  flex: 1
151
143
  },
@@ -1,4 +1,4 @@
1
- @import 'ant-design-vue/es/style/themes/index.less';
2
-
3
- @basicLayout-prefix-cls: ~'@{ant-prefix}-pro-basicLayout';
4
- @pro-layout-header-height: 48px;
1
+ @import 'ant-design-vue/es/style/themes/index.less';
2
+
3
+ @basicLayout-prefix-cls: ~'@{ant-prefix}-pro-basicLayout';
4
+ @pro-layout-header-height: 48px;
@@ -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 ? void 0 : _finalItem$meta.hideInMenu) {
6
+ if ((_finalItem$meta = finalItem.meta) !== null && _finalItem$meta !== void 0 && _finalItem$meta.hideInMenu) {
7
7
  return null;
8
8
  }
9
- if (finalItem && (finalItem === null || finalItem === void 0 ? void 0 : finalItem.children)) {
9
+ if (finalItem && finalItem !== null && finalItem !== void 0 && finalItem.children) {
10
10
  var _finalItem$meta2;
11
- if (!((_finalItem$meta2 = finalItem.meta) === null || _finalItem$meta2 === void 0 ? void 0 : _finalItem$meta2.hideChildInMenu) && finalItem.children.some(function (child) {
11
+ if (!((_finalItem$meta2 = finalItem.meta) !== null && _finalItem$meta2 !== 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 ? void 0 : _child$meta.hideInMenu);
13
+ return child && child.name && !((_child$meta = child.meta) !== null && _child$meta !== 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 ? void 0 : _finalItem$meta3.hideInMenu)) {
30
+ if (!finalItem.name || (_finalItem$meta3 = finalItem.meta) !== null && _finalItem$meta3 !== void 0 && _finalItem$meta3.hideInMenu) {
31
31
  return null;
32
32
  }
33
33
  if (finalItem.children) {