fl-web-component 2.0.0-beta.7 → 2.0.0-beta.8

package/dist/fl-web-component.css

@@ -1 +1 @@
-@charset "UTF-8";#fl-model[data-v-268ad8af]{width:100%;height:100%;cursor:pointer}[data-v-268ad8af] .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-268ad8af] .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-268ad8af] .circle-tag{width:10px;height:10px;margin-top:5px;border-radius:50%;background-color:#ff5000}[data-v-268ad8af] .measure-label-font{word-break:break-all}[data-v-268ad8af] .mark-label-img{padding-top:5px;width:20px;height:20px}.loading-overlay[data-v-268ad8af]{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-268ad8af]{opacity:1;visibility:visible}.loading-content[data-v-268ad8af]{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-268ad8af]{width:40px;height:40px;border:4px solid #f3f3f3;border-top:4px solid #409eff;border-radius:50%;-webkit-animation:spin-268ad8af 1s linear infinite;animation:spin-268ad8af 1s linear infinite;margin:0 auto 20px}@-webkit-keyframes spin-268ad8af{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes spin-268ad8af{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.loading-text[data-v-268ad8af]{font-size:16px;font-weight:500;color:#333;margin-bottom:20px}.loading-progress-bar[data-v-268ad8af]{width:100%;height:8px;background-color:#f0f0f0;border-radius:4px;overflow:hidden;margin-bottom:15px}.loading-progress-fill[data-v-268ad8af]{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-268ad8af]{font-size:12px;color:#666;line-height:1.5}.lil-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-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-gui .controller{border-bottom:1px solid #f1f3f4!important;background:transparent!important}.lil-gui .controller:last-child{border-bottom:none!important}.lil-gui .controller .name{color:#495057!important;font-weight:500!important;font-size:12px!important}.lil-gui .controller .widget{background:#f8f9fa!important;border:1px solid #ced4da!important;border-radius:4px!important;color:#495057!important}.lil-gui .controller .widget:focus,.lil-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-gui .controller .widget:focus{outline:none!important}.lil-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-gui .controller.number .fill{border-right:solid #008de9}.lil-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-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-gui .controller .option{background:#fff!important;color:#495057!important;border-bottom:1px solid #f1f3f4!important}.lil-gui .controller .option:hover{background:#f8f9fa!important}.lil-gui .controller .option:last-child{border-bottom:none!important}.lil-gui input:active{background:#e6eff4}.lil-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-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-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-gui .controller.number .slider,.lil-gui .controller.number .slider:hover{background-color:#e6eff4}.lil-gui input,.lil-gui input:hover,.lil-gui input[type=number]:focus,.lil-gui input[type=text]:focus{background:#e6eff4}.lil-gui .controller>.name{min-width:25px}.lil-gui .controller.number input{color:#2e3136}.lil-gui .controller.number .slider:active{background-color:#e6eff4}.lil-gui .folder>.title{background:linear-gradient(135deg,#f1f3f4,#e9ecef)!important;color:#495057!important;border-bottom:1px solid #dee2e6!important}.lil-gui .folder>.title:before{color:#6c757d!important}.lil-gui .folder.closed>.children{display:none!important}#konva-container[data-v-459d4d3b]{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-5f081c10]{position:relative;width:100%;height:100%;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden}.classification_title[data-v-5f081c10]{margin:0 0 10px 0;color:#fff;font-size:14px;cursor:default}.toolbar[data-v-5f081c10]{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-5f081c10],.text_toolbar[data-v-5f081c10]{float:left;width:32px;height:32px;padding:0!important;background-repeat:no-repeat;background-size:24px;background-position:50%}.icon_active[data-v-5f081c10],.icon_toolbar[data-v-5f081c10]:hover,.text_toolbar[data-v-5f081c10]:hover{background-color:#eee}[data-v-5f081c10].icon_color .el-color-picker__trigger{height:24px;margin-top:4px;width:24px!important}[data-v-5f081c10].el-color-picker--medium,[data-v-5f081c10].el-color-picker--medium .el-color-picker__trigger{width:24px!important;height:24px!important}.canvas_container[data-v-5f081c10]{position:relative;width:100%;height:100%;overflow:auto;-webkit-box-sizing:border-box;box-sizing:border-box}.canvas_container canvas[data-v-5f081c10]{position:absolute;left:0}.canvas_container #ctx_front[data-v-5f081c10]{z-index:5;background-color:transparent}.canvas_container #ctx_back[data-v-5f081c10]{z-index:3}.canvas_container #ctx_base[data-v-5f081c10]{z-index:1}#text[data-v-5f081c10]{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-5f081c10]:hover{border:1px dashed #53a8ff}#svg-component[data-v-6e1600cc],#svg-tigger[data-v-6e1600cc]{cursor:pointer;height:100%;width:100%;position:relative}#toolbar-show[data-v-6e1600cc]{z-index:20;position:absolute;top:0;left:0;background:#fff}#three-box[data-v-5504c19e],#toolbar-show[data-v-6e1600cc]{width:100%;height:100%;overflow:hidden}
+@charset "UTF-8";#fl-model[data-v-5e18bf7c]{width:100%;height:100%;cursor:pointer}[data-v-5e18bf7c] .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-5e18bf7c] .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-5e18bf7c] .circle-tag{width:10px;height:10px;margin-top:5px;border-radius:50%;background-color:#ff5000}[data-v-5e18bf7c] .measure-label-font{word-break:break-all}[data-v-5e18bf7c] .mark-label-img{padding-top:5px;width:20px;height:20px}.loading-overlay[data-v-5e18bf7c]{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-5e18bf7c]{opacity:1;visibility:visible}.loading-content[data-v-5e18bf7c]{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-5e18bf7c]{width:40px;height:40px;border:4px solid #f3f3f3;border-top:4px solid #409eff;border-radius:50%;-webkit-animation:spin-5e18bf7c 1s linear infinite;animation:spin-5e18bf7c 1s linear infinite;margin:0 auto 20px}@-webkit-keyframes spin-5e18bf7c{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes spin-5e18bf7c{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.loading-text[data-v-5e18bf7c]{font-size:16px;font-weight:500;color:#333;margin-bottom:20px}.loading-progress-bar[data-v-5e18bf7c]{width:100%;height:8px;background-color:#f0f0f0;border-radius:4px;overflow:hidden;margin-bottom:15px}.loading-progress-fill[data-v-5e18bf7c]{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-5e18bf7c]{font-size:12px;color:#666;line-height:1.5}.lil-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-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-gui .controller{border-bottom:1px solid #f1f3f4!important;background:transparent!important}.lil-gui .controller:last-child{border-bottom:none!important}.lil-gui .controller .name{color:#495057!important;font-weight:500!important;font-size:12px!important}.lil-gui .controller .widget{background:#f8f9fa!important;border:1px solid #ced4da!important;border-radius:4px!important;color:#495057!important}.lil-gui .controller .widget:focus,.lil-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-gui .controller .widget:focus{outline:none!important}.lil-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-gui .controller.number .fill{border-right:solid #008de9}.lil-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-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-gui .controller .option{background:#fff!important;color:#495057!important;border-bottom:1px solid #f1f3f4!important}.lil-gui .controller .option:hover{background:#f8f9fa!important}.lil-gui .controller .option:last-child{border-bottom:none!important}.lil-gui input:active{background:#e6eff4}.lil-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-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-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-gui .controller.number .slider,.lil-gui .controller.number .slider:hover{background-color:#e6eff4}.lil-gui input,.lil-gui input:hover,.lil-gui input[type=number]:focus,.lil-gui input[type=text]:focus{background:#e6eff4}.lil-gui .controller>.name{min-width:25px}.lil-gui .controller.number input{color:#2e3136}.lil-gui .controller.number .slider:active{background-color:#e6eff4}.lil-gui .folder>.title{background:linear-gradient(135deg,#f1f3f4,#e9ecef)!important;color:#495057!important;border-bottom:1px solid #dee2e6!important}.lil-gui .folder>.title:before{color:#6c757d!important}.lil-gui .folder.closed>.children{display:none!important}#konva-container[data-v-459d4d3b]{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-5f081c10]{position:relative;width:100%;height:100%;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden}.classification_title[data-v-5f081c10]{margin:0 0 10px 0;color:#fff;font-size:14px;cursor:default}.toolbar[data-v-5f081c10]{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-5f081c10],.text_toolbar[data-v-5f081c10]{float:left;width:32px;height:32px;padding:0!important;background-repeat:no-repeat;background-size:24px;background-position:50%}.icon_active[data-v-5f081c10],.icon_toolbar[data-v-5f081c10]:hover,.text_toolbar[data-v-5f081c10]:hover{background-color:#eee}[data-v-5f081c10].icon_color .el-color-picker__trigger{height:24px;margin-top:4px;width:24px!important}[data-v-5f081c10].el-color-picker--medium,[data-v-5f081c10].el-color-picker--medium .el-color-picker__trigger{width:24px!important;height:24px!important}.canvas_container[data-v-5f081c10]{position:relative;width:100%;height:100%;overflow:auto;-webkit-box-sizing:border-box;box-sizing:border-box}.canvas_container canvas[data-v-5f081c10]{position:absolute;left:0}.canvas_container #ctx_front[data-v-5f081c10]{z-index:5;background-color:transparent}.canvas_container #ctx_back[data-v-5f081c10]{z-index:3}.canvas_container #ctx_base[data-v-5f081c10]{z-index:1}#text[data-v-5f081c10]{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-5f081c10]:hover{border:1px dashed #53a8ff}#svg-component[data-v-6e1600cc],#svg-tigger[data-v-6e1600cc]{cursor:pointer;height:100%;width:100%;position:relative}#toolbar-show[data-v-6e1600cc]{z-index:20;position:absolute;top:0;left:0;background:#fff}#three-box[data-v-5504c19e],#toolbar-show[data-v-6e1600cc]{width:100%;height:100%;overflow:hidden}

