@toolspack/ttd-pdfjs 0.0.2 → 0.0.4

package/README.md

@@ -19,3 +19,6 @@
 
 0.0.0: pdfjs-dist2.16.105 单独打包
 0.0.1: 修复bug
+0.0.2: 升级pdfjs-dist 到： 3.11.174
+0.0.3： cmapurl改用本地化
+0.0.4:  优化destroy，清空canvas

package/lib/ttd-pdfjs.common.js

@@ -716,6 +716,20 @@ function _slicedToArray(arr, i) {
 }
 module.exports = _slicedToArray, module.exports.__esModule = true, module.exports["default"] = module.exports;
 
+/***/ }),
+
+/***/ "27e0":
+/***/ (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, ".pdf-view[data-v-c5966ee8]{height:100%;width:100%;display:flex;flex-direction:column}.pdf-view-control[data-v-c5966ee8]{text-align:center;margin:10px 0}.pdf-view-area-wapper[data-v-c5966ee8]{flex:1 1 0%;overflow:auto;width:100%;flex-shrink:0%}.pdf-view-area[data-v-c5966ee8]{position:relative;min-height:700px}.pdf-view-area .canvasstyle[data-v-c5966ee8]{display:block;margin:0 auto}.pdf-view-area .label-area[data-v-c5966ee8]{position:absolute;right:0;bottom:0;top:0;left:0}.pdf-view-empty[data-v-c5966ee8]{text-align:center;line-height:150px;font-size:14px;color:#999}.pdf-view-loading[data-v-c5966ee8],.pdf-view-rendering[data-v-c5966ee8]{margin-top:40px;text-align:center;font-size:14px;color:#999}", ""]);
+// Exports
+module.exports = exports;
+
+
 /***/ }),
 
 /***/ "28b9":
@@ -1075,6 +1089,17 @@ module.exports = !!Object.getOwnPropertySymbols && !fails(function () {
 });
 
 
+/***/ }),
+
+/***/ "4994":
+/***/ (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_PdfView216_vue_vue_type_style_index_0_id_c5966ee8_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("f1f9");
+/* 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_PdfView216_vue_vue_type_style_index_0_id_c5966ee8_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_PdfView216_vue_vue_type_style_index_0_id_c5966ee8_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "499e":
@@ -1792,21 +1817,6 @@ module.exports = _unsupportedIterableToArray, module.exports.__esModule = true,
 
 /***/ }),
 
-/***/ "663b":
-/***/ (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__("acf0");
-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("21d7afee", content, true, {"sourceMap":false,"shadowMode":false});
-
-/***/ }),
-
 /***/ "69f3":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -3067,20 +3077,6 @@ exportTypedArrayMethod('at', function at(index) {
 });
 
 
-/***/ }),
-
-/***/ "acf0":
-/***/ (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, ".pdf-view[data-v-06104844]{height:100%;width:100%;display:flex;flex-direction:column}.pdf-view-control[data-v-06104844]{text-align:center;margin:10px 0}.pdf-view-area-wapper[data-v-06104844]{flex:1 1 0%;overflow:auto;width:100%;flex-shrink:0%}.pdf-view-area[data-v-06104844]{position:relative;min-height:700px}.pdf-view-area .canvasstyle[data-v-06104844]{display:block;margin:0 auto}.pdf-view-area .label-area[data-v-06104844]{position:absolute;right:0;bottom:0;top:0;left:0}.pdf-view-empty[data-v-06104844]{text-align:center;line-height:150px;font-size:14px;color:#999}.pdf-view-loading[data-v-06104844],.pdf-view-rendering[data-v-06104844]{margin-top:40px;text-align:center;font-size:14px;color:#999}", ""]);
-// Exports
-module.exports = exports;
-
-
 /***/ }),
 
 /***/ "ad6d":
@@ -5238,17 +5234,6 @@ module.exports = function (namespace, method) {
 };
 
 
-/***/ }),
-
-/***/ "d197":
-/***/ (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_PdfView216_vue_vue_type_style_index_0_id_06104844_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("663b");
-/* 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_PdfView216_vue_vue_type_style_index_0_id_06104844_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_PdfView216_vue_vue_type_style_index_0_id_06104844_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "d1e7":
@@ -6073,6 +6058,21 @@ module.exports = _inherits, module.exports.__esModule = true, module.exports["de
 
 /***/ }),
 
