fl-web-component 2.1.1-beta.1 → 2.1.1-beta.3

package/dist/fl-web-component.css

@@ -1 +1 @@
-@charset "UTF-8";.fl-model-containor[data-v-d40d4870]{width:100%;height:100%;position:relative;cursor:pointer}[data-v-d40d4870] .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-d40d4870] .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-d40d4870] .circle-tag{width:10px;height:10px;margin-top:5px;border-radius:50%;background-color:#ff5000}[data-v-d40d4870] .measure-label-font{word-break:break-all}[data-v-d40d4870] .mark-label-img{padding-top:5px;width:20px;height:20px}.loading-overlay[data-v-d40d4870]{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-d40d4870]{opacity:1;visibility:visible}.loading-content[data-v-d40d4870]{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-d40d4870]{width:40px;height:40px;border:4px solid #f3f3f3;border-top:4px solid #409eff;border-radius:50%;-webkit-animation:spin-d40d4870 1s linear infinite;animation:spin-d40d4870 1s linear infinite;margin:0 auto 20px}@-webkit-keyframes spin-d40d4870{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes spin-d40d4870{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.loading-text[data-v-d40d4870]{font-size:16px;font-weight:500;color:#333;margin-bottom:20px}.loading-this.progress-bar[data-v-d40d4870]{width:100%;height:8px;background-color:#f0f0f0;border-radius:4px;overflow:hidden;margin-bottom:15px}.loading-this.progress-fill[data-v-d40d4870]{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-d40d4870]{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-e2de7752]{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-e9e4a7c2]{width:100%;height:100%;position:relative;cursor:pointer}[data-v-e9e4a7c2] .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-e9e4a7c2] .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-e9e4a7c2] .circle-tag{width:10px;height:10px;margin-top:5px;border-radius:50%;background-color:#ff5000}[data-v-e9e4a7c2] .measure-label-font{word-break:break-all}[data-v-e9e4a7c2] .mark-label-img{padding-top:5px;width:20px;height:20px}.loading-overlay[data-v-e9e4a7c2]{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-e9e4a7c2]{opacity:1;visibility:visible}.loading-content[data-v-e9e4a7c2]{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-e9e4a7c2]{width:40px;height:40px;border:4px solid #f3f3f3;border-top:4px solid #409eff;border-radius:50%;-webkit-animation:spin-e9e4a7c2 1s linear infinite;animation:spin-e9e4a7c2 1s linear infinite;margin:0 auto 20px}@-webkit-keyframes spin-e9e4a7c2{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes spin-e9e4a7c2{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.loading-text[data-v-e9e4a7c2]{font-size:16px;font-weight:500;color:#333;margin-bottom:20px}.loading-this.progress-bar[data-v-e9e4a7c2]{width:100%;height:8px;background-color:#f0f0f0;border-radius:4px;overflow:hidden;margin-bottom:15px}.loading-this.progress-fill[data-v-e9e4a7c2]{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-e9e4a7c2]{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-0f76e7f4]{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.1",
+  "version": "2.1.1-beta.3",
   "scripts": {
     "postinstall": "patch-package",
     "tip1": "仅调试本组件不涉及业务组件,请执行dev",

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

@@ -229,10 +229,11 @@ function drawArc(recordDxf, entity, group, key, configParams) {
     name: key.replace(/\s*/g, ''),
     entityId: key,
     stroke: hex,
-    customColor: configParams ? configParams.color : '',
+    customColor: configParams ? configParams.color : hex,
     strokeWidth: width,
     visible: configParams ? configParams.visible : true,
     oldstrokeLength: width,
+    isGroup: false,
   });
   // if(group.attrs.isBlock){
   //   let scale=group.scale();
@@ -290,10 +291,11 @@ function drawEllpse(recordDxf, entity, group, key, configParams) {
     name: key.replace(/\s*/g, ''),
     entityId: key,
     stroke: configParams ? configParams.color : '#000',
-    customColor: configParams ? configParams.color : '',
+    customColor: configParams ? configParams.color : '#000',
     strokeWidth: width,
     visible: configParams ? configParams.visible : true,
     oldstrokeLength: width,
+    isGroup: false,
   });
   // let line = new Konva.Line({
   //   name: key.replace(/\s*/g, ""),
