n20-common-lib 1.3.99 → 1.3.101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.99",
+  "version": "1.3.101",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -49,6 +49,7 @@
     "panzoom": "*",
     "qrcode": "*",
     "resize-detector": "*",
+    "v-viewer": "*",
     "vuedraggable": "*"
   },
   "devDependencies": {

package/src/assets/css/cl-approve-card.scss

@@ -63,8 +63,11 @@
     color: $--color-text-regular;
   }
   .n20-description-bgc {
+    margin-left: 40px;
+    margin-top: 10px;
     background: $--background-color-base;
     height: 100%;
+    border-radius: 4px;
     min-height: 40px;
   }
 }

package/src/components/ApprovalCard/index.vue

@@ -42,7 +42,7 @@
           </div>
           <div v-if="item.ccUserName" class="n20-description-c m-t">抄送人：{{ item.ccUserName }}</div>
           <div v-if="item.addTaskName" class="n20-description-c m-t">加签审批人：{{ item.addTaskName }}</div>
-          <div v-if="item.suggestion" class="n20-description-c n20-description-bgc m-t p-a-ss">
+          <div v-if="item.suggestion" class="n20-description-c n20-description-bgc m-t p-a-s">
             <span v-if="item.result !== status.waiting">{{ '审批意见：' | $lc }}</span>
             <span v-if="item.suggestion">{{ item.suggestion }}</span>
           </div>

package/src/components/FileUploadTable/index.vue

@@ -248,8 +248,14 @@
       append-to-body
       @close="closeSee"
     >
-      <div v-if="imgType.test(previewName)" class="p-a flex-box flex-c flex-v" style="height: 82vh">
-        <img :src="previewUrl" :alt="previewName" style="max-width: 98%; max-height: 98%" />
+      <div
+        v-if="imgType.test(previewName)"
+        id="previewId"
+        v-viewer="{ scalable: false, inline: true, navbar: false }"
+        class="p-a flex-box flex-c flex-v"
+        style="height: 82vh"
+      >
+        <img :src="previewUrl" :alt="previewName" style="display: none" />
       </div>
       <div v-else class="p-a" style="height: 82vh">
         <component
@@ -307,12 +313,20 @@ import dayjs from 'dayjs'
 import axios from '../../utils/axios'
 import clUpload from '../Upload/index.vue'
 import Dialog from '../Dialog/index.vue'
+
+import 'viewerjs/dist/viewer.css'
+import { directive as viewer } from 'v-viewer'
 export default {
   name: 'FileUploadTable',
   components: {
     clUpload,
     Dialog
   },
+  directives: {
+    viewer: viewer({
+      debug: true
+    })
+  },
   filters: {
     typeFiter(type, typeOptions) {
       return typeOptions.find((c) => c.type === type)?.label || ''
@@ -478,6 +492,8 @@ export default {
         this.previewName = name
         this.visibleP = true
       }
+      let ele = document.getElementById('previewId').$viewer
+      ele.show()
     },
     closeSee() {
       this.previewUrl && URL.revokeObjectURL(this.previewUrl)