@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.
- package/es/CheckButton/CheckButton.js +1 -1
- package/es/ConfigProvider/index.js +1 -1
- package/es/FullPage/FullPage.js +1 -1
- package/es/Icon/icon.js +1 -2
- package/es/ProLayout/Basic/BasicLayout.js +11 -7
- package/es/ProLayout/Basic/Header.js +7 -3
- package/es/ProLayout/PageContainer/index.js +14 -8
- package/es/ProLayout/SiderMenu/BaseMenu.js +37 -14
- package/es/ProLayout/SiderMenu/SiderMenu.js +34 -14
- package/es/ProLayout/TopHeader/index.js +10 -2
- package/es/ProLayout/util.js +5 -5
- package/es/ProTable/index.js +140 -135
- package/es/Scrollbar/Scrollbar.js +212 -100
- package/es/Scrollbar/Thumb.js +189 -10
- package/es/Scrollbar/scrollbarProps.js +100 -0
- package/es/Scrollbar/thumbProps.js +10 -0
- package/es/Search/Advanced/SaveHistory.js +1 -1
- package/es/Search/Item.js +1 -1
- package/es/Search/Search.js +1 -1
- package/lib/CheckButton/CheckButton.js +1 -1
- package/lib/FullPage/FullPage.js +1 -1
- package/lib/Icon/icon.js +1 -1
- package/lib/ProLayout/Basic/BasicLayout.js +10 -6
- package/lib/ProLayout/Basic/Header.js +6 -2
- package/lib/ProLayout/PageContainer/index.js +11 -7
- package/lib/ProLayout/SiderMenu/BaseMenu.js +36 -14
- package/lib/ProLayout/SiderMenu/SiderMenu.js +34 -14
- package/lib/ProLayout/TopHeader/index.js +8 -1
- package/lib/ProLayout/util.js +5 -5
- package/lib/ProTable/index.js +139 -134
- package/lib/Scrollbar/Scrollbar.js +211 -105
- package/lib/Scrollbar/Thumb.js +188 -15
- package/lib/Scrollbar/scrollbarProps.js +106 -0
- package/lib/Scrollbar/thumbProps.js +16 -0
- package/lib/Search/Advanced/SaveHistory.js +1 -1
- package/lib/Search/Item.js +1 -1
- package/lib/Search/Search.js +1 -1
- package/package.json +4 -4
package/lib/FullPage/FullPage.js
CHANGED
|
@@ -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-
|
|
9
|
+
const _withScopeId = n => (_pushScopeId("data-v-1712542098577"), 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/lib/Icon/icon.js
CHANGED
|
@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports.default = void 0;
|
|
9
|
-
var _vue = require("vue");
|
|
10
9
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
10
|
+
var _vue = require("vue");
|
|
11
11
|
var _iconsVue = _interopRequireWildcard(require("@ant-design/icons-vue/lib/icons"));
|
|
12
12
|
var aIcon = _iconsVue;
|
|
13
13
|
var _hooks = require("@jetlinks-web/hooks");
|
|
@@ -22,6 +22,9 @@ var _antDesignVue = require("ant-design-vue");
|
|
|
22
22
|
var _excluded = ["pure", "onCollapse", "onOpenKeys", "onSelect", "onMenuClick"];
|
|
23
23
|
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); }
|
|
24
24
|
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; }
|
|
25
|
+
function _isSlot(s) {
|
|
26
|
+
return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0, _vue.isVNode)(s);
|
|
27
|
+
}
|
|
25
28
|
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), {}, {
|
|
26
29
|
pure: Boolean,
|
|
27
30
|
loading: Boolean,
|
|
@@ -181,6 +184,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
|
|
|
181
184
|
}));
|
|
182
185
|
(0, _vue.provide)(_RouteContext.routeContextInjectKey, routeContext);
|
|
183
186
|
return function () {
|
|
187
|
+
var _slot;
|
|
184
188
|
var _slots$default, _slots$default2;
|
|
185
189
|
var pure = props.pure,
|
|
186
190
|
propsOnCollapse = props.onCollapse,
|
|
@@ -246,13 +250,13 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
|
|
|
246
250
|
"onSelect": onSelect,
|
|
247
251
|
"onOpenKeys": onOpenKeys,
|
|
248
252
|
"onMenuClick": onMenuClick
|
|
249
|
-
}), null), (0, _vue.createVNode)(_antDesignVue.Layout, null, {
|
|
253
|
+
}), null), (0, _vue.createVNode)(_antDesignVue.Layout, null, _isSlot(_slot = (0, _vue.createVNode)(_antDesignVue.LayoutContent, null, {
|
|
250
254
|
default: function _default() {
|
|
251
|
-
return [(
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
255
|
+
return [(_slots$default2 = slots.default) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)];
|
|
256
|
+
}
|
|
257
|
+
})) ? _slot : {
|
|
258
|
+
default: function _default() {
|
|
259
|
+
return [_slot];
|
|
256
260
|
}
|
|
257
261
|
})];
|
|
258
262
|
}
|
|
@@ -12,6 +12,9 @@ var _TopHeader = require("../TopHeader");
|
|
|
12
12
|
var _vueTypes = _interopRequireDefault(require("ant-design-vue/es/_util/vue-types"));
|
|
13
13
|
var _RouteContext = require("../RouteContext");
|
|
14
14
|
var _antDesignVue = require("ant-design-vue");
|
|
15
|
+
function _isSlot(s) {
|
|
16
|
+
return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0, _vue.isVNode)(s);
|
|
17
|
+
}
|
|
15
18
|
var headerViewProps = exports.headerViewProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _TopHeader.baseHeaderProps), {}, {
|
|
16
19
|
headerRender: {
|
|
17
20
|
type: [Object, Function, Boolean],
|
|
@@ -73,6 +76,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
|
|
|
73
76
|
return needFixedHeader.value ? 0 : undefined;
|
|
74
77
|
});
|
|
75
78
|
return function () {
|
|
79
|
+
var _slot;
|
|
76
80
|
return (0, _vue.createVNode)(_vue.Fragment, null, [needFixedHeader.value && (0, _vue.createVNode)(_antDesignVue.Layout.Header, {
|
|
77
81
|
"style": {
|
|
78
82
|
height: "".concat(headerHeight.value, "px"),
|
|
@@ -89,9 +93,9 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
|
|
|
89
93
|
right: right.value
|
|
90
94
|
},
|
|
91
95
|
"class": className.value
|
|
92
|
-
}, {
|
|
96
|
+
}, _isSlot(_slot = renderContent()) ? _slot : {
|
|
93
97
|
default: function _default() {
|
|
94
|
-
return [
|
|
98
|
+
return [_slot];
|
|
95
99
|
}
|
|
96
100
|
})]);
|
|
97
101
|
};
|
|
@@ -16,6 +16,9 @@ var _RouteContext = require("../RouteContext");
|
|
|
16
16
|
var _util = require("../util");
|
|
17
17
|
require("./index.less");
|
|
18
18
|
var _excluded = ["title", "tabList", "tabActiveKey", "content", "pageHeaderRender", "header", "extraContent", "prefixedClassName", "prefixCls", "fixedHeader", "showBack"];
|
|
19
|
+
function _isSlot(s) {
|
|
20
|
+
return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0, _vue.isVNode)(s);
|
|
21
|
+
}
|
|
19
22
|
var pageHeaderTabConfig = exports.pageHeaderTabConfig = {
|
|
20
23
|
/**
|
|
21
24
|
* @name tabs 的列表
|
|
@@ -151,6 +154,7 @@ var renderFooter = function renderFooter(props) {
|
|
|
151
154
|
}, [item.tab]);
|
|
152
155
|
};
|
|
153
156
|
if (tabList && tabList.length) {
|
|
157
|
+
var _slot;
|
|
154
158
|
return (0, _vue.createVNode)(_antDesignVue.Tabs, (0, _objectSpread2.default)({
|
|
155
159
|
"class": "page-container-tabs",
|
|
156
160
|
"activeKey": tabActiveKey,
|
|
@@ -160,14 +164,14 @@ var renderFooter = function renderFooter(props) {
|
|
|
160
164
|
}
|
|
161
165
|
},
|
|
162
166
|
"tabBarExtraContent": tabBarExtraContent
|
|
163
|
-
}, tabProps), {
|
|
167
|
+
}, tabProps), _isSlot(_slot = tabList.map(function (item) {
|
|
168
|
+
return (0, _vue.createVNode)(_antDesignVue.Tabs.TabPane, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
|
|
169
|
+
"tab": tabPane(item),
|
|
170
|
+
"key": item.key
|
|
171
|
+
}), null);
|
|
172
|
+
})) ? _slot : {
|
|
164
173
|
default: function _default() {
|
|
165
|
-
return [
|
|
166
|
-
return (0, _vue.createVNode)(_antDesignVue.Tabs.TabPane, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
|
|
167
|
-
"tab": tabPane(item),
|
|
168
|
-
"key": item.key
|
|
169
|
-
}), null);
|
|
170
|
-
})];
|
|
174
|
+
return [_slot];
|
|
171
175
|
}
|
|
172
176
|
});
|
|
173
177
|
}
|
|
@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.default = exports.baseMenuProps = void 0;
|
|
8
|
-
var _vue = require("vue");
|
|
9
8
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
9
|
+
var _vue = require("vue");
|
|
10
10
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
11
11
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
12
12
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
@@ -17,6 +17,9 @@ var _Icon = _interopRequireDefault(require("../../Icon"));
|
|
|
17
17
|
var _utils = require("@jetlinks-web/utils");
|
|
18
18
|
var _antDesignVue = require("ant-design-vue");
|
|
19
19
|
var _iconsVue = require("@ant-design/icons-vue/lib/icons");
|
|
20
|
+
function _isSlot(s) {
|
|
21
|
+
return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0, _vue.isVNode)(s);
|
|
22
|
+
}
|
|
20
23
|
var baseMenuProps = exports.baseMenuProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _defaultSettings.defaultSettingProps), {}, {
|
|
21
24
|
prefixCls: {
|
|
22
25
|
type: String,
|
|
@@ -122,7 +125,8 @@ var MenuUtil = /*#__PURE__*/(0, _createClass2.default)(function MenuUtil(_props,
|
|
|
122
125
|
});
|
|
123
126
|
(0, _defineProperty2.default)(this, "getSubMenuOrItem", function (item) {
|
|
124
127
|
var _item$meta, _item$meta2, _item$meta7, _item$meta8;
|
|
125
|
-
if (Array.isArray(item.children) && item.children.length > 0 && !(item
|
|
128
|
+
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)) {
|
|
129
|
+
var _slot;
|
|
126
130
|
var _item$meta3, _item$meta4, _item$meta5, _item$meta6;
|
|
127
131
|
if (_this.props.subMenuItemRender) {
|
|
128
132
|
var subMenuItemRender = (0, _vue.withCtx)(_this.props.subMenuItemRender, _this.ctx);
|
|
@@ -135,13 +139,21 @@ var MenuUtil = /*#__PURE__*/(0, _createClass2.default)(function MenuUtil(_props,
|
|
|
135
139
|
prefixCls = _this$props.prefixCls,
|
|
136
140
|
locale = _this$props.locale;
|
|
137
141
|
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);
|
|
138
|
-
var defaultTitle = (_item$meta5 = item.meta)
|
|
142
|
+
var defaultTitle = ((_item$meta5 = item.meta) === null || _item$meta5 === void 0 ? void 0 : _item$meta5.icon) ? (0, _vue.createVNode)("span", {
|
|
139
143
|
"class": "".concat(prefixCls, "-menu-item")
|
|
140
144
|
}, [(0, _vue.createVNode)("span", {
|
|
141
145
|
"class": "".concat(prefixCls, "-menu-item-title")
|
|
142
|
-
},
|
|
146
|
+
}, _isSlot(menuTitle) ? menuTitle : {
|
|
147
|
+
default: function _default() {
|
|
148
|
+
return [menuTitle];
|
|
149
|
+
}
|
|
150
|
+
})]) : (0, _vue.createVNode)("span", {
|
|
143
151
|
"class": "".concat(prefixCls, "-menu-item")
|
|
144
|
-
},
|
|
152
|
+
}, _isSlot(menuTitle) ? menuTitle : {
|
|
153
|
+
default: function _default() {
|
|
154
|
+
return [menuTitle];
|
|
155
|
+
}
|
|
156
|
+
});
|
|
145
157
|
return (0, _vue.createVNode)(_antDesignVue.Menu.SubMenu, {
|
|
146
158
|
"title": defaultTitle,
|
|
147
159
|
"key": item.path,
|
|
@@ -150,9 +162,9 @@ var MenuUtil = /*#__PURE__*/(0, _createClass2.default)(function MenuUtil(_props,
|
|
|
150
162
|
"iconUrl": _this.props.iconfontUrl,
|
|
151
163
|
"icon": (_item$meta6 = item.meta) === null || _item$meta6 === void 0 ? void 0 : _item$meta6.icon
|
|
152
164
|
}, null)
|
|
153
|
-
}, {
|
|
165
|
+
}, _isSlot(_slot = _this.getNavMenuItems(item.children)) ? _slot : {
|
|
154
166
|
default: function _default() {
|
|
155
|
-
return [
|
|
167
|
+
return [_slot];
|
|
156
168
|
}
|
|
157
169
|
});
|
|
158
170
|
}
|
|
@@ -169,13 +181,14 @@ var MenuUtil = /*#__PURE__*/(0, _createClass2.default)(function MenuUtil(_props,
|
|
|
169
181
|
"disabled": (_item$meta7 = item.meta) === null || _item$meta7 === void 0 ? void 0 : _item$meta7.disabled,
|
|
170
182
|
"danger": (_item$meta8 = item.meta) === null || _item$meta8 === void 0 ? void 0 : _item$meta8.danger,
|
|
171
183
|
"key": item.path
|
|
172
|
-
}, {
|
|
184
|
+
}, _isSlot(title) ? title : {
|
|
173
185
|
default: function _default() {
|
|
174
186
|
return [title];
|
|
175
187
|
}
|
|
176
188
|
});
|
|
177
189
|
});
|
|
178
190
|
(0, _defineProperty2.default)(this, "getMenuItem", function (item) {
|
|
191
|
+
var _slot2;
|
|
179
192
|
var _item$meta9, _item$meta10, _item$meta11, _item$meta12, _item$meta13;
|
|
180
193
|
var meta = (0, _objectSpread2.default)({}, item.meta);
|
|
181
194
|
var target = meta.target || null;
|
|
@@ -198,19 +211,27 @@ var MenuUtil = /*#__PURE__*/(0, _createClass2.default)(function MenuUtil(_props,
|
|
|
198
211
|
"icon": (_item$meta10 = item.meta) === null || _item$meta10 === void 0 ? void 0 : _item$meta10.icon
|
|
199
212
|
}, null) || undefined;
|
|
200
213
|
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);
|
|
201
|
-
var defaultTitle = (_item$meta13 = item.meta)
|
|
214
|
+
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), {}, {
|
|
202
215
|
"class": "".concat(prefixCls, "-menu-item")
|
|
203
216
|
}), {
|
|
204
217
|
default: function _default() {
|
|
205
218
|
return [icon, (0, _vue.createVNode)("span", {
|
|
206
219
|
"class": "".concat(prefixCls, "-menu-item-title")
|
|
207
|
-
},
|
|
220
|
+
}, _isSlot(menuTitle) ? menuTitle : {
|
|
221
|
+
default: function _default() {
|
|
222
|
+
return [menuTitle];
|
|
223
|
+
}
|
|
224
|
+
})];
|
|
208
225
|
}
|
|
209
226
|
}) : (0, _vue.createVNode)(CustomTag, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, attrs), props), {}, {
|
|
210
227
|
"class": "".concat(prefixCls, "-menu-item")
|
|
211
|
-
}), {
|
|
228
|
+
}), _isSlot(_slot2 = (0, _vue.createVNode)("span", null, _isSlot(menuTitle) ? menuTitle : {
|
|
229
|
+
default: function _default() {
|
|
230
|
+
return [menuTitle];
|
|
231
|
+
}
|
|
232
|
+
})) ? _slot2 : {
|
|
212
233
|
default: function _default() {
|
|
213
|
-
return [
|
|
234
|
+
return [_slot2];
|
|
214
235
|
}
|
|
215
236
|
});
|
|
216
237
|
return [defaultTitle, icon];
|
|
@@ -248,6 +269,7 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
|
|
|
248
269
|
emit('click', args);
|
|
249
270
|
};
|
|
250
271
|
return function () {
|
|
272
|
+
var _slot3;
|
|
251
273
|
return (0, _vue.createVNode)(_antDesignVue.Menu, (0, _objectSpread2.default)({
|
|
252
274
|
"key": "Menu",
|
|
253
275
|
"inlineIndent": 16,
|
|
@@ -258,9 +280,9 @@ var _default2 = exports.default = (0, _vue.defineComponent)({
|
|
|
258
280
|
"onOpenChange": handleOpenChange,
|
|
259
281
|
"onSelect": handleSelect,
|
|
260
282
|
"onClick": handleClick
|
|
261
|
-
}, props.menuProps), {
|
|
283
|
+
}, props.menuProps), _isSlot(_slot3 = menuUtil.getNavMenuItems(props.menuData)) ? _slot3 : {
|
|
262
284
|
default: function _default() {
|
|
263
|
-
return [
|
|
285
|
+
return [_slot3];
|
|
264
286
|
}
|
|
265
287
|
});
|
|
266
288
|
};
|
|
@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports.siderMenuProps = exports.defaultRenderLogoAndTitle = exports.defaultRenderLogo = exports.defaultRenderCollapsedButton = exports.default = void 0;
|
|
9
|
-
var _vue = require("vue");
|
|
10
9
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
11
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
|
+
var _vue = require("vue");
|
|
12
12
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
13
13
|
var _antDesignVue = require("ant-design-vue");
|
|
14
14
|
var _BaseMenu = _interopRequireWildcard(require("./BaseMenu"));
|
|
@@ -18,6 +18,9 @@ var _Icon = _interopRequireDefault(require("../../Icon"));
|
|
|
18
18
|
var _RouteContext = require("../RouteContext");
|
|
19
19
|
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); }
|
|
20
20
|
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; }
|
|
21
|
+
function _isSlot(s) {
|
|
22
|
+
return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0, _vue.isVNode)(s);
|
|
23
|
+
}
|
|
21
24
|
var siderMenuProps = exports.siderMenuProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _defaultSettings.defaultSettingProps), _BaseMenu.baseMenuProps), {}, {
|
|
22
25
|
logo: {
|
|
23
26
|
type: [Object, String, Function],
|
|
@@ -115,7 +118,11 @@ var defaultRenderLogoAndTitle = exports.defaultRenderLogoAndTitle = function def
|
|
|
115
118
|
return null;
|
|
116
119
|
}
|
|
117
120
|
var logoDom = defaultRenderLogo(logo, logoStyle);
|
|
118
|
-
var titleDom = (0, _vue.createVNode)("h1", null,
|
|
121
|
+
var titleDom = (0, _vue.createVNode)("h1", null, _isSlot(title) ? title : {
|
|
122
|
+
default: function _default() {
|
|
123
|
+
return [title];
|
|
124
|
+
}
|
|
125
|
+
});
|
|
119
126
|
if (renderKey === 'menuHeaderRender') {
|
|
120
127
|
return null;
|
|
121
128
|
}
|
|
@@ -125,7 +132,11 @@ var defaultRenderLogoAndTitle = exports.defaultRenderLogoAndTitle = function def
|
|
|
125
132
|
return renderFunction(logoDom, props.collapsed ? null : titleDom, props);
|
|
126
133
|
}
|
|
127
134
|
if (Array.isArray(renderFunction)) {
|
|
128
|
-
return (0, _vue.createVNode)(_vue.Fragment, null,
|
|
135
|
+
return (0, _vue.createVNode)(_vue.Fragment, null, _isSlot(renderFunction) ? renderFunction : {
|
|
136
|
+
default: function _default() {
|
|
137
|
+
return [renderFunction];
|
|
138
|
+
}
|
|
139
|
+
});
|
|
129
140
|
}
|
|
130
141
|
return (0, _vue.createVNode)("a", null, [logoDom, props.collapsed ? null : titleDom]);
|
|
131
142
|
};
|
|
@@ -137,6 +148,7 @@ var defaultRenderCollapsedButton = exports.defaultRenderCollapsedButton = functi
|
|
|
137
148
|
}, null);
|
|
138
149
|
};
|
|
139
150
|
var SiderMenu = function SiderMenu(props) {
|
|
151
|
+
var _slot;
|
|
140
152
|
var collapsed = props.collapsed,
|
|
141
153
|
siderWidth = props.siderWidth,
|
|
142
154
|
breakpoint = props.breakpoint,
|
|
@@ -230,9 +242,17 @@ var SiderMenu = function SiderMenu(props) {
|
|
|
230
242
|
"onClick": props.layout !== 'mix' ? props.onMenuHeaderClick : undefined,
|
|
231
243
|
"id": "logo",
|
|
232
244
|
"style": props === null || props === void 0 ? void 0 : props.logoStyle
|
|
233
|
-
},
|
|
245
|
+
}, _isSlot(headerDom) ? headerDom : {
|
|
246
|
+
default: function _default() {
|
|
247
|
+
return [headerDom];
|
|
248
|
+
}
|
|
249
|
+
}), extraDom && !props.collapsed && (0, _vue.createVNode)("div", {
|
|
234
250
|
"class": (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(baseClassName, "-extra"), true), "".concat(baseClassName, "-extra-no-logo"), !headerDom)
|
|
235
|
-
},
|
|
251
|
+
}, _isSlot(extraDom) ? extraDom : {
|
|
252
|
+
default: function _default() {
|
|
253
|
+
return [extraDom];
|
|
254
|
+
}
|
|
255
|
+
}), (0, _vue.createVNode)("div", {
|
|
236
256
|
"style": "flex: 1; overflow: hidden auto;"
|
|
237
257
|
}, [menuContentRender && menuContentRender(props, defaultMenuDom) || defaultMenuDom]), (0, _vue.createVNode)("div", {
|
|
238
258
|
"class": "".concat(baseClassName, "-links")
|
|
@@ -248,17 +268,17 @@ var SiderMenu = function SiderMenu(props) {
|
|
|
248
268
|
props.onCollapse(!props.collapsed);
|
|
249
269
|
}
|
|
250
270
|
}
|
|
271
|
+
}, _isSlot(_slot = (0, _vue.createVNode)(_antDesignVue.Menu.Item, {
|
|
272
|
+
"key": 'collapsed-button',
|
|
273
|
+
"class": "".concat(baseClassName, "-collapsed-button"),
|
|
274
|
+
"title": false
|
|
251
275
|
}, {
|
|
252
276
|
default: function _default() {
|
|
253
|
-
return [(
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
default: function _default() {
|
|
259
|
-
return [collapsedButtonRender && typeof collapsedButtonRender === 'function' ? collapsedButtonRender(collapsed) : collapsedButtonRender];
|
|
260
|
-
}
|
|
261
|
-
})];
|
|
277
|
+
return [collapsedButtonRender && typeof collapsedButtonRender === 'function' ? collapsedButtonRender(collapsed) : collapsedButtonRender];
|
|
278
|
+
}
|
|
279
|
+
})) ? _slot : {
|
|
280
|
+
default: function _default() {
|
|
281
|
+
return [_slot];
|
|
262
282
|
}
|
|
263
283
|
}) : null])];
|
|
264
284
|
}
|
|
@@ -17,6 +17,9 @@ var _RouteContext = require("../RouteContext");
|
|
|
17
17
|
var _BaseMenu = _interopRequireDefault(require("../SiderMenu/BaseMenu"));
|
|
18
18
|
var _util = require("../util");
|
|
19
19
|
var _excluded = ["rightContentRender"];
|
|
20
|
+
function _isSlot(s) {
|
|
21
|
+
return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0, _vue.isVNode)(s);
|
|
22
|
+
}
|
|
20
23
|
var baseHeaderProps = exports.baseHeaderProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _defaultSettings.defaultSettingProps), {}, {
|
|
21
24
|
prefixCls: _vueTypes.default.string.def('ant-pro'),
|
|
22
25
|
collapsed: _vueTypes.default.looseBool,
|
|
@@ -129,7 +132,11 @@ var TopNavHeader = exports.TopNavHeader = function TopNavHeader(props) {
|
|
|
129
132
|
"class": "".concat(prefixCls, "-logo"),
|
|
130
133
|
"key": "logo",
|
|
131
134
|
"id": "logo"
|
|
132
|
-
},
|
|
135
|
+
}, _isSlot(headerDom) ? headerDom : {
|
|
136
|
+
default: function _default() {
|
|
137
|
+
return [headerDom];
|
|
138
|
+
}
|
|
139
|
+
})]), (0, _vue.createVNode)("div", {
|
|
133
140
|
"style": {
|
|
134
141
|
flex: 1
|
|
135
142
|
},
|
package/lib/ProLayout/util.js
CHANGED
|
@@ -14,14 +14,14 @@ function clearMenuItem(menusData) {
|
|
|
14
14
|
return menusData.map(function (item) {
|
|
15
15
|
var _finalItem$meta;
|
|
16
16
|
var finalItem = (0, _objectSpread2.default)({}, item);
|
|
17
|
-
if ((_finalItem$meta = finalItem.meta)
|
|
17
|
+
if ((_finalItem$meta = finalItem.meta) === null || _finalItem$meta === void 0 ? void 0 : _finalItem$meta.hideInMenu) {
|
|
18
18
|
return null;
|
|
19
19
|
}
|
|
20
|
-
if (finalItem && finalItem
|
|
20
|
+
if (finalItem && (finalItem === null || finalItem === void 0 ? void 0 : finalItem.children)) {
|
|
21
21
|
var _finalItem$meta2;
|
|
22
|
-
if (!((_finalItem$meta2 = finalItem.meta)
|
|
22
|
+
if (!((_finalItem$meta2 = finalItem.meta) === null || _finalItem$meta2 === void 0 ? void 0 : _finalItem$meta2.hideChildInMenu) && finalItem.children.some(function (child) {
|
|
23
23
|
var _child$meta;
|
|
24
|
-
return child && child.name && !((_child$meta = child.meta)
|
|
24
|
+
return child && child.name && !((_child$meta = child.meta) === null || _child$meta === void 0 ? void 0 : _child$meta.hideInMenu);
|
|
25
25
|
})) {
|
|
26
26
|
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
|
|
27
27
|
children: clearMenuItem(finalItem.children)
|
|
@@ -38,7 +38,7 @@ function flatMap(menusData) {
|
|
|
38
38
|
return menusData.map(function (item) {
|
|
39
39
|
var _finalItem$meta3;
|
|
40
40
|
var finalItem = (0, _objectSpread2.default)({}, item);
|
|
41
|
-
if (!finalItem.name || (_finalItem$meta3 = finalItem.meta)
|
|
41
|
+
if (!finalItem.name || ((_finalItem$meta3 = finalItem.meta) === null || _finalItem$meta3 === void 0 ? void 0 : _finalItem$meta3.hideInMenu)) {
|
|
42
42
|
return null;
|
|
43
43
|
}
|
|
44
44
|
if (finalItem.children) {
|