fl-web-component 2.0.14 → 2.0.15

package/dist/fl-web-component.common.js

@@ -17284,6 +17284,13 @@ Factory_1.Factory.backCompat(Node, {
 
 /***/ }),
 
+/***/ "4a63":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ "4b26":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -35659,17 +35666,6 @@ Rect.prototype.className = 'Rect';
 (0, Global_1._registerNode)(Rect);
 Factory_1.Factory.addGetterSetter(Rect, 'cornerRadius', 0, (0, Validators_1.getNumberOrArrayOfNumbersValidator)(4));
 
-/***/ }),
-
-/***/ "5df3":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_21bcf2d9_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("7a35");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_21bcf2d9_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_21bcf2d9_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "6093":
@@ -37959,6 +37955,17 @@ module.exports = function (it) {
   return IObject(defined(it));
 };
 
+/***/ }),
+
+/***/ "6da7":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_5d3a370c_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("4a63");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_5d3a370c_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_5d3a370c_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "6dd8":
@@ -41781,13 +41788,6 @@ module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACq
 
 /***/ }),
 
-/***/ "7a35":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "7a41":
 /***/ (function(module, exports) {
 
@@ -56514,7 +56514,7 @@ module.exports = document && document.documentElement;
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"name\":\"fl-web-component\",\"version\":\"2.0.14\",\"scripts\":{\"postinstall\":\"patch-package\",\"tip1\":\"仅调试本组件不涉及业务组件,请执行dev\",\"dev\":\"vue-cli-service serve\",\"lint\":\"eslint \\\"{src,packages}/**/*.{vue,js}\\\" --fix\",\"prettier\":\"prettier --write  \\\"packages/**/*.{js,css,less,scss,vue,html}\\\"\",\"=\":\"=============================================================\",\"tip2\":\"同时调试本组件与业务组件,请执行watch\",\"watch\":\"vue-cli-service build --watch --mode production --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"build\":\"npm run lint && vue-cli-service build --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"build:test\":\"vue-cli-service build --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"publish:base\":\"npm run build && npm publish --registry https://registry.npmjs.org/\",\"publish:beta:base\":\"npm run build && npm publish --tag beta --registry https://registry.npmjs.org/\",\"==\":\"=============================================================\",\"tip3\":\"发版注意: 【测试版执行publish:beta】【修改bug执行publish:fix】【新增功能执行publish:feat】【新特性执行publish:perf】\",\"publish:beta\":\"npm version prerelease --preid=beta && npm run publish:beta:base\",\"publish:fix\":\"npm version patch && npm run publish:base\",\"publish:feat\":\"npm version minor && npm run publish:base\",\"publish:perf\":\"npm version major && npm run publish:base\"},\"files\":[\"dist\",\"packages\",\"src\"],\"main\":\"dist/fl-web-component.common.js\",\"dependencies\":{\"camera-controls\":\"2.9.0\",\"core-js\":\"^3.42.0\",\"dxf-parser\":\"^1.1.2\",\"element-ui\":\"2.15.14\",\"fflate\":\"^0.8.2\",\"html2canvas\":\"^1.4.1\",\"jspdf\":\"^3.0.1\",\"konva\":\"^9.3.12\",\"lodash\":\"^4.17.21\",\"meshline\":\"^3.3.1\",\"regenerator-runtime\":\"^0.14.1\",\"svg-pan-zoom\":\"^3.6.2\",\"three\":\"^0.176.0\",\"three.path\":\"^1.0.1\",\"vue\":\"^2.6.11\"},\"devDependencies\":{\"@babel/core\":\"^7.12.16\",\"@babel/plugin-proposal-nullish-coalescing-operator\":\"^7.18.6\",\"@babel/plugin-proposal-optional-chaining\":\"^7.21.0\",\"@babel/preset-env\":\"^7.0.0\",\"@babel/runtime-corejs3\":\"^7.27.1\",\"@vue/cli-plugin-babel\":\"~4.4.0\",\"@vue/cli-plugin-eslint\":\"~4.4.0\",\"@vue/cli-service\":\"~4.4.0\",\"babel-eslint\":\"^10.1.0\",\"babel-loader\":\"^8.0.0\",\"copy-webpack-plugin\":\"^4.0.1\",\"eslint\":\"^6.7.2\",\"eslint-config-prettier\":\"^6.15.0\",\"eslint-plugin-prettier\":\"^3.4.1\",\"eslint-plugin-vue\":\"^6.2.2\",\"patch-package\":\"^6.4.7\",\"prettier\":\"^2.8.8\",\"sass\":\"1.32.13\",\"sass-loader\":\"10.1.1\",\"vue-template-compiler\":\"^2.6.11\",\"worker-loader\":\"^3.0.8\"},\"browserslist\":[\"> 1%\",\"last 2 versions\"]}");
+module.exports = JSON.parse("{\"name\":\"fl-web-component\",\"version\":\"2.0.15\",\"scripts\":{\"postinstall\":\"patch-package\",\"tip1\":\"仅调试本组件不涉及业务组件,请执行dev\",\"dev\":\"vue-cli-service serve\",\"lint\":\"eslint \\\"{src,packages}/**/*.{vue,js}\\\" --fix\",\"prettier\":\"prettier --write  \\\"packages/**/*.{js,css,less,scss,vue,html}\\\"\",\"=\":\"=============================================================\",\"tip2\":\"同时调试本组件与业务组件,请执行watch\",\"watch\":\"vue-cli-service build --watch --mode production --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"build\":\"npm run lint && vue-cli-service build --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"build:test\":\"vue-cli-service build --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"publish:base\":\"npm run build && npm publish --registry https://registry.npmjs.org/\",\"publish:beta:base\":\"npm run build && npm publish --tag beta --registry https://registry.npmjs.org/\",\"==\":\"=============================================================\",\"tip3\":\"发版注意: 【测试版执行publish:beta】【修改bug执行publish:fix】【新增功能执行publish:feat】【新特性执行publish:perf】\",\"publish:beta\":\"npm version prerelease --preid=beta && npm run publish:beta:base\",\"publish:fix\":\"npm version patch && npm run publish:base\",\"publish:feat\":\"npm version minor && npm run publish:base\",\"publish:perf\":\"npm version major && npm run publish:base\"},\"files\":[\"dist\",\"packages\",\"src\"],\"main\":\"dist/fl-web-component.common.js\",\"dependencies\":{\"camera-controls\":\"2.9.0\",\"core-js\":\"^3.42.0\",\"dxf-parser\":\"^1.1.2\",\"element-ui\":\"2.15.14\",\"fflate\":\"^0.8.2\",\"html2canvas\":\"^1.4.1\",\"jspdf\":\"^3.0.1\",\"konva\":\"^9.3.12\",\"lodash\":\"^4.17.21\",\"meshline\":\"^3.3.1\",\"regenerator-runtime\":\"^0.14.1\",\"svg-pan-zoom\":\"^3.6.2\",\"three\":\"^0.176.0\",\"three.path\":\"^1.0.1\",\"vue\":\"^2.6.11\"},\"devDependencies\":{\"@babel/core\":\"^7.12.16\",\"@babel/plugin-proposal-nullish-coalescing-operator\":\"^7.18.6\",\"@babel/plugin-proposal-optional-chaining\":\"^7.21.0\",\"@babel/preset-env\":\"^7.0.0\",\"@babel/runtime-corejs3\":\"^7.27.1\",\"@vue/cli-plugin-babel\":\"~4.4.0\",\"@vue/cli-plugin-eslint\":\"~4.4.0\",\"@vue/cli-service\":\"~4.4.0\",\"babel-eslint\":\"^10.1.0\",\"babel-loader\":\"^8.0.0\",\"copy-webpack-plugin\":\"^4.0.1\",\"eslint\":\"^6.7.2\",\"eslint-config-prettier\":\"^6.15.0\",\"eslint-plugin-prettier\":\"^3.4.1\",\"eslint-plugin-vue\":\"^6.2.2\",\"patch-package\":\"^6.4.7\",\"prettier\":\"^2.8.8\",\"sass\":\"1.32.13\",\"sass-loader\":\"10.1.1\",\"vue-template-compiler\":\"^2.6.11\",\"worker-loader\":\"^3.0.8\"},\"browserslist\":[\"> 1%\",\"last 2 versions\"]}");
 
 /***/ }),
 
