ele-admin-plus 1.1.5 → 1.1.6-beta.1
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/ele-pro-layout/index.js +1 -1
- package/es/ele-pro-layout/style/sidebar.scss +7 -0
- package/es/ele-tabs/style/index.scss +1 -1
- package/es/ele-watermark/index.js +1 -0
- package/es/style/themes/default.scss +2 -2
- package/lib/ele-pro-layout/index.js +1 -1
- package/lib/ele-pro-layout/style/sidebar.scss +7 -0
- package/lib/ele-tabs/style/index.scss +1 -1
- package/lib/ele-watermark/index.js +1 -0
- package/lib/style/themes/default.scss +2 -2
- package/package.json +1 -1
|
@@ -308,7 +308,7 @@ const _sfc_main = defineComponent({
|
|
|
308
308
|
};
|
|
309
309
|
});
|
|
310
310
|
splitMenuData();
|
|
311
|
-
homeMenuPath.value = getHomePath((temp == null ? void 0 : temp.path)
|
|
311
|
+
homeMenuPath.value = getHomePath(props.homePath ?? (temp == null ? void 0 : temp.path));
|
|
312
312
|
};
|
|
313
313
|
const updateTabData = () => {
|
|
314
314
|
if (!props.tabs) {
|
|
@@ -129,6 +129,13 @@
|
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
131
|
|
|
132
|
+
.ele-admin-sidebox-popup.ele-menu {
|
|
133
|
+
& > .el-menu--popup-container > .el-menu--popup {
|
|
134
|
+
margin-left: eleVar('sidebox', 'padding');
|
|
135
|
+
margin-right: eleVar('sidebox', 'padding');
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
132
139
|
/* 操作按钮 */
|
|
133
140
|
.ele-sidebar-tool {
|
|
134
141
|
height: eleVar('sidebar', 'tool-height');
|
|
@@ -327,13 +327,13 @@ $ele: map.deep-merge(
|
|
|
327
327
|
'arrow-margin': 0 -4px 0 6px,
|
|
328
328
|
'bg': elVar('bg-color'),
|
|
329
329
|
'border-color': elVar('border-color', 'light'),
|
|
330
|
-
'padding':
|
|
330
|
+
'padding': 4px 0,
|
|
331
331
|
'base-level': 16px,
|
|
332
332
|
'child-bg': rgba(0, 0, 0, 0.02),
|
|
333
333
|
'collapse-width': 58px,
|
|
334
334
|
'collapse-icon-size': 18px,
|
|
335
335
|
'item-height': 40px,
|
|
336
|
-
'item-margin':
|
|
336
|
+
'item-margin': 6px,
|
|
337
337
|
'item-padding': 0,
|
|
338
338
|
'item-radius': 0,
|
|
339
339
|
'item-color': elVar('text-color', 'primary'),
|
|
@@ -309,7 +309,7 @@ const _sfc_main = vue.defineComponent({
|
|
|
309
309
|
};
|
|
310
310
|
});
|
|
311
311
|
splitMenuData();
|
|
312
|
-
homeMenuPath.value = util.getHomePath((temp == null ? void 0 : temp.path)
|
|
312
|
+
homeMenuPath.value = util.getHomePath(props2.homePath ?? (temp == null ? void 0 : temp.path));
|
|
313
313
|
};
|
|
314
314
|
const updateTabData = () => {
|
|
315
315
|
if (!props2.tabs) {
|
|
@@ -129,6 +129,13 @@
|
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
131
|
|
|
132
|
+
.ele-admin-sidebox-popup.ele-menu {
|
|
133
|
+
& > .el-menu--popup-container > .el-menu--popup {
|
|
134
|
+
margin-left: eleVar('sidebox', 'padding');
|
|
135
|
+
margin-right: eleVar('sidebox', 'padding');
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
132
139
|
/* 操作按钮 */
|
|
133
140
|
.ele-sidebar-tool {
|
|
134
141
|
height: eleVar('sidebar', 'tool-height');
|
|
@@ -49,6 +49,7 @@ const _sfc_main = vue.defineComponent({
|
|
|
49
49
|
transform: "none !important",
|
|
50
50
|
filter: "none !important",
|
|
51
51
|
visibility: "visible !important",
|
|
52
|
+
transition: "none !important",
|
|
52
53
|
maxWidth: "none !important",
|
|
53
54
|
maxHeight: "none !important",
|
|
54
55
|
zoom: "1 !important",
|
|
@@ -327,13 +327,13 @@ $ele: map.deep-merge(
|
|
|
327
327
|
'arrow-margin': 0 -4px 0 6px,
|
|
328
328
|
'bg': elVar('bg-color'),
|
|
329
329
|
'border-color': elVar('border-color', 'light'),
|
|
330
|
-
'padding':
|
|
330
|
+
'padding': 4px 0,
|
|
331
331
|
'base-level': 16px,
|
|
332
332
|
'child-bg': rgba(0, 0, 0, 0.02),
|
|
333
333
|
'collapse-width': 58px,
|
|
334
334
|
'collapse-icon-size': 18px,
|
|
335
335
|
'item-height': 40px,
|
|
336
|
-
'item-margin':
|
|
336
|
+
'item-margin': 6px,
|
|
337
337
|
'item-padding': 0,
|
|
338
338
|
'item-radius': 0,
|
|
339
339
|
'item-color': elVar('text-color', 'primary'),
|