Merge pull request #558 from flipped-aurora/gva_gormv2_dev

Gva gormv2 dev

Author: 奇淼（piexlmax

web/src/App.vue

@@ -19,5 +19,9 @@ export default {
   background: #eee;
   height: 100vh;
   overflow: hidden;
+  font-weight: 400 !important;
+}
+.el-button{
+  font-weight: 400 !important;
 }
 </style>

web/src/style/basics.scss

@@ -8,14 +8,14 @@ $white-bg:#fff;
 $el-icon-small:30px;
 $el-icon-mini:24px;
 // aside
-$width-aside:220px; 
+$width-aside:220px;
 $width-hideside-aside:54px;
 $width-mobile-aside:210px;
 $color-aside:rgba(255, 255, 255,.9);
 $icon-arrow-size-aside:12px;
 $width-submenu-aside:55px;
 $bg-aside:#191a23;
-$height-aside-tilte:64px;
+$height-aside-tilte:60px;
 $height-aside-img:30px;
 $width-aside-img:30px;
 // header

web/src/view/layout/aside/historyComponent/history.vue

@@ -118,7 +118,14 @@ export default {
       if (this.historys.length === 1 && this.$route.name === this.defaultRouter) {
         return false
       }
-      if (e.srcElement.id) {
+      let id = ''
+      if (e.srcElement.nodeName === 'SPAN') {
+        console.log(e)
+        id = e.srcElement.offsetParent.id
+      } else {
+        id = e.srcElement.id
+      }
+      if (id) {
         this.contextMenuVisible = true
         let width
         if (this.isCollapse) {
@@ -131,7 +138,7 @@ export default {
         }
         this.left = e.clientX - width
         this.top = e.clientY + 10
-        this.rightActive = e.srcElement.id.split('-')[1]
+        this.rightActive = id.split('-')[1]
       }
     },
     closeAll() {

web/src/view/layout/setting/index.vue

@@ -101,7 +101,7 @@ export default {
   color: #fff;
   border-radius: 4px 0 0 4px;
   cursor: pointer;
-  -webkit-box-shadow: inset 0 0 6px rgb(0 ,0 ,0, 10%);
+  -webkit-box-shadow: inset 0 0 6px rgba(0 ,0 ,0, 10%);
 }
 .setting_body{
   padding: 20px;