@toolspack/ttd-common 0.5.6 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolspack/ttd-common",
-  "version": "0.5.6",
+  "version": "1.0.0",
   "private": false,
   "main": "lib/ttd-common.umd.min.js",
   "scripts": {
@@ -10,13 +10,13 @@
     "lint": "vue-cli-service lint --max-warnings 100"
   },
   "dependencies": {
-    "axios": "^1.5.0",
     "babel-cli": "^6.26.0",
     "babel-laoder": "0.0.1-security",
     "babel-polyfill": "^6.26.0",
     "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

@@ -1,18 +1,17 @@
 <template>
   <div id="app">
     <form id="myForm" @submit.prevent="uploadFile">
-    <label for="">请上传：</label>
-    <input type="file" ref="fileInput" multiple name="files"><br>
-    <input type="hidden" name="bucketName" :value="uName">
-    <input type="submit" value="提交">
-  </form>
+      <label for="">请上传：</label>
+      <input type="file" ref="fileInput" multiple name="files"><br>
+      <input type="hidden" name="bucketName" :value="uName">
+      <input type="submit" value="提交">
+    </form>
   <PdfView :pdfurl="url" />
   </div>
 </template>
 
 <script>
-import axios from 'axios'
-import PdfView from './packages/pdfjs/PdfView2.vue'
+import PdfView from './packages/pdfjs/PdfView216.vue'
 
 const _baseUrl = 'http://peys.totodi.com:37811/'
 
@@ -40,19 +39,6 @@ export default {
 
       // 添加其他字段数据到表单中
       formData.append('u_name', this.uName);
-
-      // 发送异步请求
-      axios.post(this.action, formData)
-        .then((response) => {
-          // 处理上传成功的回调
-          console.log('上传成功');
-          // 执行其他操作
-        })
-        .catch((error) => {
-          // 处理上传失败的回调
-          console.error('上传失败', error);
-          // 执行其他操作
-        });
     },
   },
 }

package/src/packages/index.js

@@ -4,10 +4,13 @@ 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/pdfjs/{PdfView2.vue → PdfView216.vue}

@@ -193,16 +193,16 @@ export default {
       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.2.228/cmaps/',
-        //   cMapPacked: true,
-        // }).promise
+        // 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)

package/src/packages/ukey/SignNew.vue

@@ -23,31 +23,38 @@ export default {
     },
   },
   created() {
-    // this.getBrowserInfo()
+    this.getBrowserInfo()
   },
   mounted() {
     if (this.isIE) {
+      console.log('--- ie sign')
       this.child = this.$refs.signIe
     } else {
+      console.log('--- chrome sign')
       this.child = this.$refs.signChrome
     }
   },
   methods: {
     getBrowserInfo() {
-      // const { appVersion, appName } = navigator
-      // if (appName.indexOf('Internet') >= 0) {
-      //   this.isIE = true
-      //   return false
-      // }
-      // if (appVersion.indexOf('Trident') >= 0) {
-      //   this.isIE = true
-      //   return false
-      // }
+      const { userAgent, plugins, mimeTypes } = navigator
 
-      // 360的急速模式，需要使用id签署控件
-      // if (appVersion.indexOf(' WOW64') >= 0) {
-      //   this.isIE = true
-      // }
+      if (userAgent.indexOf('Trident') >= 0) {
+        this.isIE = true
+        return true
+      }
+      // 360的急速模式，需要使用ie签署控件(無法實現,或不稳定，360会快速修复让用户无法检测)
+      // 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
+      }
+      this.isIE = false
     },
   },
 }

package/src/packages/ukey/Ukey.vue

@@ -167,4 +167,4 @@ export default {
   position: absoute;
   left: -5000px;
 }
-</style>>
+</style>

package/src/packages/ukey/WzhSign.vue

@@ -6,8 +6,6 @@
   </div>
 </template>
 <script>
-// import { getSignHash, mergeHash } from '@/api/ess'
-
 import { getUrl } from '../utils'
 
 export default {
@@ -24,8 +22,11 @@ export default {
       classid = 'clsid:8BF7E683-630E-4B59-9E61-C996B671EBDF'
       // classid = 'clsid:63F9892E-D854-476E-A839-C8BA79254EC1'
     }
+
+    const { userAgent } = navigator
+    const isIE = userAgent.indexOf('Trident') >= 0
     return {
-      isIE: navigator.appName.indexOf('Internet') >= 0 || navigator.appVersion.indexOf('Trident') >= 0,
+      isIE,
       publicPath: 'https://wsp.totodi.com/jz/', // 为了获取public下的静态文件
       codebase,
       classid,
@@ -51,8 +52,6 @@ export default {
       if (this.CryptoAgent) {
         return false
       }
-      // 使用refs 拿到的元素 不能ukey签章
-      // this.CryptoAgent = document.getElementById('CryptoAgent')
       this.CryptoAgent = this.$refs.CryptoAgent
       if (!this.CryptoAgent) {
         alert('验签插件加载失败！')
@@ -315,4 +314,4 @@ export default {
   position: absolute;
   left: -5000px;
 }
-</style>>
+</style>

package/src/packages/ukey/WzhSignChrome.vue

@@ -1,11 +1,8 @@
 <!--无纸化 签署-->
 <template>
-  <div class="CryptoAgent-wrapper">
-  </div>
+  <div class="CryptoAgent-wrapper"></div>
 </template>
 <script>
-// import { getSignHash, mergeHash } from '@/api/ess'
-
 import { getUrl } from '../utils'
 
 import WZHforChrome from './WZHforChrome'
@@ -14,7 +11,6 @@ export default {
   mixins: [WZHforChrome],
   data() {
     return {
-      isIE: navigator.appName.indexOf('Internet') >= 0 || navigator.appVersion.indexOf('Trident') >= 0,
       sourceData: '', // 签名原文， 动态随机字符串
       certType: 'RSA', // 签名算法
       CryptoAgent: null,
@@ -244,4 +240,4 @@ export default {
   position: absolute;
   left: -5000px;
 }
-</style>>
+</style>

package/src/packages/ukey/SignNew copy.vue

@@ -1,54 +0,0 @@
-<template>
-  <div>
-    <WzhSign :api="api" ref="signIe" v-if="isIE" />
-    <WzhSignChrome :api="api" ref="signChrome" v-else />
-  </div>
-</template>
-<script>
-import WzhSign from './WzhSign.vue';
-import WzhSignChrome from './WzhSignChrome.vue';
-
-export default {
-  components: { WzhSign, WzhSignChrome },
-  data() {
-    return {
-      child: null,
-      isIE: true,
-    }
-  },
-  props: {
-    api: {
-      type: Object,
-      required: true,
-    },
-  },
-  created() {
-    // this.getBrowserInfo()
-  },
-  mounted() {
-    if (this.isIE) {
-      this.child = this.$refs.signIe
-    } else {
-      this.child = this.$refs.signChrome
-    }
-  },
-  methods: {
-    getBrowserInfo() {
-      const { appVersion, appName } = navigator
-      if (appName.indexOf('Internet') >= 0) {
-        this.isIE = true
-        return false
-      }
-      if (appVersion.indexOf('Trident') >= 0) {
-        this.isIE = true
-        return false
-      }
-
-      // 360的急速模式，需要使用id签署控件
-      // if (appVersion.indexOf(' WOW64') >= 0) {
-      //   this.isIE = true
-      // }
-    },
-  },
-}
-</script>