Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/FD_Pano

src/components/table/index.vue

@@ -20,7 +20,7 @@
         <!-- 复选框 -->
         <li v-if="selection" class="check-cls" ><span @click="selectItem(item,i)" class="fdcheck" :class="{check_active:item.hasAuth}"></span></li>
         <!--  -->
-        <li v-for="(sub,j) in header" :class="{ themetxt: sub.fontweight, showWhenHover: sub.showWhenHover }" :key='j' :style="{textAlign:item.textAlign, width:sub.width ? sub.width+'px':(100/header.length)+'%'}">
+        <li v-for="(sub,j) in header" :class="{ themetxt: sub.fontweight, showWhenHover: sub.showWhenHover, multiLine: sub.key === 'name' }" :key='j' :style="{textAlign:item.textAlign, width:sub.width ? sub.width+'px':(100/header.length)+'%'}">
           <slot :data='item[sub.key]' :item="item"  :sub='sub' name='item'></slot>
         </li>
       </ul>

src/components/table/style.less

@@ -60,15 +60,10 @@
           }
         }
       }
-
-      li {
-        text-align: left;
-        display: inline-block;
-        padding-right: 20px;
-        flex-grow: 1;
+      .multiLine {
         span {
           word-break: break-all;
-          color: #909090;
+          white-space: normal;
           display: -webkit-box;
           -webkit-box-orient: vertical;
           -webkit-line-clamp: 2;
@@ -78,6 +73,17 @@
           }
         }
       }
+      li {
+        text-align: left;
+        display: inline-block;
+        padding-right: 20px;
+        flex-grow: 1;
+        span {
+          color: #323233;
+          word-break: keep-all;
+          white-space: nowrap;
+        }
+      }
     }
 
     .bottom-line {

src/components/userInfo.vue

@@ -60,7 +60,7 @@ export default {
   }
   .icon-show_drop-down {
     color: #323233;
-    font-size: 10px;
+    font-size: 7px;
   }
   &:hover {
     .menu {

src/views/material/audio/index.vue

@@ -82,10 +82,7 @@
               :myAudioUrl="data"
             ></v-audio>
           </div>
-          <span
-            v-else
-            :style="{ fontWeight: sub.fontweight, color: '#202020' }"
-            >{{ data || "-" }}</span
+          <span v-else>{{ data || "-" }}</span
           >
         </div>
       </tableList>

src/views/material/image/index.vue

@@ -84,7 +84,6 @@
           </div>
           <span
             v-else
-            :style="{ fontWeight: sub.fontweight, color: '#202020' }"
             >{{ data || "-" }}</span
           >
         </div>

src/views/material/pano/index.vue

@@ -96,10 +96,7 @@
             <img :src="data + `?${Math.random()}`" alt="" />
           </div>
           <!-- 文字型单元格 -->
-          <span
-            v-else
-            :style="{ fontWeight: sub.fontweight, color: '#202020' }"
-            >{{ data || "-" }}
+          <span v-else>{{ data || "-" }}
           </span>
         </div>
       </tableList>

src/views/material/style.less

@@ -52,6 +52,7 @@
         width: 100%;
         height: 100%;
         object-fit: cover;
+        background: #F5F7FA;
       }
     }
     .audio{

src/views/material/video/index.vue

@@ -86,7 +86,6 @@
           </div>
           <span
             v-else
-            :style="{ fontWeight: sub.fontweight, color: '#202020' }"
             >{{ data || "-" }}</span
           >
         </div>