+/***/ "f1f9":
+/***/ (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__("27e0");
+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("c6574fb4", content, true, {"sourceMap":false,"shadowMode":false});
+
+/***/ }),
+
 /***/ "f5df":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -6196,12 +6196,12 @@ 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":"1b0d714b-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/pdfjs/PdfView216.vue?vue&type=template&id=06104844&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f6dab170-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/pdfjs/PdfView216.vue?vue&type=template&id=c5966ee8&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"pdf-view"},[(_vm.showPages)?_c('div',{staticClass:"pdf-view-control"},[_c('switch-page',{ref:"switchPage",attrs:{"numPages":_vm.page_count},on:{"page":_vm.onChangePage}})],1):_vm._e(),_c('div',{staticClass:"pdf-view-area-wapper"},[_c('div',{style:(_vm.style)},[(_vm.pdfurl)?_c('div',{staticClass:"center pdf-view-area",style:({'border': _vm.border?'1px solid #666': ''}),on:{"drop":_vm.onDrop,"dragover":_vm.onDragOver}},[(_vm.fileLoading)?_c('div',{staticClass:"pdf-view-loading"},[_vm._v("文件加载中...")]):_vm._e(),_c('canvas',{ref:"canvas",staticClass:"canvasstyle"}),_c('div',{staticClass:"label-area"},[_vm._t("default")],2)]):_c('div',{staticClass:"pdf-view-empty"},[_vm._v("未找到资源，请联系管理员!")])])])])}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/packages/pdfjs/PdfView216.vue?vue&type=template&id=06104844&scoped=true&
