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

src/assets/style/component.less

@@ -826,11 +826,7 @@ textarea:-ms-input-placeholder {
     padding: 0;
     border-top: none;
     text-align: right;
-    .ui-button {
-      margin: 0 10px;
-    }
   }
-  
 }
 
 .ui-message-header {

src/components/table/index.vue

@@ -13,6 +13,8 @@
     <div class="t-con"
       v-infinite-scroll="requestMoreData"
       :infinite-scroll-disabled="!canRequestMoreData"
+      ref="t-con"
+      :style="`margin-right: ${hasScrollBar ? -6 : 0}px`"
     >
       <ul class="t-item" active-txt :class="{'bottom-line': showLine}" v-for="(item, i) in fixdata" :key="i">
         <!-- 复选框 -->
@@ -65,7 +67,8 @@ export default {
   data () {
     return {
       selectAll: false,
-      lock: true
+      lock: true,
+      hasScrollBar: false,
     }
   },
   computed: {
@@ -118,7 +121,17 @@ export default {
     }
   },
   mounted () {
-  }
+    const resizeObserver = new ResizeObserver((entries) => {
+      console.log('asdf');
+      if (entries[0].target.clientHeight < entries[0].target.scrollHeight) {
+        this.hasScrollBar = true
+      } else {
+        this.hasScrollBar = false
+      }
+       
+    })
+    resizeObserver.observe(this.$refs['t-con'])
+  },
 }
 </script>
 

src/framework/material/aside.vue

@@ -16,22 +16,22 @@ export default {
         name:'全景图片',
         id:'pano',
         link:{path:'/pano'},
-        icon:'iconbs_nav_panorama'
+        icon:'icon-material_panoramic_picture'
       },{
         name:'图片',
         id:'image',
         link:{path:'/image'},
-        icon:'iconbs_nav_photo'
+        icon:'icon-material_image'
       },{
         name:'音频',
         id:'audio',
         link:{path:'/audio'},
-        icon:'iconbs_nav_sound'
+        icon:'icon-material_music'
       },{
         name:'视频',
         id:'video',
         link:{path:'/video'},
-        icon:'iconbs_nav_video'
+        icon:'icon-material_video'
       }]
     }
   },

src/views/material/popup/imagePreviewer.vue

@@ -1,7 +1,10 @@
 <template>
   <popup v-if="ifShow">
     <div class="preview-wrapper">
-      <div class="title">{{imageTitleList[currentIndex]}}</div>
+      <div class="title">
+        <i class="iconfont icon-material_image title-icon"/>
+        {{imageTitleList[currentIndex]}}
+      </div>
       <img class="close-btn" :src="require('@/assets/images/icons/material_preview_close@2x.png')" @click=onClickClose />
       <img
         class="image"
@@ -179,6 +182,9 @@ export default {
       align-items: center;
       padding-left: 16px;
       padding-right: 16px;
+      .title-icon {
+        margin-right: 6px;
+      }
     }
     .close-btn {
       position: absolute;

src/views/material/popup/panoImagePreviewer.vue

@@ -1,7 +1,10 @@
 <template>
   <popup v-if="ifShow">
     <div class="preview-wrapper" ref="preview-wrapper">
-      <div class="title">{{imageTitleList[currentIndex]}}</div>
+      <div class="title">
+        <i class="iconfont icon-material_panoramic_picture title-icon"/>
+        {{imageTitleList[currentIndex]}}
+      </div>
       <img class="close-btn" :src="require('@/assets/images/icons/material_preview_close@2x.png')" @click=onClickClose />
       <iframe
         ref="iframe"
@@ -171,6 +174,9 @@ export default {
     align-items: center;
     padding-left: 16px;
     padding-right: 16px;
+    .title-icon {
+      margin-right: 6px;
+    }
   }
   .close-btn {
     position: absolute;

src/views/material/popup/videoPreviewer.vue

@@ -1,7 +1,10 @@
 <template>
   <popup v-if="ifShow">
     <div class="preview-wrapper">
-      <div class="title">{{title}}</div>
+      <div class="title">
+        <i class="iconfont icon-material_video title-icon"/>
+        {{title}}
+      </div>
       <img class="close-btn" :src="require('@/assets/images/icons/material_preview_close@2x.png')" @click=onClickClose />
       <video class="video" controls controlslist="nodownload noremoteplayback noplaybackrate" disablePictureInPicture autoplay :src="videoSrc"></video>
     </div>
@@ -66,6 +69,9 @@ export default {
       align-items: center;
       padding-left: 16px;
       padding-right: 16px;
+      .title-icon {
+        margin-right: 6px;
+      }
     }
     .close-btn {
       position: absolute;

src/views/material/style.less

@@ -31,11 +31,9 @@
             display: block;
           }
         }
-        .tooltip {
-          i {
-            font-size: 12px;
-            cursor: default;
-          }
+        i {
+          font-size: 12px;
+          cursor: default;
         }
       }
     }