mxdraw 0.1.21 → 0.1.22

package/dist/types/MxModule/McEdGetPointWorldDrawObject/McEdGetPointWorldDrawObjectClass.d.ts

@@ -1,5 +1,14 @@
 /** @module McEdGetPointWorldDrawObject*/
 import { ColorType } from '../MxType/MxType';
+export interface McEdGetPointWorldDrawObjectClass {
+    [x: string]: any;
+    drawCircle(cen: THREE.Vector3, dRadius: number): void;
+    drawLine(pt1: THREE.Vector3, pt2: THREE.Vector3): void;
+    drawEntity(ent: THREE.Object3D | null): void;
+    drawText(sText: string, iSize: number, dAngle: number, pt: THREE.Vector3): void;
+    setDraw(call: (currentPoint: THREE.Vector3, pWorldDraw: McEdGetPointWorldDrawObjectClass) => void): void;
+    drawCustomEntity(ent: any): void;
+}
 /**
  * McEdGetPointWorldDrawObject 用于构建一个动态绘制回调对象
  * @example ```typescript

package/dist/types/MxModule/McGeVector3d/McGeVector3d.d.ts

@@ -1,3 +1,4 @@
+/** @module McGeVector3d */
 /**
  * McGeVector3d
  * @example ```typescript

package/dist/types/MxModule/MrxDbgUiPrPoint/MrxDbgUiPrPointClass.d.ts

@@ -1,6 +1,23 @@
 /** @module MrxDbgUiPrPointClass */
-import { MrxDbgUiPrBaseReturn } from '../../types/MrxDbgUiPrPoint';
 import McEdGetPointWorldDrawObject from '../McEdGetPointWorldDrawObject';
+import MrxDbgUiPrBaseReturn from '../MrxDbgUiPrBaseReturn';
+export interface MrxDbgUiPrPointClass {
+    keyWords(): string;
+    setKeyWords(keyWordList: string): void;
+    message(): string;
+    setMessage(message: string): void;
+    keyWordPicked(): string;
+    isKeyWordPicked(matchKeyWord: string): boolean;
+    setUserDraw(pDraw: any): void;
+    value(): THREE.Vector3;
+    valueDocCoord(): THREE.Vector3;
+    basePt(): THREE.Vector3;
+    setBasePt(basePt: THREE.Vector3): void;
+    setUseBasePt(useIt: boolean): void;
+    go(retcall: (status: MrxDbgUiPrBaseReturn) => void): void;
+    goWhile(retcall: (status: MrxDbgUiPrBaseReturn) => any, exitcall?: (status: MrxDbgUiPrBaseReturn) => any): void;
+    drawReserve(callAddEntity?: (ent: THREE.Object3D) => void): void;
+}
 /**
  * MrxDbgUiPrPoint 用于构建一个取点对象
  * @example ```typescript

package/dist/types/MxModule/MxDrawObject/MxDrawObject.d.ts

@@ -1,6 +1,64 @@
 /** @module MxDrawObject */
-import { MxDrawObjectType } from '../../types/MxDrawObject';
 import MxDbEntity from '../MxDbEntity';
