fl-web-component 2.1.16 → 2.1.17

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

@@ -46441,17 +46441,6 @@ module.exports = function (module) {
   return module;
 };
 
-/***/ }),
-
-/***/ "635c":
-/***/ (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_23a6a3a8_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("a149");
-/* 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_23a6a3a8_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_23a6a3a8_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "6438":
@@ -66019,7 +66008,7 @@ module.exports = document && document.documentElement;
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"name\":\"fl-web-component\",\"version\":\"2.1.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: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.17\",\"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\"]}");
 
 /***/ }),
 
@@ -66142,6 +66131,13 @@ function mergeFn(a, b) {
 
 /***/ }),
 
+/***/ "9428":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ "9470":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -67403,13 +67399,6 @@ module.exports = Object('z').propertyIsEnumerable(0) ? Object : function (it) {
 
 /***/ }),
 
-/***/ "a149":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "a15e":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -83715,6 +83704,17 @@ exports.default = {
   }
 };
 
+/***/ }),
+
+/***/ "e9e6":
+/***/ (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_e9d7a15c_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("9428");
+/* 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_e9d7a15c_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_e9d7a15c_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "ea34":
@@ -88142,7 +88142,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":"15acc870-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=23daca8a&scoped=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b8217a8-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=23daca8a&scoped=true
 var com_graphicsvue_type_template_id_23daca8a_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -116562,6 +116562,7 @@ var measure_distance_MeasureDistance = function MeasureDistance(renderer, scene,
   this.measureName = 'measureObj';
   // 创建一个辅助平面来捕获鼠标事件
   this.plane = new Plane(new Vector3(0, 0, 1), 0);
+  this.mousePoint = null;
 };
 measure_distance_MeasureDistance.prototype = {
   start: function start() {
@@ -116723,6 +116724,7 @@ measure_distance_MeasureDistance.prototype = {
   },
   mousemove: function mousemove(e) {
     if (measure_distance_this.isCompleted || measure_distance_this.pointArray.length === 0) return;
+    measure_distance_this.mousePoint = e;
     var positionResult = measure_distance_this.getPosition(e);
     if (positionResult) {
       var point = positionResult.point;
@@ -116863,9 +116865,12 @@ measure_distance_MeasureDistance.prototype = {
     }
   },
   close: function close(isClear) {
+    console.log(this.mousePoint);
+    if (this.mousePoint) {
+      this.rightClick(this.mousePoint);
+    }
     this.renderer.domElement.removeEventListener('mousedown', this.mousedown);
     this.renderer.domElement.removeEventListener('mouseup', this.click);
-    this.renderer.domElement.removeEventListener('mousemove', this.mousemove);
     this.renderer.domElement.removeEventListener('contextmenu', this.rightClick);
     if (!isClear) {
       this.remove(this.points);
@@ -116958,6 +116963,7 @@ var measure_area_MeasureArea = function MeasureArea(renderer, scene, camera, wid
   this.height = height;
   this.firstTime = 0;
   this.measureName = 'measureObj';
+  this.mousePoint = null;
   // 创建一个辅助平面来捕获鼠标事件
   this.plane = new Plane(new Vector3(0, 0, 1), 0);
 };
@@ -117143,6 +117149,7 @@ measure_area_MeasureArea.prototype = {
   mousemove: function mousemove(e) {
     if (measure_area_this.isCompleted || measure_area_this.pointArray.length === 0) return;
     var positionResult = measure_area_this.getPosition(e);
+    measure_area_this.mousePoint = e;
     if (positionResult) {
       var point = positionResult.point;
       if (measure_area_this.hasTempPoint) {
@@ -117264,9 +117271,13 @@ measure_area_MeasureArea.prototype = {
     }
   },
   close: function close(isClear) {
+    if (this.mousePoint) {
+      this.rightClick(this.mousePoint);
+      this.mousePoint = null;
+    }
     this.renderer.domElement.removeEventListener('mouseup', this.click);
     this.renderer.domElement.removeEventListener('mousedown', this.mousedown);
-    this.renderer.domElement.removeEventListener('mousemove', this.mousemove);
+    // this.renderer.domElement.removeEventListener('mousemove', this.mousemove);
     this.renderer.domElement.removeEventListener('contextmenu', this.rightClick);
     if (!isClear) {
       this.remove(this.points);
@@ -117402,6 +117413,7 @@ var measure_angle_MeasureAngle = function MeasureAngle(renderer, scene, camera,
   // 创建一个辅助平面来捕获鼠标事件
   this.plane = new Plane(new Vector3(0, 0, 1), 0);
   this.measureName = 'measureObj';
+  this.mousePoint = null;
   // this.POINT_MATERIAL = new THREE.PointsMaterial({ color: 0xff5000, size: 1, opacity: 0.6, transparent: true, depthWrite: false, depthTest: false })
   // this.LINE_MATERIAL = new THREE.LineBasicMaterial({ color: 0xff0000, linewidth: 3, opacity: 0.8, transparent: true, side: THREE.DoubleSide, depthWrite: false, depthTest: false })
 };
@@ -117617,6 +117629,7 @@ measure_angle_MeasureAngle.prototype = {
     }
     if (measure_angle_this.pointArray.length >= 3 && !measure_angle_this.hasTempPoint) return;
     var positionResult = measure_angle_this.getPosition(e);
+    measure_angle_this.mousePoint = e;
     if (positionResult) {
       var point = positionResult.point;
       if (measure_angle_this.hasTempPoint) {
@@ -117748,9 +117761,13 @@ measure_angle_MeasureAngle.prototype = {
     }
   },
   close: function close(isClear) {
+    if (this.mousePoint) {
+      this.rightClick(this.mousePoint);
+      this.mousePoint = null;
+    }
     this.renderer.domElement.removeEventListener('mouseup', this.click, false);
     this.renderer.domElement.removeEventListener('mousedown', this.mousedown, false);
-    this.renderer.domElement.removeEventListener('mousemove', this.mousemove, false);
+    // this.renderer.domElement.removeEventListener('mousemove', this.mousemove, false);
     this.renderer.domElement.removeEventListener('contextmenu', this.rightClick, false);
     if (!isClear) {
       this.remove(this.points);
@@ -139930,8 +139947,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":"15acc870-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=23a6a3a8&scoped=true
-var com_flcanvasvue_type_template_id_23a6a3a8_scoped_true_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b8217a8-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=e9d7a15c&scoped=true
+var com_flcanvasvue_type_template_id_e9d7a15c_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -139944,9 +139961,9 @@ var com_flcanvasvue_type_template_id_23a6a3a8_scoped_true_render = function rend
     }
   });
 };
-var com_flcanvasvue_type_template_id_23a6a3a8_scoped_true_staticRenderFns = [];
+var com_flcanvasvue_type_template_id_e9d7a15c_scoped_true_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=template&id=23a6a3a8&scoped=true
+// CONCATENATED MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=template&id=e9d7a15c&scoped=true
 
 // EXTERNAL MODULE: ./node_modules/konva/lib/index.js
 var lib = __webpack_require__("362d");
@@ -143302,6 +143319,7 @@ function drawLwLine(recordDxf, entity, group, key, configParams, lineTypes) {
   //     oldstrokeLength: width,
   //   });
   // }
+  // if (dashArr.length === 0) {
   group.push({
     type: 'polyline',
     points: list,
@@ -143316,6 +143334,7 @@ function drawLwLine(recordDxf, entity, group, key, configParams, lineTypes) {
     visible: configParams ? configParams.visible : true,
     oldstrokeLength: width
   });
+  // }
 }
 function drawSpline(recordDxf, entity, group, key, configParams) {
   var color = entity.color;
@@ -143427,7 +143446,7 @@ function getDashArray(lineTypeName, lineTypes, entity) {
     return []; // 无定义则实线
   }
   var rawDash = lineTypeDef.pattern.map(Math.abs).map(function (len) {
-    return len < 0.6 ? 1 : len;
+    return len < 0.3 ? 1 : len;
   });
   var scale = entity.lineTypeScale || 1;
   var dash = rawDash.map(function (v) {
@@ -144090,6 +144109,9 @@ function downloadPDF(base64, fileName) {
           var shapeGroup = group.filter(function (item) {
             return item.type !== 'text';
           });
+          if (key === '2.0.64-RDCONNCROSS-o.225.11.1.tktub9-5') {
+            console.log(shapeGroup);
+          }
           if (shapeGroup.length > 0) {
             // 根据颜色分组
             var colorGroup = lodash_default.a.groupBy(shapeGroup, 'stroke');
@@ -144105,13 +144127,14 @@ function downloadPDF(base64, fileName) {
                 customColor: _configParams ? _configParams.color : colorKey,
                 strokeScaleEnabled: false,
                 // 加上这句是当坐标点巨大时也能正常显示
-                // visible: configParams ? configParams.visible : true,
+                // visible: key === '2.0.64-RDCONNCROSS-o.225.11.1.tktub9-5' ? false : true, // configParams ? configParams.visible : true,
                 sceneFunc: function sceneFunc(context, shape) {
                   context.beginPath();
                   for (var _i5 = 0; _i5 < entityColorGroup.length; _i5++) {
                     var _entity3 = entityColorGroup[_i5];
                     if (_entity3.type === 'line') {
-                      context.strokeStyle = _entity3.stroke;
+                      // context.strokeStyle = entity.stroke;
+                      // context.lineWidth = entity.strokeWidth
                       var x1 = _entity3.x1;
                       var y1 = _entity3.y1;
                       var x2 = _entity3.x2;
@@ -144128,10 +144151,11 @@ function downloadPDF(base64, fileName) {
                       v2.y = y2;
                       _this[fn](v1);
                       _this[fn](v2);
+                      context.fillStrokeShape(shape);
                     }
                     if (_entity3.type === 'polyline') {
-                      context.strokeStyle = _entity3.stroke;
-                      var flag = false;
+                      // context.strokeStyle = entity.stroke;
+                      // context.lineWidth = entity.strokeWidth
                       var points = _entity3.points;
                       var closed = _entity3.closed;
                       for (var _j = 0; _j < points.length; _j++) {
@@ -144151,22 +144175,17 @@ function downloadPDF(base64, fileName) {
                         }
                       }
                       if (closed) {
-                        /// if (j === points.length - 1) {
                         context.lineTo(points[0], points[1]);
-                        // }
                       }
-                      // if (entity.lineType === 'DASH') {
-                      //   context.setLineDash(entity.dash)
+                      // if (entity.dash.length > 0) {
+                      // context.lineCap = 'round';
+                      context.setLineDash(_entity3.dash);
+                      context.fillStrokeShape(shape);
                       // }
-
-                      if (_entity3.dash.length > 0) {
-                        console.log(_entity3.dash);
-                        context.lineCap = 'round';
-                        context.setLineDash(_entity3.dash);
-                      }
                     }
+                    context.setLineDash([]);
                   }
-                  context.fillStrokeShape(shape);
+                  // context.fillStrokeShape(shape);
                 },
                 shapeType: 'shape'
               });
@@ -144333,8 +144352,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=23a6a3a8&prod&lang=scss&scoped=true
-var com_flcanvasvue_type_style_index_0_id_23a6a3a8_prod_lang_scss_scoped_true = __webpack_require__("635c");
+// EXTERNAL MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=style&index=0&id=e9d7a15c&prod&lang=scss&scoped=true
+var com_flcanvasvue_type_style_index_0_id_e9d7a15c_prod_lang_scss_scoped_true = __webpack_require__("e9e6");
 
 // CONCATENATED MODULE: ./packages/components/com-flcanvas/index.vue
 
@@ -144347,17 +144366,17 @@ var com_flcanvasvue_type_style_index_0_id_23a6a3a8_prod_lang_scss_scoped_true =
 
 var com_flcanvas_component = normalizeComponent(
   components_com_flcanvasvue_type_script_lang_js,
-  com_flcanvasvue_type_template_id_23a6a3a8_scoped_true_render,
-  com_flcanvasvue_type_template_id_23a6a3a8_scoped_true_staticRenderFns,
+  com_flcanvasvue_type_template_id_e9d7a15c_scoped_true_render,
+  com_flcanvasvue_type_template_id_e9d7a15c_scoped_true_staticRenderFns,
   false,
   null,
-  "23a6a3a8",
+  "e9d7a15c",
   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":"15acc870-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=3fceaac3&scoped=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b8217a8-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=3fceaac3&scoped=true
 var per_controlvue_type_template_id_3fceaac3_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -144471,7 +144490,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":"15acc870-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":"5b8217a8-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;
@@ -144518,7 +144537,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":"15acc870-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":"5b8217a8-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;