fl-web-component 2.1.1-beta.7 → 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.
@@ -1 +1 @@
1
- @charset "UTF-8";.fl-model-containor[data-v-7f8842df]{width:100%;height:100%;position:relative;cursor:pointer}[data-v-7f8842df] .tips-label{width:60px;color:#000;font:12px Helvetica;margin-top:-3em;padding:5px;text-align:center;vertical-align:middle;background-color:khaki}[data-v-7f8842df] .measure-label{max-width:100px;margin-top:-1em;border:10px;border-radius:5px;padding:3px 10px;cursor:pointer;color:#009bea;background-color:#f4f4f4;-webkit-box-shadow:0 1px 3px 1px rgba(0,0,0,.25);box-shadow:0 1px 3px 1px rgba(0,0,0,.25)}[data-v-7f8842df] .circle-tag{width:10px;height:10px;margin-top:5px;border-radius:50%;background-color:#ff5000}[data-v-7f8842df] .measure-label-font{word-break:break-all}[data-v-7f8842df] .mark-label-img{padding-top:5px;width:20px;height:20px}.loading-overlay[data-v-7f8842df]{position:absolute;top:0;left:0;right:0;bottom:0;background-color:rgba(0,0,0,.7);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;z-index:1000;opacity:0;visibility:hidden;-webkit-transition:opacity .3s ease,visibility .3s ease;transition:opacity .3s ease,visibility .3s ease}.loading-overlay--visible[data-v-7f8842df]{opacity:1;visibility:visible}.loading-content[data-v-7f8842df]{background:#fff;border-radius:12px;padding:30px;text-align:center;-webkit-box-shadow:0 8px 32px rgba(0,0,0,.3);box-shadow:0 8px 32px rgba(0,0,0,.3);min-width:300px;max-width:400px}.loading-spinner[data-v-7f8842df]{width:40px;height:40px;border:4px solid #f3f3f3;border-top:4px solid #409eff;border-radius:50%;-webkit-animation:spin-7f8842df 1s linear infinite;animation:spin-7f8842df 1s linear infinite;margin:0 auto 20px}@-webkit-keyframes spin-7f8842df{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes spin-7f8842df{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.loading-text[data-v-7f8842df]{font-size:16px;font-weight:500;color:#333;margin-bottom:20px}.loading-this.progress-bar[data-v-7f8842df]{width:100%;height:8px;background-color:#f0f0f0;border-radius:4px;overflow:hidden;margin-bottom:15px}.loading-this.progress-fill[data-v-7f8842df]{height:100%;background:-webkit-gradient(linear,left top,right top,from(#409eff),to(#67c23a));background:linear-gradient(90deg,#409eff,#67c23a);border-radius:4px;-webkit-transition:width .3s ease;transition:width .3s ease}.loading-details[data-v-7f8842df]{font-size:12px;color:#666;line-height:1.5}.lil-this.gui{background:hsla(0,0%,100%,.95)!important;border:1px solid #e0e0e0!important;border-radius:8px!important;-webkit-box-shadow:0 4px 12px rgba(0,0,0,.15)!important;box-shadow:0 4px 12px rgba(0,0,0,.15)!important;backdrop-filter:blur(10px)!important;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,sans-serif!important}.lil-this.gui .title{background:linear-gradient(135deg,#f8f9fa,#e9ecef)!important;color:#495057!important;border-bottom:1px solid #dee2e6!important;font-weight:600!important;padding:0 12px!important;border-radius:8px 8px 0 0!important}.lil-this.gui .controller{border-bottom:1px solid #f1f3f4!important;background:transparent!important}.lil-this.gui .controller:last-child{border-bottom:none!important}.lil-this.gui .controller .name{color:#495057!important;font-weight:500!important;font-size:12px!important}.lil-this.gui .controller .widget{background:#f8f9fa!important;border:1px solid #ced4da!important;border-radius:4px!important;color:#495057!important}.lil-this.gui .controller .widget:focus,.lil-this.gui .controller .widget:hover{border-color:#80bdff!important;-webkit-box-shadow:0 0 0 2px rgba(0,123,255,.25)!important;box-shadow:0 0 0 2px rgba(0,123,255,.25)!important}.lil-this.gui .controller .widget:focus{outline:none!important}.lil-this.gui .controller input[type=range]{background:#e9ecef!important;height:4px!important;-webkit-appearance:none!important;-moz-appearance:none!important;appearance:none!important;border-radius:2px!important}.lil-this.gui .controller.number .fill{border-right:solid #008de9}.lil-this.gui .controller input[type=range]::-webkit-slider-thumb{background:#007bff!important;border:2px solid #fff!important;-webkit-box-shadow:0 2px 4px rgba(0,0,0,.2)!important;box-shadow:0 2px 4px rgba(0,0,0,.2)!important;width:16px!important;height:16px!important;border-radius:50%!important;-webkit-appearance:none!important;appearance:none!important;cursor:pointer!important}.lil-this.gui .controller input[type=range]::-moz-range-thumb{background:#007bff!important;border:2px solid #fff!important;box-shadow:0 2px 4px rgba(0,0,0,.2)!important;width:16px!important;height:16px!important;border-radius:50%!important;cursor:pointer!important}.lil-this.gui .controller .option{background:#fff!important;color:#495057!important;border-bottom:1px solid #f1f3f4!important}.lil-this.gui .controller .option:hover{background:#f8f9fa!important}.lil-this.gui .controller .option:last-child{border-bottom:none!important}.lil-this.gui input:active{background:#e6eff4}.lil-this.gui .controller button{background:linear-gradient(135deg,#007bff,#0056b3)!important;color:#fff!important;border:none!important;border-radius:4px!important;font-weight:500!important;-webkit-transition:all .2s ease!important;transition:all .2s ease!important}.lil-this.gui .controller button:hover{background:linear-gradient(135deg,#0056b3,#004085)!important;-webkit-transform:translateY(-1px)!important;transform:translateY(-1px)!important;-webkit-box-shadow:0 4px 8px rgba(0,123,255,.3)!important;box-shadow:0 4px 8px rgba(0,123,255,.3)!important}.lil-this.gui .controller .color{border:2px solid #fff!important;border-radius:4px!important;-webkit-box-shadow:0 2px 4px rgba(0,0,0,.1)!important;box-shadow:0 2px 4px rgba(0,0,0,.1)!important}.lil-this.gui .controller.number .slider,.lil-this.gui .controller.number .slider:hover{background-color:#e6eff4}.lil-this.gui input,.lil-this.gui input:hover,.lil-this.gui input[type=number]:focus,.lil-this.gui input[type=text]:focus{background:#e6eff4}.lil-this.gui .controller>.name{min-width:25px}.lil-this.gui .controller.number input{color:#2e3136}.lil-this.gui .controller.number .slider:active{background-color:#e6eff4}.lil-this.gui .folder>.title{background:linear-gradient(135deg,#f1f3f4,#e9ecef)!important;color:#495057!important;border-bottom:1px solid #dee2e6!important}.lil-this.gui .folder>.title:before{color:#6c757d!important}.lil-this.gui .folder.closed>.children{display:none!important}#konva-container[data-v-3b9c081b]{z-index:3;width:100%;height:100%;cursor:pointer;overflow:hidden}span[data-v-f547d5c6]{font-weight:bolder}.text[data-v-f547d5c6]{margin-top:20px}.line[data-v-f547d5c6]{border-bottom:1px solid #dcdfe6;margin:20px 0}.center[data-v-f547d5c6]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.center .cen span[data-v-f547d5c6],.center .top span[data-v-f547d5c6]{color:"#53a8ff";display:inline-block;width:30px;height:30px;text-align:center;line-height:30px;border:1px solid;padding:5px;margin-bottom:10px;background-color:#e9f3ff}.center .cen span[data-v-f547d5c6]{margin:10px}.button[data-v-f547d5c6]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:end;margin-top:20px}@font-face{font-family:iconfont;src:url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.woff2?t=1646635700216) format("woff2"),url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.woff?t=1646635700216) format("woff"),url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.ttf?t=1646635700216) format("truetype")}.iconfont[data-v-f547d5c6]{font-family:iconfont!important;font-size:50px;font-style:normal;color:"#53a8ff";-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-shubiao[data-v-f547d5c6]:before{content:""}.main_body[data-v-4b17bce0]{position:relative;width:100%;height:100%;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden}.classification_title[data-v-4b17bce0]{margin:0 0 10px 0;color:#fff;font-size:14px;cursor:default}.toolbar[data-v-4b17bce0]{z-index:10;position:absolute;width:520px;padding:8px 16px;border-radius:6px;-webkit-box-shadow:0 2px 10px 0 rgba(6,29,44,.25);box-shadow:0 2px 10px 0 rgba(6,29,44,.25);background-color:#fff;top:10px;left:50%;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-transform:translateX(-50%);transform:translateX(-50%);display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-pack:distribute;justify-content:space-around}.icon_toolbar[data-v-4b17bce0],.text_toolbar[data-v-4b17bce0]{float:left;width:32px;height:32px;padding:0!important;background-repeat:no-repeat;background-size:24px;background-position:50%}.icon_active[data-v-4b17bce0],.icon_toolbar[data-v-4b17bce0]:hover,.text_toolbar[data-v-4b17bce0]:hover{background-color:#eee}[data-v-4b17bce0].icon_color .el-color-picker__trigger{height:24px;margin-top:4px;width:24px!important}[data-v-4b17bce0].el-color-picker--medium,[data-v-4b17bce0].el-color-picker--medium .el-color-picker__trigger{width:24px!important;height:24px!important}.canvas_container[data-v-4b17bce0]{position:relative;width:100%;height:100%;overflow:auto;-webkit-box-sizing:border-box;box-sizing:border-box}.canvas_container canvas[data-v-4b17bce0]{position:absolute;left:0}.canvas_container #ctx_front[data-v-4b17bce0]{z-index:5;background-color:transparent}.canvas_container #ctx_back[data-v-4b17bce0]{z-index:3}.canvas_container #ctx_base[data-v-4b17bce0]{z-index:1}#text[data-v-4b17bce0]{position:absolute;z-index:-1;resize:none;outline:none;border:1px dashed #9c9c9c;overflow:hidden;background:transparent;line-height:30px;display:none}#text[data-v-4b17bce0]:hover{border:1px dashed #53a8ff}#svg-component[data-v-2572c0e2],#svg-tigger[data-v-2572c0e2]{cursor:pointer;height:100%;width:100%;position:relative}#toolbar-show[data-v-2572c0e2]{z-index:20;position:absolute;width:100%;height:100%;top:0;left:0;overflow:hidden;background:#fff}
1
+ @charset "UTF-8";.fl-model-containor[data-v-7f8842df]{width:100%;height:100%;position:relative;cursor:pointer}[data-v-7f8842df] .tips-label{width:60px;color:#000;font:12px Helvetica;margin-top:-3em;padding:5px;text-align:center;vertical-align:middle;background-color:khaki}[data-v-7f8842df] .measure-label{max-width:100px;margin-top:-1em;border:10px;border-radius:5px;padding:3px 10px;cursor:pointer;color:#009bea;background-color:#f4f4f4;-webkit-box-shadow:0 1px 3px 1px rgba(0,0,0,.25);box-shadow:0 1px 3px 1px rgba(0,0,0,.25)}[data-v-7f8842df] .circle-tag{width:10px;height:10px;margin-top:5px;border-radius:50%;background-color:#ff5000}[data-v-7f8842df] .measure-label-font{word-break:break-all}[data-v-7f8842df] .mark-label-img{padding-top:5px;width:20px;height:20px}.loading-overlay[data-v-7f8842df]{position:absolute;top:0;left:0;right:0;bottom:0;background-color:rgba(0,0,0,.7);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;z-index:1000;opacity:0;visibility:hidden;-webkit-transition:opacity .3s ease,visibility .3s ease;transition:opacity .3s ease,visibility .3s ease}.loading-overlay--visible[data-v-7f8842df]{opacity:1;visibility:visible}.loading-content[data-v-7f8842df]{background:#fff;border-radius:12px;padding:30px;text-align:center;-webkit-box-shadow:0 8px 32px rgba(0,0,0,.3);box-shadow:0 8px 32px rgba(0,0,0,.3);min-width:300px;max-width:400px}.loading-spinner[data-v-7f8842df]{width:40px;height:40px;border:4px solid #f3f3f3;border-top:4px solid #409eff;border-radius:50%;-webkit-animation:spin-7f8842df 1s linear infinite;animation:spin-7f8842df 1s linear infinite;margin:0 auto 20px}@-webkit-keyframes spin-7f8842df{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes spin-7f8842df{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.loading-text[data-v-7f8842df]{font-size:16px;font-weight:500;color:#333;margin-bottom:20px}.loading-this.progress-bar[data-v-7f8842df]{width:100%;height:8px;background-color:#f0f0f0;border-radius:4px;overflow:hidden;margin-bottom:15px}.loading-this.progress-fill[data-v-7f8842df]{height:100%;background:-webkit-gradient(linear,left top,right top,from(#409eff),to(#67c23a));background:linear-gradient(90deg,#409eff,#67c23a);border-radius:4px;-webkit-transition:width .3s ease;transition:width .3s ease}.loading-details[data-v-7f8842df]{font-size:12px;color:#666;line-height:1.5}.lil-this.gui{background:hsla(0,0%,100%,.95)!important;border:1px solid #e0e0e0!important;border-radius:8px!important;-webkit-box-shadow:0 4px 12px rgba(0,0,0,.15)!important;box-shadow:0 4px 12px rgba(0,0,0,.15)!important;backdrop-filter:blur(10px)!important;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,sans-serif!important}.lil-this.gui .title{background:linear-gradient(135deg,#f8f9fa,#e9ecef)!important;color:#495057!important;border-bottom:1px solid #dee2e6!important;font-weight:600!important;padding:0 12px!important;border-radius:8px 8px 0 0!important}.lil-this.gui .controller{border-bottom:1px solid #f1f3f4!important;background:transparent!important}.lil-this.gui .controller:last-child{border-bottom:none!important}.lil-this.gui .controller .name{color:#495057!important;font-weight:500!important;font-size:12px!important}.lil-this.gui .controller .widget{background:#f8f9fa!important;border:1px solid #ced4da!important;border-radius:4px!important;color:#495057!important}.lil-this.gui .controller .widget:focus,.lil-this.gui .controller .widget:hover{border-color:#80bdff!important;-webkit-box-shadow:0 0 0 2px rgba(0,123,255,.25)!important;box-shadow:0 0 0 2px rgba(0,123,255,.25)!important}.lil-this.gui .controller .widget:focus{outline:none!important}.lil-this.gui .controller input[type=range]{background:#e9ecef!important;height:4px!important;-webkit-appearance:none!important;-moz-appearance:none!important;appearance:none!important;border-radius:2px!important}.lil-this.gui .controller.number .fill{border-right:solid #008de9}.lil-this.gui .controller input[type=range]::-webkit-slider-thumb{background:#007bff!important;border:2px solid #fff!important;-webkit-box-shadow:0 2px 4px rgba(0,0,0,.2)!important;box-shadow:0 2px 4px rgba(0,0,0,.2)!important;width:16px!important;height:16px!important;border-radius:50%!important;-webkit-appearance:none!important;appearance:none!important;cursor:pointer!important}.lil-this.gui .controller input[type=range]::-moz-range-thumb{background:#007bff!important;border:2px solid #fff!important;box-shadow:0 2px 4px rgba(0,0,0,.2)!important;width:16px!important;height:16px!important;border-radius:50%!important;cursor:pointer!important}.lil-this.gui .controller .option{background:#fff!important;color:#495057!important;border-bottom:1px solid #f1f3f4!important}.lil-this.gui .controller .option:hover{background:#f8f9fa!important}.lil-this.gui .controller .option:last-child{border-bottom:none!important}.lil-this.gui input:active{background:#e6eff4}.lil-this.gui .controller button{background:linear-gradient(135deg,#007bff,#0056b3)!important;color:#fff!important;border:none!important;border-radius:4px!important;font-weight:500!important;-webkit-transition:all .2s ease!important;transition:all .2s ease!important}.lil-this.gui .controller button:hover{background:linear-gradient(135deg,#0056b3,#004085)!important;-webkit-transform:translateY(-1px)!important;transform:translateY(-1px)!important;-webkit-box-shadow:0 4px 8px rgba(0,123,255,.3)!important;box-shadow:0 4px 8px rgba(0,123,255,.3)!important}.lil-this.gui .controller .color{border:2px solid #fff!important;border-radius:4px!important;-webkit-box-shadow:0 2px 4px rgba(0,0,0,.1)!important;box-shadow:0 2px 4px rgba(0,0,0,.1)!important}.lil-this.gui .controller.number .slider,.lil-this.gui .controller.number .slider:hover{background-color:#e6eff4}.lil-this.gui input,.lil-this.gui input:hover,.lil-this.gui input[type=number]:focus,.lil-this.gui input[type=text]:focus{background:#e6eff4}.lil-this.gui .controller>.name{min-width:25px}.lil-this.gui .controller.number input{color:#2e3136}.lil-this.gui .controller.number .slider:active{background-color:#e6eff4}.lil-this.gui .folder>.title{background:linear-gradient(135deg,#f1f3f4,#e9ecef)!important;color:#495057!important;border-bottom:1px solid #dee2e6!important}.lil-this.gui .folder>.title:before{color:#6c757d!important}.lil-this.gui .folder.closed>.children{display:none!important}#konva-container[data-v-41b98e1a]{z-index:3;width:100%;height:100%;cursor:pointer;overflow:hidden}span[data-v-f547d5c6]{font-weight:bolder}.text[data-v-f547d5c6]{margin-top:20px}.line[data-v-f547d5c6]{border-bottom:1px solid #dcdfe6;margin:20px 0}.center[data-v-f547d5c6]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.center .cen span[data-v-f547d5c6],.center .top span[data-v-f547d5c6]{color:"#53a8ff";display:inline-block;width:30px;height:30px;text-align:center;line-height:30px;border:1px solid;padding:5px;margin-bottom:10px;background-color:#e9f3ff}.center .cen span[data-v-f547d5c6]{margin:10px}.button[data-v-f547d5c6]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:end;margin-top:20px}@font-face{font-family:iconfont;src:url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.woff2?t=1646635700216) format("woff2"),url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.woff?t=1646635700216) format("woff"),url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.ttf?t=1646635700216) format("truetype")}.iconfont[data-v-f547d5c6]{font-family:iconfont!important;font-size:50px;font-style:normal;color:"#53a8ff";-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-shubiao[data-v-f547d5c6]:before{content:""}.main_body[data-v-4b17bce0]{position:relative;width:100%;height:100%;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden}.classification_title[data-v-4b17bce0]{margin:0 0 10px 0;color:#fff;font-size:14px;cursor:default}.toolbar[data-v-4b17bce0]{z-index:10;position:absolute;width:520px;padding:8px 16px;border-radius:6px;-webkit-box-shadow:0 2px 10px 0 rgba(6,29,44,.25);box-shadow:0 2px 10px 0 rgba(6,29,44,.25);background-color:#fff;top:10px;left:50%;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-transform:translateX(-50%);transform:translateX(-50%);display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-pack:distribute;justify-content:space-around}.icon_toolbar[data-v-4b17bce0],.text_toolbar[data-v-4b17bce0]{float:left;width:32px;height:32px;padding:0!important;background-repeat:no-repeat;background-size:24px;background-position:50%}.icon_active[data-v-4b17bce0],.icon_toolbar[data-v-4b17bce0]:hover,.text_toolbar[data-v-4b17bce0]:hover{background-color:#eee}[data-v-4b17bce0].icon_color .el-color-picker__trigger{height:24px;margin-top:4px;width:24px!important}[data-v-4b17bce0].el-color-picker--medium,[data-v-4b17bce0].el-color-picker--medium .el-color-picker__trigger{width:24px!important;height:24px!important}.canvas_container[data-v-4b17bce0]{position:relative;width:100%;height:100%;overflow:auto;-webkit-box-sizing:border-box;box-sizing:border-box}.canvas_container canvas[data-v-4b17bce0]{position:absolute;left:0}.canvas_container #ctx_front[data-v-4b17bce0]{z-index:5;background-color:transparent}.canvas_container #ctx_back[data-v-4b17bce0]{z-index:3}.canvas_container #ctx_base[data-v-4b17bce0]{z-index:1}#text[data-v-4b17bce0]{position:absolute;z-index:-1;resize:none;outline:none;border:1px dashed #9c9c9c;overflow:hidden;background:transparent;line-height:30px;display:none}#text[data-v-4b17bce0]:hover{border:1px dashed #53a8ff}#svg-component[data-v-2572c0e2],#svg-tigger[data-v-2572c0e2]{cursor:pointer;height:100%;width:100%;position:relative}#toolbar-show[data-v-2572c0e2]{z-index:20;position:absolute;width:100%;height:100%;top:0;left:0;overflow:hidden;background:#fff}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fl-web-component",
3
- "version": "2.1.1-beta.7",
3
+ "version": "2.1.1-beta.9",
4
4
  "scripts": {
5
5
  "postinstall": "patch-package",
6
6
  "tip1": "仅调试本组件不涉及业务组件,请执行dev",
@@ -281,7 +281,7 @@ export default {
281
281
  nodes[i].destroy();
282
282
  }
283
283
  }*/
284
-
284
+ this.bounds = null;
285
285
  this.konvaLayer.destroyChildren();
286
286
  const parser = new DxfParser();
287
287
  let dxf = parser.parse(data);
@@ -289,7 +289,6 @@ export default {
289
289
  let dxf2 = parser2.parseSync(data);
290
290
 
291
291
  let hatchEntitys = dxf2.entities;
292
- console.log(dxf2.entities)
293
292
  // 处理HATCH部分
294
293
  for (let i = 0; i < hatchEntitys.length; i++) {
295
294
  let entity = hatchEntitys[i];
@@ -444,83 +443,85 @@ export default {
444
443
  if (this.konvaLayer) this.konvaLayer.add(entity.obj);
445
444
  }
446
445
  }
446
+ if (group.length > 0) {
447
+ if (group[0]?.stroke) {
448
+ group[0].stroke = '#000';
449
+ }
450
+ let customShape = new Konva.Shape({
451
+ x: 0,
452
+ y: 0,
453
+ strokeWidth: 0.2,
454
+ name: key.replace(/\s*/g, ''),
455
+ entityId: key,
456
+ stroke: group[0].stroke,
457
+ customColor: configParams ? configParams.color : group[0].stroke,
458
+ //visible: configParams ? configParams.visible :true,
459
+ sceneFunc(context, shape) {
460
+ context.beginPath();
461
+ for (let i = 0; i < group.length; i++) {
462
+ let entity = group[i];
447
463
 
448
- if (group[0].stroke == undefined) {
449
- group[0].stroke = '#000';
450
- }
451
- let customShape = new Konva.Shape({
452
- x: 0,
453
- y: 0,
454
- strokeWidth: 0.2,
455
- name: key.replace(/\s*/g, ''),
456
- entityId: key,
457
- stroke: group[0].stroke,
458
- customColor: configParams ? configParams.color : group[0].stroke,
459
- //visible: configParams ? configParams.visible :true,
460
- sceneFunc(context, shape) {
461
- context.beginPath();
462
- for (let i = 0; i < group.length; i++) {
463
- let entity = group[i];
464
-
465
- if (entity.type === 'line') {
466
- context.strokeStyle = entity.stroke;
467
- let x1 = entity.x1;
468
- let y1 = entity.y1;
469
- let x2 = entity.x2;
470
- let y2 = entity.y2;
471
- if (x1 != undefined && y1 != undefined && x2 != undefined && y2 != undefined) {
472
- context.moveTo(x1, -parseFloat(y1));
473
- context.lineTo(x2, -parseFloat(y2));
464
+ if (entity.type === 'line') {
465
+ context.strokeStyle = entity.stroke;
466
+ let x1 = entity.x1;
467
+ let y1 = entity.y1;
468
+ let x2 = entity.x2;
469
+ let y2 = entity.y2;
470
+ if (x1 != undefined && y1 != undefined && x2 != undefined && y2 != undefined) {
471
+ context.moveTo(x1, -parseFloat(y1));
472
+ context.lineTo(x2, -parseFloat(y2));
473
+ }
474
+ let v1 = {};
475
+ v1.x = x1;
476
+ v1.y = y1;
477
+ let v2 = {};
478
+ v2.x = x2;
479
+ v2.y = y2;
480
+ _this.updateBounds(v1);
481
+ _this.updateBounds(v2);
474
482
  }
475
- let v1 = {};
476
- v1.x = x1;
477
- v1.y = y1;
478
- let v2 = {};
479
- v2.x = x2;
480
- v2.y = y2;
481
- _this.updateBounds(v1);
482
- _this.updateBounds(v2);
483
- }
484
- if (entity.type === 'polyline') {
485
- context.strokeStyle = entity.stroke;
483
+ if (entity.type === 'polyline') {
484
+ context.strokeStyle = entity.stroke;
486
485
 
487
- let flag = false;
486
+ let flag = false;
488
487
 
489
- let points = entity.points;
488
+ let points = entity.points;
490
489
 
491
- let closed = entity.closed;
490
+ let closed = entity.closed;
492
491
 
493
- for (let j = 0; j < points.length; j++) {
494
- let index = j % 2;
495
- if (index === 0) {
496
- let x = points[j];
497
- let y = points[j + 1];
498
- let point = {};
499
- point.x = x;
500
- point.y = y;
501
- _this.updateBounds(point);
492
+ for (let j = 0; j < points.length; j++) {
493
+ let index = j % 2;
494
+ if (index === 0) {
495
+ let x = points[j];
496
+ let y = points[j + 1];
497
+ let point = {};
498
+ point.x = x;
499
+ point.y = y;
500
+ _this.updateBounds(point);
502
501
 
503
- if (j === 0) {
504
- context.moveTo(x, y);
505
- } else {
506
- context.lineTo(x, y);
502
+ if (j === 0) {
503
+ context.moveTo(x, y);
504
+ } else {
505
+ context.lineTo(x, y);
506
+ }
507
507
  }
508
- }
509
508
 
510
- if (closed) {
511
- if (j === points.length - 1) {
512
- context.lineTo(points[0], points[1]);
509
+ if (closed) {
510
+ if (j === points.length - 1) {
511
+ context.lineTo(points[0], points[1]);
512
+ }
513
513
  }
514
514
  }
515
515
  }
516
516
  }
517
- }
518
- // context.closePath();
519
- context.fillStrokeShape(shape);
520
- },
521
- shapeType: 'shape',
522
- });
523
- if (this.konvaLayer) this.konvaLayer.add(customShape);
517
+ // context.closePath();
518
+ context.fillStrokeShape(shape);
519
+ },
520
+ shapeType: 'shape',
521
+ });
522
+ if (this.konvaLayer) this.konvaLayer.add(customShape);
523
+ }
524
+
524
525
  }
525
526
  }
526
527
  //缩放视口
@@ -544,17 +545,17 @@ export default {
544
545
  this.$refs.svgDraw.clientHeight / 2 -
545
546
  (Math.ceil(boundingScale.height) / 2 + boundingScale.y);
546
547
 
547
- this.konvaStage.scale({
548
- x: 2,
549
- y: 2,
550
- });
551
- this.konvaStage.setX(0);
552
- this.konvaStage.setY(750); // 750
553
-
554
- this.activedSvgPan.zoom.x = 0;
555
- this.activedSvgPan.zoom.y = 750;
556
- this.activedSvgPan.x = x;
557
- this.activedSvgPan.y = x;
548
+ // this.konvaStage.scale({
549
+ // x: 2,
550
+ // y: 2,
551
+ // });
552
+ // this.konvaStage.setX(0);
553
+ // this.konvaStage.setY(750); // 750
554
+
555
+ // this.activedSvgPan.zoom.x = 0;
556
+ // this.activedSvgPan.zoom.y = 750;
557
+ // this.activedSvgPan.x = x;
558
+ // this.activedSvgPan.y = x;
558
559
  setTimeout(() => {
559
560
  this.centerDraw();
560
561
  this.$emit('loaded');
@@ -608,7 +609,6 @@ export default {
608
609
  this.konvaLayer.destroyChildren();
609
610
  const parser = new DxfParser();
610
611
  let dxf = parser.parse(data);
611
-
612
612
  if (dxf.entities.length > 0) {
613
613
  let entities = formatEntity(dxf.entities);
614
614
  let layers = dxf.tables.layer.layers;
@@ -699,69 +699,71 @@ export default {
699
699
  }
700
700
  }
701
701
 
702
- if (group[0].stroke == undefined) {
703
- group[0].stroke = '#000';
704
- }
702
+ if (group.length > 0) {
703
+ if (group[0]?.stroke) {
704
+ group[0].stroke = '#000';
705
+ }
705
706
 
706
- let customShape = new Konva.Shape({
707
- x: 0,
708
- y: 0,
709
- strokeWidth: 0.2,
710
- name: key.replace(/\s*/g, ''),
711
- entityId: key,
712
- stroke: group[0].stroke,
713
- customColor: configParams ? configParams.color : '',
714
- //visible: configParams ? configParams.visible :true,
715
- sceneFunc(context, shape) {
716
- context.beginPath();
717
- for (let i = 0; i < group.length; i++) {
718
- let entity = group[i];
719
-
720
- if (entity.type === 'line') {
721
- context.strokeStyle = entity.stroke;
722
- let x1 = entity.x1;
723
- let y1 = entity.y1;
724
- let x2 = entity.x2;
725
- let y2 = entity.y2;
726
- if (x1 != undefined && y1 != undefined && x2 != undefined && y2 != undefined) {
727
- context.moveTo(x1, -parseFloat(y1));
728
- context.lineTo(x2, -parseFloat(y2));
707
+ let customShape = new Konva.Shape({
708
+ x: 0,
709
+ y: 0,
710
+ strokeWidth: 0.2,
711
+ name: key.replace(/\s*/g, ''),
712
+ entityId: key,
713
+ stroke: group[0].stroke,
714
+ customColor: configParams ? configParams.color : '',
715
+ //visible: configParams ? configParams.visible :true,
716
+ sceneFunc(context, shape) {
717
+ context.beginPath();
718
+ for (let i = 0; i < group.length; i++) {
719
+ let entity = group[i];
720
+
721
+ if (entity.type === 'line') {
722
+ context.strokeStyle = entity.stroke;
723
+ let x1 = entity.x1;
724
+ let y1 = entity.y1;
725
+ let x2 = entity.x2;
726
+ let y2 = entity.y2;
727
+ if (x1 != undefined && y1 != undefined && x2 != undefined && y2 != undefined) {
728
+ context.moveTo(x1, -parseFloat(y1));
729
+ context.lineTo(x2, -parseFloat(y2));
730
+ }
729
731
  }
730
- }
731
- if (entity.type === 'polyline') {
732
- context.strokeStyle = entity.stroke;
732
+ if (entity.type === 'polyline') {
733
+ context.strokeStyle = entity.stroke;
733
734
 
734
- let flag = false;
735
+ let flag = false;
735
736
 
736
- let points = entity.points;
737
- let closed = entity.closed;
737
+ let points = entity.points;
738
+ let closed = entity.closed;
738
739
 
739
- for (let j = 0; j < points.length; j++) {
740
- let index = j % 2;
741
- if (index === 0) {
742
- let x = points[j];
743
- let y = points[j + 1];
740
+ for (let j = 0; j < points.length; j++) {
741
+ let index = j % 2;
742
+ if (index === 0) {
743
+ let x = points[j];
744
+ let y = points[j + 1];
744
745
 
745
- if (j === 0) {
746
- context.moveTo(x, y);
747
- } else {
748
- context.lineTo(x, y);
746
+ if (j === 0) {
747
+ context.moveTo(x, y);
748
+ } else {
749
+ context.lineTo(x, y);
750
+ }
749
751
  }
750
- }
751
752
 
752
- if (closed) {
753
- if (j === points.length - 1) {
754
- context.lineTo(points[0], points[1]);
753
+ if (closed) {
754
+ if (j === points.length - 1) {
755
+ context.lineTo(points[0], points[1]);
756
+ }
755
757
  }
756
758
  }
757
759
  }
758
760
  }
759
- }
760
- // context.closePath();
761
- context.fillStrokeShape(shape);
762
- },
763
- });
764
- if (this.konvaLayer) this.konvaLayer.add(customShape);
761
+ // context.closePath();
762
+ context.fillStrokeShape(shape);
763
+ },
764
+ });
765
+ if (this.konvaLayer) this.konvaLayer.add(customShape);
766
+ }
765
767
  }
766
768
  }
767
769