+export interface MxDrawObjectType {
+    renderer: THREE.WebGLRenderer;
+    addEvent(arg0: string, arg1: (...parmes: any) => any): void;
+    setIniset(arg0: {
+        EnableOsnapFunction: boolean;
+    }): void;
+    getScene(): THREE.Scene;
+    getCamera(): THREE.Camera;
+    setMouseRightRotate(isRotate: boolean): void;
+    getFullDisplayRange(): object;
+    getCanvas(): HTMLCanvasElement;
+    updateDisplay(): void;
+    createCanvasImageData(fun: (imageData: string) => void, param?: object): void;
+    setViewColor(color: number): void;
+    setSize(width: number, height: number): void;
+    getIntersectObjects(ptMouse: THREE.Vector2): THREE.Intersection[];
+    getViewWidth(): number;
+    getViewHeight(): number;
+    zoomInitialStates(): void;
+    zoomScale(scale: number): void;
+    zoomW(minPt: THREE.Vector3, maxPt: THREE.Vector3, isWorld?: boolean): void;
+    zoomCenter(dCenX: number, dCenY: number): void;
+    initZoomW(pt1Doc: THREE.Vector3, pt2Doc: THREE.Vector3): void;
+    addMxEntity(ent: any): number;
+    eraseMxEntity(id: number): boolean;
+    screenCoord2World(x: number, y: number, z?: number): THREE.Vector3;
+    worldCoord2Screen(x: number, y: number, z: number): THREE.Vector3;
+    screenCoord2Doc(x: number, y: number, z: number): THREE.Vector3;
+    worldCoordLong2Doc(l: number): number;
+    docCoordLong2World(l: number): number;
+    docCoord2World(x: number, y: number, z: number): THREE.Vector3;
+    worldCoord2Doc(x: number, y: number, z: number): THREE.Vector3;
+    docCoord2Screen(x: number, y: number, z: number): THREE.Vector3;
+    screenCoordLong2Doc(l: number): number;
+    docCoordLong2Screen(l: number): number;
+    screenCoordLong2World(l: number): number;
+    worldCoordLong2Screen(l: number): number;
+    initRendererParam(param: object): void;
+    getMxAllSelect(): Array<number>;
+    addMxCurrentSelect(id: number): void;
+    clearMxCurrentSelect(): boolean;
+    getMxEntityUserObject(id: number): MxDbEntity;
+    findMxEntityAtPoint(ptMouse: THREE.Vector3): Array<MxDbEntity>;
+    setMouseMiddlePan(isPan: boolean): void;
+    resetThreeJSControls(): void;
+    getAllMxEntity(): Array<MxDbEntity>;
+    enableZoom(isEnable: boolean): void;
+    enablePan(isEnable: boolean): void;
+    addObject(obj: THREE.Object3D | null, isAddToSelect?: boolean): void;
+    addViewObject(obj: THREE.Object3D): void;
+    removeViewObject(obj: THREE.Object3D): void;
+    removeObject(obj: THREE.Object3D, isRemoveSelectObject?: boolean): void;
+    saveMxEntityToJson(): string;
+    loadMxEntityFromJson(dataString: string): Promise<boolean>;
+    eraseAllMxEntity(): void;
+    makeCurrent(): void;
+    getViewCenterDocCoord(): THREE.Vector3;
+    updateCanvasSize(): void;
+}
 /**
  * 引入mxdraw库不会挂载MxDrawObject 只能在以下特定函数中获取
  * @function

package/dist/types/MxModule/MxFun/MxFun.d.ts

@@ -2,9 +2,95 @@ import MxDrawObject from '../MxDrawObject';
 import { MeshLambertMaterial } from 'three';
 import MxDbEntity from '../MxDbEntity';
 import mxUiData from '../loadCoreCode/mxUiData';
+import { MxDrawObjectType } from '../MxDrawObject/MxDrawObject';
+import { ColorType } from '../MxType/MxType';
 interface CanvasParent extends HTMLElement {
     tabindex?: number;
 }
+interface MxCADLayerTableRecord {
+    id: number;
+    name: string;
+    color: number;
+    off: boolean;
+}
+export interface MxCADObject {
+    /** 新建文件 */
+    newFile(): void;
+    /** 撤销操作 */
+    undo(): void;
+    /**
+     * 打开文件
+     * @param file 文件路径
+     * @param retfun 打开文件后的回调函数
+     *
+     * */
+    openFile(file: string, retfun?: (ret: Object) => void): void;
+    /**
+     * 保存文件
+     * @param file 文件路径
+     * @param retfun 保存文件后的回调函数
+     *
+     * */
+    saveFile(file: string, retfun?: (ret: Object) => void): void;
+    /**
+     * 获取打开的文件名称
+     * @param file 文件路径
+     * @param retfun 保存文件后的回调函数
+     *
+     * */
+    getFileName(): string;
+    /**
+     * 获取全部图层数据
+     * @retruns 全部图层数据
+     *
+     * */
+    getAllLayerData(): MxCADLayerTableRecord[];
+}
+interface CmdMangerType {
+    McEdGetPointWorldDrawObjectClass(): any;
+    getMrxDbgUiPrPointClass(): any;
+}
+export interface MxFunType {
+    createMxObject(canvasId: string, arg1: string, arg2: (mxDraw: MxDrawObjectType) => void, is2d: boolean | undefined, isNewCreate?: boolean, isStaticLoad?: boolean): void;
+    setMxServer(MXSERVER: string): void;
+    addCommand(cmdName: string, fun: Function): void;
+    sendStringToExecute(sCmd: string, ...params: any[]): boolean;
+    call(cmd: string, param: any, retfun?: Function): void;
+    getCurrentDraw(): MxDrawObjectType;
+    screenCoordLong2World(len: number): number;
+    screenCoordLong2Doc(len: number): number;
+    worldCoordLong2Doc(len: number): number;
+    docCoordLong2World(len: number): number;
+    docCoordLong2Screen(len: number): number;
+    screenCoord2World(x: number | THREE.Vector3, y?: number, z?: number): THREE.Vector3;
+    worldCoord2Screen(x: number | THREE.Vector3, y?: number, z?: number): THREE.Vector3;
+    docCoord2World(x: number | THREE.Vector3, y?: number, z?: number): THREE.Vector3;
+    worldCoord2Doc(x: number | THREE.Vector3, y?: number, z?: number): THREE.Vector3;
+    screenCoord2Doc(x: number | THREE.Vector3, y?: number, z?: number): THREE.Vector3;
+    docCoord2Screen(x: number | THREE.Vector3, y?: number, z?: number): THREE.Vector3;
+    updateDisplay(): void;
+    addWindowsEvent(fun: (type: string, event: any) => number): void;
+    isRunningCommand(): boolean;
+    zoomW(x1: number, y1: number, x2: number, y2: number, isWorld?: boolean): void;
+    showLayer(idLayer: number | string, isShow: boolean, isSketch?: boolean): void;
+    acutPrintf(sval: string, ...val: string[]): void;
+    getCurrentMxCAD(): MxCADObject;
+    getQueryString(name: string): string;
+    setIniset(iniObj: object): void;
+    upDisplayForLayerData(dataLayers: any): boolean;
+    enablStaticLoad(isStaticLoad?: boolean): void;
+    setStaticServer(server: string): void;
+    initUiDataObject(uiDataObj: any): void;
+    loadImageMaterial(imageUrlPath: string, callResult: (material: MeshLambertMaterial) => void): void;
+    pointInPolyline(pt: THREE.Vector3, vecPolyline: Array<THREE.Vector3>): boolean;
+    calcArea(aryPoint: Array<THREE.Vector3>): number;
+    initMxDbEntityType(userObject: any): void;
+    initDynamicCreate(dynCreate: any): void;
+    openFile(sFile: string, useWebsocket: boolean): boolean;
+    getMxJigCmdManager(): CmdMangerType;
+    loadSVG(url: string, color?: ColorType, callResult?: any): void;
+    getTHREE(): any;
+}
 /**
  * MxFun 模块
  * 导出库时已实例化，只需要调用实例方法 例如：
@@ -350,7 +436,7 @@ export default class MxFun {
      * console.log(mxcad)
      * ```
      */
