npm - fl-web-component - Versions diffs - 2.1.1-beta.6 → 2.1.1-beta.9 - Mend

fl-web-component 2.1.1-beta.6 → 2.1.1-beta.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/fl-web-component.common.js +279 -260
package/dist/fl-web-component.common.js.map +1 -1
package/dist/fl-web-component.css +1 -1
package/package.json +1 -1
package/packages/components/com-flcanvas/components/entityFormatting.js +3 -1
package/packages/components/com-flcanvas/index.vue +263 -247

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

@@ -4064,17 +4064,6 @@ exports.default = {
 module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAA/hJREFUeF7tmU1ME0EUgN8Q5UQTrnKCCxoTZEr4MZ64ElHgQhrEiAm/J0HFmwp6U6J4EoSEGAXREyBni9xsCV1KYkQP9gRXkuJFsE+nZZdtu+12Zqs72NmEkGZ+3nvfvPfmzQyBAv9IgdsPCoDygAInoEKgwB1AJUEVAioECpyACgEZHYDSxtIY/LhGikgjIFAEKGd6EoAIENAwBgthLfAyH7pL5wFVtL6VEJwBIKU2BkYAYcQpiLwBoLSOAgD7E/5iRUAByQ2uCUhsNLy+NsI1xtTZMQBKz5cjwRkEbBRVwvE4guPh9eCQyDyOADDjY+RXKAd35dJtoK/nj3cDTExOWY6zakeEtk0tsMAlKJFXxL9z3vrvcJigyspOwZUOH3g8JdwT3rv/0BjDjOvv647/fj45nQYhczvuFuF+haZpuzwKCAOg9AKNkYMQE8aMf/fmFXg8Hh7Z8b6LS8twb8QEoLcb+vt7jHnMEMzGxwFNTMHEi+kjmYiDYS34jEcJYQBVtK6LEDLDhA3fHoLODh+PXKPv4M1h8K+sJo0dsIDAFNU9w9J4AECEhU0t0MajSF4APBi9Cy2XmnnkGn3bfZ2w9fVb2thUCOYOaSt/1BgJhwIVPIq4DqC6piGjvlYQshgfnyccCnDZxNXZrKk5BJx4QFYApoSoy7ZKjGa9jh2ApoutsL2zkx4CFsbbQ0AtHAp6j1UIWCbBFOOZ28eTYIbdQTf4WCbB13Pz8HjsqbFo2bY6q90hqVhC6OI9G7ieA6LRKDQ1twH7zz6zkVYJL0s79w7A5LkOgCnh93+EwVt3jrygtztRCpuLHFNgMwhp7QKrLw0ApsijsScwO/eWJ38ZfRFj45va2r89DOVrG0wqcCxq/5yICK7+X/UAVuNn+1ouW1eOS0vL8UOQ1daYcT4ZAWQrcJghG+ufsgJiID6srML2zjZsbSVKZXboOl1ZCbW1NfHfxu7xPwKwc/2kU6SMABbf24SA4OFJByM9ALsVdNquAJgvUmQMAacrbDdeeYDsHmBXB9itcGp7at0gvQfY1QG8AFLrBgVA+hCwqQN4PSD10lV6D+A1kLe/AiBTCDh5GOFdeb1/0lWaG4VQvp7GRACw67N231XjyHyA6P2sBTWRuYSvxJiwKm+Dnxw+ixuPoyX8j6M8ikf39mB2dt58XyB0F6jLdATgDKXlxeRk3p/HcweCuz9x3/tF0yK5j0nu6QgAmyoBodivP5OLKsI7DhFX9mH/uhPjmUzHAHTFz9I6egJINa8hIv0PADdEYz5VXt4AiBgiwxgFQIZVcFMH5QFu0pdBtvIAGVbBTR2UB7hJXwbZygNkWAU3dVAe4CZ9GWQXvAf8Bn5sSl++Dyn0AAAAAElFTkSuQmCC"
-/***/ }),
-/***/ "2f91":
-/***/ (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_cb260cfc_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("fcd8");
-/* 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_cb260cfc_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_cb260cfc_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
 /***/ }),
 /***/ "2f9a":
