n20-common-lib 2.19.2 → 2.19.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.19.2",
+  "version": "2.19.4",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/Descriptions/index.vue

@@ -10,9 +10,10 @@
 <script>
 export default {
   name: 'Descriptions',
-  data() {
-    return {
-      column: 2
+  props: {
+    column: {
+      type: Number,
+      default: 2
     }
   },
   created() {
@@ -34,6 +35,9 @@ export default {
       } else if (wW > 1920) {
         this.column = 4
       }
+    },
+    destroyResize() {
+      window.removeEventListener('resize', this.resize)
     }
   }
 }

package/src/components/Preview/index.vue

@@ -10,10 +10,7 @@
     :close-on-click-modal="false"
     @close="closeSee"
   >
-    <span class="file-upload-table_preview-pn">
-      <el-button round onlyicon plain size="mini" icon="el-icon-back" @click="$emit('preSee')" />
-      <el-button round onlyicon plain size="mini" icon="el-icon-right" @click="$emit('nextSee')" />
-    </span>
+    <span class="file-upload-table_preview-pn"> </span>
     <div v-if="visiblePv" class="p-a" style="height: 82vh">
       <!--  <ViewerImg v-if="imgType.test(previewName)" :options="viewerOptions" style="height: 100%">
         <img :src="previewUrl" :alt="previewName" style="display: none" />
@@ -22,7 +19,7 @@
         :is="previewSameOrg ? 'object' : 'div'"
         :key="previewUrl"
         :data="previewUrl"
-        style="width: 100%; height: 100%"
+        style="width: 100%; height: calc(100% - 30px)"
       >
         <div class="flex-column flex-c flex-v" style="height: 100%">
           <i class="el-icon-s-release" style="font-size: 60px; color: #999"></i>
@@ -38,6 +35,11 @@
           </span>
         </div>
       </component>
+      <div class="flex-box flex-c flex-v m-t-s">
+        <el-button round onlyicon plain size="mini" icon="el-icon-back" @click="preSee" />
+        <span v-if="fileList.length > 0" class="m-l-s m-r-s">{{ index + 1 }}/{{ fileList.length }}</span>
+        <el-button round onlyicon plain size="mini" icon="el-icon-right" @click="nextSee" />
+      </div>
     </div>
   </Dialog>
 </template>
@@ -62,6 +64,12 @@ export default {
     visible: {
       type: Boolean,
       default: false
+    },
+    fileList: {
+      type: Array,
+      default: () => {
+        return []
+      }
     }
     // seeRow: {
     //   type: Object,
@@ -99,24 +107,56 @@ export default {
       previewName: undefined,
       previewSameOrg: false,
       visiblePv: false,
-      visiblePvT: null
-    }
-  },
-  computed: {
-    visibleP: {
-      get() {
-        return this.visible
-      },
-      set(val) {
-        this.$emit('update:visible', val)
-      }
+      visiblePvT: null,
+      visibleP: false,
+      index: 0
     }
   },
 
   methods: {
+    async preSee() {
+      if (this.fileList.length > 0) {
+        if (this.index === 0) {
+          this.index = this.fileList.length - 1
+        } else {
+          this.index--
+        }
+        const { url, name, sameOrg } = await this.getFileInfo(this.fileList[this.index])
+        if (url) {
+          this.previewSameOrg = sameOrg
+          this.previewUrl = url
+          this.previewName = name
+        }
+      } else {
+        this.$emit('preSee')
+      }
+    },
+    async nextSee() {
+      if (this.fileList.length > 0) {
+        if (this.index === this.fileList.length - 1) {
+          this.index = 0
+        } else {
+          this.index++
+        }
+        const { url, name, sameOrg } = await this.getFileInfo(this.fileList[this.index])
+        if (url) {
+          this.previewSameOrg = sameOrg
+          this.previewUrl = url
+          this.previewName = name
+        }
+      } else {
+        this.$emit('nextSee')
+      }
+    },
+
     async fileShow(id, fileName = '') {
+      let selectid = id
+      this.index = 0
+      if (this.fileList.length > 0) {
+        selectid = this.fileList[this.index]
+      }
       this.name = fileName
-      const { url, name, sameOrg } = await this.getFileInfo(id)
+      const { url, name, sameOrg } = await this.getFileInfo(selectid)
       if (url) {
         this.previewSameOrg = sameOrg
         this.previewUrl = url
@@ -130,7 +170,7 @@ export default {
       const response = await this.$axios.post(
         this.apiPrefix ? this.apiPrefix + '/neams/eamsbaserecord/downloadFile' : '/neams/eamsbaserecord/downloadFile',
         { beid: id },
-        { responseType: 'blob', loading: false }
+        { responseType: 'blob', loading: true }
       )
       const blob = response
       // 下载文件名
@@ -142,6 +182,7 @@ export default {
         url = `/api/onlinePreview?beid=${id}`
       }
       const sameOrg = this.seeTypes.test(name) || this.seeTypes.test(url)
+      console.log(url, name, sameOrg)
       return {
         url,
         name,
@@ -151,10 +192,7 @@ export default {
     closeSee() {
       this.previewUrl && URL.revokeObjectURL(this.previewUrl)
       this.previewUrl = undefined
-
-      this.visiblePvT = setTimeout(() => {
-        this.visiblePv = false
-      }, 300)
+      this.visibleP = false
     }
   }
 }