@toolspack/ttd-common 1.1.4 → 1.1.6

package/.eslintignore

@@ -1,6 +1,6 @@
-node_modules
-public
-pdf.js
-pdf.worker.js
-pdf.worker.min.js
+node_modules
+public
+pdf.js
+pdf.worker.js
+pdf.worker.min.js
 **/pdf-view/build/*.js

package/.eslintrc.js

@@ -1,52 +1,52 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true,
-  },
-  extends: [
-    'plugin:vue/essential',
-    '@vue/airbnb',
-  ],
-  rules: {
-    'template-curly-spacing': 'off',
-    semi: 0,
-    'no-unused-vars': 0,
-    'consistent-return': 0,
-    'max-len': 0,
-    'func-names': 0,
-    'no-console': 'off',
-    'no-control-regex': 'off',
-    'comma-dangle': ['error', 'always-multiline'],
-    'no-mixed-spaces-and-tabs': 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'no-alert': 0,
-    'no-underscore-dangle': 0,
-    'no-await-in-loop': 0,
-    'no-restricted-syntax': 0,
-    'prefer-destructuring': 0,
-    'import/no-cycle': 0,
-    'import/prefer-default-export': 0,
-    camelcase: 'off',
-    'guard-for-in': 0,
-    'no-param-reassign': 0,
-    'no-plusplus': 0,
-    'no-unused-expressions': 0,
-    "linebreak-styleL": 0,
-    'react/jsx-filename-extension': [0, { extensions: ['.js', '.jsx'] }],
-  },
-  settings: {
-    'import/resolver': {
-      node: {
-        paths: ['src'],
-        extensions: ['.js', '.jsx', '.ts', '.tsx'],
-      },
-    },
-  },
-  globals: {
-    PDFCtrl: true,
-    require: true,
-  },
-  parserOptions: {
-    parser: 'babel-eslint',
-  },
-}
+module.exports = {
+  root: true,
+  env: {
+    node: true,
+  },
+  extends: [
+    'plugin:vue/essential',
+    '@vue/airbnb',
+  ],
+  rules: {
+    'template-curly-spacing': 'off',
+    semi: 0,
+    'no-unused-vars': 0,
+    'consistent-return': 0,
+    'max-len': 0,
+    'func-names': 0,
+    'no-console': 'off',
+    'no-control-regex': 'off',
+    'comma-dangle': ['error', 'always-multiline'],
+    'no-mixed-spaces-and-tabs': 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'no-alert': 0,
+    'no-underscore-dangle': 0,
+    'no-await-in-loop': 0,
+    'no-restricted-syntax': 0,
+    'prefer-destructuring': 0,
+    'import/no-cycle': 0,
+    'import/prefer-default-export': 0,
+    camelcase: 'off',
+    'guard-for-in': 0,
+    'no-param-reassign': 0,
+    'no-plusplus': 0,
+    'no-unused-expressions': 0,
+    "linebreak-style": 0,
+    'react/jsx-filename-extension': [0, { extensions: ['.js', '.jsx'] }],
+  },
+  settings: {
+    'import/resolver': {
+      node: {
+        paths: ['src'],
+        extensions: ['.js', '.jsx', '.ts', '.tsx'],
+      },
+    },
+  },
+  globals: {
+    PDFCtrl: true,
+    require: true,
+  },
+  parserOptions: {
+    parser: 'babel-eslint',
+  },
+}

package/README.md

@@ -1,45 +1,47 @@
-# ttd-bamboo
-
---target: 构建目标，默认为应用模式。这里修改为 lib 启用库模式。
-
---dest : 输出目录，默认 dist。这里我们改成 lib
-
-[entry]: 最后一个参数为入口文件，默认为 src/App.vue。这里我们指定编译 packages/ 组件库目录。
-
-# 调试方法
-修改 package.json的main 
-  "main": "lib/ttd-common.umd.min.js",
-  "main": "src/packages/index.js",
- 执行 npm link ,  
-然后在开发项目就可以用  npm link @toolspack/ttd-common(项目名或文件夹名称) 来使用 本组件
-
-# 发布项目
-（不能和上次版本一样） npm run lib (打包)， 打包完成后，执行npm publish 
-
-# ukey签章，是以左上角为原点，使用前端打的标签位置 除以1.5， 
-# 套印签署，是以左下角为原点 除以1.5 并且 印章图片也是左下角为原点
-# 服务端签署（wzh）, 同套印
-
-
-### 问题:
-1. 使用 SignFile_KeyImage 签章时, 如果ukey内有多个印章, 只能选默认的第一个
-2. 使用 SelectSignCert 选择印章对 SignFile_KeyImage, ReadKeyImage 无效
-### 解决方案:
-1. 使用 SelectSignCert 选择印章
-2. 从服务端获取对应的印章图片
-3. 用 SignFile_Image 进行签署
-
-
-0.4.9: 更换依赖包位置： https://wsp.totodi.com/cfca_plug/
-0.5.0: 支持chrome,edge  
-0.5.1: 支持chrome,edge 获取ukey图片  
-0.5.2: 添加没有扩展时报错，并babel 转化es5(否则ie打不开)
-0.5.3: 360急速支持(加入embed元素)
-0.5.4: 初始化失败不在报错，使用时报
-0.5.5: 初始化不兼容浏览器报错改为console
-0.5.6: 关闭chrome的支持（临时线上需要）
-1.0.0： 加入pdfjs: 2.16.105 (此版本不支持ie, 导入需要使用try-chatch)
-1.0.1： 移除pdfjs: 2.16.105 ，单独打包
-1.1.0： 签署效验： 1校验前端上行  序列号和 ukey 类型是否匹配  2 校验上行的印章md5 和 后端获取的印章md5 是否匹配
-1.1.2: 添加userId上行
-1.1.4:  sealId印章图片的id
+# ttd-bamboo
+
+--target: 构建目标，默认为应用模式。这里修改为 lib 启用库模式。
+
+--dest : 输出目录，默认 dist。这里我们改成 lib
+
+[entry]: 最后一个参数为入口文件，默认为 src/App.vue。这里我们指定编译 packages/ 组件库目录。
+
+# 调试方法
+修改 package.json的main 
+  "main": "lib/ttd-common.umd.min.js",
+  "main": "src/packages/index.js",
+ 执行 npm link ,  
+然后在开发项目就可以用  npm link @toolspack/ttd-common(项目名或文件夹名称) 来使用 本组件
+
+# 发布项目
+（不能和上次版本一样） npm run lib (打包)， 打包完成后，执行npm publish 
+
+# ukey签章，是以左上角为原点，使用前端打的标签位置 除以1.5， 
+# 套印签署，是以左下角为原点 除以1.5 并且 印章图片也是左下角为原点
+# 服务端签署（wzh）, 同套印
+
+
+### 问题:
+1. 使用 SignFile_KeyImage 签章时, 如果ukey内有多个印章, 只能选默认的第一个
+2. 使用 SelectSignCert 选择印章对 SignFile_KeyImage, ReadKeyImage 无效
+### 解决方案:
+1. 使用 SelectSignCert 选择印章
+2. 从服务端获取对应的印章图片
+3. 用 SignFile_Image 进行签署
+
+
+0.4.9: 更换依赖包位置： https://wsp.totodi.com/cfca_plug/
+0.5.0: 支持chrome,edge  
+0.5.1: 支持chrome,edge 获取ukey图片  
+0.5.2: 添加没有扩展时报错，并babel 转化es5(否则ie打不开)
+0.5.3: 360急速支持(加入embed元素)
+0.5.4: 初始化失败不在报错，使用时报
+0.5.5: 初始化不兼容浏览器报错改为console
+0.5.6: 关闭chrome的支持（临时线上需要）
+1.0.0： 加入pdfjs: 2.16.105 (此版本不支持ie, 导入需要使用try-chatch)
+1.0.1： 移除pdfjs: 2.16.105 ，单独打包
+1.1.0： 签署效验： 1校验前端上行  序列号和 ukey 类型是否匹配  2 校验上行的印章md5 和 后端获取的印章md5 是否匹配
+1.1.2: 添加userId上行
+1.1.4:  sealId印章图片的id
+1.1.5 : 显示后端返回error msg
+1.1.6： 优化msg

package/lib/ttd-common.common.js

@@ -87,6 +87,20 @@ module.exports =
 /************************************************************************/
 /******/ ({
 
+/***/ "1449":
+/***/ (function(module, exports, __webpack_require__) {
+
+// Imports
+var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
+exports = ___CSS_LOADER_API_IMPORT___(false);
+// Module
+exports.push([module.i, ".CryptoAgent-wrapper[data-v-620e54e0]{height:0;width:0;position:absolute;left:-5000px}", ""]);
+// Exports
+module.exports = exports;
+
+
+/***/ }),
+
 /***/ "1ad4":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -96,21 +110,6 @@ module.exports =
 /* unused harmony reexport * */
 
 
-/***/ }),
-
-/***/ "1fd9":
-/***/ (function(module, exports, __webpack_require__) {
-
-// style-loader: Adds some css to the DOM by adding a <style> tag
-
-// load the styles
-var content = __webpack_require__("cf0d");
-if(typeof content === 'string') content = [[module.i, content, '']];
-if(content.locals) module.exports = content.locals;
-// add the styles to the DOM
-var add = __webpack_require__("499e").default
-var update = add("4092b311", content, true, {"sourceMap":false,"shadowMode":false});
-
 /***/ }),
 
 /***/ "24fb":
