Merge branch 'develop' into 'pre-dev'

# Conflicts:
#   src/components/NavLeft.vue
This commit is contained in:
huangshengfa
2023-03-07 18:10:11 +08:00
23 changed files with 6254 additions and 22676 deletions

View File

@@ -3,7 +3,7 @@
class="navLeft"
:style="{
width: packup ? '100px' : '208px',
'min-height': screenHeight - 80 + 'px',
height: screenHeight - 80 + 'px',
}"
>
<div style="display: flex; justify-content: flex-end">
@@ -808,20 +808,19 @@ export default {
],
});
// console.log(state.openKeys, state.selectedKeys);
const onOpenChange = (openKeys) => {
const latestOpenKey = openKeys.find(
(key) => state.openKeys.indexOf(key) === -1
);
if (state.rootSubmenuKeys.indexOf(latestOpenKey) === -1) {
state.openKeys = openKeys;
console.log('111',openKeys)
} else {
state.openKeys = latestOpenKey ? [latestOpenKey] : [];
console.log('222222222222222')
}
};
const selectItem = (e) => {
// console.log("onSelect", e, );
let arr = state.keysList;
arr.map((value) => {
if (e.key === value.selectedKeys) {
@@ -830,9 +829,11 @@ export default {
"selectedKeys",
JSON.stringify([value.selectedKeys])
);
state.openKeys = [value.openKeys];
// console.log('2222',[value.openKeys,value.openKeys2])
state.openKeys = [value.openKeys,value.openKeys2];
// state.openKeys=['sub17', 'sub17-2']
state.selectedKeys = [value.selectedKeys];
state.openKeys2 = [value.openKeys];
state.openKeys2 = [value.openKeys,value.openKeys2];
state.selectedKeys2 = [value.openKeys];
}
});
@@ -933,12 +934,31 @@ export default {
<style lang="scss">
.navLeft {
width: 208px;
min-height: 100%;
height: 100%;
overflow-y: auto;
overflow-x: hidden;
background: linear-gradient(0deg, #a9e9f7 0%, #388be1 73%);
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
// margin-top: -50px;
flex-shrink: 0;
.treeMenu {
padding-left: 17px;
.ant-menu-item-icon {
width: 10px !important;
height: 10px;
min-width: 10px;
border-radius: 50%;
margin-right: 10px;
// background: white;
border: 2px solid white;
}
.ant-menu-title-content {
box-sizing: border-box;
// padding-left: 40px !important;
overflow: hidden;
text-overflow: ellipsis;
}
}
.packup {
width: 19px;
height: 15px;
@@ -970,7 +990,7 @@ export default {
.ant-menu-title-content {
padding: 0px !important;
// padding-left: 27px !important;
font-size: 16px;
font-size: 14px;
font-weight: 400;
color: #ffffff;
line-height: 36px;
@@ -980,7 +1000,7 @@ export default {
.ant-menu-item a,
.ant-menu-item a:hover {
font-size: 16px;
font-size: 14px;
font-weight: 400;
color: #ffffff;
line-height: 36px;
@@ -996,7 +1016,7 @@ export default {
//修改左侧padding
.ant-menu-item,
.ant-menu-submenu-title {
padding-left: 27px !important;
padding-left: 14px !important;
height: 49px !important;
line-height: 49px !important;
margin: 0px !important;
@@ -1009,7 +1029,7 @@ export default {
display: flex;
align-items: center;
justify-content: center;
margin-right: 15px;
margin-right: 10px;
}
.ant-menu-submenu-arrow {
@@ -1044,8 +1064,8 @@ export default {
height: 10px;
border-radius: 5px;
border: 2px solid rgba(255, 255, 255, 1);
margin-left: 24px;
margin-right: 18px;
margin-left: 18px;
margin-right: 10px;
display: inline-block;
}
@@ -1054,8 +1074,8 @@ export default {
height: 10px;
border-radius: 5px;
background-color: rgba(255, 255, 255, 1);
margin-left: 24px;
margin-right: 18px;
margin-left: 18px;
margin-right: 10px;
display: inline-block;
}
}