@@ -78641,7 +78641,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":"0f764383-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-graphics/index.vue?vue&type=template&id=3e15de76&scoped=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7fa45508-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-graphics/index.vue?vue&type=template&id=3e15de76&scoped=true
 var com_graphicsvue_type_template_id_3e15de76_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -126597,8 +126597,8 @@ var component = normalizeComponent(
 )
 
 /* harmony default export */ var com_graphics = (component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0f764383-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-flcanvas/index.vue?vue&type=template&id=21bcf2d9&scoped=true
-var com_flcanvasvue_type_template_id_21bcf2d9_scoped_true_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7fa45508-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-flcanvas/index.vue?vue&type=template&id=5d3a370c&scoped=true
+var com_flcanvasvue_type_template_id_5d3a370c_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -126611,9 +126611,9 @@ var com_flcanvasvue_type_template_id_21bcf2d9_scoped_true_render = function rend
     }
   });
 };
-var com_flcanvasvue_type_template_id_21bcf2d9_scoped_true_staticRenderFns = [];
+var com_flcanvasvue_type_template_id_5d3a370c_scoped_true_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=template&id=21bcf2d9&scoped=true
+// CONCATENATED MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=template&id=5d3a370c&scoped=true
 
 // EXTERNAL MODULE: ./node_modules/konva/lib/index.js
 var lib = __webpack_require__("362d");