@@ -607,17 +606,6 @@ if(content.locals) module.exports = content.locals;
 var add = __webpack_require__("499e").default
 var update = add("9892f504", content, true, {"sourceMap":false,"shadowMode":false});
 
-/***/ }),
-
-/***/ "9bd7":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WzhSign_vue_vue_type_style_index_0_id_4ff3c96d_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("1fd9");
-/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WzhSign_vue_vue_type_style_index_0_id_4ff3c96d_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WzhSign_vue_vue_type_style_index_0_id_4ff3c96d_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "ad52":
@@ -632,6 +620,17 @@ exports.push([module.i, ".CryptoAgent-wrapper[data-v-fe79e680]{height:0;width:0;
 module.exports = exports;
 
 
+/***/ }),
+
+/***/ "b044":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WzhSign_vue_vue_type_style_index_0_id_620e54e0_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("c203");
+/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WzhSign_vue_vue_type_style_index_0_id_620e54e0_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WzhSign_vue_vue_type_style_index_0_id_620e54e0_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "b33c":
@@ -648,17 +647,18 @@ module.exports = exports;
 
 /***/ }),
 
-/***/ "cf0d":
+/***/ "c203":
 /***/ (function(module, exports, __webpack_require__) {
 
-// Imports
-var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
-exports = ___CSS_LOADER_API_IMPORT___(false);
-// Module
-exports.push([module.i, ".CryptoAgent-wrapper[data-v-4ff3c96d]{height:0;width:0;position:absolute;left:-5000px}", ""]);
-// Exports
-module.exports = exports;
+// style-loader: Adds some css to the DOM by adding a <style> tag
 
+// load the styles
+var content = __webpack_require__("1449");
+if(typeof content === 'string') content = [[module.i, content, '']];
+if(content.locals) module.exports = content.locals;
+// add the styles to the DOM
+var add = __webpack_require__("499e").default
+var update = add("08ceac39", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -719,7 +719,7 @@ if (typeof window !== 'undefined') {
 // Indicate to webpack that this file can be concatenated
 /* harmony default export */ var setPublicPath = (null);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3ee2a2a2-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/cfca/CfcaPdf.vue?vue&type=template&id=cd924424&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"a07b9b12-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/cfca/CfcaPdf.vue?vue&type=template&id=cd924424&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"cfca-pdf"},[(_vm.isIE)?[_c('div',{staticClass:"cfca-pdf-wrapper",style:({visibility: _vm.visible})},[_c('div',{class:{'cfca-left': true, 'active': _vm.active==='left', 'disabled': _vm.pageNo <= 1},on:{"click":function($event){return _vm.GoToPrevPage()}}},[_c('span',{staticClass:"el-icon-arrow-left"})]),_c('div',{staticClass:"cfca-content"},[_c('div',{staticClass:"cfca-page"},[_c('div',{staticClass:"fl cfca-title"},[_c('h2',[_vm._v(_vm._s(_vm.title))])]),_c('div',{staticClass:"fr"},[_vm._v(" "+_vm._s(_vm.pageNo)+"/"+_vm._s(_vm.pageCount)+" "),_c('span',{staticClass:"di"},[_vm._v("第")]),_c('el-input',{staticClass:"page-num",attrs:{"size":"mini"},on:{"change":_vm.GoToPage},nativeOn:{"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.GoToPage($event)}},model:{value:(_vm.inputPage),callback:function ($$v) {_vm.inputPage=$$v},expression:"inputPage"}}),_vm._v("页 ")],1)]),_c('div',{ref:"PDFCtrlPlaceHolder",staticClass:"cfca-object"},[_c('div',{staticClass:"obj-wrapper",on:{"dragenter":_vm.onDragEnter,"dragover":_vm.onDragOver,"drop":_vm.onDrop}},[(this.idstr)?[_c('object',{ref:"pdfCtrl",staticClass:"PDFCtrlObject",staticStyle:{"position":"relative","z-Index":"1"},attrs:{"id":'PDFCtrl' + this.idstr,"tabindex":0,"codebase":_vm.publicPath + _vm.codebase,"classid":"clsid:6F60FE31-F827-4295-8AC4-775EF7478A6A","width":"100%","height":"100%"}},[_c('param',{attrs:{"name":"wmode","value":"transparent"}}),_c('param',{attrs:{"name":"showToolbar","value":"false"}})])]:[_c('object',{ref:"pdfCtrl",staticClass:"PDFCtrlObject",staticStyle:{"position":"relative","z-Index":"1"},attrs:{"tabindex":0,"codebase":_vm.publicPath + _vm.codebase,"classid":"clsid:6F60FE31-F827-4295-8AC4-775EF7478A6A","width":"100%","height":"100%"}},[_c('param',{attrs:{"name":"wmode","value":"transparent"}}),_c('param',{attrs:{"name":"showToolbar","value":"false"}})])]],2)]),_c('div',{staticClass:"cfca-control"},[_vm._t("default")],2)]),_c('div',{class:{'cfca-right': true, 'active': _vm.active==='right', 'disabled': _vm.pageNo >= _vm.pageCount},on:{"click":function($event){return _vm.GoToNextPage()}}},[_c('span',{staticClass:"el-icon-arrow-right"})])])]:[_c('div',{staticClass:"red",staticStyle:{"height":"350px","padding":"20px","position":"relative","margin-bottom":"20px"}},[_vm._v(" 提示：当前浏览器不支持控件预览，请切换IE浏览器进行查看 "),_c('div',{staticClass:"tc",staticStyle:{"position":"absolute","bottom":"0","left":"0","right":"0"}},[_vm._t("default")],2)])]],2)}
 var staticRenderFns = []
 
