n20-common-lib 2.9.26 → 2.9.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.9.26",
+  "version": "2.9.28",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -63,6 +63,7 @@
     "strip-json-comments": "*",
     "v-viewer": "1.6.4",
     "vue-jsonp": "2.0.0",
+    "jsencrypt": "^3.3.2",
     "vuedraggable": "*",
     "webpack-duplicate-relano-plugin": "^0.1.0",
     "xe-utils": "^3.5.11"
@@ -93,7 +94,6 @@
     "fuse.js": "^6.6.2",
     "html-webpack-tags-plugin": "^2.0.17",
     "jest": "^27.0.5",
-    "jsencrypt": "^3.3.2",
     "jszip": "^3.10.0",
     "md2vue-loader": "file:./md2vue-loader",
     "mockjs": "^1.1.0",

package/src/components/FileUploadTable/index.vue

@@ -182,7 +182,7 @@
       </el-table-column>
     </el-table>
 
-    <!-- <Dialog
+    <Dialog
       v-drag
       class="p-a-0"
       :title="'附件预览' | $lc"
@@ -218,8 +218,7 @@
           </div>
         </component>
       </div>
-    </Dialog> -->
-    <Preview ref="preview" @preSee="preSee" @nextSee="nextSee" :visible.sync="visibleP"></Preview>
+    </Dialog>
     <Dialog
       v-drag
       :title="'附件批量上传' | $lc"
@@ -284,7 +283,6 @@ import axios from '../../utils/axios'
 import { $lc } from '../../utils/i18n/index'
 import importG from '../../utils/importGlobal.js'
 import Dialog from '../Dialog/index.vue'
-import Preview from '../Preview/index.vue'
 import Upload from '../Upload/index.vue'
 
 const ViewerImg = async function () {
@@ -310,8 +308,7 @@ export default {
   components: {
     Upload,
     Dialog,
-    ViewerImg,
-    Preview
+    ViewerImg
   },
   filters: {
     typeFiter(type, typeOptions) {
@@ -627,9 +624,17 @@ export default {
       }
     },
     async seeFile(row) {
-      this.visibleP = true
-      // this.seeRow = row
-      this.$refs.preview.fileShow(row[this.keys.rowKey])
+      let { url, name, sameOrg } = await this.getFileInfo(row, 'preview')
+      if (url) {
+        this.previewSameOrg = sameOrg
+        this.previewUrl = url
+        this.previewName = name
+        this.visibleP = true
+
+        clearTimeout(this.visiblePvT)
+        this.visiblePv = true
+        this.seeRow = row
+      }
     },
     preSee() {
       let i = this.tableData.findIndex((row) => row === this.seeRow)
@@ -641,6 +646,14 @@ export default {
       let row = this.tableData[i + 1] || this.tableData[0]
       this.seeFile(row)
     },
+    closeSee() {
+      this.previewUrl && URL.revokeObjectURL(this.previewUrl)
+      this.previewUrl = undefined
+
+      this.visiblePvT = setTimeout(() => {
+        this.visiblePv = false
+      }, 300)
+    },
     uploadHttpRequestBath(opt) {
       if (this.uploadHttpRequest) {
         return this.uploadHttpRequest(opt)