+// CONCATENATED MODULE: ./src/packages/pdfjs/PdfView216.vue?vue&type=template&id=c5966ee8&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/typeof.js
 function _typeof(obj) {
@@ -6550,7 +6550,7 @@ function _asyncToGenerator(fn) {
     });
   };
 }
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"1b0d714b-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/pdfjs/SwitchPage.vue?vue&type=template&id=0190e316&scoped=true&lang=html&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f6dab170-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/pdfjs/SwitchPage.vue?vue&type=template&id=0190e316&scoped=true&lang=html&
 var SwitchPagevue_type_template_id_0190e316_scoped_true_lang_html_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"switch-page"},[_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){return _vm.switchPage('prev')}}},[_c('i',{staticClass:"el-icon-caret-left"})]),_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){return _vm.switchPage('next')}}},[_c('i',{staticClass:"el-icon-caret-right"})]),_c('span',{staticStyle:{"margin-left":"10px"}},[_vm._v(_vm._s(_vm.page)+"/"+_vm._s(_vm.numPages))]),_c('span',{staticStyle:{"margin-left":"6px"}},[_vm._v(" 跳转至 "),_c('el-input',{staticStyle:{"width":"50px","margin":"0 4px"},attrs:{"size":"mini"},nativeOn:{"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.goPage($event)}},model:{value:(_vm.itemPage),callback:function ($$v) {_vm.itemPage=_vm._n($$v)},expression:"itemPage"}}),_vm._v(" 页 ")],1)],1)}
 var SwitchPagevue_type_template_id_0190e316_scoped_true_lang_html_staticRenderFns = []
 
@@ -6788,6 +6788,15 @@ var component = normalizeComponent(
 var PDFJS = __webpack_require__("9511");
 var defautScale = 1.0;
 PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
+// https://unpkg.com/pdfjs-dist@2.16.105/cmaps/
+// 使用代理的cmaps，会导致加载很慢，改用本地
+
+var cMapUrl = 'https://wsp.totodi.com/staticfiles_web/web/pdfjs/cmaps/';
+
+// const cMapUrl = 'https://cdn.jsdelivr.net/npm/pdfjs-dist@3.11.174/cmaps/'
+
+// const cMapUrl = 'https://petx.totodi.com/jz/pdfjs/cmaps'
+
 /* harmony default export */ var PdfView216vue_type_script_lang_js_ = ({
   components: {
     SwitchPage: SwitchPage
@@ -6825,6 +6834,7 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
     return {
       pdfDoc: null,
       // pdfjs 生成的对象
+      viewport: null,
       pageNum: 1,
       // 当前页数
       pageRendering: false,
@@ -6882,6 +6892,7 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
               viewport = page.getViewport({
                 scale: scaleNum
               });
+              _this.viewport = viewport;
 
               // 将 canvas 尺寸 传给父组件
               _this.$emit('size', viewport, num);
@@ -6897,9 +6908,9 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
                 viewport: viewport
               };
               renderTask = page.render(renderContext); // Wait for rendering to finish
-              _context.next = 21;
+              _context.next = 22;
               return renderTask.promise;
-            case 21:
+            case 22:
               vm.pageRendering = false;
               if (vm.pageNumPending !== null) {
                 // New page rendering is pending
@@ -6907,21 +6918,21 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
                 vm.pageNumPending = null;
               }
               _this.$emit('renderSuccess');
-              _context.next = 29;
+              _context.next = 30;
               break;
-            case 26:
-              _context.prev = 26;
+            case 27:
+              _context.prev = 27;
               _context.t0 = _context["catch"](2);
               console.error(_context.t0);
-            case 29:
-              _context.prev = 29;
+            case 30:
+              _context.prev = 30;
               _this.pageRendering = false;
-              return _context.finish(29);
-            case 32:
+              return _context.finish(30);
+            case 33:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[2, 26, 29, 32]]);
+        }, _callee, null, [[2, 27, 30, 33]]);
       }))();
     },
     prev: function prev() {
@@ -6950,7 +6961,14 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
     },
     closepdf: function closepdf() {
       // 关闭PDF
+      console.log('closepdf - begin');
       if (this.pdfDoc) {
+        if (this.viewport) {
+          var canvas = this.$refs.canvas;
+          var cxt = canvas.getContext('2d');
+          cxt.clearRect(0, 0, this.viewport.width, this.viewport.height);
+        }
+        this.viewport = null;
         this.pdfDoc.destroy();
       }
       this.pdfDoc = null;
@@ -6996,7 +7014,7 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
               _context2.next = 8;
               return PDFJS.getDocument({
                 url: encodeURI(url),
-                cMapUrl: 'https://unpkg.com/pdfjs-dist@2.16.105/cmaps/',
+                cMapUrl: cMapUrl,
                 cMapPacked: true
               }).promise;
             case 8:
@@ -7027,24 +7045,20 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
               _this2.fileLoading = false;
               return _context2.finish(24);
             case 27:
-              if (!_this2.pdfDoc) {
-                _context2.next = 33;
-                break;
+              // 初始化pdf
+              if (_this2.pdfDoc) {
+                console.log('pdfDocument is ready  destroy,,');
+                _this2.closepdf();
+                _this2.pdfDoc = null;
+                console.log('pdfDocument is  destroy');
               }
-              console.log('pdfDocument is ready  destroy,,');
-              _context2.next = 31;
-              return _this2.pdfDoc.destroy();
-            case 31:
-              _this2.pdfDoc = null;
-              console.log('pdfDocument is  destroy');
-            case 33:
               _this2.pdfDoc = pdfDoc_;
               _this2.page_count = pdfDoc_.numPages;
               console.log('this.page_count', _this2.page_count);
               _this2.$emit('numPages', pdfDoc_.numPages);
               _this2.renderPage(_this2.pageNum);
               _this2.emitPage(_this2.pageNum);
-            case 39:
+            case 34:
             case "end":
               return _context2.stop();
           }
@@ -7068,8 +7082,9 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
     // }
   },
   beforeDestroy: function beforeDestroy() {
+    console.log('---', this.pdfDoc);
     if (this.pdfDoc) {
-      this.pdfDoc.destroy();
+      this.closepdf();
     }
   },
   watch: {
@@ -7087,7 +7102,9 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
             _this3.initPage = true;
             _this3.loadUrl(val);
             if (_this3.pdfDoc) {
-              _this3.pdfDoc.destroy();
+              console.log('wtach 3333');
+              _this3.closepdf();
+              console.log('wtach 444');
             }
           }
           if (_this3.showPages) {
@@ -7105,8 +7122,8 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
 });
 // CONCATENATED MODULE: ./src/packages/pdfjs/PdfView216.vue?vue&type=script&lang=js&
  /* harmony default export */ var pdfjs_PdfView216vue_type_script_lang_js_ = (PdfView216vue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./src/packages/pdfjs/PdfView216.vue?vue&type=style&index=0&id=06104844&lang=less&scoped=true&
-var PdfView216vue_type_style_index_0_id_06104844_lang_less_scoped_true_ = __webpack_require__("d197");
+// EXTERNAL MODULE: ./src/packages/pdfjs/PdfView216.vue?vue&type=style&index=0&id=c5966ee8&lang=less&scoped=true&
+var PdfView216vue_type_style_index_0_id_c5966ee8_lang_less_scoped_true_ = __webpack_require__("4994");
 
 // CONCATENATED MODULE: ./src/packages/pdfjs/PdfView216.vue
 
@@ -7123,7 +7140,7 @@ var PdfView216_component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "06104844",
+  "c5966ee8",
   null
   
 )