@@ -1870,7 +1870,7 @@ var component = normalizeComponent(
 )
 
 /* harmony default export */ var CfcaPdf = (component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3ee2a2a2-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/ukey/Ukey.vue?vue&type=template&id=225ea8bc&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"a07b9b12-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/ukey/Ukey.vue?vue&type=template&id=225ea8bc&scoped=true&
 var Ukeyvue_type_template_id_225ea8bc_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"CryptoAgent-wrapper"},[(_vm.isIE)?[_c('object',{ref:"CryptoAgent",attrs:{"codebase":_vm.publicPath + _vm.codebase,"classid":_vm.classid}})]:[_c('embed',{ref:"CryptoAgent",staticStyle:{"height":"0px","width":"0px"},attrs:{"type":"application/npCryptoKit.Ultimate.x86"}})]],2)}
 var Ukeyvue_type_template_id_225ea8bc_scoped_true_staticRenderFns = []
 
@@ -1895,10 +1895,10 @@ var Ukeyvue_type_template_id_225ea8bc_scoped_true_staticRenderFns = []
 //
 //
 
-/* ukey 签章
-* cfca 有2中签章方式： 1 消息验签，2 文件验签， 我们使用的是消息验签的方式
-* 下面是 签章 的公用方法，通过mixin 使用
-*
+/* ukey 签章
+* cfca 有2中签章方式： 1 消息验签，2 文件验签， 我们使用的是消息验签的方式
+* 下面是 签章 的公用方法，通过mixin 使用
+*
 * */
 
 // 消息签名, 生成Base64 编码的 PKCS#7 签名结果