@@ -331,7 +333,7 @@ function drawLine(recordDxf, entity, group, key, configParams) {
     entityId: key,
     isGroup: false,
     stroke: hex,
-    customColor: configParams ? configParams.color : '',
+    customColor: configParams ? configParams.color : hex,
     strokeWidth: width,
     visible: configParams ? configParams.visible : true,
     oldstrokeLength: width,
@@ -385,13 +387,14 @@ function drawText(recordDxf, entity, group, key, configParams) {
     align: 'left',
     verticalAlign: 'top',
     fill: hex,
-    customColor: configParams ? configParams.color : '',
+    customColor: configParams ? configParams.color : hex,
     name: key.replace(/\s*/g, ''),
     entityId: key,
     fontFamily: 'SimSun',
     visible: configParams ? configParams.visible : true,
     stroke: hex,
     strokeWidth: 0.1,
+    shapeType: 'text',
   });
 
   if (entity.xScale) {
@@ -451,6 +454,7 @@ function drawText(recordDxf, entity, group, key, configParams) {
     entityId: key,
     visible: configParams ? configParams.visible : true,
     customColor: configParams ? configParams.color : '',
+    isGroup: true,
   });
   g.add(dim);
 
@@ -491,9 +495,10 @@ function drawLwLine(recordDxf, entity, group, key, configParams) {
     points: list,
     closed: closed,
     name: key.replace(/\s*/g, ''),
+    isGroup: false,
     entityId: key,
     stroke: hex,
-    customColor: configParams ? configParams.color : '',
+    customColor: configParams ? configParams.color : hex,
     strokeWidth: width,
     visible: configParams ? configParams.visible : true,
     oldstrokeLength: width,
@@ -534,7 +539,7 @@ function drawSpline(recordDxf, entity, group, key, configParams) {
     entityId: key,
     isGroup: false,
     stroke: configParams ? configParams : '#000',
-    customColor: configParams ? configParams.color : '',
+    customColor: configParams ? configParams.color : '#000',
     strokeWidth: width,
     visible: configParams ? configParams.visible : true,
     oldstrokeLength: width,

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

@@ -457,7 +457,7 @@ export default {
             name: key.replace(/\s*/g, ''),
             entityId: key,
             stroke: group[0].stroke,
-            customColor: configParams ? configParams.color : '',
+            customColor: configParams ? configParams.color : group[0].stroke,
             //visible: configParams ? configParams.visible :true,
             sceneFunc(context, shape) {
               context.beginPath();
@@ -520,6 +520,7 @@ export default {
               // context.closePath();
               context.fillStrokeShape(shape);
             },
+            shapeType: 'shape',
           });
           if (this.konvaLayer) this.konvaLayer.add(customShape);
         }
@@ -818,10 +819,43 @@ export default {
       this.konvaLayer = null;
       this.konvaStage = null;
     },
-    beforeDestroy() {
-      this.clearCache();
+    // 更改图纸的色系 区分明暗两种 darkness 暗色系 bright 明亮
+    setColorScheme(colorType) {
+      // const backgroundColor = colorType === "darkness" ? "#000" : "transparent";
+      const color = colorType === "darkness" ? "#fff" : "#000";
+      // konvaStage.container().style.background = backgroundColor;
+      this.konvaLayer.children.forEach((item) => {
+        this.traverseLayer(item, color);
+      });
+    },
+    
+    traverseLayer(obj, color) {
+      if (!obj.attrs.isGroup) {
+        if (color === '#fff') {
+         let setColor = (obj.attrs.customColor === '#000' || obj.attrs.customColor === '#000000'|| obj.attrs.customColor === 'rgb(0, 0, 0)' || obj.attrs.customColor === 'rgba(0, 0, 0, 1)') ? color : obj.attrs.customColor
+          if (obj.attrs.shapeType === 'hatch' || obj.attrs.shapeType === 'text') {
+            obj.setFill(setColor);
+          }
+          obj.setStroke(setColor);
+          obj.attrs.oldCustomColor = obj.attrs.customColor
+          obj.attrs.customColor = setColor
+        } else {
+          obj.attrs.customColor = obj.attrs.oldCustomColor
+          if (obj.attrs.shapeType === 'hatch' || obj.attrs.shapeType === 'text') {
+            obj.setFill(obj.attrs.customColor);
+          }
+          obj.setStroke(obj.attrs.customColor);
+        }
+      } else {
+        obj.children.forEach((item) => {
+          this.traverseLayer(item, color);
+        });
+      }
     },
   },
+  beforeDestroy() {
+    this.clearCache();
+  }
 };
 </script>
 <style lang="scss" scoped>

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