@@ -56199,6 +56188,13 @@ Factory_1.Factory.addGetterSetter(Path, 'data');
 /***/ }),
+/***/ "8d26":
+/***/ (function(module, exports, __webpack_require__) {
+// extracted by mini-css-extract-plugin
+/***/ }),
 /***/ "8e84":
 /***/ (function(module, exports, __webpack_require__) {
@@ -56518,7 +56514,7 @@ module.exports = document && document.documentElement;
 /***/ "9224":
 /***/ (function(module) {
-module.exports = JSON.parse("{\"name\":\"fl-web-component\",\"version\":\"2.1.1-beta.6\",\"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:prod\",\"watch\":\"vue-cli-service build --watch --mode development --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"watch:prod\":\"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.1.1-beta.9\",\"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:prod\",\"watch\":\"vue-cli-service build --watch --mode development --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"watch:prod\":\"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\"]}");
 /***/ }),
@@ -69107,6 +69103,17 @@ var Contrast = function Contrast(imageData) {
 exports.Contrast = Contrast;
 Factory_1.Factory.addGetterSetter(Node_1.Node, 'contrast', 0, (0, Validators_1.getNumberValidator)(), Factory_1.Factory.afterSetFilter);
+/***/ }),
+/***/ "c89b":
+/***/ (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_41b98e1a_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("8d26");
+/* 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_41b98e1a_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_41b98e1a_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
 /***/ }),
 /***/ "c8ba":
@@ -78627,7 +78634,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":"fe6df7e8-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=7f8842df&scoped=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"768c168b-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=7f8842df&scoped=true
 var com_graphicsvue_type_template_id_7f8842df_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -128804,8 +128811,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":"fe6df7e8-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=cb260cfc&scoped=true
-var com_flcanvasvue_type_template_id_cb260cfc_scoped_true_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"768c168b-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=41b98e1a&scoped=true
+var com_flcanvasvue_type_template_id_41b98e1a_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -128818,9 +128825,9 @@ var com_flcanvasvue_type_template_id_cb260cfc_scoped_true_render = function rend
     }
   });
 };
-var com_flcanvasvue_type_template_id_cb260cfc_scoped_true_staticRenderFns = [];
+var com_flcanvasvue_type_template_id_41b98e1a_scoped_true_staticRenderFns = [];
-// CONCATENATED MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=template&id=cb260cfc&scoped=true
+// CONCATENATED MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=template&id=41b98e1a&scoped=true
 // EXTERNAL MODULE: ./node_modules/konva/lib/index.js
 var lib = __webpack_require__("362d");
@@ -134039,6 +134046,9 @@ function drawArc(recordDxf, entity, group, key, configParams) {
   var rgb = decimalToRGBHex(color);
   var hex = rgb.hex;
   var startAngle, endAngle;
+  if (hex == '#FFFFFF') {
+    hex = '#000';
+  }
   if (entity.type === 'CIRCLE') {
     startAngle = entity.startAngle || 0;
     endAngle = startAngle + 2 * Math.PI;
@@ -135330,7 +135340,7 @@ function downloadPDF(base64, fileName) {
                         nodes[i].destroy();
                       }
                     }*/
+      this.bounds = null;
       this.konvaLayer.destroyChildren();
       var parser = new dxf_parser_dist();
       var dxf = parser.parse(data);
@@ -135482,75 +135492,78 @@ function downloadPDF(base64, fileName) {
                 if (_this3.konvaLayer) _this3.konvaLayer.add(_entity2.obj);
               }
             }
