Browse Source

Merge remote-tracking branch 'origin/master'

yangc 8 years ago
parent
commit
8346e0fc07
1 changed files with 12 additions and 1 deletions
  1. 12 1
      components/default/Header.vue

+ 12 - 1
components/default/Header.vue

@@ -24,7 +24,7 @@
                 <li class="menu-item"
                     v-for="en in user.data.enterprises"
                     v-if="showEnterprises && en.enName!=enterprise.enName">
-                  <a @click="switchEnterprise(en)">{{ en.enName }}</a>
+                  <a @click="switchEnterprise(en)" :title="en.enName">{{ en.enName }}</a>
                 </li>
                 <li class="menu-item"  v-if="showEnterprises">
                   <a @click="switchEnterprise({uu: 0})"><span v-text="user.data.userName"></span>(个人账户)</a>
@@ -121,6 +121,17 @@
   .header .navbar .navbar-container .navbar-right .dropdown .dropdown-menu li span,.header .navbar .navbar-container .navbar-right .dropdown .dropdown-menu li a{
     font-size: 12px;
   }
+  .header .navbar .navbar-container .navbar-right .dropdown .dropdown-menu .menu-item a{
+    width: 100%;
+    display: inline-block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 30px;
+  }
+  .header .navbar .navbar-container .navbar-right .dropdown .dropdown-menu .menu-item{
+    height: 30px;
+  }
   .dropdown-menu>li>a{
     padding: 0;
     line-height: 30px;