@toolspack/ttd-common 1.0.0 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolspack/ttd-common",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": false,
   "main": "lib/ttd-common.umd.min.js",
   "scripts": {
@@ -16,7 +16,6 @@
     "core-js": "^3.6.5",
     "less": "^3.8.1",
     "less-loader": "^4.1.0",
-    "pdfjs-dist": "2.16.105",
     "vue": "^2.6.12"
   },
   "devDependencies": {

package/src/App.vue

@@ -6,17 +6,14 @@
       <input type="hidden" name="bucketName" :value="uName">
       <input type="submit" value="提交">
     </form>
-  <PdfView :pdfurl="url" />
   </div>
 </template>
 
 <script>
-import PdfView from './packages/pdfjs/PdfView216.vue'
 
 const _baseUrl = 'http://peys.totodi.com:37811/'
 
 export default {
-  components: { PdfView },
   name: 'App',
   data() {
     return {

package/src/packages/index.js

@@ -4,13 +4,10 @@ import WzhSign from './ukey/WzhSign.vue'
 import SignNew from './ukey/SignNew.vue'
 import WzhSignChrome from './ukey/WzhSignChrome.vue'
 
-import PdfView216 from './pdfjs/PdfView216.vue'
-
 export default {
   CfcaPdf,
   Ukey,
   WzhSign,
   WzhSignChrome,
   SignNew,
-  PdfView216,
 }

package/src/packages/ukey/SignNew.vue

@@ -43,17 +43,18 @@ export default {
         return true
       }
       // 360的急速模式，需要使用ie签署控件(無法實現,或不稳定，360会快速修复让用户无法检测)
+      // 测试后，360的急速模式  可以和chrome 用一个签署代码了
       // const plugin360 = [
       //   '360', '360SoftMgrPlugin', 'ActiveX hosting plugin for Firefox/Chrome',
       //   'GamePlugin', 'QQMail Plugin', 'Tencent QQ', 'npQQPhotoDrawEx']
-      if (plugins['360SoftMgrPlugin']) {
-        this.isIE = true
-        return true
-      }
-      if (mimeTypes['application/360softmgrplugin']) {
-        this.isIE = true
-        return true
-      }
+      // if (plugins['360SoftMgrPlugin']) {
+      //   this.isIE = true
+      //   return true
+      // }
+      // if (mimeTypes['application/360softmgrplugin']) {
+      //   this.isIE = true
+      //   return true
+      // }
       this.isIE = false
     },
   },

package/src/packages/ukey/WzhSign.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="CryptoAgent-wrapper">
     <object v-if="isIE" ref="CryptoAgent" :codebase="publicPath + codebase" :classid="classid"></object>
-    <embed v-else ref="CryptoAgent" type="application/npCryptoKit.ToToDi.x86" style="height: 0px; width: 0px">
+    <embed v-else ref="CryptoAgent" type="application/npCryptoKit.ToToDi.x86" style="height: 0px; width: 0px" />
   </div>
 </template>
 <script>
@@ -124,8 +124,8 @@ export default {
       } catch (e) {
         console.log('SignOnClick error=', e)
         this.ShowErrorInfo()
+        return ''
       }
-      return ''
     },
     GetCertInfoOnClick(InfoTypeID) {
       InfoTypeID = InfoTypeID || 'SubjectDN'
@@ -141,6 +141,7 @@ export default {
       } catch (e) {
         console.log('GetCertInfoOnClick-WzhSign: ', e)
         this.ShowErrorInfo(e)
+        return false
       }
     },
     SelectCertificateOnClick(serialNo = '') {
@@ -164,14 +165,14 @@ export default {
         console.log('wzh SelectCertResult', bSelectCertResult)
         return true
       } catch (e) {
-        console.log('wzh SelectCertResult catch error: ')
+        console.log('wzh SelectCertResult error: ', e)
         this.ShowErrorInfo(e)
         return false
       }
     },
-    getHashValue(label, fileOss, sealImage) {
+    getHashValue(label, fileOss, params) {
       const CertContent = this.CryptoAgent.GetSignCertInfo('CertContent');
-      this.$emit('getImg', sealImage)
+      this.$emit('getImg', params)
       if (!CertContent) {
         alert('获取证书公钥失败！')
         return Promise.reject()
@@ -187,7 +188,10 @@ export default {
               reason: '', // 签署原因
               location: '', // 签署地点
               signImgfileName: '', // 图片名称
-              signImgfile: sealImage, // 图片路径，格式同文件字段类似
+              signImgfile: params.image, // 图片路径，格式同文件字段类似
+              signImgMd5: params.md5, // 印章图片的md5
+              serialNo: params.serialNo, // 证书序列号
+              ukeyType: params.ukeyType, // 证书类型（ttd配置）
               pageNo: label.pageIndex, // 签章页
               pageX: Number(label.X), // 签章页签章位置X坐标
               pageY: Number(label.Y), // 签章页签章位置Y坐标
@@ -199,34 +203,34 @@ export default {
       alert('文件对象不合规！')
       return Promise.reject()
     },
-    async getSignHashValue(item, fileItem, image) {
+    async getSignHashValue(item, fileItem, params) {
+      let sourceHashData = ''
+      const { code, data } = await this.getHashValue(item, fileItem, params);
+      if (code === 0) {
+        if (`${data.bean.code}` === '200') { sourceHashData = data.bean.pdfHash }
+      }
+      if (!sourceHashData) {
+        alert(`CFCA计算HASH值失败！( ${data.bean.msg || ''})`)
+        return false
+      }
+      // 将原文Hash值的Base64编码解码后，对其进行PKCS#7分离式签名
+      let signature = ''
       try {
-        let sourceHashData = ''
-        const { code, data } = await this.getHashValue(item, fileItem, image);
-        if (code === 0) {
-          if (`${data.bean.code}` === '200') { sourceHashData = data.bean.pdfHash }
-        }
-        if (!sourceHashData) {
-          alert(`CFCA计算HASH值失败！( ${data.bean.msg || ''})`)
-          return false
-        }
-        // 将原文Hash值的Base64编码解码后，对其进行PKCS#7分离式签名
-        const signature = this.CryptoAgent.SignHashMsgPKCS7Detached(sourceHashData, 'SHA-1');
-        if (!signature) {
-          this.ShowErrorInfo()
-          return false;
-        }
+        signature = this.CryptoAgent.SignHashMsgPKCS7Detached(sourceHashData, 'SHA-1');
+      } catch (e) {
+        this.ShowErrorInfo()
+      }
+      if (signature) {
         return {
           signature,
           id: data.bean.id,
         }
-      } catch (e) {
-        console.log('getSignHashValue', e)
-        this.ShowErrorInfo(e)
       }
+      alert('获取PKCS#7分离式签名失败！')
+      return false
     },
-    async signFileKeyImage(item, fileItem, image) {
-      const res = await this.getSignHashValue(item, fileItem, image)
+    async signFileKeyImage(item, fileItem, params) {
+      const res = await this.getSignHashValue(item, fileItem, params)
       let errorMsg = '计算Hash 失败！'
       if (res) {
         const { data, code } = await this.api.mergeHash({
@@ -254,9 +258,10 @@ export default {
     },
     // fileOss: 为文件对象 {obje}
     //  isOffset: 修正印章的位置，印章加时间后需要向下修正
-    async multipleSign(labels, fileOss, serialNo, image, isOffset = 18) {
-      const serialNoBegin = this.CryptoAgent.GetSignCertInfo('SerialNumber');
+    //  parama:  其他参数：ukeyType,  image, md5, isOffset
+    async multipleSign(labels, fileOss, params) {
       let result = ''
+      const { image, isOffset = 18 } = params
       if (!image) {
         alert('印章图片缺失！')
         return false
@@ -272,37 +277,36 @@ export default {
         }
         if (index > 0) {
           const serialNoAgain = this.CryptoAgent.GetSignCertInfo('SerialNumber');
-          if (serialNoBegin !== serialNoAgain) {
+          if (params.serialNo !== serialNoAgain) {
             alert('签署过程中，请不要更换ukey!')
             return false
           }
           // 这里签署第二个章，需要在第一个签好的文件上签署 所以用result中是文件
           if (result) {
             // eslint-disable-next-line
-            result = await this.signFileKeyImage((item), result, image)
+            result = await this.signFileKeyImage((item), result, params)
           }
-
           console.log(`iterateSign 签章结果${index}---result----`, result)
         } else {
           // eslint-disable-next-line
-          result = await this.signFileKeyImage((item), fileOss, image)
+          result = await this.signFileKeyImage((item), fileOss, params)
           console.log('第一个章 签章结果', result)
         }
       }
       console.log('multipleSign 签章的结果', result)
       return result
     },
-  },
-  ShowErrorInfo(response = '') {
-    if (!this.CryptoAgent || !this.CryptoAgent.GetLastErrorDesc) {
-      alert('不支持该功能!');
-    } else { // host error
-      let errorDesc = this.CryptoAgent.GetLastErrorDesc()
-      if (response) {
-        errorDesc = `${errorDesc}[${response}]`
+    ShowErrorInfo(response = '') {
+      if (!this.CryptoAgent || !this.CryptoAgent.GetLastErrorDesc) {
+        alert('不支持该功能!');
+      } else { // host error
+        let errorDesc = this.CryptoAgent.GetLastErrorDesc()
+        if (response) {
+          errorDesc = `${errorDesc}[${response}]`
+        }
+        alert(errorDesc)
       }
-      alert(errorDesc)
-    }
+    },
   },
 }
 

package/src/packages/ukey/WzhSignChrome.vue

@@ -31,7 +31,6 @@ export default {
      */
     onLoad() {
       if (this.CryptoAgent) {
-        console.log(3333, this.CryptoAgent)
         return false
       }
       this.LoadObj()
@@ -63,7 +62,7 @@ export default {
     },
 
     async  SignOnClick() {
-      this.sourceData = `${new Date().getTime() }`
+      this.sourceData = `${new Date().getTime()}`
       const source = this.sourceData
       let signature = ''
       const signType = 'Attach' // 签名类型
@@ -94,7 +93,7 @@ export default {
           console.log(5444444, version)
         } catch (response) {
           console.log(44444, response)
-          // alert('扩展初始化失败，请联系管理员！')
+          alert('扩展初始化失败，请联系管理员！')
           this.ShowErrorInfo(response);
           return Promise.reject()
         }
@@ -112,9 +111,9 @@ export default {
       })
       // 返回值resSelect  在chrome下是 对象，在ie下返回是 true/false
     },
-    async getHashValue(label, fileOss, sealImage) {
+    async getHashValue(label, fileOss, params) {
       const CertContent = await this.GetCertInfoOnClick('CertContent');
-      this.$emit('getImg', sealImage)
+      this.$emit('getImg', params)
       if (!CertContent) {
         alert('获取证书公钥失败！')
         return Promise.reject()
@@ -130,7 +129,10 @@ export default {
               reason: '', // 签署原因
               location: '', // 签署地点
               signImgfileName: '', // 图片名称
-              signImgfile: sealImage, // 图片路径，格式同文件字段类似
+              signImgfile: params.image, // 图片路径，格式同文件字段类似
+              signImgMd5: params.md5, // 印章图片的md5
+              serialNo: params.serialNo, // 证书序列号
+              ukeyType: params.ukeyType, // 证书类型（ttd配置）
               pageNo: label.pageIndex, // 签章页
               pageX: Number(label.X), // 签章页签章位置X坐标
               pageY: Number(label.Y), // 签章页签章位置Y坐标
@@ -142,9 +144,9 @@ export default {
       alert('文件对象不合规！')
       return Promise.reject()
     },
-    async getSignHashValue(item, fileItem, image) {
+    async getSignHashValue(item, fileItem, params) {
       let sourceHashData = ''
-      const { code, data } = await this.getHashValue(item, fileItem, image);
+      const { code, data } = await this.getHashValue(item, fileItem, params);
       if (code === 0) {
         if (`${data.bean.code}` === '200') { sourceHashData = data.bean.pdfHash }
       }
@@ -162,8 +164,8 @@ export default {
           this.ShowErrorInfo(response);
         });
     },
-    async signFileKeyImage(item, fileItem, image) {
-      const res = await this.getSignHashValue(item, fileItem, image)
+    async signFileKeyImage(item, fileItem, params) {
+      const res = await this.getSignHashValue(item, fileItem, params)
       let errorMsg = '计算Hash 失败！'
       if (res) {
         const { data, code } = await this.api.mergeHash({
@@ -191,9 +193,10 @@ export default {
     },
     // fileOss: 为文件对象 {obje}
     //  isOffset: 修正印章的位置，印章加时间后需要向下修正
-    async multipleSign(labels, fileOss, serialNo, image, isOffset = 18) {
-      const serialNoBegin = await this.GetCertInfoOnClick('SerialNumber');
+    //  parama:  其他参数：ukeyType,  image, md5, isOffset
+    async multipleSign(labels, fileOss, params) {
       let result = ''
+      const { image, isOffset = 18 } = params
       if (!image) {
         alert('印章图片缺失！')
         return false
@@ -208,21 +211,20 @@ export default {
           item.Y -= isOffset
         }
         if (index > 0) {
-          const serialNoAgain = await this.GetCertInfoOnClick('SerialNumber');
-          if (serialNoBegin !== serialNoAgain) {
+          const serialNoAgain = this.GetCertInfoOnClick('SerialNumber');
+          if (params.serialNo !== serialNoAgain) {
             alert('签署过程中，请不要更换ukey!')
             return false
           }
           // 这里签署第二个章，需要在第一个签好的文件上签署 所以用result中是文件
           if (result) {
             // eslint-disable-next-line
-            result = await this.signFileKeyImage((item), result, image)
+            result = await this.signFileKeyImage((item), result, params)
           }
-
           console.log(`iterateSign 签章结果${index}---result----`, result)
         } else {
           // eslint-disable-next-line
-          result = await this.signFileKeyImage((item), fileOss, image)
+          result = await this.signFileKeyImage((item), fileOss, params)
           console.log('第一个章 签章结果', result)
         }
       }

package/src/packages/pdfjs/PdfView216.vue

@@ -1,331 +0,0 @@
-<template>
-  <div class="pdf-view">
-    <div class="pdf-view-control" v-if="showPages">
-      <switch-page ref="switchPage" @page="onChangePage" :numPages="page_count"></switch-page>
-    </div>
-    <div class="pdf-view-area-wapper">
-      <div :style="style">
-        <div
-          class="center pdf-view-area"
-          @drop="onDrop"
-          @dragover="onDragOver"
-          :style="{'border': border?'1px solid #666': ''}"
-          v-if="pdfurl"
-        >
-          <div v-if="fileLoading"  class="pdf-view-loading">文件加载中...</div>
-          <!-- <div v-else-if="pageRendering" class="pdf-view-rendering">内容渲染中...</div> -->
-          <canvas class="canvasstyle" ref="canvas"></canvas>
-          <div class="label-area">
-            <slot></slot>
-          </div>
-        </div>
-        <div v-else class="pdf-view-empty">未找到资源，请联系管理员!</div>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-
-const PDFJS = require('pdfjs-dist')
-
-const defautScale = 1.0
-
-PDFJS.GlobalWorkerOptions.workerSrc = require('pdfjs-dist/legacy/build/pdf.worker.entry')
-
-export default {
-  props: {
-    pdfurl: {
-      default: '',
-    },
-    scale: {
-      type: Number,
-      default: defautScale,
-    },
-    showPages: {
-      type: [String, Number, Boolean],
-      default: true,
-    },
-    border: {
-      type: [String, Number, Boolean],
-      default: true,
-    },
-    marginAuto: {
-      type: [String, Number, Boolean],
-      default: false,
-    },
-    page: {
-      type: [String, Number],
-      default: 1,
-    },
-    showWidth: {
-      type: [String, Number],
-      default: 0,
-    },
-  },
-  data() {
-    return {
-      pdfDoc: null, // pdfjs 生成的对象
-      pageNum: 1, // 当前页数
-      pageRendering: false,
-      fileLoading: true,
-      pageNumPending: null,
-      compuscale: defautScale, // 放大倍数
-      page_count: 0, // 总页数
-      maxscale: 1.5, // 最大放大倍数
-      minscale: 0.8, // 最小放大倍数
-      isready: false,
-      initPage: true, // 初始化页面
-      style: {
-        width: '860px', // 先给个默认值，当渲染后，后自动按实际值渲染，否则打标签那里，会显示异常
-        margin: this.marginAuto === '' || this.marginAuto ? '0 auto' : '0',
-      },
-    }
-  },
-  methods: {
-    async renderPage(num) {
-      // 渲染pdf
-      const vm = this
-      this.pageRendering = true
-      // Using promise to fetch the page
-      try {
-        const page = await this.pdfDoc.getPage(num)
-        let scaleNum = vm.compuscale
-        let viewport = ''
-        const viewboxWidth = this.showWidth
-        if (this.initPage && viewboxWidth) {
-          const desiredWidth = parseInt(viewboxWidth, 10) - 2
-          // 首先获得pdf 原本宽度，然后根据showWidth 计算缩放倍数
-          viewport = page.getViewport({ scale: 1.0 })
-          scaleNum = desiredWidth / viewport.width
-          this.initPage = false
-          this.compuscale = scaleNum
-          this.maxscale = scaleNum
-        }
-        // 重新渲染 缩放过的PDF
-        viewport = page.getViewport({ scale: scaleNum })
-
-        // 将 canvas 尺寸 传给父组件
-        this.$emit('size', viewport, num)
-
-        // Render PDF page into canvas context
-        vm.isready = true
-
-        const { canvas } = vm.$refs
-
-        this.style.width = `${viewport.width + 2}px`;
-        canvas.height = viewport.height
-        canvas.width = viewport.width
-
-        const renderContext = {
-          canvasContext: canvas.getContext('2d'),
-          viewport,
-        }
-        const renderTask = page.render(renderContext)
-
-        // Wait for rendering to finish
-        await renderTask.promise
-        vm.pageRendering = false
-        if (vm.pageNumPending !== null) {
-          // New page rendering is pending
-          vm.renderPage(vm.pageNumPending)
-          vm.pageNumPending = null
-        }
-        this.$emit('renderSuccess')
-      } catch (error) {
-        console.error(error)
-      } finally {
-        this.pageRendering = false
-      }
-    },
-    prev() {
-      // 上一页
-      if (this.pageNum <= 1) {
-        return
-      }
-      this.pageNum--
-      this.queueRenderPage(this.pageNum)
-    },
-    next() {
-      // 下一页
-      if (this.pageNum >= this.page_count) {
-        return
-      }
-      this.pageNum++
-      this.queueRenderPage(this.pageNum)
-    },
-    onChangePage(page) {
-      this.emitPage(page)
-      // switch page  改变页码
-      this.queueRenderPage(page)
-    },
-    emitPage(page) {
-      this.$emit('pageChange', page, this.page_count, page === this.page_count)
-    },
-    closepdf() {
-      // 关闭PDF
-      if (this.pdfDoc) {
-        this.pdfDoc.destroy();
-      }
-      this.pdfDoc = null
-      this.isready = false
-      this.compuscale = this.scale
-      this.$emit('closepdf')
-    },
-    queueRenderPage(num) {
-      if (this.pageRendering) {
-        this.pageNumPending = num
-      } else {
-        this.renderPage(num)
-      }
-    },
-    async loadUrl(url) {
-      if (!PDFJS) {
-        return false
-      }
-      this.fileLoading = true
-      //  此处无法确定，到底是否使用encodeURI
-      // var reg = /[\u4e00-\u9fa5]+/
-      // if (reg.test(url)) {
-      //   url = encodeURI(url)
-      //   console.log('-----encodeURI------', url)
-      // }
-      console.log('----PdfView---', url)
-      let pdfDoc_
-      try {
-        console.log('888--')
-        // const pdfData = await fetch(
-        //   new URL(url, window.location).href,
-        // );
-        // const arrayBufferPdf = await pdfData.arrayBuffer(); // 转成 ArrayBuffer 塞给 pdf.js
-        // pdfDoc_ = await PDFJS.getDocument({ data: arrayBufferPdf }).promise;
-        pdfDoc_ = await PDFJS.getDocument({
-          url: encodeURI(url),
-          cMapUrl: 'https://unpkg.com/pdfjs-dist@2.16.105/cmaps/',
-          cMapPacked: true,
-        }).promise
-      } catch (error) {
-        console.log('999999--')
-        console.error(error)
-
-        const pdfData = await fetch(
-          new URL(url, window.location).href,
-        );
-        const arrayBufferPdf = await pdfData.arrayBuffer(); // 转成 ArrayBuffer 塞给 pdf.js
-        pdfDoc_ = await PDFJS.getDocument({ data: arrayBufferPdf }).promise;
-      } finally {
-        this.fileLoading = false
-      }
-
-      // 初始化pdf
-      if (this.pdfDoc) {
-        console.log('pdfDocument is ready  destroy,,')
-        await this.pdfDoc.destroy();
-        this.pdfDoc = null
-        console.log('pdfDocument is  destroy')
-      }
-      this.pdfDoc = pdfDoc_
-      this.page_count = pdfDoc_.numPages
-      console.log('this.page_count', this.page_count)
-      this.$emit('numPages', pdfDoc_.numPages)
-      this.renderPage(this.pageNum)
-      this.emitPage(this.pageNum)
-    },
-    onDrop(event) {
-      this.$emit('drop', event)
-    },
-    onDragOver(event) {
-      // 默认地，无法将数据/元素放置到其他元素中。如果需要设置允许放置，我们必须阻止对元素的默认处理方式。
-      // 这要通过调用 ondragover 事件的 event.preventDefault() 方法：
-      event.preventDefault()
-    },
-  },
-  mounted() {
-    this.compuscale = this.scale
-    // this.initPage = true
-    // if (this.pdfurl) {
-    //   this.loadUrl(this.pdfurl)
-    // }
-  },
-  beforeDestroy() {
-    if (this.pdfDoc) {
-      this.pdfDoc.destroy();
-    }
-  },
-  watch: {
-    scale(val) {
-      if (val) {
-        this.compuscale = val
-      }
-    },
-    pdfurl: {
-      handler(val) {
-        this.$nextTick(() => {
-          if (val) {
-            this.pageNum = 1
-            this.initPage = true
-            this.loadUrl(val)
-            if (this.pdfDoc) {
-              this.pdfDoc.destroy();
-            }
-          }
-          if (this.showPages) {
-            this.$refs.switchPage.setPage(1)
-          }
-        })
-      },
-      immediate: true,
-    },
-    // 监听页码变化，渲染对应合同页
-    page(newPage, oldPage) {
-      this.queueRenderPage(newPage)
-    },
-  },
-}
-</script>
-
-<style lang="less" scoped>
-.pdf-view {
-  height: 100%;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-}
-.pdf-view-control {
-  text-align: center;
-  margin: 10px 0;
-}
-.pdf-view-area-wapper {
-  flex: 1 1 0%;
-  overflow: auto;
-  width: 100%;
-  flex-shrink: 0%;
-}
-.pdf-view-area {
-  position: relative;
-  min-height: 700px;
-  .canvasstyle {
-    display: block;
-    margin: 0 auto;
-  }
-  .label-area {
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    top: 0;
-    left: 0;
-  }
-}
-.pdf-view-empty {
-  text-align: center;
-  line-height: 150px;
-  font-size: 14px;
-  color: #999;
-}
-
-.pdf-view-loading, .pdf-view-rendering {
-  margin-top: 40px;
-  text-align: center;
-  font-size: 14px;
-  color: #999;
-}
-</style>