@@ -165,7 +165,7 @@ import { onContextHandle } from './component/context';
 
 const isDebug = process.env.NODE_ENV !== 'production' || process.env.VUE_APP_IS_WATCH === true;
 // const isDebug = false;
-const COLLISION_PENETRATION_EPSILON = 10;
+const COLLISION_PENETRATION_EPSILON = 1;
 const COLLISION_OBB_AXIS_EPSILON = 1e-8;
 const COLLISION_DEBUG_GROUP_NAME = '__collision_obb_debug_group__';
 
@@ -215,7 +215,8 @@ export default {
         isPaused: false,
       },
       isolateMode: false,
-      collisionObbDebugEnabled: isDebug,
+      // collisionObbDebugEnabled: isDebug,
+      collisionObbDebugEnabled: false,
     };
   },
   watch: {
@@ -1805,6 +1806,53 @@ export default {
       }
       node.items.push({ id, box });
     },
+    _buildCollisionOctreeFromEntries(entries) {
+      if (!Array.isArray(entries) || entries.length === 0) {
+        return null;
+      }
+
+      let minX = Infinity;
+      let minY = Infinity;
+      let minZ = Infinity;
+      let maxX = -Infinity;
+      let maxY = -Infinity;
+      let maxZ = -Infinity;
+
+      entries.forEach(item => {
+        const box = item && item.box;
+        if (!box || !box.isBox3) return;
+        const mn = box.min;
+        const mx = box.max;
+        if (mn.x < minX) minX = mn.x;
+        if (mn.y < minY) minY = mn.y;
+        if (mn.z < minZ) minZ = mn.z;
+        if (mx.x > maxX) maxX = mx.x;
+        if (mx.y > maxY) maxY = mx.y;
+        if (mx.z > maxZ) maxZ = mx.z;
+      });
+
+      if (minX === Infinity) {
+        return null;
+      }
+
+      const rootBox = new this.THREE.Box3(
+        new this.THREE.Vector3(minX, minY, minZ),
+        new this.THREE.Vector3(maxX, maxY, maxZ)
+      );
+      const root = {
+        box: rootBox,
+        items: [],
+        children: null,
+        depth: 0,
+      };
+
+      entries.forEach(item => {
+        if (!item || !item.box) return;
+        this._octreeInsert(root, String(item.id), item.box);
+      });
+
+      return root;
+    },
     _isCollisionBoxAvailable(box) {
       if (!box || !box.isBox3 || box.isEmpty()) return false;
       if (box.userData && box.userData.visible === false) return false;
@@ -1935,7 +1983,8 @@ export default {
     _buildCollisionPairMap() {
       const pairMap = new Map();
       const collisionPairs = this.getOctreeCollisionPairs();
-      const pairs = collisionPairs && Array.isArray(collisionPairs.pairs) ? collisionPairs.pairs : [];
+      const pairs =
+        collisionPairs && Array.isArray(collisionPairs.pairs) ? collisionPairs.pairs : [];
       for (let i = 0; i < pairs.length; i++) {
         const pair = pairs[i];
         if (!pair) continue;
@@ -2071,9 +2120,8 @@ export default {
       }
       return false;
     },
-    _queryOctreeByBox(box) {
+    _queryOctreeByBoxWithRoot(root, box) {
       const results = [];
-      const root = this._octree;
       if (!root || !this._isCollisionBoxAvailable(box)) return results;
 
       const stack = [root];
@@ -2099,25 +2147,88 @@ export default {
 
       return results;
     },
-    getOctreeCollisionPairs() {
+    _queryOctreeByBox(box) {
+      return this._queryOctreeByBoxWithRoot(this._octree, box);
+    },
+    getOctreeCollisionPairs(options = {}) {
       const pairs = [];
       if (!this._boxIndex || this._boxIndex.size === 0) return { pairs };
 
-      if (!this._octree) {
-        this.buildOctreeFromBoxIndex();
+      const normalizeIds = value =>
+        Array.isArray(value)
+          ? Array.from(
+              new Set(
+                value
+                  .map(item => (item === null || item === undefined ? '' : String(item)))
+                  .filter(item => item !== '')
+              )
+            )
+          : [];
+
+      const getEntriesByIds = ids => {
+        const entries = [];
+        const idSet = new Set(ids);
+        this._boxIndex.forEach((box, id) => {
+          const key = String(id);
+          if (idSet.has(key)) {
+            entries.push({
+              id: key,
+              box,
+            });
+          }
+        });
+        return entries;
+      };
+
+      const sourceIds = normalizeIds(options.sourceIds);
+      const targetIds = normalizeIds(options.targetIds);
+      const includeIds = Array.isArray(options.includeIds) ? normalizeIds(options.includeIds) : [];
+
+      let root = this._octree;
+      let sourceEntries = [];
+      let dedupePairKeySet = null;
+
+      if (sourceIds.length > 0 && targetIds.length > 0) {
+        const targetEntries = getEntriesByIds(targetIds);
+        sourceEntries = getEntriesByIds(sourceIds);
+        if (sourceEntries.length === 0 || targetEntries.length === 0) return { pairs };
+        root = this._buildCollisionOctreeFromEntries(targetEntries);
+        if (!root) return { pairs };
+        dedupePairKeySet = new Set();
+      } else if (includeIds.length > 0) {
+        sourceEntries = getEntriesByIds(includeIds);
+        if (sourceEntries.length === 0) return { pairs };
+        root = this._buildCollisionOctreeFromEntries(sourceEntries);
+        if (!root) return { pairs };
+      } else {
+        if (!this._octree) {
+          this.buildOctreeFromBoxIndex();
+        }
+        if (!this._octree) return { pairs };
+        this._boxIndex.forEach((box, id) => {
+          sourceEntries.push({
+            id: String(id),
+            box,
+          });
+        });
       }
-      if (!this._octree) return { pairs };
 
-      this._boxIndex.forEach((boxA, idA) => {
+      sourceEntries.forEach(({ id: idA, box: boxA }) => {
         if (!this._isCollisionBoxAvailable(boxA)) return;
 
-        const hits = this._queryOctreeByBox(boxA);
+        const hits = this._queryOctreeByBoxWithRoot(root, boxA);
         for (let i = 0; i < hits.length; i++) {
           const item = hits[i];
           if (!item || String(item.id) === String(idA)) continue;
           const boxB = item.box;
           if (!this._isCollisionBoxMatched(boxA, boxB)) continue;
 
+          if (dedupePairKeySet) {
+            const pairKey = `${String(idA)}__${String(item.id)}`;
+            if (dedupePairKeySet.has(pairKey)) continue;
+            dedupePairKeySet.add(pairKey);
+          }
+
           pairs.push({
             idA: this._formatCollisionPairId(idA),
             idB: this._formatCollisionPairId(item.id),