package/package.json

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

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

@@ -365,7 +365,6 @@ function drawLine(recordDxf, entity, group, key, configParams) {
     // group.add(line);
 }
 function drawText(recordDxf, entity, group, key, configParams) {
-
     let color=entity.color;
     let rgb=decimalToRGBHex(color);
     console.log(rgb);
@@ -400,6 +399,17 @@ function drawText(recordDxf, entity, group, key, configParams) {
         stroke: hex,
         strokeWidth:0.1,
     });
+    let width=dim.getTextWidth()
+    //let clientRect=dim.getClientRect()
+    //let clientWidth=clientRect.width;
+
+    if(entity.halign){
+        if(entity.halign==1){
+            dim.attrs.x= dim.attrs.x-(width/2);
+        }
+    }
+
+
     if (entity.rotation) {
         if(entity.rotation==90||parseInt(entity.rotation)==90||parseInt(entity.rotation)==89||parseInt(entity.rotation)==450) {
             dim.attrs.x = parseFloat(x) - fontSize;
@@ -414,8 +424,59 @@ function drawText(recordDxf, entity, group, key, configParams) {
         if(entity.rotation==360||parseFloat(entity.rotation)==360){
             dim.attrs.y=  -parseFloat(y) - fontSize;
         }
+        if(parseInt(entity.rotation)==30||parseInt(entity.rotation)==29) {
+            //dim.attrs.x=  parseFloat(x) -200;
+
+            //console.log("rect");
+            //console.log(rect);
+            dim.attrs.y=  -parseFloat(y) - fontSize*0.85;
+            dim.attrs.x = parseFloat(x) - fontSize*0.85;
+            if(text.length>9){
+                let width=dim.getTextWidth()
+                //let clientRect=dim.getClientRect()
+                //let clientWidth=clientRect.width;
+                dim.attrs.y=  -parseFloat(y) +fontSize;
+                if(entity.halign){
+                    if(entity.halign==1){
+                        dim.attrs.x= dim.attrs.x-(width/2);
+                    }
+
+                }
+                if (entity.valign === 3) {          // Middle
+                    dim.attrs.x= dim.attrs.x+1;
+                    dim.attrs.y = -parseFloat(y) +fontSize*1.8 ;
+                }
+            }else{
+                if (entity.valign === 3) {          // Middle
+                    dim.attrs.x= dim.attrs.x+1;
+                    dim.attrs.y = -parseFloat(y)  ;
+                }
+            }
+        }
+        if(parseInt(entity.rotation)==330||parseInt(entity.rotation)==329) {
+            //dim.attrs.x=  parseFloat(x) -200;
+
+            //console.log("rect");
+            //console.log(rect);
+            dim.attrs.y=  -parseFloat(y) -fontSize;
+            dim.attrs.x = parseFloat(x) +0.5;
+        }
+        if(parseInt(entity.rotation)==60||parseInt(entity.rotation)==60) {
+            //dim.attrs.x=  parseFloat(x) -200;
+
+            //console.log("rect");
+            //console.log(rect);
+            dim.attrs.y=  -parseFloat(y) ;
+            dim.attrs.x = parseFloat(x) -fontSize;
+        }
+
+
+        // dim.attrs.y=  -parseFloat(y)+ fontSize*0.8;
+
         dim.attrs.rotation = 360-entity.rotation ;
+
     }else{
+
         // 支持 DXF 垂直对齐（valign），仅在未旋转时按插入点对齐
         if (entity.valign === 2) {          // Middle
             dim.attrs.y = -parseFloat(y) - fontSize / 2;
@@ -429,16 +490,7 @@ function drawText(recordDxf, entity, group, key, configParams) {
         dim.attrs.fontSize =(fontSize+0.35)* entity.xScale;
     }
 
-    let width=dim.getTextWidth()
-    //let clientRect=dim.getClientRect()
-    //let clientWidth=clientRect.width;
 
-    if(entity.halign){
-        if(entity.halign==1){
-            dim.attrs.x= dim.attrs.x-(width*1.15/2);
-
-        }
-    }
 
     //dim.attrs.x= dim.attrs.x-parseFloat(2);
     group.push({

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

@@ -2294,7 +2294,9 @@ export default {
 
     /**
      * 初始化流式加载器（别名 init）
-     * @param {Object} config - 其他配置
+     * @param {Object} config - 配置项
+     * @param {Object} config.modelApi - 模型API接口
+     * @param {string} [config.projectId] - 项目ID
      */
     init(config = {}) {
       this.initStreamLoader(config.modelApi, config);
@@ -2304,6 +2306,7 @@ export default {
      * 初始化流式加载器
      * @param {Object} modelApi - 模型API接口
      * @param {Object} config - 其他配置
+     * @param {string} [config.projectId] - 项目ID
      */
     initStreamLoader(modelApi, config = {}) {
       const { projectId, ...restConfig } = config || {};

package/src/utils/flgltf-parser.js

@@ -1,245 +1,245 @@
-import * as THREE from 'three';
-
-const NODE_TYPES = {
-  pbsGrp: 1,
-  major: 2,
-  model: 3,
-};
-
-  // 处理mesh数据，生成drawObjs
-function processMeshData(input, options) {
-  const drawObjMap = new Map();
-
-  if (!input.mesh) {
-    return [];
-  }
-
-  input.mesh.forEach(meshItem => {
-    const geomList = [];
-    meshItem.primitives.forEach(primitive => {
-      const primitiveData = input.primitive.find(g => g.id === primitive.prmid);
-      if (primitiveData) {
-        const material = input.material?.find(m => m.id === primitiveData.material);
-        const prop = {
-          color: material?.color || [255, 255, 255, 1],
-          fontsize: material?.fontsize !== undefined ? material?.fontsize : 20,
-          frontname: material?.frontname !== undefined ? material?.frontname : '',
-          italic: material?.italic,
-          linepacing: 1, // 默认值
-          linewidth: material?.linewidth !== undefined ? material?.linewidth : 1, // 默认值
-          visible: material?.visible === false ? false : true,
-          transparent: material?.transp !== undefined ? material?.transp : 0,
-        };
-
-        const identity = new THREE.Matrix4().identity();
-
-        geomList.push({
-          matrix: {
-            val: primitive.matrix?.length ? primitive.matrix : identity.elements,
-            // val: identity.elements,
-          },
-          // originMatrix: meshItem.id == primitive.prmid ? [] : identity.elements,
-          prmid: primitive.prmid,
-          geomId: primitiveData.id,
-          type: primitiveData.geomType,
-          text: primitiveData.geomText,
-          points: primitiveData.position,
-          alignType: primitiveData.alignType,
-          normals: primitiveData.normal,
-          triangles: primitiveData.indices || [],
-          max: primitiveData.max,
-          min: primitiveData.min,
-          prop: prop,
-        });
-      }
-    });
-
-    drawObjMap.set(meshItem.id, {
-      drawObjId: meshItem.id,
-      geoms: geomList,
-      // lodLevel: meshItem.type || 2,
-    });
-  });
-
-  return Array.from(drawObjMap.values());
-}
-
-// 处理node数据，生成instances
-function processNodeData(input, options) {
-  const flatNode = options?.flatNode;
-
-  function flattenAndComputeWorldMatrices(
-    nodes,
-    result = [],
-    // parentWorldMatrix = null,
-    fatherId = ''
-  ) {
-    for (const node of nodes) {
-      const { category, instanceId, matrix, children, drawObject, groupId, nodeType } = node;
-
-      // 构造本地矩阵
-      let localMatrix;
-      if (matrix && matrix.val) {
-        localMatrix = new THREE.Matrix4().fromArray(matrix.val);
-      } else {
-        localMatrix = new THREE.Matrix4().identity(); // 默认为单位矩阵
-      }
-
-      // 计算世界矩阵
-      // const worldMatrix = parentWorldMatrix
-      //   ? parentWorldMatrix.clone().multiply(localMatrix)
-      //   : localMatrix.clone();
-      const worldMatrix = localMatrix.clone();
-
-      // 构造输出节点
-      result.push({
-        drawObject,
-        category,
-        instanceId,
-        // matrix,
-        matrix: {
-          val: Array.from(worldMatrix.toArray()),
-        },
-        fatherId,
-        groupId,
-        nodeType,
-      });
-
-      // 递归处理子节点，传递当前世界矩阵
-      if (children) {
-        flattenAndComputeWorldMatrices(children, result, instanceId);
-      }
-    }
-
-    return result;
-  }
-
-  if(!flatNode){
-    const formatInstances = [];
-    const preNode = input.node ? input.node : generateNode(input.mesh);
-    const rootInstances = parseNode(preNode);
-    flattenAndComputeWorldMatrices(rootInstances, formatInstances);
-
-    return formatInstances
-  }else{
-    return parseNode(input.node, flatNode);
-  }
-}
-
-// 处理一个primitive，生成多个drawObj
-function processOnePrimtiveToMultiMesh(primitive){
-  return {
-    instanceId: primitive.drawObjId, // 实例与drawObj一对多关系
-    drawObject: primitive.geoms[0]?.prmid || '',
-    matrix: primitive.geoms[0]?.matrix || [],
-  }
-}
-
-// 主解析函数，整合两个独立模块的结果
-function parseData(input, options) {
-  const drawObjs = processMeshData(input, options);
-  const instances = drawObjs.map((item) => {
-    return processOnePrimtiveToMultiMesh(item); // 实例与drawObj一对多关系
-  })
-  // const instances = drawObjs.map((item) => {
-  //   return {
-  //     instanceId: item.drawObjId, // 实例与drawObj一对一关系
-  //     drawObject: item.drawObjId,
-  //   }
-  // })
-  // const instances = processNodeData(input);
-
-  const map = {
-    drawObjs,
-    instances,
-  };
-  // console.log('parseData', map);
-  return map;
-}
-
-// 递归处理节点实例
-function parseNode(node, isFlatNode) {
-  function processInstance(instance, parentInstanceId, instanceMap, groupId, isFlatNode) {
-    const newInstance = {
-      category: instance.category || instance.name,
-      drawObject: instance.drawObject || instance.mesh,
-      fatherId: parentInstanceId || '',
-      instanceId: instance.id || instance.batchId,
-      matrix: instance.matrix,
-      children: [],
-      nodeType: instance.nodeType,
-      groupId: instance.nodeType === NODE_TYPES.pbsGrp ? instance._batchId : groupId,
-    };
-
-    if(!isFlatNode){
-      // 处理子实例
-      if (instance.children && instance.children.length > 0) {
-        instance.children.forEach(childId => {
-          const childInstance = instanceMap.get(childId);
-          if (childInstance) {
-            const processedChild = processInstance(
-              childInstance,
-              instance._batchId,
-              instanceMap,
-              newInstance.groupId
-            );
-            newInstance.children.push(processedChild);
-          }
-        });
-      }
-    }
-
-    return newInstance;
-  }
-
-  const rootInstances = [];
-  // 创建实例映射
-  if(!isFlatNode){
-    const instanceMap = new Map();
-    node.forEach(instance => {
-      instanceMap.set(instance.id, instance);
-    });
-
-    // 处理根实例
-    instanceMap.forEach(instance => {
-      let isRoot = true;
-      instanceMap.forEach(otherInstance => {
-        if (otherInstance.children && otherInstance.children.includes(instance.id)) {
-          isRoot = false;
-        }
-      });
-      if (isRoot) {
-        const processed = processInstance(instance, instance._batchId, instanceMap);
-        rootInstances.push(processed);
-      }
-    });
-  }else{
-    // 处理根实例
-    node.forEach(instance => {
-      const processed = processInstance(instance, instance._batchId, {}, 0, isFlatNode);
-      rootInstances.push(processed);
-    });
-  }
-  return rootInstances
-}
-// 生成默认node节点
-function generateNode(mesh) {
-  let nodes = [];
-  mesh.forEach(item => {
-    if (item.primitives.length) {
-      let tempNode = {
-        id: item.id,
-        _batchId: item.id,
-        name: item.id,
-        mesh: item.id,
-        matrix: {},
-        nodeType: 3,
-      };
-      nodes.push(tempNode);
-    }
-  });
-
-  return nodes;
-}
-
-export { parseData, parseNode, processMeshData, processNodeData };
+import * as THREE from 'three';
+
+const NODE_TYPES = {
+  pbsGrp: 1,
+  major: 2,
+  model: 3,
+};
+
+  // 处理mesh数据，生成drawObjs
+function processMeshData(input, options) {
+  const drawObjMap = new Map();
+
+  if (!input.mesh) {
+    return [];
+  }
+
+  input.mesh.forEach(meshItem => {
+    const geomList = [];
+    meshItem.primitives.forEach(primitive => {
+      const primitiveData = input.primitive.find(g => g.id === primitive.prmid);
+      if (primitiveData) {
+        const material = input.material?.find(m => m.id === primitiveData.material);
+        const prop = {
+          color: material?.color || [255, 255, 255, 1],
+          fontsize: material?.fontsize !== undefined ? material?.fontsize : 20,
+          frontname: material?.frontname !== undefined ? material?.frontname : '',
+          italic: material?.italic,
+          linepacing: 1, // 默认值
+          linewidth: material?.linewidth !== undefined ? material?.linewidth : 1, // 默认值
+          visible: material?.visible === false ? false : true,
+          transparent: material?.transp !== undefined ? material?.transp : 0,
+        };
+
+        const identity = new THREE.Matrix4().identity();
+
+        geomList.push({
+          matrix: {
+            val: primitive.matrix?.length ? primitive.matrix : identity.elements,
+            // val: identity.elements,
+          },
+          // originMatrix: meshItem.id == primitive.prmid ? [] : identity.elements,
+          prmid: primitive.prmid,
+          geomId: primitiveData.id,
+          type: primitiveData.geomType,
+          text: primitiveData.geomText,
+          points: primitiveData.position,
+          alignType: primitiveData.alignType,
+          normals: primitiveData.normal,
+          triangles: primitiveData.indices || [],
+          max: primitiveData.max,
+          min: primitiveData.min,
+          prop: prop,
+        });
+      }
+    });
+
+    drawObjMap.set(meshItem.id, {
+      drawObjId: meshItem.id,
+      geoms: geomList,
+      // lodLevel: meshItem.type || 2,
+    });
+  });
+
+  return Array.from(drawObjMap.values());
+}
+
+// 处理node数据，生成instances
+function processNodeData(input, options) {
+  const flatNode = options?.flatNode;
+
+  function flattenAndComputeWorldMatrices(
+    nodes,
+    result = [],
+    // parentWorldMatrix = null,
+    fatherId = ''
+  ) {
+    for (const node of nodes) {
+      const { category, instanceId, matrix, children, drawObject, groupId, nodeType } = node;
+
+      // 构造本地矩阵
+      let localMatrix;
+      if (matrix && matrix.val) {
+        localMatrix = new THREE.Matrix4().fromArray(matrix.val);
+      } else {
+        localMatrix = new THREE.Matrix4().identity(); // 默认为单位矩阵
+      }
+
+      // 计算世界矩阵
+      // const worldMatrix = parentWorldMatrix
+      //   ? parentWorldMatrix.clone().multiply(localMatrix)
+      //   : localMatrix.clone();
+      const worldMatrix = localMatrix.clone();
+
+      // 构造输出节点
+      result.push({
+        drawObject,
+        category,
+        instanceId,
+        // matrix,
+        matrix: {
+          val: Array.from(worldMatrix.toArray()),
+        },
+        fatherId,
+        groupId,
+        nodeType,
+      });
+
+      // 递归处理子节点，传递当前世界矩阵
+      if (children) {
+        flattenAndComputeWorldMatrices(children, result, instanceId);
+      }
+    }
+
+    return result;
+  }
+
+  if(!flatNode){
+    const formatInstances = [];
+    const preNode = input.node ? input.node : generateNode(input.mesh);
+    const rootInstances = parseNode(preNode);
+    flattenAndComputeWorldMatrices(rootInstances, formatInstances);
+
+    return formatInstances
+  }else{
+    return parseNode(input.node, flatNode);
+  }
+}
+
+// 处理一个primitive，生成多个drawObj
+function processOnePrimtiveToMultiMesh(primitive){
+  return {
+    instanceId: primitive.drawObjId, // 实例与drawObj一对多关系
+    drawObject: primitive.geoms[0]?.prmid || '',
+    matrix: primitive.geoms[0]?.matrix || [],
+  }
+}
+
+// 主解析函数，整合两个独立模块的结果
+function parseData(input, options) {
+  const drawObjs = processMeshData(input, options);
+  const instances = drawObjs.map((item) => {
+    return processOnePrimtiveToMultiMesh(item); // 实例与drawObj一对多关系
+  })
+  // const instances = drawObjs.map((item) => {
+  //   return {
+  //     instanceId: item.drawObjId, // 实例与drawObj一对一关系
+  //     drawObject: item.drawObjId,
+  //   }
+  // })
+  // const instances = processNodeData(input);
+
+  const map = {
+    drawObjs,
+    instances,
+  };
+  // console.log('parseData', map);
+  return map;
+}
+
+// 递归处理节点实例
+function parseNode(node, isFlatNode) {
+  function processInstance(instance, parentInstanceId, instanceMap, groupId, isFlatNode) {
+    const newInstance = {
+      category: instance.category || instance.name,
+      drawObject: instance.drawObject || instance.mesh,
+      fatherId: parentInstanceId || '',
+      instanceId: instance.id || instance.batchId,
+      matrix: instance.matrix,
+      children: [],
+      nodeType: instance.nodeType,
+      groupId: instance.nodeType === NODE_TYPES.pbsGrp ? instance._batchId : groupId,
+    };
+
+    if(!isFlatNode){
+      // 处理子实例
+      if (instance.children && instance.children.length > 0) {
+        instance.children.forEach(childId => {
+          const childInstance = instanceMap.get(childId);
+          if (childInstance) {
+            const processedChild = processInstance(
+              childInstance,
+              instance._batchId,
+              instanceMap,
+              newInstance.groupId
+            );
+            newInstance.children.push(processedChild);
+          }
+        });
+      }
+    }
+
+    return newInstance;
+  }
+
+  const rootInstances = [];
+  // 创建实例映射
+  if(!isFlatNode){
+    const instanceMap = new Map();
+    node.forEach(instance => {
+      instanceMap.set(instance.id, instance);
+    });
+
+    // 处理根实例
+    instanceMap.forEach(instance => {
+      let isRoot = true;
+      instanceMap.forEach(otherInstance => {
+        if (otherInstance.children && otherInstance.children.includes(instance.id)) {
+          isRoot = false;
+        }
+      });
+      if (isRoot) {
+        const processed = processInstance(instance, instance._batchId, instanceMap);
+        rootInstances.push(processed);
+      }
+    });
+  }else{
+    // 处理根实例
+    node.forEach(instance => {
+      const processed = processInstance(instance, instance._batchId, {}, 0, isFlatNode);
+      rootInstances.push(processed);
+    });
+  }
+  return rootInstances
+}
+// 生成默认node节点
+function generateNode(mesh) {
+  let nodes = [];
+  mesh.forEach(item => {
+    if (item.primitives.length) {
+      let tempNode = {
+        id: item.id,
+        _batchId: item.id,
+        name: item.id,
+        mesh: item.id,
+        matrix: {},
+        nodeType: 3,
+      };
+      nodes.push(tempNode);
+    }
+  });
+
+  return nodes;
+}
+
+export { parseData, parseNode, processMeshData, processNodeData };