@@ -1967,8 +1967,8 @@ function Ukeyvue_type_script_lang_js_SignOnClick() {
     this.onLoad();
   },
   methods: {
-    /**
-     * 初始化验签工具包，加载 验签空间（object）
+    /**
+     * 初始化验签工具包，加载 验签空间（object）
      */
     onLoad: function onLoad() {
       if (this.CryptoAgent) {
@@ -2066,12 +2066,12 @@ var Ukey_component = normalizeComponent(
 )
 
 /* harmony default export */ var Ukey = (Ukey_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3ee2a2a2-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/ukey/WzhSign.vue?vue&type=template&id=4ff3c96d&scoped=true&
-var WzhSignvue_type_template_id_4ff3c96d_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"CryptoAgent-wrapper"},[(_vm.isIE)?_c('object',{ref:"CryptoAgent",attrs:{"codebase":_vm.publicPath + _vm.codebase,"classid":_vm.classid}}):_c('embed',{ref:"CryptoAgent",staticStyle:{"height":"0px","width":"0px"},attrs:{"type":"application/npCryptoKit.ToToDi.x86"}})])}
-var WzhSignvue_type_template_id_4ff3c96d_scoped_true_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"a07b9b12-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/ukey/WzhSign.vue?vue&type=template&id=620e54e0&scoped=true&
+var WzhSignvue_type_template_id_620e54e0_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"CryptoAgent-wrapper"},[(_vm.isIE)?_c('object',{ref:"CryptoAgent",attrs:{"codebase":_vm.publicPath + _vm.codebase,"classid":_vm.classid}}):_c('embed',{ref:"CryptoAgent",staticStyle:{"height":"0px","width":"0px"},attrs:{"type":"application/npCryptoKit.ToToDi.x86"}})])}
+var WzhSignvue_type_template_id_620e54e0_scoped_true_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/packages/ukey/WzhSign.vue?vue&type=template&id=4ff3c96d&scoped=true&
+// CONCATENATED MODULE: ./src/packages/ukey/WzhSign.vue?vue&type=template&id=620e54e0&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/toPrimitive.js
 
