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

src/components/shared/message/Confirm.vue

@@ -79,4 +79,11 @@ export default {
         }
     }
 };
-</script>
+</script>
+
+<style lang="less" scoped>
+.ui-message {
+  width: 400px;
+  height: 230px;
+}
+</style>

src/components/table/style.less

@@ -13,7 +13,7 @@
     display: flex;
     align-items: center;
     width: 100%;
-    padding: 15px 16px;
+    padding: 15px 16px 15px 16px;
     background-color: #F5F7FA;
     color: #646566;
     line-height: 19px;
@@ -21,7 +21,8 @@
     z-index: 1; // 为了避免.t-con向下滚动后覆盖本元素。因为.t-con的margin-top是负值。
     li {
       text-align: left;
-      margin-right: 20px;
+      padding-right: 20px;
+      flex-grow: 1;
     }
   }
 
@@ -35,7 +36,7 @@
       display: flex;
       align-items: center;
       width: 100%;
-      padding: 10px 0 10px 16px;
+      padding: 10px 16px 10px 16px;
       .showWhenHover {
         visibility: hidden;
       }
@@ -63,13 +64,18 @@
       li {
         text-align: left;
         display: inline-block;
-        box-sizing: content-box;
-        margin-right: 10px;
-
+        padding-right: 20px;
+        flex-grow: 1;
         span {
           word-break: break-all;
           color: #909090;
-          // display: inline-block;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 2;
+          overflow: hidden;
+          &:hover {
+            display: inline;
+          }
         }
       }
     }

src/views/material/audio/index.vue

@@ -227,6 +227,7 @@ export default {
       this.$confirm({
         title: '删除素材',
         content: "确定要删除素材吗？",
+        okText: '删除',
         ok: () => {
           delMaterial(item.id, () => {
             this.$msg.success("删除成功");

src/views/material/components/uploadList1.1.0.vue

@@ -180,6 +180,13 @@ export default {
       border-bottom: 1px solid #EBEDF0;
       position: relative;
       overflow: hidden;
+      &:hover {
+        .right {
+          .cancel-btn {
+            display: block;
+          }
+        }
+      }
       .left {
         display: flex;
         align-items: center;
@@ -225,10 +232,11 @@ export default {
           font-family: MicrosoftYaHei;
           color: #969799;
         }
-        img {
+        .cancel-btn {
           width: 18px;
           height: 18px;
           cursor: pointer;
+          display: none;
         }
       }
       .progress-bar {

src/views/material/image/index.vue

@@ -226,6 +226,7 @@ export default {
       this.$confirm({
         title: '删除素材',
         content: "确定要删除素材吗？",
+        okText: '删除',
         ok: () => {
           delMaterial(item.id, () => {
             this.$msg.success("删除成功");

src/views/material/pano/index.vue

@@ -358,6 +358,7 @@ export default {
       this.$confirm({
         title: '删除素材',
         content: "确定要删除素材吗？",
+        okText: '删除',
         ok: () => {
           delMaterial(item.id, () => {
             this.$msg.success("删除成功");

src/views/material/pano/pano.js

@@ -10,24 +10,19 @@ let data = [
     key: 'name',
     name: '名称',
     en: '名称',
-    width: 340,
+    width: 240,
   },
   {
     key: 'detail',
-    // name: '操作',
-    // en:  '操作',
     name: '',
     en:  '',
     showWhenHover: true,
     canclick: true,
     width: 100,
-    textAlign:'center',
-    width: 100,
   },
   {
     key: 'fileSize',
     name: '大小',
-    width: 100,
     en: '大小',
     width: 80,
   },

src/views/material/video/index.vue

@@ -230,7 +230,9 @@ export default {
     },
     del(item) {
       this.$confirm({
+        title: '删除素材',
         content: "确定要删除素材吗？",
+        okText: '删除',
         ok: () => {
           delMaterial(item.id, () => {
             this.$msg.success("删除成功");