@toolspack/ttd-common 0.1.21 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolspack/ttd-common",
-  "version": "0.1.21",
+  "version": "0.2.1",
   "private": false,
   "main": "lib/ttd-common.umd.min.js",
   "scripts": {

package/src/App.vue

@@ -1,6 +1,7 @@
 <template>
   <div id="app">
-    <pdf-view :pdfurl="testD.pdfurl" :scale="1" marginAuto></pdf-view>
+    <el-button @click="viewImg">预览</el-button>
+    <img :src="pdfurl+'&w=120'" />
   </div>
 </template>
 
@@ -11,11 +12,7 @@ export default {
   data() {
     const obj = { a: 2 }
     return {
-      testD: {
-        ...obj,
-        pdfurl: 'https://opentest.totodi.com/visit/totodi-contract/20210728-46234f90113748a7b84da8ba9567c574-1DABA7.pdf?expireDataTime=1627474098651',
-        name: 2323,
-      },
+      pdfurl: 'https://opentest.totodi.com/visit/totodi-other/20210913-42b48e947cc34a40b140a09acd039861-6.png?expireDataTime=1631521122550',
     }
   },
   methods: {
@@ -23,7 +20,7 @@ export default {
     },
     viewImg(url) {
       this.$ImgPreview({
-        url,
+        url: this.pdfurl,
         closeColor: '#ffffff',
         keyboard: 'open',
         clickMaskCLose: 'open',

package/src/packages/cfca/CfcaPdf.vue

@@ -430,11 +430,11 @@ export default {
       try {
         //  序列号等数据，通过 验签工具包，或者 签章工具包，都可以获取
         const subjectDN = '';// this.PDFCtrl.GetSignCertInfo('SubjectCN')
-        const issuerDN = '';// this.PDFCtrl.GetSignCertInfo('IssuerDN')
+        const issuerDN = 'CFCA ACS ';// this.PDFCtrl.GetSignCertInfo('IssuerDN')
         const certSN = serialNo || '';// this.PDFCtrl.GetSignCertInfo('SerialNumber')
 
         console.log('证书序列号，精确匹配', certSN)
-        this.PDFCtrl.SelectSignCert(subjectDN, issuerDN, certSN, '')
+        this.PDFCtrl.SelectSignCert(subjectDN, issuerDN, `${certSN}`, '')
         // 添加一个设置服务器时间戳的方法
         this.PDFCtrl.SetTimestampServer('http://210.74.41.195/timestamp')
         return true
@@ -505,7 +505,7 @@ export default {
             lacotionX = Number(item.X) + 47
             lacotionY = Number(item.height) - Number(item.Y) - 47
           } else {
-          // 于静 的签章标签，是未经处理的（无需Y轴颠倒），所以处理方式，和江湖的不一样，
+          // 于静 的 签章标签，是未经处理的（无需Y轴颠倒），所以处理方式，和江湖的不一样，
             lacotionX = Number(item.X) + 47
             lacotionY = Number(item.Y) - 47
           }

package/src/packages/img-view/hevue-img-preview.vue

@@ -1,36 +1,3 @@
-<!--
- *                                                     __----~~~~~~~~~~~------___
- *                                    .  .   ~~//====......          __--~ ~~
- *                    -.            \_|//     |||\\  ~~~~~~::::... /~
- *                 ___-==_       _-~o~  \/    |||  \\            _/~~-
- *         __---~~~.==~||\=_    -_--~/_-~|-   |\\   \\        _/~
- *     _-~~     .=~    |  \\-_    '-~7  /-   /  ||    \      /
- *   .~       .~       |   \\ -_    /  /-   /   ||      \   /
- *  /  ____  /         |     \\ ~-_/  /|- _/   .||       \ /
- *  |~~    ~~|--~~~~--_ \     ~==-/   | \~--===~~        .\
- *           '         ~-|      /|    |-~\~~       __--~~
- *                       |-~~-_/ |    |   ~\_   _-~            /\
- *                            /  \     \__   \/~                \__
- *                        _--~ _/ | .-~~____--~-/                  ~~==.
- *                       ((->/~   '.|||' -_|    ~~-/ ,              . _||
- *                                  -_     ~\      ~~---l__i__i__i--~~_/
- *                                  _-~-__   ~)  \--______________--~~
- *                                //.-~~~-~_--~- |-------~~~~~~~~
- *                                       //.-~~~--\
- *                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *                               神兽保佑            永无BUG
- -->
-
-<!--
- * @Author: your name
- * @Date: 2021-03-08 21:11:32
- * @LastEditTime: 2021-03-08 22:37:42
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: /hevue-img-preview/src/lib/hevue-img-preview.vue
--->
-
 <template>
   <transition name="fade">
     <div
@@ -44,10 +11,9 @@
       :style="'background:' + mainBackground"
     >
       <!-- 用于临时在手机端展示一些调试信息 -->
-      <!-- <div>{{ logText }}</div> -->
+      <!-- <div>{{ logText }}--{{imgState}}</div> -->
       <div class="he-img-wrap">
-        <img src="./loading.gif" v-show="imgState === 1" />
-        <!-- <div class="iconfont loading">&#xe6b1;</div> -->
+        <img src="https://jzwsp.totodi.com/jz/image-loading.gif" v-show="imgState === 1" />
         <img
           :src="imgurl"
           ref="heImView"
@@ -303,6 +269,7 @@ export default {
       img.src = url;
       img.onload = () => {
         // 如果加载出来图片当下标不是当前显示图片当下标，则不予显示（用户点击过快当时候，会出现用户点到第三张了，此时第一张图片才加载完当情况）
+        console.log(`onload: index=${index}--imgIndex=${this.imgIndex}--imgState=${ this.imgState}`)
         if (index !== undefined && index === this.imgIndex) {
           this.imgState = 2;
           this.imgurl = url;
@@ -310,6 +277,7 @@ export default {
           this.imgState = 2;
           this.imgurl = url;
         }
+        console.log('imgState=', this.imgState)
       };
       img.onerror = () => {
         if (index !== undefined && index === this.imgIndex) {
@@ -317,6 +285,7 @@ export default {
         } else if (index === undefined) {
           this.imgState = 3;
         }
+        console.log(`onerror : index=${index}--imgIndex=${this.imgIndex}--imgState=${ this.imgState}`)
       };
     },
     // 旋转图片

package/src/packages/img-view/index.js

@@ -1,9 +1,3 @@
-/*
- * @Author: heyongsheng
- * @Date: 2020-04-22 15:40:42
- * @Last Modified by: heyongsheng
- * @Last Modified time: 2020-07-08 22:49:13
- */
 import Vue from 'vue';
 import VueToast from './hevue-img-preview.vue';
 

package/src/packages/make-label/LabelMake.vue

@@ -435,7 +435,7 @@ export default {
       /* *
         前端使用的坐标系统为，左上角为零点， 后台合标签使用的是左下角为零点；
         所以X坐标不变，Y坐标的需要计算（页面高度- y 再加上 标签的高度 ）
-        后端忽略了 标签的高度，所以我们给他修复一下 yAxis= Y坐标 + 标签高度
+        后端忽略了 标签的高度，所以我给他修复一下 yAxis= Y坐标 + 标签高度
         文本标签不做修改
       */
       let yAxis = ''

package/src/packages/pdf-view/PdfView.vue

@@ -177,7 +177,11 @@ export default {
       //   console.log('-----encodeURI------', url)
       // }
       console.log('----PdfView---', url)
-      PDFJS.getDocument(encodeURI(url)).promise.then((pdfDoc_) => {
+      PDFJS.getDocument({
+        url: encodeURI(url),
+        cMapUrl: 'https://unpkg.com/pdfjs-dist@2.2.228/cmaps/',
+        cMapPacked: true,
+      }).promise.then((pdfDoc_) => {
         // 初始化pdf
         if (this.pdfDoc) {
           console.log('pdfDocument is ready  destroy,,')
@@ -185,7 +189,7 @@ export default {
         }
         this.pdfDoc = pdfDoc_
         this.page_count = pdfDoc_.numPages
-        console.log('this.page_count 2.912', this.page_count)
+        console.log('this.page_count 22.37', this.page_count)
         this.$emit('numPages', pdfDoc_.numPages)
         this.renderPage(this.pageNum)
       })/* .catch((err) => {

package/src/packages/ukey/Ukey.vue

@@ -80,7 +80,7 @@ export default {
       }
       try {
         const subjectDNFilter = ''
-        const issuerDNFilter = ''
+        const issuerDNFilter = 'CFCA ACS '
         // 此处获取SerialNumber 会报错
         const serialNumFilter = serialNo;// this.GetSignCertInfoUkey('SerialNumber');
 
@@ -98,7 +98,7 @@ export default {
         }
         return bSelectCertResult
       } catch (e) {
-        console.log('SelectCertificateOnClick', e)
+        console.log('SelectCertificateOnClick catch', e)
         const errorDescE = this.CryptoAgent.GetLastErrorDesc();
         alert(`${errorDescE }/error`);
         return false

package/src/packages/ukey/WzhSign.vue

@@ -95,12 +95,12 @@ export default {
       }
       try {
         const subjectDNFilter = '';
-        const issuerDNFilter = '';
+        const issuerDNFilter = 'CFCA ACS ';// CFCA ACS OCA31 ,CFCA ACS OCA32, CFCA ACS TEST OCA31
         const serialNumFilter = serialNo;
-        const cspName = 'CFCA FOR UKEY CSP v1.1.0'
+        const bstrSM2CSPNameList = 'CFCA FOR UKEY CSP v1.1.0'
         let bSelectCertResult = '';
-        console.log('无纸化 选证书 selectSignCert， serialNo(非毕传)=', serialNo)
-        bSelectCertResult = this.CryptoAgent.SelectCertificate(subjectDNFilter, issuerDNFilter, serialNumFilter, cspName);
+        console.log('无纸化 选证书 selectSignCert， serialNo(非传)=', serialNo)
+        bSelectCertResult = this.CryptoAgent.SelectCertificate(subjectDNFilter, issuerDNFilter, serialNumFilter, bstrSM2CSPNameList);
         // Opera浏览器，NPAPI函数执行结果为false时，不能触发异常，需要自己判断返回值。
         if (!bSelectCertResult) {
           const errorDesc = this.CryptoAgent.GetLastErrorDesc();