fl-web-component 2.1.1-beta.13 → 2.1.1-beta.15

package/dist/fl-web-component.css

@@ -1 +1 @@
-@charset "UTF-8";.fl-model-containor[data-v-3b9a926b]{width:100%;height:100%;position:relative;cursor:pointer}[data-v-3b9a926b] .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-3b9a926b] .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-3b9a926b] .circle-tag{width:10px;height:10px;margin-top:5px;border-radius:50%;background-color:#ff5000}[data-v-3b9a926b] .measure-label-font{word-break:break-all}[data-v-3b9a926b] .mark-label-img{padding-top:5px;width:20px;height:20px}.loading-overlay[data-v-3b9a926b]{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-3b9a926b]{opacity:1;visibility:visible}.loading-content[data-v-3b9a926b]{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-3b9a926b]{width:40px;height:40px;border:4px solid #f3f3f3;border-top:4px solid #409eff;border-radius:50%;-webkit-animation:spin-3b9a926b 1s linear infinite;animation:spin-3b9a926b 1s linear infinite;margin:0 auto 20px}@-webkit-keyframes spin-3b9a926b{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes spin-3b9a926b{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.loading-text[data-v-3b9a926b]{font-size:16px;font-weight:500;color:#333;margin-bottom:20px}.loading-this.progress-bar[data-v-3b9a926b]{width:100%;height:8px;background-color:#f0f0f0;border-radius:4px;overflow:hidden;margin-bottom:15px}.loading-this.progress-fill[data-v-3b9a926b]{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-3b9a926b]{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-97fd148c]{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}
+@charset "UTF-8";.fl-model-containor[data-v-1d8164d7]{width:100%;height:100%;position:relative;cursor:pointer}[data-v-1d8164d7] .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-1d8164d7] .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-1d8164d7] .circle-tag{width:10px;height:10px;margin-top:5px;border-radius:50%;background-color:#ff5000}[data-v-1d8164d7] .measure-label-font{word-break:break-all}[data-v-1d8164d7] .mark-label-img{padding-top:5px;width:20px;height:20px}.loading-overlay[data-v-1d8164d7]{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-1d8164d7]{opacity:1;visibility:visible}.loading-content[data-v-1d8164d7]{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-1d8164d7]{width:40px;height:40px;border:4px solid #f3f3f3;border-top:4px solid #409eff;border-radius:50%;-webkit-animation:spin-1d8164d7 1s linear infinite;animation:spin-1d8164d7 1s linear infinite;margin:0 auto 20px}@-webkit-keyframes spin-1d8164d7{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes spin-1d8164d7{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.loading-text[data-v-1d8164d7]{font-size:16px;font-weight:500;color:#333;margin-bottom:20px}.loading-this.progress-bar[data-v-1d8164d7]{width:100%;height:8px;background-color:#f0f0f0;border-radius:4px;overflow:hidden;margin-bottom:15px}.loading-this.progress-fill[data-v-1d8164d7]{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-1d8164d7]{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-bb5cebba]{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

@@ -1,6 +1,6 @@
 {
   "name": "fl-web-component",
-  "version": "2.1.1-beta.13",
+  "version": "2.1.1-beta.15",
   "scripts": {
     "postinstall": "patch-package",
     "tip1": "仅调试本组件不涉及业务组件,请执行dev",

package/packages/components/com-flcanvas/components/entityFormatting.js

@@ -1,7 +1,7 @@
 import bSpline from './bspline';
 import * as THREE from 'three';
 //rgb转换
-function decimalToRGBHex(decimalValue) {
+export function decimalToRGBHex(decimalValue) {
   // Ensure the input is a valid integer
   if (!Number.isInteger(decimalValue)) {
     throw new Error('Input must be an integer.');
@@ -314,8 +314,7 @@ function drawEllpse(recordDxf, entity, group, key, configParams) {
 }
 function drawLine(recordDxf, entity, group, key, configParams) {
   let color = entity.color;
-  let rgb = decimalToRGBHex(color);
-  
+  let rgb = decimalToRGBHex(color)
   let hex = rgb.hex;
   let x1 = entity.vertices[0].x;
   let y1 = entity.vertices[0].y;
@@ -470,7 +469,6 @@ function drawHatch(recordDxf, entity, group, key, configParams) {
 function drawLwLine(recordDxf, entity, group, key, configParams) {
   let color = entity.color;
   let rgb = decimalToRGBHex(color);
-  
   let hex = rgb.hex;
 
   if (hex == '#FFFFFF') {

package/packages/components/com-flcanvas/index.vue

@@ -39,12 +39,14 @@ import { Vector2 } from 'three';
 import DxfParser from 'dxf-parser';
 import DxfParser2 from '@/utils/dxf-parser/DxfParser';
 import jsPDF from 'jspdf';
+import _ from 'lodash'
 import {
   formatEntity,
   handleFn,
   centering,
   _GenerateArcVertices,
   _GenerateBulgeVertices,
+  decimalToRGBHex
 } from './components/entityFormatting';
 export default {
   name: 'Fl2dcanvas',
@@ -79,7 +81,6 @@ export default {
       }
     });
     this.$nextTick(() => {
-      console.log(this.$refs.svgDraw.clientHeight)
       this.konvaStage = new Konva.Stage({
         className: 'stage',
         container: 'konva-container',
@@ -289,133 +290,138 @@ export default {
       }
       const parser2 = new DxfParser2();
       let dxf2 = parser2.parseSync(data);
-
       let hatchEntitys = dxf2.entities.filter(item => item.type === 'HATCH');
       // 处理HATCH部分
       for (let i = 0; i < hatchEntitys.length; i++) {
         let entity = hatchEntitys[i];
         let layerConfig = this.recordLayerConfig[entity.layer];
         let configParams = layerConfig && Object.keys(layerConfig).length > 0 ? layerConfig : null;
-        let color = configParams ? configParams.color : '#000';
+        let entityColor = entity.color;
+        let rgb = entityColor ? decimalToRGBHex(entityColor) : {hex: '#FFFFFF'};
+        let hex = rgb.hex;
+        if (hex == '#FFFFFF') {
+          hex = '#000';
+        }
+        let color = configParams ? configParams.color : hex;
         let visible = configParams ? configParams.visible : true;
         let name = entity.layer.replace(/\s*/g, '');
         // if (entity.type == 'HATCH') {
-          let boundaryLoops = entity.boundaryLoops;
-          if (boundaryLoops && boundaryLoops.length > 0) {
-            for (let j = 0; j < boundaryLoops.length; j++) {
-              let list = [];
-              let edges = boundaryLoops[j].edges;
-              if (edges != undefined) {
-                for (let k = 0; k < edges.length; k++) {
-                  let entity = edges[k];
-                  if (entity.type == 3) {
-                    let majorAxisEndPoint = entity.end;
-                    let center = entity.start;
-                    const xR = Math.sqrt(
-                      majorAxisEndPoint.x * majorAxisEndPoint.x +
-                        majorAxisEndPoint.y * majorAxisEndPoint.y
-                    );
-                    const axisRatio = entity.radius;
-                    const yR = xR * axisRatio;
-                    const rotation = Math.atan2(majorAxisEndPoint.y, majorAxisEndPoint.x);
-
-                    const arcVertices = _GenerateArcVertices({
-                      vertices: [],
-                      center,
-                      radius: xR,
-                      startAngle: parseFloat(entity.startAngle),
-                      endAngle: parseFloat(entity.endAngle),
-                      yRadius: yR,
-                      ccwAngleDir: entity.isCcw,
-                    });
-
-                    if (rotation !== 0) {
-                      //XXX should account angDir?
-                      const cos = Math.cos(rotation);
-                      const sin = Math.sin(rotation);
-                      for (const v of arcVertices) {
-                        const tx = v.x - center.x;
-                        const ty = v.y - center.y;
-                        /* Rotate the vertex around the ellipse center point. */
-                        v.x = tx * cos - ty * sin + center.x;
-                        v.y = tx * sin + ty * cos + center.y;
-                      }
-                    }
-                    //let list = [];
-                    for (let i = 0; i < arcVertices.length; i++) {
-                      list.push(arcVertices[i].x);
-                      list.push(-parseFloat(arcVertices[i].y));
+        let boundaryLoops = entity.boundaryLoops;
+        if (boundaryLoops && boundaryLoops.length > 0) {
+          for (let j = 0; j < boundaryLoops.length; j++) {
+            let list = [];
+            let edges = boundaryLoops[j].edges;
+            if (edges != undefined) {
+              for (let k = 0; k < edges.length; k++) {
+                let entity = edges[k];
+                if (entity.type == 3) {
+                  let majorAxisEndPoint = entity.end;
+                  let center = entity.start;
+                  const xR = Math.sqrt(
+                    majorAxisEndPoint.x * majorAxisEndPoint.x +
+                      majorAxisEndPoint.y * majorAxisEndPoint.y
+                  );
+                  const axisRatio = entity.radius;
+                  const yR = xR * axisRatio;
+                  const rotation = Math.atan2(majorAxisEndPoint.y, majorAxisEndPoint.x);
+
+                  const arcVertices = _GenerateArcVertices({
+                    vertices: [],
+                    center,
+                    radius: xR,
+                    startAngle: parseFloat(entity.startAngle),
+                    endAngle: parseFloat(entity.endAngle),
+                    yRadius: yR,
+                    ccwAngleDir: entity.isCcw,
+                  });
+
+                  if (rotation !== 0) {
+                    //XXX should account angDir?
+                    const cos = Math.cos(rotation);
+                    const sin = Math.sin(rotation);
+                    for (const v of arcVertices) {
+                      const tx = v.x - center.x;
+                      const ty = v.y - center.y;
+                      /* Rotate the vertex around the ellipse center point. */
+                      v.x = tx * cos - ty * sin + center.x;
+                      v.y = tx * sin + ty * cos + center.y;
                     }
                   }
-                  if (entity.type == 1) {
-                    list.push(entity.start.x);
-                    list.push(-parseFloat(entity.start.y));
-                    list.push(entity.end.x);
-                    list.push(-parseFloat(entity.end.y));
-                    //konvaLayer.add(line);
+                  //let list = [];
+                  for (let i = 0; i < arcVertices.length; i++) {
+                    list.push(arcVertices[i].x);
+                    list.push(-parseFloat(arcVertices[i].y));
                   }
-                  let line = new Konva.Line({
-                    points: list,
-                    name: name,
-                    entityId: entity.layer,
-                    strokeWidth: 0.2,
-                    closed: true,
-                    fill: color,
-                    stroke: color,
-                    customColor: color,
-                    visible: visible,
-                    shapeType: 'hatch',
-                  });
-                  this.konvaLayer.add(line);
                 }
-              } else {
-                let boundaryLoops = entity.boundaryLoops;
-                let loop = boundaryLoops[0];
-                if (loop.type == 7) {
-                  let vertices = [];
-                  for (let vtxIdx = 0; vtxIdx < loop.polyline.vertices.length; vtxIdx++) {
-                    const vtx = loop.polyline.vertices[vtxIdx];
-                    if ((vtx.bulge ?? 0) == 0) {
+                if (entity.type == 1) {
+                  list.push(entity.start.x);
+                  list.push(-parseFloat(entity.start.y));
+                  list.push(entity.end.x);
+                  list.push(-parseFloat(entity.end.y));
+                  //konvaLayer.add(line);
+                }
+                let line = new Konva.Line({
+                  points: list,
+                  name: name,
+                  entityId: entity.layer,
+                  strokeWidth: 0.2,
+                  closed: true,
+                  fill: color,
+                  stroke: color,
+                  customColor: color,
+                  visible: visible,
+                  shapeType: 'hatch',
+                });
+                this.konvaLayer.add(line);
+              }
+            } else {
+              let boundaryLoops = entity.boundaryLoops;
+              let loop = boundaryLoops[0];
+              if (loop.type == 7) {
+                let vertices = [];
+                for (let vtxIdx = 0; vtxIdx < loop.polyline.vertices.length; vtxIdx++) {
+                  const vtx = loop.polyline.vertices[vtxIdx];
+                  if ((vtx.bulge ?? 0) == 0) {
+                    vertices.push(new Vector2(vtx.x, vtx.y));
+                  } else {
+                    const prevVtx =
+                      loop.polyline.vertices[
+                        vtxIdx == 0 ? loop.polyline.vertices.length - 1 : vtxIdx - 1
+                      ];
+                    if ((prevVtx.bulge ?? 0) == 0) {
+                      /* Start vertex is not produced by _GenerateBulgeVertices(). */
                       vertices.push(new Vector2(vtx.x, vtx.y));
-                    } else {
-                      const prevVtx =
-                        loop.polyline.vertices[
-                          vtxIdx == 0 ? loop.polyline.vertices.length - 1 : vtxIdx - 1
-                        ];
-                      if ((prevVtx.bulge ?? 0) == 0) {
-                        /* Start vertex is not produced by _GenerateBulgeVertices(). */
-                        vertices.push(new Vector2(vtx.x, vtx.y));
-                      }
-                      const nextVtx =
-                        loop.polyline.vertices[
-                          vtxIdx == loop.polyline.vertices.length - 1 ? 0 : vtxIdx + 1
-                        ];
-                      vertices = _GenerateBulgeVertices([], vtx, nextVtx, vtx.bulge);
                     }
+                    const nextVtx =
+                      loop.polyline.vertices[
+                        vtxIdx == loop.polyline.vertices.length - 1 ? 0 : vtxIdx + 1
+                      ];
+                    vertices = _GenerateBulgeVertices([], vtx, nextVtx, vtx.bulge);
                   }
-                  let list = [];
-                  for (let i = 0; i < vertices.length; i++) {
-                    list.push(vertices[i].x);
-                    list.push(-parseFloat(vertices[i].y));
-                  }
-
-                  let line = new Konva.Line({
-                    points: list,
-                    strokeWidth: 0.2,
-                    name: name,
-                    entityId: entity.layer,
-                    closed: true,
-                    fill: color,
-                    stroke: color,
-                    customColor: color,
-                    visible: visible,
-                    shapeType: 'hatch',
-                  });
-                  this.konvaLayer.add(line);
                 }
+                let list = [];
+                for (let i = 0; i < vertices.length; i++) {
+                  list.push(vertices[i].x);
+                  list.push(-parseFloat(vertices[i].y));
+                }
+
+                let line = new Konva.Line({
+                  points: list,
+                  strokeWidth: 0.2,
+                  name: name,
+                  entityId: entity.layer,
+                  closed: true,
+                  fill: color,
+                  stroke: color,
+                  customColor: color,
+                  visible: visible,
+                  shapeType: 'hatch',
+                });
+                this.konvaLayer.add(line);
               }
             }
           }
+        }
         // }
       }
       //加载图纸
@@ -452,79 +458,84 @@ export default {
             // if (group[0]?.stroke) {
             //   group[0].stroke = '#000';
             // }
-            let customShape = new Konva.Shape({
-              x: 0,
-              y: 0,
-              strokeWidth: 0.2,
-              name: key.replace(/\s*/g, ''),
-              entityId: key,
-              stroke: shapeGroup[0].stroke,
-              customColor: configParams ? configParams.color : shapeGroup[0].stroke,
-              //visible: configParams ? configParams.visible :true,
-              sceneFunc(context, shape) {
-                context.beginPath();
-                for (let i = 0; i < shapeGroup.length; i++) {
-                  let entity = shapeGroup[i];
-
-                  if (entity.type === 'line') {
-                    context.strokeStyle = entity.stroke;
-                    let x1 = entity.x1;
-                    let y1 = entity.y1;
-                    let x2 = entity.x2;
-                    let y2 = entity.y2;
-                    if (x1 != undefined && y1 != undefined && x2 != undefined && y2 != undefined) {
-                      context.moveTo(x1, -parseFloat(y1));
-                      context.lineTo(x2, -parseFloat(y2));
+            // 根据颜色分组
+            let colorGroup = _.groupBy(shapeGroup, 'stroke');
+            for (const colorKey in colorGroup) {
+              let  entityColorGroup = colorGroup[colorKey]
+              let customShape = new Konva.Shape({
+                x: 0,
+                y: 0,
+                strokeWidth: 0.2,
+                name: key.replace(/\s*/g, ''),
+                entityId: key,
+                stroke: colorKey,
+                customColor: configParams ? configParams.color : colorKey,
+                //visible: configParams ? configParams.visible :true,
+                sceneFunc(context, shape) {
+                  context.beginPath();
+                  for (let i = 0; i < entityColorGroup.length; i++) {
+                    let entity = entityColorGroup[i];
+                    if (entity.type === 'line') {
+                      context.strokeStyle = entity.stroke;
+                      let x1 = entity.x1;
+                      let y1 = entity.y1;
+                      let x2 = entity.x2;
+                      let y2 = entity.y2;
+                      if (x1 != undefined && y1 != undefined && x2 != undefined && y2 != undefined) {
+                        context.moveTo(x1, -parseFloat(y1));
+                        context.lineTo(x2, -parseFloat(y2));
+                      }
+                      let v1 = {};
+                      v1.x = x1;
+                      v1.y = y1;
+                      let v2 = {};
+                      v2.x = x2;
+                      v2.y = y2;
+                      _this.updateBounds(v1);
+                      _this.updateBounds(v2);
                     }
-                    let v1 = {};
-                    v1.x = x1;
-                    v1.y = y1;
-                    let v2 = {};
-                    v2.x = x2;
-                    v2.y = y2;
-                    _this.updateBounds(v1);
-                    _this.updateBounds(v2);
-                  }
-                  if (entity.type === 'polyline') {
-                    context.strokeStyle = entity.stroke;
+                    if (entity.type === 'polyline') {
+                      context.strokeStyle = entity.stroke;
 
-                    let flag = false;
+                      let flag = false;
 
-                    let points = entity.points;
+                      let points = entity.points;
 
-                    let closed = entity.closed;
+                      let closed = entity.closed;
 
-                    for (let j = 0; j < points.length; j++) {
-                      let index = j % 2;
-                      if (index === 0) {
-                        let x = points[j];
-                        let y = points[j + 1];
-                        let point = {};
-                        point.x = x;
-                        point.y = y;
-                        _this.updateBounds(point);
+                      for (let j = 0; j < points.length; j++) {
+                        let index = j % 2;
+                        if (index === 0) {
+                          let x = points[j];
+                          let y = points[j + 1];
+                          let point = {};
+                          point.x = x;
+                          point.y = y;
+                          _this.updateBounds(point);
 
-                        if (j === 0) {
-                          context.moveTo(x, y);
-                        } else {
-                          context.lineTo(x, y);
+                          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 (this.konvaLayer) this.konvaLayer.add(customShape);
+                  // context.closePath();
+                  context.fillStrokeShape(shape);
+                },
+                shapeType: 'shape',
+              });
+              if (this.konvaLayer) this.konvaLayer.add(customShape);
+            }
+
           }
 
         }

package/packages/components/com-graphics/index.vue

@@ -204,8 +204,8 @@ export default {
       occlusionState: {
         // enabled: false,
         enabled: true,
-        previewEnabled: false,
-        // previewEnabled: isDebug,
+        // previewEnabled: false,
+        previewEnabled: isDebug,
         bufferWidth: 1700,
         sampleStride: 1,
         minSampleCount: 5,
@@ -222,8 +222,8 @@ export default {
       },
       isolateMode: false,
       sceneBoundingBoxDebugEnabled: false,
-      collisionObbDebugEnabled: isDebug,
-      // collisionObbDebugEnabled: false,
+      // collisionObbDebugEnabled: isDebug,
+      collisionObbDebugEnabled: false,
       // occlusionBoundsDebugEnabled: isDebug,
       occlusionBoundsDebugEnabled: false,
     };
@@ -1699,7 +1699,8 @@ export default {
         const validGeomTypes = new Set(Object.values(GEOM_TYPES));
         for (let i = 0; i < arr.length; i++) {
           const it = arr[i];
-          if (!validGeomTypes.has(it.geomType)) {
+          const tempGeomType = it.geomType || it.geom_type;
+          if (!validGeomTypes.has(tempGeomType)) {
             continue;
           }
           const minSource = it.min;
@@ -1729,14 +1730,15 @@ export default {
           // 八叉树仍使用 AABB 粗筛，最终碰撞使用 sourceBox 派生的 OBB 精筛
           const boxThree = sourceBox.clone();
 
+          const tempMeshMatrix = it.meshMatrix || it.mesh_matrix;
           const hasMatrix = Array.isArray(it.matrix) && it.matrix.length >= 16;
-          const hasMeshMatrix = Array.isArray(it.meshMatrix) && it.meshMatrix.length >= 16;
+          const hasMeshMatrix = Array.isArray(tempMeshMatrix) && tempMeshMatrix.length >= 16;
           let localMatrix = null;
           let collisionMatrix = null;
           if (hasMatrix || hasMeshMatrix) {
             localMatrix = new this.THREE.Matrix4();
             if (hasMeshMatrix) {
-              localMatrix.fromArray(it.meshMatrix);
+              localMatrix.fromArray(tempMeshMatrix);
             } else {
               localMatrix.identity();
             }
@@ -1767,18 +1769,18 @@ export default {
 
           const userData = {
             flag: it.flag || 1, // 默认为 1
-            geomType: it.geomType,
+            geomType: tempGeomType,
             obbData, // 存储原始 OBB 数据
             transparent: it.transp > 0,
             sourceVisible: it.visible === false ? false : true,
             visible: it.visible === false ? false : true, // 默认显示
             occlusionEnabled:
-              it.geomType === GEOM_TYPES.geom_3d || it.geomType === GEOM_TYPES.geom_3d_obj,
+              tempGeomType === GEOM_TYPES.geom_3d || tempGeomType === GEOM_TYPES.geom_3d_obj,
           };
           if (it.flag === 1) {
             userData.indices = it.indices;
             userData.matrix = localMatrix ? localMatrix.toArray() : it.matrix;
-            userData.meshMatrix = it.meshMatrix;
+            userData.meshMatrix = tempMeshMatrix;
             // userData.matrix = new this.THREE.Matrix4().identity();
           }
           // 如果是 flag=3，解析并存储中心点、半轴长、旋转矩阵

package/packages/utils/StreamLoaderParser.worker.js

@@ -402,26 +402,26 @@ function parsePrimitive(dataView, uint8Array, offset, isFullProps = true) {
     primitive.documentId = '';
   }
 
-  if (dataView.byteLength < offset + 4) {
-    throw new Error('Insufficient data for Material length');
-  }
-  const materialTextLen = dataView.getUint32(offset, false);
-  offset += 4;
-  if (materialTextLen === 0xffffffff) {
-    primitive.material = null;
-  } else if (materialTextLen > 0) {
-    if (dataView.byteLength < offset + materialTextLen) {
-      throw new Error('Insufficient data for Material content');
-    }
-    const textBytes = uint8Array.subarray(offset, offset + materialTextLen);
-    primitive.material = utf8Decoder.decode(textBytes);
-    offset += materialTextLen;
-  } else {
-    primitive.material = '';
-  }
-
-  if (dataView.byteLength < offset + 4) {
-    throw new Error('Insufficient data for GeomText length');
+  if (dataView.byteLength < offset + 4) {
+    throw new Error('Insufficient data for Material length');
+  }
+  const materialTextLen = dataView.getUint32(offset, false);
+  offset += 4;
+  if (materialTextLen === 0xffffffff) {
+    primitive.material = null;
+  } else if (materialTextLen > 0) {
+    if (dataView.byteLength < offset + materialTextLen) {
+      throw new Error('Insufficient data for Material content');
+    }
+    const textBytes = uint8Array.subarray(offset, offset + materialTextLen);
+    primitive.material = utf8Decoder.decode(textBytes);
+    offset += materialTextLen;
+  } else {
+    primitive.material = '';
+  }
+
+  if (dataView.byteLength < offset + 4) {
+    throw new Error('Insufficient data for GeomText length');
   }
   const geomTextLen = dataView.getUint32(offset, false);
   offset += 4;