@@ -130048,7 +130048,8 @@ var activedSvgPan = {
   components: {},
   data: function data() {
     return {
-      bounds: null
+      bounds: null,
+      bounds1: null
     };
   },
   created: function created() {
@@ -130115,30 +130116,47 @@ var activedSvgPan = {
         };
         konvaStage.position(newPos);
       });
-      konvaStage.on('pointerdblclick', function (e) {
+      //双击鼠标滚轮
+      konvaStage.on("pointerdblclick", function (e) {
+        /*
+        konvaStage.scale({
+          x: 1,
+          y: 1,
+        });
+        let x=-parseFloat(this.bounds.minX);
+        let y =-parseFloat(this.bounds.minY);
+          konvaStage.setX(x);
+        konvaStage.setY(y); // 750
+          //算一下舞台中点
+        let width=konvaStage.width();
+        let height=konvaStage.height()
+        let x1=width/2;
+        let y1=height/2;
+          //算包围盒宽高
+          let boundsWidth=this.bounds.maxX-this.bounds.minX;
+        let boundsHeight=Math.abs(Math.abs(this.bounds.maxY)-Math.abs(this.bounds.minY));
+          let x2=x+x1-(boundsWidth/2);
+        let y2=y+y1-(boundsHeight/2)
+              konvaStage.setX(x2);
+        konvaStage.setY(y2); // 750
+        */
+
+        var _this2$calculateScale = _this2.calculateScaleAndPosition(_this2.bounds, konvaStage.width(), konvaStage.height(), 0.05 // 5% 边距
+          ),
+          scale = _this2$calculateScale.scale,
+          x = _this2$calculateScale.x,
+          y = _this2$calculateScale.y;
+        console.log("test2:");
+        console.log(_this2.bounds);
+        konvaStage.position({
+          x: x,
+          y: y
+        });
         konvaStage.scale({
-          x: 1,
-          y: 1
+          x: scale,
+          y: scale
         });
-        var x = -parseFloat(_this2.bounds.minX);
-        var y = -parseFloat(_this2.bounds.minY);
-        konvaStage.setX(x);
-        konvaStage.setY(y); // 750
-
-        //算一下舞台中点
-        var width = konvaStage.width();
-        var height = konvaStage.height();
-        var x1 = width / 2;
-        var y1 = height / 2;
-
-        //算包围盒宽高
-
-        var boundsWidth = _this2.bounds.maxX - _this2.bounds.minX;
-        var boundsHeight = Math.abs(Math.abs(_this2.bounds.maxY) - Math.abs(_this2.bounds.minY));
-        var x2 = x + x1 - boundsWidth / 2;
-        var y2 = y + y1 - boundsHeight / 2;
-        konvaStage.setX(x2);
-        konvaStage.setY(y2); // 750
+        konvaStage.batchDraw();
       });
     });
 