-            if (group[0].stroke == undefined) {
-              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 : group[0].stroke,
-              //visible: configParams ? configParams.visible :true,
-              sceneFunc: function sceneFunc(context, shape) {
-                context.beginPath();
-                for (var _i5 = 0; _i5 < group.length; _i5++) {
-                  var _entity3 = group[_i5];
-                  if (_entity3.type === 'line') {
-                    context.strokeStyle = _entity3.stroke;
-                    var x1 = _entity3.x1;
-                    var y1 = _entity3.y1;
-                    var x2 = _entity3.x2;
-                    var y2 = _entity3.y2;
-                    if (x1 != undefined && y1 != undefined && x2 != undefined && y2 != undefined) {
-                      context.moveTo(x1, -parseFloat(y1));
-                      context.lineTo(x2, -parseFloat(y2));
+            if (group.length > 0) {
+              var _group$;
+              if ((_group$ = group[0]) !== null && _group$ !== void 0 && _group$.stroke) {
+                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 : group[0].stroke,
+                //visible: configParams ? configParams.visible :true,
+                sceneFunc: function sceneFunc(context, shape) {
+                  context.beginPath();
+                  for (var _i5 = 0; _i5 < group.length; _i5++) {
+                    var _entity3 = group[_i5];
+                    if (_entity3.type === 'line') {
+                      context.strokeStyle = _entity3.stroke;
+                      var x1 = _entity3.x1;
+                      var y1 = _entity3.y1;
+                      var x2 = _entity3.x2;
+                      var y2 = _entity3.y2;
+                      if (x1 != undefined && y1 != undefined && x2 != undefined && y2 != undefined) {
+                        context.moveTo(x1, -parseFloat(y1));
+                        context.lineTo(x2, -parseFloat(y2));
+                      }
+                      var v1 = {};
+                      v1.x = x1;
+                      v1.y = y1;
+                      var v2 = {};
+                      v2.x = x2;
+                      v2.y = y2;
+                      _this.updateBounds(v1);
+                      _this.updateBounds(v2);
                     }
-                    var v1 = {};
-                    v1.x = x1;
-                    v1.y = y1;
-                    var v2 = {};
-                    v2.x = x2;
-                    v2.y = y2;
-                    _this.updateBounds(v1);
-                    _this.updateBounds(v2);
-                  }
-                  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 _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);
-                        } else {
-                          context.lineTo(_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 _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);
+                          } else {
+                            context.lineTo(_x, _y);
+                          }
                         }
-                      }
-                      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]);
+                          }
                         }
                       }
                     }
                   }
-                }
-                // context.closePath();
-                context.fillStrokeShape(shape);
-              },
-              shapeType: 'shape'
-            });
-            if (_this3.konvaLayer) _this3.konvaLayer.add(customShape);
+                  // context.closePath();
+                  context.fillStrokeShape(shape);
+                },
+                shapeType: 'shape'
+              });
+              if (_this3.konvaLayer) _this3.konvaLayer.add(customShape);
+            }
           }
         },
         _ret;
@@ -135574,17 +135587,18 @@ function downloadPDF(base64, fileName) {
       //平移视口
       var x = ((_this$$refs$svgDraw2 = this.$refs.svgDraw) === null || _this$$refs$svgDraw2 === void 0 ? void 0 : _this$$refs$svgDraw2.clientWidth) / 2 - (Math.ceil(boundingScale.width) / 2 + boundingScale.x / 2);
       var y = this.$refs.svgDraw.clientHeight / 2 - (Math.ceil(boundingScale.height) / 2 + boundingScale.y);
-      this.konvaStage.scale({
-        x: 2,
-        y: 2
-      });
-      this.konvaStage.setX(0);
-      this.konvaStage.setY(750); // 750
-      this.activedSvgPan.zoom.x = 0;
-      this.activedSvgPan.zoom.y = 750;
-      this.activedSvgPan.x = x;
-      this.activedSvgPan.y = x;
+      // this.konvaStage.scale({
+      //   x: 2,
+      //   y: 2,
+      // });
+      // this.konvaStage.setX(0);
+      // this.konvaStage.setY(750); // 750
+      // this.activedSvgPan.zoom.x = 0;
+      // this.activedSvgPan.zoom.y = 750;
+      // this.activedSvgPan.x = x;
+      // this.activedSvgPan.y = x;
       setTimeout(function () {
         _this3.centerDraw();
         _this3.$emit('loaded');
@@ -135621,175 +135635,187 @@ function downloadPDF(base64, fileName) {
     toPdfs: function toPdfs(list) {
       var _this4 = this;
       var _this = this;
-      var pdf = new jspdf_es_min["a" /* default */]('l', 'px', [this.konvaStage.width(), this.konvaStage.height()]);
-      var exportPixelRatio = 2; // 可以 2/3/4 自己调
-      for (var pageIdx = 0; pageIdx < list.length; pageIdx++) {
-        var data = list[pageIdx];
-        //先绘制图面
-        this.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 = this.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, this.konvaLayer, this.recordLayerConfig);
-            }
-            for (var _i6 = 0; _i6 < group.length; _i6++) {
-              var entity = group[_i6];
-              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);
+      return new Promise(function (resolve, reject) {
+        var pdf = new jspdf_es_min["a" /* default */]('l', 'px', [_this4.konvaStage.width(), _this4.konvaStage.height()]);
+        var exportPixelRatio = 2; // 可以 2/3/4 自己调
+        var index = 0;
+        for (var pageIdx = 0; pageIdx < list.length; pageIdx++) {
+          var data = list[pageIdx];
+          //先绘制图面
+          _this4.konvaLayer.destroyChildren();
+          var parser = new dxf_parser_dist();
+          var dxf = parser.parse(data);
+          if (dxf.entities.length > 0) {
+            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 = _this4.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, _this4.konvaLayer, _this4.recordLayerConfig);
+                }
+                for (var _i6 = 0; _i6 < group.length; _i6++) {
+                  var entity = group[_i6];
+                  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);
+                      }
+                    }
                   }
                 }
               }
             }