package/lib/ttd-pdfjs.umd.js

@@ -725,6 +725,20 @@ function _slicedToArray(arr, i) {
 }
 module.exports = _slicedToArray, module.exports.__esModule = true, module.exports["default"] = module.exports;
 
+/***/ }),
+
+/***/ "27e0":
+/***/ (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, ".pdf-view[data-v-c5966ee8]{height:100%;width:100%;display:flex;flex-direction:column}.pdf-view-control[data-v-c5966ee8]{text-align:center;margin:10px 0}.pdf-view-area-wapper[data-v-c5966ee8]{flex:1 1 0%;overflow:auto;width:100%;flex-shrink:0%}.pdf-view-area[data-v-c5966ee8]{position:relative;min-height:700px}.pdf-view-area .canvasstyle[data-v-c5966ee8]{display:block;margin:0 auto}.pdf-view-area .label-area[data-v-c5966ee8]{position:absolute;right:0;bottom:0;top:0;left:0}.pdf-view-empty[data-v-c5966ee8]{text-align:center;line-height:150px;font-size:14px;color:#999}.pdf-view-loading[data-v-c5966ee8],.pdf-view-rendering[data-v-c5966ee8]{margin-top:40px;text-align:center;font-size:14px;color:#999}", ""]);
+// Exports
+module.exports = exports;
+
+
 /***/ }),
 
 /***/ "28b9":
@@ -1084,6 +1098,17 @@ module.exports = !!Object.getOwnPropertySymbols && !fails(function () {
 });
 
 
+/***/ }),
+
+/***/ "4994":
+/***/ (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_PdfView216_vue_vue_type_style_index_0_id_c5966ee8_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("f1f9");
+/* 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_PdfView216_vue_vue_type_style_index_0_id_c5966ee8_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_PdfView216_vue_vue_type_style_index_0_id_c5966ee8_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "499e":
@@ -1801,21 +1826,6 @@ module.exports = _unsupportedIterableToArray, module.exports.__esModule = true,
 
 /***/ }),
 
-/***/ "663b":
-/***/ (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__("acf0");
-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("21d7afee", content, true, {"sourceMap":false,"shadowMode":false});
-
-/***/ }),
-
 /***/ "69f3":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -3076,20 +3086,6 @@ exportTypedArrayMethod('at', function at(index) {
 });
 
 
-/***/ }),
-
-/***/ "acf0":
-/***/ (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, ".pdf-view[data-v-06104844]{height:100%;width:100%;display:flex;flex-direction:column}.pdf-view-control[data-v-06104844]{text-align:center;margin:10px 0}.pdf-view-area-wapper[data-v-06104844]{flex:1 1 0%;overflow:auto;width:100%;flex-shrink:0%}.pdf-view-area[data-v-06104844]{position:relative;min-height:700px}.pdf-view-area .canvasstyle[data-v-06104844]{display:block;margin:0 auto}.pdf-view-area .label-area[data-v-06104844]{position:absolute;right:0;bottom:0;top:0;left:0}.pdf-view-empty[data-v-06104844]{text-align:center;line-height:150px;font-size:14px;color:#999}.pdf-view-loading[data-v-06104844],.pdf-view-rendering[data-v-06104844]{margin-top:40px;text-align:center;font-size:14px;color:#999}", ""]);
-// Exports
-module.exports = exports;
-
-
 /***/ }),
 
 /***/ "ad6d":
@@ -5247,17 +5243,6 @@ module.exports = function (namespace, method) {
 };
 
 
-/***/ }),
-
-/***/ "d197":
-/***/ (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_PdfView216_vue_vue_type_style_index_0_id_06104844_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("663b");
-/* 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_PdfView216_vue_vue_type_style_index_0_id_06104844_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_PdfView216_vue_vue_type_style_index_0_id_06104844_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "d1e7":
@@ -6082,6 +6067,21 @@ module.exports = _inherits, module.exports.__esModule = true, module.exports["de
 
 /***/ }),
 
