mxdraw 0.1.106 → 0.1.108

package/dist/index.d.ts

@@ -1839,7 +1839,7 @@ interface MxFunType {
     openFile(sFile: string | string[], useWebsocket: boolean): boolean;
     getMxJigCmdManager(): CmdMangerType;
     loadSVG(url: string, color?: number | string | THREE.Color, callResult?: any, loadSet?: any): void;
-    getTHREE(): typeof window.THREE;
+    getTHREE(): any;
 }
 /**
  * MxFun 模块
@@ -3583,21 +3583,24 @@ declare class MxDbRegularPolygon extends MxDbEntity {
  * */
 declare class MxDbLeadComment extends MxDbEntity {
     /** 标注点 */
-    point1: THREE.Vector3;
+    point1: three.Vector3;
     /** 文字显示位置 */
-    point2: THREE.Vector3;
+    point2: three.Vector3;
     /** 文字内容 */
     text: string;
     /** 文字高度 */
     textHeight: number;
     textWidth: number;
+    /** 文字大小，取屏幕像素绘图单位。 */
+    fixedSize: boolean;
     getTypeName(): string;
     create(): MxDbEntity;
     worldDraw(pWorldDraw: McGiWorldDraw): void;
-    getGripPoints(): Array<THREE.Vector3>;
-    moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
+    getGripPoints(): Array<three.Vector3>;
+    moveGripPointsAt(index: number, offset: three.Vector3): boolean;
     dwgIn(obj: any): boolean;
     dwgOut(obj: any): object;
+    protected onViewChange(): boolean;
 }
 
 /**
@@ -3616,6 +3619,9 @@ declare class MxDbRectBoxLeadComment extends MxDbEntity {
     textHeight: number;
     /** 云线的半圆弧半径 */
     radius: number;
+    textWidth: number;
+    /** 文字大小，取屏幕像素绘图单位。 */
+    fixedSize: boolean;
     getTypeName(): string;
     create(): MxDbEntity;
     worldDraw(pWorldDraw: McGiWorldDraw): void;
@@ -3623,6 +3629,7 @@ declare class MxDbRectBoxLeadComment extends MxDbEntity {
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
     dwgIn(obj: any): boolean;
     dwgOut(obj: any): object;
+    protected onViewChange(): boolean;
 }
 
 /**

package/dist/lib/MxModule/MxDbLeadComment/index.d.ts

@@ -1,4 +1,5 @@
 /** @module MxDbLeadComment*/
+import * as THREE from 'three';
 import McGiWorldDraw from '../McGiWorldDraw';
 import MxDbEntity from '../MxDbEntity';
 /**
@@ -14,6 +15,8 @@ export default class MxDbLeadComment extends MxDbEntity {
     /** 文字高度 */
     textHeight: number;
     textWidth: number;
+    /** 文字大小，取屏幕像素绘图单位。 */
+    fixedSize: boolean;
     getTypeName(): string;
     create(): MxDbEntity;
     worldDraw(pWorldDraw: McGiWorldDraw): void;
@@ -21,4 +24,5 @@ export default class MxDbLeadComment extends MxDbEntity {
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
     dwgIn(obj: any): boolean;
     dwgOut(obj: any): object;
+    protected onViewChange(): boolean;
 }

package/dist/lib/MxModule/MxDbLeadComment/index.js