-          }
-        }
-        var _loop2 = function _loop2() {
-            if (entities[_key]) {
-              var _group = [];
-              var _l = entities[_key].length;
-              var _layerConfig2 = _this4.recordLayerConfig[_key];
-              var _configParams2 = _layerConfig2 && Object.keys(_layerConfig2).length > 0 ? _layerConfig2 : null;
-              for (var _i7 = 0; _i7 < _l; _i7++) {
-                var _type = entities[_key][_i7].type;
-                handleFn(_type, dxf, entities[_key][_i7], _group, _key, _configParams2, _this4.konvaLayer, _this4.recordLayerConfig);
-              }
-              if (!_this4.konvaLayer) return {
-                v: void 0
-              };
-              for (var _i8 = 0; _i8 < _group.length; _i8++) {
-                var _entity4 = _group[_i8];
-                if (_entity4.type === 'text') {
-                  if (_this4.konvaLayer) _this4.konvaLayer.add(_entity4.obj);
-                }
-              }
-              if (_group[0].stroke == undefined) {
-                _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: _configParams2 ? _configParams2.color : '',
-                //visible: configParams ? configParams.visible :true,
-                sceneFunc: function sceneFunc(context, shape) {
-                  context.beginPath();
-                  for (var _i9 = 0; _i9 < _group.length; _i9++) {
-                    var _entity5 = _group[_i9];
-                    if (_entity5.type === 'line') {
-                      context.strokeStyle = _entity5.stroke;
-                      var _x3 = _entity5.x1;
-                      var _y3 = _entity5.y1;
-                      var _x4 = _entity5.x2;
-                      var _y4 = _entity5.y2;
-                      if (_x3 != undefined && _y3 != undefined && _x4 != undefined && _y4 != undefined) {
-                        context.moveTo(_x3, -parseFloat(_y3));
-                        context.lineTo(_x4, -parseFloat(_y4));
-                      }
+            var _loop2 = function _loop2() {
+                if (entities[_key]) {
+                  var _group = [];
+                  var _l = entities[_key].length;
+                  var _layerConfig2 = _this4.recordLayerConfig[_key];
+                  var _configParams2 = _layerConfig2 && Object.keys(_layerConfig2).length > 0 ? _layerConfig2 : null;
+                  for (var _i7 = 0; _i7 < _l; _i7++) {
+                    var _type = entities[_key][_i7].type;
+                    handleFn(_type, dxf, entities[_key][_i7], _group, _key, _configParams2, _this4.konvaLayer, _this4.recordLayerConfig);
+                  }
+                  if (!_this4.konvaLayer) return {
+                    v: void 0
+                  };
+                  for (var _i8 = 0; _i8 < _group.length; _i8++) {
+                    var _entity4 = _group[_i8];
+                    if (_entity4.type === 'text') {
+                      if (_this4.konvaLayer) _this4.konvaLayer.add(_entity4.obj);
                     }
-                    if (_entity5.type === 'polyline') {
-                      context.strokeStyle = _entity5.stroke;
-                      var _flag = false;
-                      var _points = _entity5.points;
-                      var _closed = _entity5.closed;
-                      for (var _j2 = 0; _j2 < _points.length; _j2++) {
-                        var _index = _j2 % 2;
-                        if (_index === 0) {
-                          var _x5 = _points[_j2];
-                          var _y5 = _points[_j2 + 1];
-                          if (_j2 === 0) {
-                            context.moveTo(_x5, _y5);
-                          } else {
-                            context.lineTo(_x5, _y5);
+                  }
+                  if (_group.length > 0) {
+                    var _group$2;
+                    if ((_group$2 = _group[0]) !== null && _group$2 !== void 0 && _group$2.stroke) {
+                      _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: _configParams2 ? _configParams2.color : '',
+                      //visible: configParams ? configParams.visible :true,
+                      sceneFunc: function sceneFunc(context, shape) {
+                        context.beginPath();
+                        for (var _i9 = 0; _i9 < _group.length; _i9++) {
+                          var _entity5 = _group[_i9];
+                          if (_entity5.type === 'line') {
+                            context.strokeStyle = _entity5.stroke;
+                            var _x3 = _entity5.x1;
+                            var _y3 = _entity5.y1;
+                            var _x4 = _entity5.x2;
+                            var _y4 = _entity5.y2;
+                            if (_x3 != undefined && _y3 != undefined && _x4 != undefined && _y4 != undefined) {
+                              context.moveTo(_x3, -parseFloat(_y3));
+                              context.lineTo(_x4, -parseFloat(_y4));
+                            }
                           }
-                        }
-                        if (_closed) {
-                          if (_j2 === _points.length - 1) {
-                            context.lineTo(_points[0], _points[1]);
+                          if (_entity5.type === 'polyline') {
+                            context.strokeStyle = _entity5.stroke;
+                            var _flag = false;
+                            var _points = _entity5.points;
+                            var _closed = _entity5.closed;
+                            for (var _j2 = 0; _j2 < _points.length; _j2++) {
+                              var _index2 = _j2 % 2;
+                              if (_index2 === 0) {
+                                var _x5 = _points[_j2];
+                                var _y5 = _points[_j2 + 1];
+                                if (_j2 === 0) {
+                                  context.moveTo(_x5, _y5);
+                                } else {
+                                  context.lineTo(_x5, _y5);
+                                }
+                              }
+                              if (_closed) {
+                                if (_j2 === _points.length - 1) {
+                                  context.lineTo(_points[0], _points[1]);
+                                }
+                              }
+                            }
                           }
                         }
+                        // context.closePath();
+                        context.fillStrokeShape(shape);
                       }
-                    }
+                    });
+                    if (_this4.konvaLayer) _this4.konvaLayer.add(customShape);
                   }
-                  // context.closePath();
-                  context.fillStrokeShape(shape);
                 }
-              });
-              if (_this4.konvaLayer) _this4.konvaLayer.add(customShape);
+              },
+              _ret2;
+            for (var _key in entities) {
+              _ret2 = _loop2();
+              if (_ret2) return _ret2.v;
             }
-          },
-          _ret2;
-        for (var _key in entities) {
-          _ret2 = _loop2();
-          if (_ret2) return _ret2.v;
-        }
-        var _this$calculateScaleA2 = this.calculateScaleAndPosition(_this.bounds1, this.konvaStage.width(), this.konvaStage.height(), 0.05 // 5% 边距
-          ),
-          scale = _this$calculateScaleA2.scale,
-          x = _this$calculateScaleA2.x,
-          y = _this$calculateScaleA2.y;
-        _this.bounds1 = null;
-        this.konvaStage.position({
-          x: x,
-          y: y
-        });
-        this.konvaStage.scale({
-          x: scale,
-          y: scale
-        });
-        this.konvaStage.batchDraw();
-        //添加成功移动视口位置
+            var _this4$calculateScale = _this4.calculateScaleAndPosition(_this.bounds1, _this4.konvaStage.width(), _this4.konvaStage.height(), 0.05 // 5% 边距
+              ),
+              scale = _this4$calculateScale.scale,
+              x = _this4$calculateScale.x,
+              y = _this4$calculateScale.y;
+            _this.bounds1 = null;
+            _this4.konvaStage.position({
+              x: x,
+              y: y
+            });
+            _this4.konvaStage.scale({
+              x: scale,
+              y: scale
+            });
+            _this4.konvaStage.batchDraw();
+            //添加成功移动视口位置 pageIdx === 0
-        if (pageIdx == 0) {
-          pdf.addImage(this.konvaStage.toDataURL({
-            pixelRatio: 2
-          }), 0, 0, this.konvaStage.width(), this.konvaStage.height());
+            if (index === 0) {
+              pdf.addImage(_this4.konvaStage.toDataURL({
+                pixelRatio: 2
+              }), 0, 0, _this4.konvaStage.width(), _this4.konvaStage.height());
+            } else {
+              pdf.addPage();
+              pdf.addImage(_this4.konvaStage.toDataURL({
+                pixelRatio: 2
+              }), 0, 0, _this4.konvaStage.width(), _this4.konvaStage.height());
+            }
+            index++;
+          }
+        }
+        if (index > 0) {
+          pdf.save('批量导出.pdf');
+          resolve();
         } else {
-          pdf.addPage();
-          pdf.addImage(this.konvaStage.toDataURL({
-            pixelRatio: 2
-          }), 0, 0, this.konvaStage.width(), this.konvaStage.height());
+          reject('解析数据为空, 请检查数据再进行下载');
         }
-      }
-      pdf.save('批量导出.pdf');
+      });
       // var imgData = canvas.toDataURL('image/png');
       //doc.text("Hello world!", 10, 10);
@@ -135845,8 +135871,8 @@ function downloadPDF(base64, fileName) {
 });
 // 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=cb260cfc&prod&lang=scss&scoped=true
-var com_flcanvasvue_type_style_index_0_id_cb260cfc_prod_lang_scss_scoped_true = __webpack_require__("2f91");
+// EXTERNAL MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=style&index=0&id=41b98e1a&prod&lang=scss&scoped=true
+var com_flcanvasvue_type_style_index_0_id_41b98e1a_prod_lang_scss_scoped_true = __webpack_require__("c89b");
 // CONCATENATED MODULE: ./packages/components/com-flcanvas/index.vue
@@ -135859,17 +135885,17 @@ var com_flcanvasvue_type_style_index_0_id_cb260cfc_prod_lang_scss_scoped_true =
 var com_flcanvas_component = normalizeComponent(
   components_com_flcanvasvue_type_script_lang_js,
-  com_flcanvasvue_type_template_id_cb260cfc_scoped_true_render,
-  com_flcanvasvue_type_template_id_cb260cfc_scoped_true_staticRenderFns,
+  com_flcanvasvue_type_template_id_41b98e1a_scoped_true_render,
+  com_flcanvasvue_type_template_id_41b98e1a_scoped_true_staticRenderFns,
   false,
   null,
-  "cb260cfc",
+  "41b98e1a",
   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":"fe6df7e8-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":"768c168b-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;
@@ -135977,7 +136003,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":"fe6df7e8-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":"768c168b-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;
@@ -136024,7 +136050,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":"fe6df7e8-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":"768c168b-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;
@@ -137056,13 +137082,6 @@ exports.f = __webpack_require__("cc15");
 /***/ }),
-/***/ "fcd8":
-/***/ (function(module, exports, __webpack_require__) {
-// extracted by mini-css-extract-plugin
-/***/ }),
 /***/ "fce6":
 /***/ (function(module, exports, __webpack_require__) {