fl-web-component 2.0.19-beta.0 → 2.0.19-beta.2

package/dist/fl-web-component.css

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

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

@@ -165,6 +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 = 0.1;
 
 export default {
   name: 'FlModel',
@@ -1769,6 +1770,84 @@ export default {
       }
       node.items.push({ id, box });
     },
+    _isCollisionBoxAvailable(box) {
+      if (!box || !box.isBox3 || box.isEmpty()) return false;
+      if (box.userData && box.userData.visible === false) return false;
+      return true;
+    },
+    _formatCollisionPairId(id) {
+      const value = String(id);
+      const numberValue = Number(value);
+      return Number.isFinite(numberValue) ? numberValue : id;
+    },
+    _getBoxMinPenetration(boxA, boxB) {
+      const x = Math.min(boxA.max.x - boxB.min.x, boxB.max.x - boxA.min.x);
+      const y = Math.min(boxA.max.y - boxB.min.y, boxB.max.y - boxA.min.y);
+      const z = Math.min(boxA.max.z - boxB.min.z, boxB.max.z - boxA.min.z);
+      return Math.min(x, y, z);
+    },
+    _isCollisionBoxMatched(boxA, boxB) {
+      if (!this._isCollisionBoxAvailable(boxA) || !this._isCollisionBoxAvailable(boxB))
+        return false;
+      if (!boxA.intersectsBox(boxB)) return false;
+      return this._getBoxMinPenetration(boxA, boxB) > COLLISION_PENETRATION_EPSILON;
+    },
+    _queryOctreeByBox(box) {
+      const results = [];
+      const root = this._octree;
+      if (!root || !this._isCollisionBoxAvailable(box)) return results;
+
+      const stack = [root];
+      while (stack.length) {
+        const node = stack.pop();
+        if (!node || !node.box || !this._isCollisionBoxMatched(node.box, box)) continue;
+
+        if (node.children) {
+          for (let i = 0; i < 8; i++) {
+            stack.push(node.children[i]);
+          }
+        }
+
+        if (node.items && node.items.length) {
+          for (let i = 0; i < node.items.length; i++) {
+            const item = node.items[i];
+            if (item && this._isCollisionBoxMatched(item.box, box)) {
+              results.push(item);
+            }
+          }
+        }
+      }
+
+      return results;
+    },
+    getOctreeCollisionPairs() {
+      const pairs = [];
+      if (!this._boxIndex || this._boxIndex.size === 0) return { pairs };
+
+      if (!this._octree) {
+        this.buildOctreeFromBoxIndex();
+      }
+      if (!this._octree) return { pairs };
+
+      this._boxIndex.forEach((boxA, idA) => {
+        if (!this._isCollisionBoxAvailable(boxA)) return;
+
+        const hits = this._queryOctreeByBox(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;
+
+          pairs.push({
+            idA: this._formatCollisionPairId(idA),
+            idB: this._formatCollisionPairId(item.id),
+          });
+        }
+      });
+
+      return { pairs };
+    },
     _getCurrentFrustum() {
       // 确保相机矩阵是最新的
       if (this.camera) {
@@ -3804,6 +3883,7 @@ export default {
       this.skipNextRenderFrame = true;
 
       const intersects = this.getRaycasterObjects(event);
+      console.log(intersects)
       const shouldBlockCamera = intersects.some(item =>
         this.isActiveTransformControlIntersection(item)
       );
@@ -3838,9 +3918,12 @@ export default {
       this.mouse.x = (x / rect.width) * 2 - 1;
       this.mouse.y = -(y / rect.height) * 2 + 1;
       this.raycaster.setFromCamera(this.mouse, this.camera);
-      return this.scene && this.scene.children
-        ? this.raycaster.intersectObjects(this.scene.children, true)
-        : [];
+      if (this.scene && this.scene.children) {
+        let intersects = this.raycaster.intersectObjects(this.scene.children, true)
+        return intersects.filter(item => item.object.type === 'Mesh')
+      }
+      return []
+
     },
     isTransformControlIntersection(intersection) {
       let current = intersection && intersection.object ? intersection.object : null;

package/src/utils/threejs/measure-clear-distance.js

@@ -45,10 +45,17 @@ MeasureClearDistance.prototype = {
 
     _this.raycaster.setFromCamera(mouse, this.camera);
     let intersects = _this.raycaster.intersectObjects(_this.scene.children, true);
-    if (intersects.length > 0) {
-      return intersects[0]
+    let l = intersects.length
+    let obj = null
+    if (l > 0) {
+      for (let index = 0; index < l; index++) {
+        if (intersects[index].object.type === 'Mesh') {
+          obj = intersects[index]
+          break
+        }
+      }
     }
-    return null
+    return obj
   },
   createLine(p1, p2, config = { color: 0xff0000 }) {
     const lineMaterial = new THREE.LineBasicMaterial({
@@ -91,10 +98,15 @@ MeasureClearDistance.prototype = {
     let lastTime = new Date().getTime();
     if (lastTime - this.firstTime < 300) {
       const measureObj = _this.getPosition(e);
-
+      console.log(measureObj)
       if (measureObj) {
         _this.selectedObjects.push(measureObj)
-
+        // 高亮选中的
+        // const instanceInfo = measureObj.object.userData?.instancesMap?.get(measureObj.object.name);
+        // const { instanceIndex } = instanceInfo;
+        let instanceIndex = measureObj.instanceId
+        measureObj.object.setColorAt(instanceIndex, new THREE.Color(0x53a8ff));
+        measureObj.object.instanceColor.needsUpdate = true;
         if (_this.selectedObjects.length % 2 === 0) {
           _this.calculateClearDistance()
         }
@@ -109,13 +121,29 @@ MeasureClearDistance.prototype = {
     const obj1 = this.selectedObjects[l - 2];
     const obj2 = this.selectedObjects[l - 1];
     const isParallel = this.checkParallelism(obj1.object, obj1.instanceId, obj2.object, obj2.instanceId);
-    console.log(isParallel)
-    const pts1 = this.getInstanceSurfacePoints(obj1.object, obj1.instanceId, 600);
-    const pts2 = this.getInstanceSurfacePoints(obj2.object, obj2.instanceId, 600);
-    if (pts1.length === 0 || pts2.length === 0) {
+
+    if (!isParallel) {
+      Message.warning('请选择两个平行的物体');
       return
     }
-    const closestPair = this.findClosestPair(pts1, pts2);
+    // 全局采样
+    const localPts1 = this.sampleGlobal(obj1.object.geometry, 1000);
+    const localPts2 = this.sampleGlobal(obj2.object.geometry, 1000);
+    const wm1 = this.getInstanceWorldMatrix(obj1.object, obj1.instanceId);
+    const wm2 = this.getInstanceWorldMatrix(obj2.object, obj2.instanceId);
+    const worldPts1 = localPts1.map(p => p.clone().applyMatrix4(wm1));
+    const worldPts2 = localPts2.map(p => p.clone().applyMatrix4(wm2));
+    let closestPair = this.findClosestPair(worldPts1, worldPts2);
+    // 局部精细搜索
+    const radius = closestPair.distance * 2 + 0.1;
+    const localPts1Fine = this.sampleLocal(obj1.object, obj1.instanceId, closestPair.point1, radius, 1000);
+    const localPts2Fine = this.sampleLocal(obj2.object, obj2.instanceId, closestPair.point2, radius, 1000);
+    const combined1 = worldPts1.filter(p => p.distanceTo(closestPair.point1) < radius).concat(localPts1Fine);
+    const combined2 = worldPts2.filter(p => p.distanceTo(closestPair.point2) < radius).concat(localPts2Fine);
+    if (combined1.length > 0 && combined2.length > 0) {
+      closestPair = this.findClosestPair(combined1, combined2, true);
+    }
+
     const position = new THREE.Vector3((closestPair.point1.x + closestPair.point2.x) / 2, (closestPair.point1.y + closestPair.point2.y) / 2, (closestPair.point1.z + closestPair.point2.z) / 2);
     // 将测量结果显示在页面中
     const circleTag1 = this.createLabel('circle-tag', '', closestPair.point1);
@@ -131,109 +159,84 @@ MeasureClearDistance.prototype = {
     this.scene.add(line);
     this.scene.add(label);
   },
-  getInstanceSurfacePoints(instancedMesh, instanceId, maxPoints = 1000) {
-    const geometry = instancedMesh.geometry;
-    // let localPoints = this.generateGenericLocalPoints(geometry, maxPoints);
-    let localPoints = this.sampleGeometrySurface(geometry, maxPoints);
-    const worldMatrix = this.getInstanceWorldMatrix(instancedMesh, instanceId);
-    const worldPoints = localPoints.map(p => p.clone().applyMatrix4(worldMatrix));
-    return worldPoints.slice(0, maxPoints);
-  },
-  sampleGeometrySurface(geometry, maxPoints = 600) {
-    const positions = geometry.getAttribute('position');
-    if (!positions) return [];
-
-    // 获取三角形（优先使用索引）
-    let triangles = [];
-    if (geometry.index) {
-      const index = geometry.index.array;
-      for (let i = 0; i < index.length; i += 3) {
-        const a = new THREE.Vector3(positions.getX(index[i]), positions.getY(index[i]), positions.getZ(index[i]));
-        const b = new THREE.Vector3(positions.getX(index[i + 1]), positions.getY(index[i + 1]), positions.getZ(index[i + 1]));
-        const c = new THREE.Vector3(positions.getX(index[i + 2]), positions.getY(index[i + 2]), positions.getZ(index[i + 2]));
-        triangles.push([a, b, c]);
-      }
-    } else {
-      // 无索引时，每三个顶点组成一个三角形
-      for (let i = 0; i < positions.count; i += 3) {
-        const a = new THREE.Vector3(positions.getX(i), positions.getY(i), positions.getZ(i));
-        const b = new THREE.Vector3(positions.getX(i + 1), positions.getY(i + 1), positions.getZ(i + 1));
-        const c = new THREE.Vector3(positions.getX(i + 2), positions.getY(i + 2), positions.getZ(i + 2));
-        triangles.push([a, b, c]);
-      }
-    }
-
+  // 全部采样
+  sampleGlobal(geometry, maxPoints = 600) {
+    const triangles = this.extractTriangles(geometry);
     if (triangles.length === 0) return [];
-
-    // 计算每个三角形的面积
-    const areas = triangles.map(([a, b, c]) => {
-      const ab = new THREE.Vector3().subVectors(b, a);
-      const ac = new THREE.Vector3().subVectors(c, a);
+    const areas = triangles.map(t => {
+      const ab = new THREE.Vector3().subVectors(t.b, t.a);
+      const ac = new THREE.Vector3().subVectors(t.c, t.a);
       return new THREE.Vector3().crossVectors(ab, ac).length() * 0.5;
     });
-    const totalArea = areas.reduce((sum, a) => sum + a, 0);
-
-    // 按面积比例分配采样点数
+    const totalArea = areas.reduce((s, a) => s + a, 0);
     const points = [];
     for (let i = 0; i < triangles.length; i++) {
-      const [a, b, c] = triangles[i];
-      const area = areas[i];
-      let samplesForFace = Math.round((area / totalArea) * maxPoints);
-      if (samplesForFace < 1 && points.length < maxPoints) samplesForFace = 1; // 确保每个面至少一个点
-
-      for (let j = 0; j < samplesForFace; j++) {
-        // 重心坐标随机采样
-        const u = Math.random();
-        const v = Math.random() * (1 - u);
-        const w = 1 - u - v;
-        const point = new THREE.Vector3()
-          .addScaledVector(a, u)
-          .addScaledVector(b, v)
-          .addScaledVector(c, w);
-        points.push(point);
+      const { a, b, c } = triangles[i];
+      const count = Math.max(1, Math.round((areas[i] / totalArea) * maxPoints));
+      for (let j = 0; j < count; j++) {
+        const u = Math.random(), v = Math.random() * (1 - u), w = 1 - u - v;
+        points.push(new THREE.Vector3().addScaledVector(a, u).addScaledVector(b, v).addScaledVector(c, w));
       }
     }
-
-    // 如果点数不够，随机补充
     while (points.length < maxPoints) {
-      const triIdx = Math.floor(Math.random() * triangles.length);
-      const [a, b, c] = triangles[triIdx];
-      const u = Math.random();
-      const v = Math.random() * (1 - u);
-      const w = 1 - u - v;
-      points.push(new THREE.Vector3().addScaledVector(a, u).addScaledVector(b, v).addScaledVector(c, w));
+      const t = triangles[Math.floor(Math.random() * triangles.length)];
+      const u = Math.random(), v = Math.random() * (1 - u), w = 1 - u - v;
+      points.push(new THREE.Vector3().addScaledVector(t.a, u).addScaledVector(t.b, v).addScaledVector(t.c, w));
     }
     return points.slice(0, maxPoints);
   },
-  generateGenericLocalPoints(geometry, maxPoints = 1000) {
+  // 局部采样
+  sampleLocal(instancedMesh, instanceId, centerWorld, radius, pointsCount = 300) {
+    const worldMatrix = this.getInstanceWorldMatrix(instancedMesh, instanceId);
+    const invMatrix = new THREE.Matrix4().copy(worldMatrix).invert();
+    const centerLocal = centerWorld.clone().applyMatrix4(invMatrix);
+    const triangles = this.extractTriangles(instancedMesh.geometry);
+    if (triangles.length === 0) return [];
+
+    const relevantTris = triangles.filter(t => {
+      const box = new THREE.Box3().setFromPoints([t.a, t.b, t.c]);
+      return box.distanceToPoint(centerLocal) <= radius;
+    });
+    if (relevantTris.length === 0) return [];
+
+    const localPoints = [];
+    const perTri = Math.ceil(pointsCount / relevantTris.length);
+    for (const { a, b, c } of relevantTris) {
+      for (let j = 0; j < perTri; j++) {
+        const u = Math.random(), v = Math.random() * (1 - u), w = 1 - u - v;
+        const pt = new THREE.Vector3().addScaledVector(a, u).addScaledVector(b, v).addScaledVector(c, w);
+        if (pt.distanceTo(centerLocal) <= radius) localPoints.push(pt);
+      }
+    }
+    while (localPoints.length < pointsCount && relevantTris.length > 0) {
+      const { a, b, c } = relevantTris[Math.floor(Math.random() * relevantTris.length)];
+      const u = Math.random(), v = Math.random() * (1 - u), w = 1 - u - v;
+      const pt = new THREE.Vector3().addScaledVector(a, u).addScaledVector(b, v).addScaledVector(c, w);
+      if (pt.distanceTo(centerLocal) <= radius) localPoints.push(pt);
+    }
+    return localPoints.map(p => p.clone().applyMatrix4(worldMatrix));
+  },
+  extractTriangles(geometry) {
     const pos = geometry.getAttribute('position');
     if (!pos) return [];
-    const allVerts = [];
-    for (let i = 0; i < pos.count; i++) {
-      allVerts.push(new THREE.Vector3(pos.getX(i), pos.getY(i), pos.getZ(i)));
-    }
-    let sourceVerts = allVerts;
+    const triangles = [];
     if (geometry.index) {
-      const indexArr = geometry.index.array;
-      const seen = new Set();
-      sourceVerts = [];
-      for (let i = 0; i < indexArr.length; i++) {
-        const v = allVerts[indexArr[i]];
-        const key = `${v.x.toFixed(4)},${v.y.toFixed(4)},${v.z.toFixed(4)}`;
-        if (!seen.has(key)) {
-          seen.add(key);
-          sourceVerts.push(v.clone());
-        }
+      const idx = geometry.index.array;
+      for (let i = 0; i < idx.length; i += 3) {
+        const a = new THREE.Vector3(pos.getX(idx[i]), pos.getY(idx[i]), pos.getZ(idx[i]));
+        const b = new THREE.Vector3(pos.getX(idx[i + 1]), pos.getY(idx[i + 1]), pos.getZ(idx[i + 1]));
+        const c = new THREE.Vector3(pos.getX(idx[i + 2]), pos.getY(idx[i + 2]), pos.getZ(idx[i + 2]));
+        triangles.push({ a, b, c });
+      }
+    } else {
+      for (let i = 0; i < pos.count; i += 3) {
+        const a = new THREE.Vector3(pos.getX(i), pos.getY(i), pos.getZ(i));
+        const b = new THREE.Vector3(pos.getX(i + 1), pos.getY(i + 1), pos.getZ(i + 1));
+        const c = new THREE.Vector3(pos.getX(i + 2), pos.getY(i + 2), pos.getZ(i + 2));
+        triangles.push({ a, b, c });
       }
     }
-    if (sourceVerts.length > maxPoints) {
-      const step = Math.ceil(sourceVerts.length / maxPoints);
-      const sampled = [];
-      for (let i = 0; i < sourceVerts.length; i += step) sampled.push(sourceVerts[i]);
-      sourceVerts = sampled;
-    }
-    return sourceVerts;
-
+    return triangles;
   },
   findClosestPair(points1, points2) {
     let minDist = Infinity;
@@ -241,8 +244,8 @@ MeasureClearDistance.prototype = {
     const c2 = new THREE.Vector3();
     for (const p1 of points1) {
       for (const p2 of points2) {
-        const d = p1.distanceTo(p2);
-        if (d < minDist) {
+        const d = Number((p1.distanceTo(p2)).toFixed(2));
+        if (d <= minDist) {
           minDist = d;
           c1.copy(p1);
           c2.copy(p2);
@@ -251,38 +254,49 @@ MeasureClearDistance.prototype = {
     }
     return { point1: c1, point2: c2, distance: minDist };
   },
-
-  // 平行判断 (基于包围盒主轴方向)
   checkParallelism(inst1, id1, inst2, id2) {
+    // 1. 获取世界矩阵
     const mat1 = this.getInstanceWorldMatrix(inst1, id1);
     const mat2 = this.getInstanceWorldMatrix(inst2, id2);
-    const box1 = new THREE.Box3();
-    const box2 = new THREE.Box3();
-
-    // 确保包围盒存在
-    if (!inst1.geometry.boundingBox) inst1.geometry.computeBoundingBox();
-    if (!inst2.geometry.boundingBox) inst2.geometry.computeBoundingBox();
-
-    box1.copy(inst1.geometry.boundingBox).applyMatrix4(mat1);
-    box2.copy(inst2.geometry.boundingBox).applyMatrix4(mat2);
 
-    const size1 = new THREE.Vector3(); box1.getSize(size1);
-    const size2 = new THREE.Vector3(); box2.getSize(size2);
+    // 2. 提取纯旋转部分（消除缩放和位移）
+    const rotMat1 = new THREE.Matrix4().extractRotation(mat1);
+    const rotMat2 = new THREE.Matrix4().extractRotation(mat2);
 
-    const getMainDir = (s) => {
-      if (s.x >= s.y && s.x >= s.z) return new THREE.Vector3(1, 0, 0);
-      if (s.y >= s.x && s.y >= s.z) return new THREE.Vector3(0, 1, 0);
-      return new THREE.Vector3(0, 0, 1);
+    // 如果物体可能有非均匀缩放，extractRotation 可能会出错，
+    // 更稳健的方法是手动归一化列向量
+    const normalizeMatrix = (m) => {
+        const col0 = new THREE.Vector3().setFromMatrixColumn(m, 0).normalize();
+        const col1 = new THREE.Vector3().setFromMatrixColumn(m, 1).normalize();
+        const col2 = new THREE.Vector3().setFromMatrixColumn(m, 2).normalize();
+        const normMat = new THREE.Matrix4();
+        normMat.makeBasis(col0, col1, col2);
+        return normMat;
     };
-    const d1 = getMainDir(size1);
-    const d2 = getMainDir(size2);
+    const cleanRot1 = normalizeMatrix(rotMat1);
+    const cleanRot2 = normalizeMatrix(rotMat2);
 
-    const rot1 = new THREE.Quaternion().setFromRotationMatrix(new THREE.Matrix4().extractRotation(mat1));
-    const rot2 = new THREE.Quaternion().setFromRotationMatrix(new THREE.Matrix4().extractRotation(mat2));
-    d1.applyQuaternion(rot1);
-    d2.applyQuaternion(rot2);
+    // 3. 定义三个基向量（局部坐标系的X, Y, Z轴）
+    const axes = [
+        new THREE.Vector3(1, 0, 0),
+        new THREE.Vector3(0, 1, 0),
+        new THREE.Vector3(0, 0, 1)
+    ];
 
-    return Math.abs(d1.dot(d2)) > 0.95;
+    // 4. 检查是否有任意一对基向量在世界空间中平行
+    const threshold = 0.99; // 提高阈值，更严格
+    for (const axis1 of axes) {
+        // 将局部基向量转换到世界方向
+        const worldDir1 = axis1.clone().applyMatrix4(cleanRot1).normalize();
+        for (const axis2 of axes) {
+            const worldDir2 = axis2.clone().applyMatrix4(cleanRot2).normalize();
+            const dot = Math.abs(worldDir1.dot(worldDir2));
+            if (dot > threshold) {
+                return true; // 只要有一对方向平行即判为平行
+            }
+        }
+    }
+    return false;
   },
   getInstanceWorldMatrix(instancedMesh, instanceId) {
     const matrix = new THREE.Matrix4();
@@ -303,10 +317,22 @@ MeasureClearDistance.prototype = {
       this.polyline.splice(0);
       this.labels.splice(0);
       this.firstTime = 0;
+      this.selectedObjects.forEach(item => {
+        let instanceIndex = item.instanceId
+        item.object.setColorAt(instanceIndex, item.object.material.userData.nColor);
+        item.object.instanceColor.needsUpdate = true;
+      })
+      this.selectedObjects.splice(0)
     }
     this.renderer.domElement.style.cursor = 'pointer';
   },
   clear() {
+    this.selectedObjects.forEach(item => {
+      let instanceIndex = item.instanceId
+      item.object.setColorAt(instanceIndex, item.object.material.userData.nColor);
+      item.object.instanceColor.needsUpdate = true;
+    })
+    this.selectedObjects.splice(0)
     this.remove(this.points);
     this.remove(this.polyline);
     this.remove(this.labels);