@@ -1 +1 @@
-import MxDbEntity from"../MxDbEntity";import MxThreeJS from"../MxThreeJS";export default class MxDbLeadComment extends MxDbEntity{constructor(){super(...arguments),this.point1=new THREE.Vector3,this.point2=new THREE.Vector3,this.text="",this.textHeight=20,this.textWidth=0}getTypeName(){return"MxDbLeadComment"}create(){return new MxDbLeadComment}worldDraw(t){if(t.drawLine(this.point1,this.point2),this.text.length>0){const i=new THREE.Vector3;let e=MxThreeJS.clacTextSpriteSize(this.text,this.textHeight,this.textWidth);i.x=this.point2.x+.5*e.spritewidth,i.y=this.point2.y+.5*e.spriteheight,t.drawText(this.text,this.textHeight,0,i,this.textWidth);const h=new THREE.Vector3;h.x=this.point2.x+e.textwidth,h.y=this.point2.y,t.drawLine(h,this.point2)}}getGripPoints(){let t=[];return t.push(this.point1),t.push(this.point2),t}moveGripPointsAt(t,i){return 0==t?this.point1.add(i):1==t&&this.point2.add(i),!0}dwgIn(t){return this.onDwgIn(t),this.point1.copy(t.point1),this.point2.copy(t.point2),this.text=t.text.substr(0),this.textHeight=t.textHeight,t.textWidth&&(this.textWidth=t.textWidth),!0}dwgOut(t){return this.onDwgOut(t),t.point1=this.point1,t.point2=this.point2,t.textHeight=this.textHeight,t.text=this.text,t.textWidth=this.textWidth,t}};
+import*as THREE from"three";import MxDbEntity from"../MxDbEntity";import MxThreeJS from"../MxThreeJS";export default class MxDbLeadComment extends MxDbEntity{constructor(){super(...arguments),this.point1=new THREE.Vector3,this.point2=new THREE.Vector3,this.text="",this.textHeight=20,this.textWidth=0,this.fixedSize=!1}getTypeName(){return"MxDbLeadComment"}create(){return new MxDbLeadComment}worldDraw(t){if(t.drawLine(this.point1,this.point2),this.text.length>0){const e=new THREE.Vector3;let i=this.textHeight,h=this.textWidth,n=t.getMxObject();this.fixedSize&&(i=n.screenCoordLong2Doc(i),h=n.screenCoordLong2Doc(h));let s=MxThreeJS.clacTextSpriteSize(this.text,i,h);e.x=this.point2.x+.5*s.textwidth,e.y=this.point2.y+.5*s.allTextHeight,t.drawText(this.text,i,0,e,h);const o=new THREE.Vector3;o.x=this.point2.x+s.textwidth,o.y=this.point2.y,t.drawLine(o,this.point2)}}getGripPoints(){let t=[];return t.push(this.point1),t.push(this.point2),t}moveGripPointsAt(t,e){return 0==t?this.point1.add(e):1==t&&this.point2.add(e),!0}dwgIn(t){return this.onDwgIn(t),this.point1.copy(t.point1),this.point2.copy(t.point2),this.text=t.text.substr(0),this.textHeight=t.textHeight,t.textWidth&&(this.textWidth=t.textWidth),this.fixedSize=t.fixedSize,!0}dwgOut(t){return this.onDwgOut(t),t.point1=this.point1,t.point2=this.point2,t.textHeight=this.textHeight,t.text=this.text,t.textWidth=this.textWidth,t.fixedSize=this.fixedSize,t}onViewChange(){return!!this.fixedSize&&(this.setNeedUpdateDisplay(!1),!0)}};

package/dist/lib/MxModule/MxDbRectBoxLeadComment/index.d.ts

