cloud-web-corejs 1.0.54-dev.632 → 1.0.54-dev.633

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 (3) hide show
  1. package/package.json +1 -1
  2. package/src/layout/components/Sidebar/default.vue +78 -64
  3. package/src/layout/components/langTool.vue +1 -1
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "cloud-web-corejs",
3
3
  "private": false,
4
- "version": "1.0.54-dev.632",
4
+ "version": "1.0.54-dev.633",
5
5
  "scripts": {
6
6
  "dev": "vue-cli-service serve",
7
7
  "lint": "eslint --ext .js,.vue src",
package/src/layout/components/Sidebar/default.vue CHANGED
@@ -142,8 +142,9 @@
142
142
  :key="'menuModule' + menuModule.id"
143
143
  @click.native="rourteTo(menuModule)"
144
144
  >
145
+ <i :class="getMenuClass(menuModule, 1)" v-if="menuModule.children.length <= 0"></i>
145
146
  <template slot="title">
146
- <i :class="getMenuClass(menuModule, 1)"></i>
147
+ <i :class="getMenuClass(menuModule, 1)" v-if="menuModule.children.length > 0"></i>
147
148
  <span>{{ getMenuName(menuModule) }}</span>
148
149
  </template>
149
150
  <component
@@ -783,7 +784,7 @@ export default {
783
784
  let dom = event.target;
784
785
  let domAttr = dom.getBoundingClientRect();
785
786
  // var sh1 = dom.offsetTop;
786
- var sh1 = domAttr.top + 10;
787
+ var sh1 = domAttr.top + 5;
787
788
  let $snav = this.$refs["seconMenus" + id][0];
788
789
  let snavAttr = $snav.getBoundingClientRect();
789
790
 
@@ -1056,46 +1057,57 @@ export default {
1056
1057
  position: relative;
1057
1058
  background-color: rgba(0, 0, 0, 0.2);
1058
1059
  word-break: break-word;
1060
+ .el-scrollbar__view > .el-submenu > .el-submenu__title{padding:0 11px !important;
1061
+ span{font-size:14px;}
1062
+ ~ .el-menu{
1063
+ padding:5px 0;
1064
+ .el-submenu.is-opened .el-submenu__title{background-color:#FFF;opacity:1;
1065
+ span{color:$baseColor;}
1066
+ i.iconfont{color:$baseColor}
1067
+ }
1068
+ }
1059
1069
 
1060
- .el-submenu {
1061
- overflow: hidden; //有点电脑分辨率问题
1062
- .el-submenu__title {
1063
- padding: 0 11px !important;
1064
- height: 48px;
1065
- line-height: 48px;
1066
-
1067
- i {
1068
- color: #fff;
1069
- font-size: 13px;
1070
- margin-right: 0;
1071
- width: 18px;
1072
-
1073
- &.iconfont {
1074
- margin-right: 5px;
1075
- font-size: 19px;
1076
- float: left;
1077
- }
1070
+ }
1071
+ .el-submenu__title,.el-menu-item {
1072
+ padding: 0 11px;
1073
+ height: 48px;
1074
+ line-height: 48px;
1075
+ &:hover,&.is-active{background-color:rgba(0, 0, 0, 0.29)}
1076
+ i {
1077
+ color: #fff;
1078
+ font-size: 13px;
1079
+ margin-right: 0;
1080
+ width: 18px;
1078
1081
 
1079
- &.el-submenu__icon-arrow {
1080
- right: 3px;
1081
- text-align: center;
1082
- font-size: 12px;
1083
- margin-top: -5px;
1084
- display: none;
1085
- }
1082
+ &.iconfont {
1083
+ margin-right: 5px;
1084
+ font-size: 19px;
1085
+ float: left;
1086
1086
  }
1087
1087
 
1088
- > span {
1089
- height: 48px;
1090
- display: table-cell;
1091
- width: 114px;
1092
- vertical-align: middle;
1093
- font-size: 13px;
1094
- white-space: normal;
1095
- line-height: 16px;
1088
+ &.el-submenu__icon-arrow {
1089
+ right: 3px;
1090
+ text-align: center;
1091
+ font-size: 12px;
1092
+ margin-top: -5px;
1093
+ display: none;
1096
1094
  }
1097
1095
  }
1098
1096
 
1097
+ > span {
1098
+ height: 48px;
1099
+ display: table-cell;
1100
+ width: 114px;
1101
+ vertical-align: middle;
1102
+ font-size: 13px;
1103
+ white-space: normal;
1104
+ line-height: 16px;
1105
+ }
1106
+ }
1107
+
1108
+ .el-submenu {
1109
+ overflow: hidden; //有点电脑分辨率问题
1110
+
1099
1111
  &.is-opened .el-submenu__title {
1100
1112
  //background-color: rgba(27, 66, 97) !important;
1101
1113
  }
@@ -1104,10 +1116,10 @@ export default {
1104
1116
 
1105
1117
  .el-submenu {
1106
1118
  &.is-opened{
1107
- > .el-submenu__title{background-color:rgba(0, 0, 0, 0.29) !important}
1119
+ > .el-submenu__title{background-color:rgba(0, 0, 0, 0.29)}
1108
1120
  }
1109
1121
  .el-menu {
1110
- background: rgba(0, 0, 0, 0.35) !important;
1122
+ background: rgba(0, 0, 0, 0.35);
1111
1123
  box-shadow: 0px -5px 8px #00000014 inset;
1112
1124
  //padding:4px 0;
1113
1125
  .el-submenu__title{
@@ -1115,11 +1127,11 @@ export default {
1115
1127
  line-height: 1.4;
1116
1128
  font-size: 12px;
1117
1129
  opacity: 0.8;
1118
- margin: 10px 0 10px 14px;
1130
+ margin: 5px 0 5px 14px;
1119
1131
  padding: 7px 2px 7px 33px !important;
1120
1132
  border-radius: 8px;
1121
1133
  text-align: left;
1122
- min-width: 81px !important;
1134
+ min-width: 81px;
1123
1135
  white-space: normal;
1124
1136
  margin-right: 10px;
1125
1137
  word-break: break-word;
@@ -1164,7 +1176,7 @@ export default {
1164
1176
  padding-left: 33px !important;
1165
1177
  font-size: 12px;
1166
1178
  opacity: 0.8;
1167
- margin: 10px 0 10px 14px;
1179
+ margin: 5px 0 5px 14px;
1168
1180
  padding: 7px 2px 7px 0px;
1169
1181
  border-radius: 8px;
1170
1182
  text-align: left;
@@ -1216,7 +1228,6 @@ export default {
1216
1228
  .el-submenu {
1217
1229
  .el-submenu__title {
1218
1230
  > span {
1219
- font-size: 14px;
1220
1231
  text-align: center;
1221
1232
  }
1222
1233
 
@@ -1529,12 +1540,11 @@ export default {
1529
1540
  // }
1530
1541
  .el-menu--vertical{
1531
1542
  > .el-menu--popup{overflow: hidden;
1532
- > .el-submenu,> .el-menu-item{
1533
- .el-submenu__title{
1534
- height: auto;
1535
- line-height: 1.4;
1543
+ .el-submenu__title,.el-menu-item{
1544
+ height: auto !important;
1545
+ line-height: 1.4 !important;
1536
1546
  opacity: 0.8;
1537
- margin: 10px 0 10px 14px;
1547
+ margin: 5px 0 5px 14px;
1538
1548
  padding: 7px 2px 7px 12px !important;
1539
1549
  border-radius: 8px;
1540
1550
  text-align: left;
@@ -1542,35 +1552,39 @@ export default {
1542
1552
  white-space: normal;
1543
1553
  margin-right: 10px;
1544
1554
  word-break: break-word;
1545
- &:hover{
1546
- background:#FFF;
1547
- i.iconfont{color:$baseColor}
1548
- }
1549
- }
1550
- &.is-opened{
1551
- > .el-submenu__title{background-color:#FFF !important;opacity: 1;
1552
- span{color:$baseColor}
1553
- i.iconfont{color:$baseColor}
1554
- }
1555
+ i.iconfont{color:#FFF;margin-right:8px;}
1555
1556
  }
1556
- }
1557
-
1558
1557
  }
1559
- .el-submenu,.el-menu-item {
1558
+ .el-submenu{
1560
1559
  .el-submenu__title{
1561
1560
  height:36px;line-height:36px;
1562
1561
  .el-submenu__icon-arrow{display:none}
1562
+ }
1563
+ &:hover{
1564
+ .el-submenu__title{
1565
+ background:#FFF;
1566
+ span{color:#FFF}
1567
+ i.iconfont{color:$baseColor}
1568
+ }
1569
+ }
1563
1570
 
1564
- &:hover{background:#16344D;
1565
-
1571
+ &.is-opened{
1572
+ .el-submenu__title{background-color:#FFF;opacity: 1;
1573
+ span{color:$baseColor}
1574
+ i.iconfont{color:$baseColor}
1566
1575
  }
1567
1576
  }
1577
+ }
1578
+ .el-menu-item{
1568
1579
  &:hover{
1569
- > i.iconfont{color:$baseColor}
1580
+ background:#FFF !important;opacity:1;
1581
+ span{color:$baseColor}
1582
+ i.iconfont{color:$baseColor}
1570
1583
  }
1571
- i.iconfont{color:#FFF;margin-right:8px;}
1572
1584
  &.is-opened{
1573
- .el-submenu__title{background-color:rgba(0, 0, 0, 0.29) !important}
1585
+ background:#FFF;opacity:1;
1586
+ span{color:$baseColor}
1587
+ i.iconfont{color:$baseColor}
1574
1588
  }
1575
1589
  }
1576
1590
  }
package/src/layout/components/langTool.vue CHANGED
@@ -84,7 +84,7 @@ export default {
84
84
  vertical-align: middle;
85
85
  color: #fff;
86
86
  font-size: 12px;
87
-
87
+ margin-left: 5px;
88
88
  .el-icon--right {
89
89
  margin-left: 3px;
90
90
  }