@toolspack/ttd-common 0.2.7 → 0.3.0

package/package.json

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

package/src/packages/cfca/CfcaPdf.vue

@@ -466,6 +466,7 @@ export default {
       console.log(`-signFileKeyImage--certSN-${ certSN}`, item)
 
       try {
+        //  套印是 已左下角为原定， ukey 签署是以左上角未原点，并且，图像是图像的中心点  140/1.5/2 = 47
         let lacotionX = ''; let lacotionY = '';
         if (item.height) {
           lacotionX = Number(item.X) + 47
@@ -539,7 +540,8 @@ export default {
 
       for (let index = 0; index < labels.length; index++) {
         const item = labels[index]
-        // const label = getUrl(item.labelContent)
+        const label = getUrl(item.labelContent)
+        console.log('label=', label)
         // this.$message.success(`签署 [${text}] 位于第${label.pageIndex}页的位置，[总共:${index + 1}/${labels.length}个位置]`)
         if (index > 0) {
           const serialNoAgain = this.PDFCtrl.GetSignCertInfo('SerialNumber')

package/src/packages/label-list/LabelOperate.vue

@@ -9,7 +9,9 @@
         >
           <el-submenu  :index="''+index" v-for="(item, index) in operateConfig" :key="index" >
             <template slot="title">
-              <span>{{item.typeName}}</span>
+              <el-tooltip class="item" effect="dark" content="item.typeName" placement="top-start">
+                <span class="title-con-text">{{item.typeName}}</span>
+              </el-tooltip>
             </template>
             <el-menu-item v-for="(item2,index2) in item.typeSeal" :key="index2" :index="index+'-'+index2" @click="changeColor(index,index2)">
                <span  @click="emitSignItem(item2)" :class="{'colorChnage':ind=== index+'-'+index2, 'label-item-btn': true}" slot="title">{{item2.name}}</span>
@@ -52,18 +54,21 @@ export default {
 </script>
 <style  lang="less">
 .label-done-area {
-  .label-operate-menu{
-     .el-submenu__title {
-      font-size: 18px;
+  .label-operate-menu {
+    .el-submenu__title {
+      font-size: 16px;
       color: #222 !important;
-      border-bottom: 1px solid #dcdde3;
+      border-bottom-color: #dcdde3;
     }
-    .el-menu-item{
+    .el-menu-item {
       height: 40px;
       line-height: 40px;
     }
     .el-menu.el-menu--inline {
       border-bottom: 1px solid #dcdde3;
+      &:last-child {
+        border-bottom: 0 none;
+      }
     }
     .title-con.el-dropdown {
       width: 280px;
@@ -77,6 +82,12 @@ export default {
     .el-submenu.is-opened .el-submenu__title {
       border-bottom: 1px solid #dcdde3;
     }
+    .title-con-text {
+      width: 251px;
+      display: inline-block;
+      overflow: hidden;
+      text-overflow: ellipsi;
+    }
   }
 }
 </style>
@@ -85,16 +96,16 @@ export default {
 .label-group {
   margin-bottom: 20px;
   border: 1px solid #ccc;
-   .label-item-btn {
-      line-height: 40px;
-      width: 280px;
-      background: none;
-      border: none;
-      cursor: pointer;
-      padding: 0;
-      text-align: left;
-      font-size: 16px;
-    }
+  .label-item-btn {
+    line-height: 40px;
+    width: 280px;
+    background: none;
+    border: none;
+    cursor: pointer;
+    padding: 0;
+    text-align: left;
+    font-size: 14px;
+  }
 }
 .label-done-area {
   width: 320px;

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

@@ -114,7 +114,7 @@ export default {
     // 此动作用于点击其他区域时清除标签内动态生成的删除按钮
     const vm = this;
     document.onclick = () => {
-      vm.removeElementsByClass('dele');
+      vm.removeElementsByClass('mouse-right-el');
     };
     const box = this.$refs.labelView
     const me = this
@@ -400,7 +400,7 @@ export default {
       if (!this.isclose && !this.isset) {
         return;
       }
-      this.removeElementsByClass('dele');
+      this.removeElementsByClass('mouse-right-el');
       const x = e.offsetX;
       const y = e.offsetY;
       const oEm = document.createElement('ul');
@@ -583,6 +583,7 @@ export default {
 .labelCon .span-text {
   display: table-cell;
   vertical-align: middle;
+  white-space: normal;
 }
 .label-proterty {
   position: absolute;

package/src/packages/ukey/Ukey.vue

@@ -89,7 +89,7 @@ export default {
         }
         let bSelectCertResult = ''
         let errorDesc = ''
-        const csp = 'CFCA FOR UKEY CSP v1.1.0'
+        const csp = 'Uyee CSP v6.0 (Enterprise)||CFCA FOR UKEY CSP v1.1.0'
         // SelectCertificate 通过传入的字符串作为 DN 的筛选条件，选择出符合 DN 条件的带私钥的SM2/RSA 签名证书。如果筛选字符串为空，则对相应条件不进行筛选
         bSelectCertResult = this.CryptoAgent.SelectCertificate(subjectDNFilter, issuerDNFilter, serialNumFilter, csp)
         if (!bSelectCertResult) {

package/src/packages/ukey/WzhSign.vue

@@ -97,7 +97,7 @@ export default {
         const subjectDNFilter = '';
         const issuerDNFilter = 'CFCA ACS ';// CFCA ACS OCA31 ,CFCA ACS OCA32, CFCA ACS TEST OCA31
         const serialNumFilter = serialNo;
-        const bstrSM2CSPNameList = 'CFCA FOR UKEY CSP v1.1.0'
+        const bstrSM2CSPNameList = 'Uyee CSP v6.0 (Enterprise)||CFCA FOR UKEY CSP v1.1.0'
         let bSelectCertResult = '';
         console.log('无纸化 选证书 selectSignCert， serialNo(非传)=', serialNo)
         bSelectCertResult = this.CryptoAgent.SelectCertificate(subjectDNFilter, issuerDNFilter, serialNumFilter, bstrSM2CSPNameList);