@@ -130147,6 +130165,52 @@ var activedSvgPan = {
   //销毁方法
 
   methods: {
+    calculateScaleAndPosition: function calculateScaleAndPosition(contentBounds, stageWidth, stageHeight) {
+      var padding = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0.1;
+      // 1. 计算内容的实际宽高
+      var contentWidth = contentBounds.maxX - contentBounds.minX;
+      var contentHeight = contentBounds.maxY - contentBounds.minY;
+
+      // 2. 处理空内容或零宽高的边界情况
+      if (contentWidth <= 0 || contentHeight <= 0) {
+        return {
+          scale: 1,
+          x: stageWidth / 2,
+          y: stageHeight / 2
+        };
+      }
+
+      // 3. 计算可用区域（留出边距）
+      var availableWidth = stageWidth * (1 - padding * 2);
+      var availableHeight = stageHeight * (1 - padding * 2);
+
+      // 4. 计算缩放比例（取较小的那个，确保完全显示）
+      var scaleX = availableWidth / contentWidth;
+      var scaleY = availableHeight / contentHeight;
+      var scale = Math.min(scaleX, scaleY);
+
+      // 5. 计算缩放后的内容尺寸
+      var scaledWidth = contentWidth * scale;
+      var scaledHeight = contentHeight * scale;
+
+      // 6. 计算居中偏移量
+      // 内容中心点在缩放后的位置
+      var contentCenterX = (contentBounds.minX + contentBounds.maxX) / 2;
+      var contentCenterY = (contentBounds.minY + contentBounds.maxY) / 2;
+
+      // 画布中心点
+      var stageCenterX = stageWidth / 2;
+      var stageCenterY = stageHeight / 2;
+
+      // 偏移量 = 画布中心 - 内容中心 * 缩放
+      var x = stageCenterX - contentCenterX * scale;
+      var y = stageCenterY - contentCenterY * scale;
+      return {
+        scale: scale,
+        x: x,
+        y: y
+      };
+    },
     updateBounds: function updateBounds(v) {
       if (this.bounds === null) {
         this.bounds = {
@@ -130349,92 +130413,129 @@ var activedSvgPan = {
       var pdf = new jspdf_es_min["a" /* default */]('l', 'px', [konvaStage.width(), konvaStage.height()]);
       var exportPixelRatio = 2; // 可以 2/3/4 自己调
 
-      for (var i = 0; i < list.length; i++) {
-        var data = list[i];
+      for (var pageIdx = 0; pageIdx < list.length; pageIdx++) {
+        var data = list[pageIdx];
         //先绘制图面
         konvaLayer.destroyChildren();
         var parser = new dxf_parser_dist();
         var dxf = parser.parse(data);
         var entities = formatEntity(dxf.entities);
         var layers = dxf.tables.layer.layers;
+
+        //先计算包围
+        for (var key in entities) {
+          if (entities[key]) {
+            var group = [];
+            var l = entities[key].length;
+            var layerConfig = recordLayerConfig[key];
+            var configParams = layerConfig && Object.keys(layerConfig).length > 0 ? layerConfig : null;
+            for (var i = 0; i < l; i++) {
+              var type = entities[key][i].type;
+              handleFn(type, dxf, entities[key][i], group, key, configParams, konvaLayer, recordLayerConfig);
+            }
+            for (var _i3 = 0; _i3 < group.length; _i3++) {
+              var entity = group[_i3];
+              if (entity.type === 'line') {
+                var x1 = entity.x1;
+                var y1 = entity.y1;
+                var x2 = entity.x2;
+                var y2 = entity.y2;
+                var v1 = {};
+                v1.x = x1;
+                v1.y = y1;
+                var v2 = {};
+                v2.x = x2;
+                v2.y = y2;
+                _this.updateBounds1(v1);
+                _this.updateBounds1(v2);
+              }
+              if (entity.type === "polyline") {
+                var flag = false;
+                var points = entity.points;
+                var closed = entity.closed;
+                for (var j = 0; j < points.length; j++) {
+                  var index = j % 2;
+                  if (index === 0) {
+                    var _x2 = points[j];
+                    var _y2 = points[j + 1];
+                    var point = {};
+                    point.x = _x2;
+                    point.y = _y2;
+                    _this.updateBounds1(point);
+                  }
+                }
+              }
+            }
+          }
+        }
+        console.log("bounds1");
+        console.log(_this.bounds1);
         var _loop2 = function _loop2() {
-            if (entities[key]) {
-              var group = [];
-              var l = entities[key].length;
-              var layerConfig = recordLayerConfig[key];
-              var configParams = layerConfig && Object.keys(layerConfig).length > 0 ? layerConfig : null;
-              for (var _i3 = 0; _i3 < l; _i3++) {
-                var type = entities[key][_i3].type;
-                handleFn(type, dxf, entities[key][_i3], group, key, configParams, konvaLayer, recordLayerConfig);
+            if (entities[_key]) {
+              var _group = [];
+              var _l = entities[_key].length;
+              var _layerConfig = recordLayerConfig[_key];
+              var _configParams = _layerConfig && Object.keys(_layerConfig).length > 0 ? _layerConfig : null;
+              for (var _i4 = 0; _i4 < _l; _i4++) {
+                var _type = entities[_key][_i4].type;
+                handleFn(_type, dxf, entities[_key][_i4], _group, _key, _configParams, konvaLayer, recordLayerConfig);
               }
               if (!konvaLayer) return {
                 v: void 0
               };
-              for (var _i4 = 0; _i4 < group.length; _i4++) {
-                var entity = group[_i4];
-                if (entity.type === 'text') {
-                  if (konvaLayer) konvaLayer.add(entity.obj);
+              for (var _i5 = 0; _i5 < _group.length; _i5++) {
+                var _entity2 = _group[_i5];
+                if (_entity2.type === 'text') {
+                  if (konvaLayer) konvaLayer.add(_entity2.obj);
                 }
               }
-              if (group[0].stroke == undefined) {
-                console.log(group);
-                group[0].stroke = '#000';
+              if (_group[0].stroke == undefined) {
+                console.log(_group);
+                _group[0].stroke = '#000';
               }
               var customShape = new lib_default.a.Shape({
                 x: 0,
                 y: 0,
                 strokeWidth: 0.2,
-                name: key.replace(/\s*/g, ''),
-                entityId: key,
-                stroke: group[0].stroke,
-                customColor: configParams ? configParams.color : '',
+                name: _key.replace(/\s*/g, ""),
+                entityId: _key,
+                stroke: _group[0].stroke,
+                customColor: _configParams ? _configParams.color : "",
                 //visible: configParams ? configParams.visible :true,
                 sceneFunc: function sceneFunc(context, shape) {
                   context.beginPath();
-                  for (var _i5 = 0; _i5 < group.length; _i5++) {
-                    var _entity2 = group[_i5];
-                    if (_entity2.type === 'line') {
-                      context.strokeStyle = _entity2.stroke;
-                      var x1 = _entity2.x1;
-                      var y1 = _entity2.y1;
-                      var x2 = _entity2.x2;
-                      var y2 = _entity2.y2;
-                      if (x1 != undefined && y1 != undefined && x2 != undefined && y2 != undefined) {
-                        context.moveTo(x1, -parseFloat(y1));
-                        context.lineTo(x2, -parseFloat(y2));
+                  for (var _i6 = 0; _i6 < _group.length; _i6++) {
+                    var _entity3 = _group[_i6];
+                    if (_entity3.type === 'line') {
+                      context.strokeStyle = _entity3.stroke;
+                      var _x3 = _entity3.x1;
+                      var _y3 = _entity3.y1;
+                      var _x4 = _entity3.x2;
+                      var _y4 = _entity3.y2;
+                      if (_x3 != undefined && _y3 != undefined && _x4 != undefined && _y4 != undefined) {
+                        context.moveTo(_x3, -parseFloat(_y3));
+                        context.lineTo(_x4, -parseFloat(_y4));
                       }
-                      var v1 = {};
-                      v1.x = x1;
-                      v1.y = y1;
-                      var v2 = {};
-                      v2.x = x2;
-                      v2.y = y2;
-                      _this.updateBounds(v1);
-                      _this.updateBounds(v2);
                     }
-                    if (_entity2.type === 'polyline') {
-                      context.strokeStyle = _entity2.stroke;
-                      var flag = false;
-                      var points = _entity2.points;
-                      var closed = _entity2.closed;
-                      for (var j = 0; j < points.length; j++) {
-                        var index = j % 2;
-                        if (index === 0) {
-                          var x = points[j];
-                          var y = points[j + 1];
-                          var point = {};
-                          point.x = x;
-                          point.y = y;
-                          _this.updateBounds(point);
-                          if (j === 0) {
-                            context.moveTo(x, y);
+                    if (_entity3.type === "polyline") {
+                      context.strokeStyle = _entity3.stroke;
+                      var _flag = false;
+                      var _points = _entity3.points;
+                      var _closed = _entity3.closed;
+                      for (var _j = 0; _j < _points.length; _j++) {
+                        var _index = _j % 2;
+                        if (_index === 0) {
+                          var _x5 = _points[_j];
+                          var _y5 = _points[_j + 1];
+                          if (_j === 0) {
+                            context.moveTo(_x5, _y5);
                           } else {
-                            context.lineTo(x, y);
+                            context.lineTo(_x5, _y5);
                           }
                         }
-                        if (closed) {
-                          if (j === points.length - 1) {
-                            context.lineTo(points[0], points[1]);
+                        if (_closed) {
+                          if (_j === _points.length - 1) {
+                            context.lineTo(_points[0], _points[1]);
                           }
                         }
                       }
@@ -130448,19 +130549,30 @@ var activedSvgPan = {
             }
           },
           _ret2;
-        for (var key in entities) {
+        for (var _key in entities) {
           _ret2 = _loop2();
           if (_ret2) return _ret2.v;
         }
+        var _this$calculateScaleA = this.calculateScaleAndPosition(_this.bounds1, konvaStage.width(), konvaStage.height(), 0.05 // 5% 边距
+          ),
+          scale = _this$calculateScaleA.scale,
+          x = _this$calculateScaleA.x,
+          y = _this$calculateScaleA.y;
+        console.log("test1:");
+        console.log(this.bounds1);
+        _this.bounds1 = null;
+        konvaStage.position({
+          x: x,
+          y: y
+        });
         konvaStage.scale({
-          x: 2,
-          y: 2
+          x: scale,
+          y: scale
         });
-        konvaStage.setX(0);
-        konvaStage.setY(750); // 750
+        konvaStage.batchDraw();
         //添加成功移动视口位置
 
-        if (i == 0) {
+        if (pageIdx == 0) {
           pdf.addImage(konvaStage.toDataURL({
             pixelRatio: 2
           }), 0, 0, konvaStage.width(), konvaStage.height());
@@ -130471,7 +130583,7 @@ var activedSvgPan = {
           }), 0, 0, konvaStage.width(), konvaStage.height());
         }
       }
-      pdf.save('批量导出.pdf');
+      pdf.save("批量导出.pdf");
 
       // var imgData = canvas.toDataURL('image/png');
       //doc.text("Hello world!", 10, 10);
@@ -130493,8 +130605,8 @@ var activedSvgPan = {
 });
 // CONCATENATED MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=script&lang=js
  /* harmony default export */ var components_com_flcanvasvue_type_script_lang_js = (com_flcanvasvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=style&index=0&id=21bcf2d9&prod&lang=scss&scoped=true
-var com_flcanvasvue_type_style_index_0_id_21bcf2d9_prod_lang_scss_scoped_true = __webpack_require__("5df3");
+// EXTERNAL MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=style&index=0&id=5d3a370c&prod&lang=scss&scoped=true
+var com_flcanvasvue_type_style_index_0_id_5d3a370c_prod_lang_scss_scoped_true = __webpack_require__("6da7");
 
 // CONCATENATED MODULE: ./packages/components/com-flcanvas/index.vue
 
@@ -130507,17 +130619,17 @@ var com_flcanvasvue_type_style_index_0_id_21bcf2d9_prod_lang_scss_scoped_true =
 
 var com_flcanvas_component = normalizeComponent(
   components_com_flcanvasvue_type_script_lang_js,
-  com_flcanvasvue_type_template_id_21bcf2d9_scoped_true_render,
-  com_flcanvasvue_type_template_id_21bcf2d9_scoped_true_staticRenderFns,
+  com_flcanvasvue_type_template_id_5d3a370c_scoped_true_render,
+  com_flcanvasvue_type_template_id_5d3a370c_scoped_true_staticRenderFns,
   false,
   null,
-  "21bcf2d9",
+  "5d3a370c",
   null
   
 )
 
 /* harmony default export */ var com_flcanvas = (com_flcanvas_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0f764383-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-graphics/per-control.vue?vue&type=template&id=f547d5c6&scoped=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7fa45508-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-graphics/per-control.vue?vue&type=template&id=f547d5c6&scoped=true
 var per_controlvue_type_template_id_f547d5c6_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -130625,7 +130737,7 @@ var per_control_component = normalizeComponent(
 )
 
 /* harmony default export */ var per_control = (per_control_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0f764383-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-graphics/pid.vue?vue&type=template&id=2572c0e2&scoped=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7fa45508-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-graphics/pid.vue?vue&type=template&id=2572c0e2&scoped=true
 var pidvue_type_template_id_2572c0e2_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -130672,7 +130784,7 @@ var browserify_default = /*#__PURE__*/__webpack_require__.n(browserify);
 var html2canvas = __webpack_require__("c0e9");
 var html2canvas_default = /*#__PURE__*/__webpack_require__.n(html2canvas);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0f764383-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-graphics/component/ann-tool.vue?vue&type=template&id=4b17bce0&scoped=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7fa45508-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-graphics/component/ann-tool.vue?vue&type=template&id=4b17bce0&scoped=true
 var ann_toolvue_type_template_id_4b17bce0_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;