-    getCurrentMxCAD(): import("../../types/MxCADObject").MxCADObject;
+    getCurrentMxCAD(): MxCADObject;
     /**
      * 得到地址栏参数
      * @param name
@@ -496,5 +582,9 @@ export default class MxFun {
      * @parma callback 回调函数中返回坐标信息
      * */
     listenForCoordTip(callback: (coordTip: string) => void): void;
+    /**
+     * 返回mxfun.min.js中的THREE.JS对象，可以用它来创建mxfun.min.js中THREE对象。
+     * */
+    getMxFunTHREE(): any;
 }
 export {};

package/dist/types/MxModule/Mxassembly/Mxassembly.d.ts

@@ -1,4 +1,7 @@
 import McGeVector3d from '../McGeVector3d';
+export interface MxassemblyType {
+    McGeVector3d: any;
+}
 /**
  * Mxassembly 模块
  * 导出库时已实例化，只需要调用实例方法 例如：

package/dist/types/MxModule/store/store.d.ts

@@ -1,5 +1,5 @@
-import { MxFunType } from '../../types/MxFun';
-import { MxassemblyType } from '../../types/Mxassembly';
+import { MxassemblyType } from '../Mxassembly/Mxassembly';
+import { MxFunType } from '../MxFun/MxFun';
 import Store from './StoreClass';
 declare type stateType = {
     [x: string]: any;

package/dist/types/mxdraw.d.ts

@@ -40,8 +40,8 @@ declare const _default: {
     loadCoreCode: typeof loadCoreCode;
     store: import("./MxModule/store/StoreClass").default<{
         [x: string]: any;
-        MxFun: import("./types/MxFun").MxFunType | null;
-        Mxassembly: import("./types/Mxassembly").MxassemblyType | null;
+        MxFun: import("./MxModule/MxFun/MxFun").MxFunType | null;
+        Mxassembly: import("./MxModule/Mxassembly/Mxassembly").MxassemblyType | null;
         isCreateDrawObj: boolean;
     }>;
     MrxDbgUiPrBaseReturn: typeof MrxDbgUiPrBaseReturn;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mxdraw",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "",
   "keywords": [],
   "main": "dist/mxdraw.umd.js",