+/***/ "f1f9":
+/***/ (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__("27e0");
+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("c6574fb4", content, true, {"sourceMap":false,"shadowMode":false});
+
+/***/ }),
+
 /***/ "f5df":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -6205,12 +6205,12 @@ 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":"1b0d714b-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/pdfjs/PdfView216.vue?vue&type=template&id=06104844&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f6dab170-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/pdfjs/PdfView216.vue?vue&type=template&id=c5966ee8&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"pdf-view"},[(_vm.showPages)?_c('div',{staticClass:"pdf-view-control"},[_c('switch-page',{ref:"switchPage",attrs:{"numPages":_vm.page_count},on:{"page":_vm.onChangePage}})],1):_vm._e(),_c('div',{staticClass:"pdf-view-area-wapper"},[_c('div',{style:(_vm.style)},[(_vm.pdfurl)?_c('div',{staticClass:"center pdf-view-area",style:({'border': _vm.border?'1px solid #666': ''}),on:{"drop":_vm.onDrop,"dragover":_vm.onDragOver}},[(_vm.fileLoading)?_c('div',{staticClass:"pdf-view-loading"},[_vm._v("文件加载中...")]):_vm._e(),_c('canvas',{ref:"canvas",staticClass:"canvasstyle"}),_c('div',{staticClass:"label-area"},[_vm._t("default")],2)]):_c('div',{staticClass:"pdf-view-empty"},[_vm._v("未找到资源，请联系管理员!")])])])])}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/packages/pdfjs/PdfView216.vue?vue&type=template&id=06104844&scoped=true&