@@ -16,6 +16,9 @@ export default class MxDbRectBoxLeadComment extends MxDbEntity {
     textHeight: number;
     /** 云线的半圆弧半径 */
     radius: number;
+    textWidth: number;
+    /** 文字大小，取屏幕像素绘图单位。 */
+    fixedSize: boolean;
     getTypeName(): string;
     create(): MxDbEntity;
     worldDraw(pWorldDraw: McGiWorldDraw): void;
@@ -23,4 +26,5 @@ export default class MxDbRectBoxLeadComment extends MxDbEntity {
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
     dwgIn(obj: any): boolean;
     dwgOut(obj: any): object;
+    protected onViewChange(): boolean;
 }

package/dist/lib/MxModule/MxDbRectBoxLeadComment/index.js

@@ -1 +1 @@
-import MxDbLeadComment from"../MxDbLeadComment";import MxDbCloudLine from"../MxDbCloudLine";import MxDbEntity from"../MxDbEntity";export default class MxDbRectBoxLeadComment extends MxDbEntity{constructor(){super(...arguments),this.point1=new THREE.Vector3,this.point2=new THREE.Vector3,this.point3=new THREE.Vector3,this.text="",this.textHeight=20,this.radius=16}getTypeName(){return"MxDbRectBoxLeadComment"}create(){return new MxDbRectBoxLeadComment}worldDraw(t){let i=new MxDbCloudLine;i.setRadius(this.radius);let e=this.point1.clone(),n=this.point2.clone();if(e.x>n.x){let t=e.x;e.x=n.x,n.x=t}if(e.y>n.y){let t=e.y;e.y=n.y,n.y=t}let o=new THREE.Vector3(e.x,n.y,e.z);o=i.addLine(e,o),n=new THREE.Vector3(n.x,o.y,n.z),n=i.addLine(o,n);let s=new THREE.Vector3(n.x,e.y,e.z);if(s=i.addLine(n,s),e=i.addLine(s,e),i.worldDraw(t),this.text.length>0){let i=e,h=e.distanceTo(this.point3);h>o.distanceTo(this.point3)&&(i=o,h=o.distanceTo(this.point3)),h>n.distanceTo(this.point3)&&(i=n,h=n.distanceTo(this.point3)),h>s.distanceTo(this.point3)&&(i=s,h=s.distanceTo(this.point3));let p=new MxDbLeadComment;p.point1=i,p.point2=this.point3,p.text=this.text,p.textHeight=this.textHeight,p.worldDraw(t)}}getGripPoints(){let t=[];return t.push(this.point1),t.push(this.point2),t.push(this.point3),t}moveGripPointsAt(t,i){return 0==t?this.point1.add(i):1==t?this.point2.add(i):2==t&&this.point3.add(i),!0}dwgIn(t){return this.onDwgIn(t),this.point1.copy(t.point1),this.point2.copy(t.point2),this.point3.copy(t.point3),this.text=t.text.substr(0),this.textHeight=t.textHeight,this.radius=t.radius,!0}dwgOut(t){return this.onDwgOut(t),t.point1=this.point1,t.point2=this.point2,t.point3=this.point3,t.textHeight=this.textHeight,t.text=this.text,t.radius=this.radius,t}};
+import MxDbLeadComment from"../MxDbLeadComment";import MxDbCloudLine from"../MxDbCloudLine";import MxDbEntity from"../MxDbEntity";export default class MxDbRectBoxLeadComment extends MxDbEntity{constructor(){super(...arguments),this.point1=new THREE.Vector3,this.point2=new THREE.Vector3,this.point3=new THREE.Vector3,this.text="",this.textHeight=20,this.radius=16,this.textWidth=0,this.fixedSize=!1}getTypeName(){return"MxDbRectBoxLeadComment"}create(){return new MxDbRectBoxLeadComment}worldDraw(t){let i=new MxDbCloudLine;i.setRadius(this.radius);let e=this.point1.clone(),n=this.point2.clone();if(e.x>n.x){let t=e.x;e.x=n.x,n.x=t}if(e.y>n.y){let t=e.y;e.y=n.y,n.y=t}let o=new THREE.Vector3(e.x,n.y,e.z);o=i.addLine(e,o),n=new THREE.Vector3(n.x,o.y,n.z),n=i.addLine(o,n);let s=new THREE.Vector3(n.x,e.y,e.z);if(s=i.addLine(n,s),e=i.addLine(s,e),i.worldDraw(t),this.text.length>0){let i=e,h=e.distanceTo(this.point3);h>o.distanceTo(this.point3)&&(i=o,h=o.distanceTo(this.point3)),h>n.distanceTo(this.point3)&&(i=n,h=n.distanceTo(this.point3)),h>s.distanceTo(this.point3)&&(i=s,h=s.distanceTo(this.point3));let d=new MxDbLeadComment;d.point1=i,d.point2=this.point3,d.text=this.text,d.textHeight=this.textHeight,d.textWidth=this.textWidth,d.fixedSize=this.fixedSize,d.worldDraw(t)}}getGripPoints(){let t=[];return t.push(this.point1),t.push(this.point2),t.push(this.point3),t}moveGripPointsAt(t,i){return 0==t?this.point1.add(i):1==t?this.point2.add(i):2==t&&this.point3.add(i),!0}dwgIn(t){return this.onDwgIn(t),this.point1.copy(t.point1),this.point2.copy(t.point2),this.point3.copy(t.point3),this.text=t.text.substr(0),this.textHeight=t.textHeight,this.radius=t.radius,t.textWidth&&(this.textWidth=t.textWidth),this.fixedSize=t.fixedSize,!0}dwgOut(t){return this.onDwgOut(t),t.point1=this.point1,t.point2=this.point2,t.point3=this.point3,t.textHeight=this.textHeight,t.text=this.text,t.radius=this.radius,t.textWidth=this.textWidth,t.fixedSize=this.fixedSize,t}onViewChange(){return!!this.fixedSize&&(this.setNeedUpdateDisplay(!1),!0)}};

package/dist/lib/MxModule/MxFun/index.d.ts

@@ -1,6 +1,7 @@
 /** @module MxFun */
-import MxDrawObject, { MxDrawObjectType } from '../MxDrawObject';
+import MxDrawObject from '../MxDrawObject';
 import MxDbEntity from '../MxDbEntity';
+import { MxDrawObjectType } from '../MxDrawObject';
 import MxDbDatabase from '../MxDbDatabase';
 import MxCADObject from '../MxCADObject';
 declare let mxUiData: import("../loadCoreCode/mxUiData").MxVueInterface;
@@ -48,7 +49,7 @@ export interface MxFunType {
     openFile(sFile: string | string[], useWebsocket: boolean): boolean;
     getMxJigCmdManager(): CmdMangerType;
     loadSVG(url: string, color?: number | string | THREE.Color, callResult?: any, loadSet?: any): void;
-    getTHREE(): typeof window.THREE;
+    getTHREE(): any;
 }
 /**
  * MxFun 模块