@@ -2185,8 +2185,8 @@ function _objectSpread2(target) {
     this.onLoad();
   },
   methods: {
-    /**
-     * 初始化验签工具包，加载 验签空间（object）
+    /**
+     * 初始化验签工具包，加载 验签空间（object）
      */
     onLoad: function onLoad() {
       if (this.CryptoAgent) {
@@ -2361,7 +2361,7 @@ function _objectSpread2(target) {
     getSignHashValue: function getSignHashValue(item, fileItem, params) {
       var _this = this;
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var sourceHashData, _yield$_this$getHashV, code, data, signature;
+        var sourceHashData, _yield$_this$getHashV, code, data, msg, _data$bean, errorMsg, signature;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -2372,18 +2372,20 @@ function _objectSpread2(target) {
               _yield$_this$getHashV = _context.sent;
               code = _yield$_this$getHashV.code;
               data = _yield$_this$getHashV.data;
+              msg = _yield$_this$getHashV.msg;
               if (code === 0) {
                 if ("".concat(data.bean.code) === '200') {
                   sourceHashData = data.bean.pdfHash;
                 }
               }
               if (sourceHashData) {
-                _context.next = 10;
+                _context.next = 12;
                 break;
               }
-              alert("CFCA\u8BA1\u7B97HASH\u503C\u5931\u8D25\uFF01( ".concat(data.bean.msg || '', ")"));
+              errorMsg = (data === null || data === void 0 || (_data$bean = data.bean) === null || _data$bean === void 0 ? void 0 : _data$bean.msg) || (data === null || data === void 0 ? void 0 : data.msg) || msg || 'CFCA计算HASH值失败！';
+              alert(errorMsg);
               return _context.abrupt("return", false);
-            case 10:
+            case 12:
               // 将原文Hash值的Base64编码解码后，对其进行PKCS#7分离式签名
               signature = '';
               try {
@@ -2392,17 +2394,17 @@ function _objectSpread2(target) {
                 _this.ShowErrorInfo();
               }
               if (!signature) {
-                _context.next = 14;
+                _context.next = 16;
                 break;
               }
               return _context.abrupt("return", {
                 signature: signature,
                 id: data.bean.id
               });
-            case 14:
+            case 16:
               alert('获取PKCS#7分离式签名失败！');
               return _context.abrupt("return", false);
-            case 16:
+            case 18:
             case "end":
               return _context.stop();
           }
@@ -2412,7 +2414,7 @@ function _objectSpread2(target) {
     signFileKeyImage: function signFileKeyImage(item, fileItem, params) {
       var _this2 = this;
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var res, errorMsg, _yield$_this2$api$mer, data, code;
+        var res, errorMsg, _yield$_this2$api$mer, data, code, msg;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -2422,7 +2424,7 @@ function _objectSpread2(target) {
               res = _context2.sent;
               errorMsg = '计算Hash 失败！';
               if (!res) {
-                _context2.next = 17;
+                _context2.next = 18;
                 break;
               }
               _context2.next = 7;
@@ -2441,25 +2443,26 @@ function _objectSpread2(target) {
               _yield$_this2$api$mer = _context2.sent;
               data = _yield$_this2$api$mer.data;
               code = _yield$_this2$api$mer.code;
+              msg = _yield$_this2$api$mer.msg;
               if (!(code === 0)) {
-                _context2.next = 16;
+                _context2.next = 17;
                 break;
               }
               if (!data.bean.url) {
-                _context2.next = 13;
+                _context2.next = 14;
                 break;
               }
               return _context2.abrupt("return", data.bean);
-            case 13:
+            case 14:
               errorMsg = data.bean.msg;
-              _context2.next = 17;
+              _context2.next = 18;
               break;
-            case 16:
-              errorMsg = data.msg;
             case 17:
+              errorMsg = data.msg || msg;
+            case 18:
               _this2.$message.error(errorMsg || 'error计算Hash失败！');
               return _context2.abrupt("return", false);
-            case 19:
+            case 20:
             case "end":
               return _context2.stop();
           }
@@ -2562,8 +2565,8 @@ function _objectSpread2(target) {
 });
 // CONCATENATED MODULE: ./src/packages/ukey/WzhSign.vue?vue&type=script&lang=js&
  /* harmony default export */ var ukey_WzhSignvue_type_script_lang_js_ = (WzhSignvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./src/packages/ukey/WzhSign.vue?vue&type=style&index=0&id=4ff3c96d&lang=less&scoped=true&
-var WzhSignvue_type_style_index_0_id_4ff3c96d_lang_less_scoped_true_ = __webpack_require__("9bd7");
+// EXTERNAL MODULE: ./src/packages/ukey/WzhSign.vue?vue&type=style&index=0&id=620e54e0&lang=less&scoped=true&
+var WzhSignvue_type_style_index_0_id_620e54e0_lang_less_scoped_true_ = __webpack_require__("b044");
 
 // CONCATENATED MODULE: ./src/packages/ukey/WzhSign.vue
 
@@ -2576,24 +2579,24 @@ var WzhSignvue_type_style_index_0_id_4ff3c96d_lang_less_scoped_true_ = __webpack
 
 var WzhSign_component = normalizeComponent(
   ukey_WzhSignvue_type_script_lang_js_,
-  WzhSignvue_type_template_id_4ff3c96d_scoped_true_render,
-  WzhSignvue_type_template_id_4ff3c96d_scoped_true_staticRenderFns,
+  WzhSignvue_type_template_id_620e54e0_scoped_true_render,
+  WzhSignvue_type_template_id_620e54e0_scoped_true_staticRenderFns,
   false,
   null,
-  "4ff3c96d",
+  "620e54e0",
   null
   
 )
 
 /* harmony default export */ var WzhSign = (WzhSign_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3ee2a2a2-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/ukey/SignNew.vue?vue&type=template&id=6fac980f&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"a07b9b12-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/ukey/SignNew.vue?vue&type=template&id=6fac980f&
 var SignNewvue_type_template_id_6fac980f_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(_vm.isIE)?_c('WzhSign',{ref:"signIe",attrs:{"api":_vm.api}}):_c('WzhSignChrome',{ref:"signChrome",attrs:{"api":_vm.api}})],1)}
 var SignNewvue_type_template_id_6fac980f_staticRenderFns = []
 
 
 // CONCATENATED MODULE: ./src/packages/ukey/SignNew.vue?vue&type=template&id=6fac980f&
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3ee2a2a2-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/ukey/WzhSignChrome.vue?vue&type=template&id=fe79e680&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"a07b9b12-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/ukey/WzhSignChrome.vue?vue&type=template&id=fe79e680&scoped=true&
 var WzhSignChromevue_type_template_id_fe79e680_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"CryptoAgent-wrapper"})}
 var WzhSignChromevue_type_template_id_fe79e680_scoped_true_staticRenderFns = []
 
@@ -3047,8 +3050,8 @@ nmCryptokit.prototype.GetLastErrorDesc = function () {
     this.onLoad();
   },
   methods: {
-    /**
-     * 初始化验签工具包，加载 验签空间（object）
+    /**
+     * 初始化验签工具包，加载 验签空间（object）
      */
     onLoad: function onLoad() {
       if (this.CryptoAgent) {