+// CONCATENATED MODULE: ./src/packages/pdfjs/PdfView216.vue?vue&type=template&id=c5966ee8&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/typeof.js
 function _typeof(obj) {
@@ -6559,7 +6559,7 @@ function _asyncToGenerator(fn) {
     });
   };
 }
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"1b0d714b-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/pdfjs/SwitchPage.vue?vue&type=template&id=0190e316&scoped=true&lang=html&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"f6dab170-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/pdfjs/SwitchPage.vue?vue&type=template&id=0190e316&scoped=true&lang=html&
 var SwitchPagevue_type_template_id_0190e316_scoped_true_lang_html_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"switch-page"},[_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){return _vm.switchPage('prev')}}},[_c('i',{staticClass:"el-icon-caret-left"})]),_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){return _vm.switchPage('next')}}},[_c('i',{staticClass:"el-icon-caret-right"})]),_c('span',{staticStyle:{"margin-left":"10px"}},[_vm._v(_vm._s(_vm.page)+"/"+_vm._s(_vm.numPages))]),_c('span',{staticStyle:{"margin-left":"6px"}},[_vm._v(" 跳转至 "),_c('el-input',{staticStyle:{"width":"50px","margin":"0 4px"},attrs:{"size":"mini"},nativeOn:{"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.goPage($event)}},model:{value:(_vm.itemPage),callback:function ($$v) {_vm.itemPage=_vm._n($$v)},expression:"itemPage"}}),_vm._v(" 页 ")],1)],1)}
 var SwitchPagevue_type_template_id_0190e316_scoped_true_lang_html_staticRenderFns = []
 
@@ -6797,6 +6797,15 @@ var component = normalizeComponent(
 var PDFJS = __webpack_require__("9511");
 var defautScale = 1.0;
 PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
+// https://unpkg.com/pdfjs-dist@2.16.105/cmaps/
+// 使用代理的cmaps，会导致加载很慢，改用本地
+
+var cMapUrl = 'https://wsp.totodi.com/staticfiles_web/web/pdfjs/cmaps/';
+
+// const cMapUrl = 'https://cdn.jsdelivr.net/npm/pdfjs-dist@3.11.174/cmaps/'
+
+// const cMapUrl = 'https://petx.totodi.com/jz/pdfjs/cmaps'
+
 /* harmony default export */ var PdfView216vue_type_script_lang_js_ = ({
   components: {
     SwitchPage: SwitchPage
@@ -6834,6 +6843,7 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
     return {
       pdfDoc: null,
       // pdfjs 生成的对象
+      viewport: null,
       pageNum: 1,
       // 当前页数
       pageRendering: false,
@@ -6891,6 +6901,7 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
               viewport = page.getViewport({
                 scale: scaleNum
               });
+              _this.viewport = viewport;
 
               // 将 canvas 尺寸 传给父组件
               _this.$emit('size', viewport, num);
@@ -6906,9 +6917,9 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
                 viewport: viewport
               };
               renderTask = page.render(renderContext); // Wait for rendering to finish
-              _context.next = 21;
+              _context.next = 22;
               return renderTask.promise;
-            case 21:
+            case 22:
               vm.pageRendering = false;
               if (vm.pageNumPending !== null) {
                 // New page rendering is pending
@@ -6916,21 +6927,21 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
                 vm.pageNumPending = null;
               }
               _this.$emit('renderSuccess');
-              _context.next = 29;
+              _context.next = 30;
               break;
-            case 26:
-              _context.prev = 26;
+            case 27:
+              _context.prev = 27;
               _context.t0 = _context["catch"](2);
               console.error(_context.t0);
-            case 29:
-              _context.prev = 29;
+            case 30:
+              _context.prev = 30;
               _this.pageRendering = false;
-              return _context.finish(29);
-            case 32:
+              return _context.finish(30);
+            case 33:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[2, 26, 29, 32]]);
+        }, _callee, null, [[2, 27, 30, 33]]);
       }))();
     },
     prev: function prev() {
@@ -6959,7 +6970,14 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
     },
     closepdf: function closepdf() {
       // 关闭PDF
+      console.log('closepdf - begin');
       if (this.pdfDoc) {
+        if (this.viewport) {
+          var canvas = this.$refs.canvas;
+          var cxt = canvas.getContext('2d');
+          cxt.clearRect(0, 0, this.viewport.width, this.viewport.height);
+        }
+        this.viewport = null;
         this.pdfDoc.destroy();
       }
       this.pdfDoc = null;
@@ -7005,7 +7023,7 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
               _context2.next = 8;
               return PDFJS.getDocument({
                 url: encodeURI(url),
-                cMapUrl: 'https://unpkg.com/pdfjs-dist@2.16.105/cmaps/',
+                cMapUrl: cMapUrl,
                 cMapPacked: true
               }).promise;
             case 8:
@@ -7036,24 +7054,20 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
               _this2.fileLoading = false;
               return _context2.finish(24);
             case 27:
-              if (!_this2.pdfDoc) {
-                _context2.next = 33;
-                break;
+              // 初始化pdf
+              if (_this2.pdfDoc) {
+                console.log('pdfDocument is ready  destroy,,');
+                _this2.closepdf();
+                _this2.pdfDoc = null;
+                console.log('pdfDocument is  destroy');
               }
-              console.log('pdfDocument is ready  destroy,,');
-              _context2.next = 31;
-              return _this2.pdfDoc.destroy();
-            case 31:
-              _this2.pdfDoc = null;
-              console.log('pdfDocument is  destroy');
-            case 33:
               _this2.pdfDoc = pdfDoc_;
               _this2.page_count = pdfDoc_.numPages;
               console.log('this.page_count', _this2.page_count);
               _this2.$emit('numPages', pdfDoc_.numPages);
               _this2.renderPage(_this2.pageNum);
               _this2.emitPage(_this2.pageNum);
-            case 39:
+            case 34:
             case "end":
               return _context2.stop();
           }
@@ -7077,8 +7091,9 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
     // }
   },
   beforeDestroy: function beforeDestroy() {
+    console.log('---', this.pdfDoc);
     if (this.pdfDoc) {
-      this.pdfDoc.destroy();
+      this.closepdf();
     }
   },
   watch: {
@@ -7096,7 +7111,9 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
             _this3.initPage = true;
             _this3.loadUrl(val);
             if (_this3.pdfDoc) {
-              _this3.pdfDoc.destroy();
+              console.log('wtach 3333');
+              _this3.closepdf();
+              console.log('wtach 444');
             }
           }
           if (_this3.showPages) {
@@ -7114,8 +7131,8 @@ PDFJS.GlobalWorkerOptions.workerSrc = __webpack_require__("55db");
 });
 // CONCATENATED MODULE: ./src/packages/pdfjs/PdfView216.vue?vue&type=script&lang=js&
  /* harmony default export */ var pdfjs_PdfView216vue_type_script_lang_js_ = (PdfView216vue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./src/packages/pdfjs/PdfView216.vue?vue&type=style&index=0&id=06104844&lang=less&scoped=true&
-var PdfView216vue_type_style_index_0_id_06104844_lang_less_scoped_true_ = __webpack_require__("d197");
+// EXTERNAL MODULE: ./src/packages/pdfjs/PdfView216.vue?vue&type=style&index=0&id=c5966ee8&lang=less&scoped=true&
+var PdfView216vue_type_style_index_0_id_c5966ee8_lang_less_scoped_true_ = __webpack_require__("4994");
 
 // CONCATENATED MODULE: ./src/packages/pdfjs/PdfView216.vue
 
@@ -7132,7 +7149,7 @@ var PdfView216_component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "06104844",
+  "c5966ee8",
   null
   
 )