mxdraw 0.1.159 → 0.1.160

package/dist/lib/MxModule.d.ts

@@ -1,6 +1,6 @@
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
 import * as three from 'three';
 import { Color } from 'three';
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
 
 /**
  * 加载MxDraw库的核心代码 才能使用Mx的其他模块
@@ -130,8 +130,8 @@ declare enum InputToucheType {
     kGetBegan = 1,
     kGetEnd = 2
 }
-declare type MxColorType = number | string | THREE.Color;
-declare type UnstableColor = MxColorType | undefined;
+type MxColorType = number | string | THREE.Color;
+type UnstableColor = MxColorType | undefined;
 
 type MxType_MxCloneType = MxCloneType;
 declare const MxType_MxCloneType: typeof MxCloneType;
@@ -446,11 +446,11 @@ interface McGiWorldDraw {
     setXData(xData: any): void;
 }
 
-declare type EventType = string | symbol;
-declare type Handler<T = unknown> = (event: T) => void;
-declare class PubSub<Events extends Record<EventType, unknown> = any> {
+type EventType = string | symbol;
+type PubSubEvent = Record<EventType, (...ages: any) => any>;
+declare class PubSub<Events extends PubSubEvent = PubSubEvent> {
     events: {
-        [x: EventType]: Handler<Events[keyof Events]>[];
+        [x: EventType]: Events[keyof Events][];
     };
     constructor();
     /**
@@ -458,47 +458,116 @@ declare class PubSub<Events extends Record<EventType, unknown> = any> {
      * @param event 事件名称
      * @param callback 事件回调
      */
-    on<Key extends keyof Events>(event: Key, callback: Handler<Events[keyof Events]>): void;
+    on<Key extends keyof Events>(event: Key, callback: Events[keyof Events]): void;
     /**
      * 发布
      * @param event 事件名称
      * @param data 载荷
      */
-    emit<Key extends keyof Events>(event: Key | number, data?: Events[Key]): void;
+    emit<Key extends keyof Events>(event: Key | number, ...data: Parameters<Events[Key]>): void;
     /**
      * 销毁事件
      * @param event 事件名称
      * @param callback 事件方法
      */
-    off<Key extends keyof Events>(event: Key, callback?: Handler<Events[keyof Events]>): void;
+    off<Key extends keyof Events>(event: Key, callback?: Events[keyof Events]): void;
 }
 
-declare class Events$1<T extends Record<EventType, unknown>> extends PubSub<T> {
+type RendererEventsType = {
+    "click": () => void;
+    "hover": () => void;
+    "mousemove": () => void;
+    "mouseout": () => void;
+    "mouseover": () => void;
+    "mousedown": () => void;
+    "mouseup": () => void;
+};
+/**
+ * Node 节点
+ * @type E 事件类型 { "name": { name: string, id:number } } key-val key对应事件名称 val 对应回调值
+ * @example
+ * ```ts
+ * class ObjClass extends Node<{"added": { node: Node, id: number }}> {}
+ * ```
+ * */
+declare class Node<E extends PubSubEvent = PubSubEvent, T extends Node<E, Node<E, any>> = Node<E, Node<E, any>>> extends PubSub<E> {
+    /** 它的父节点 */
+    parent: (this | T | null);
+    /** 它的子节点集合 */
+    children: (this | T)[];
+    /** 添加子节点 */
+    add(...ages: (this | T)[]): this;
+    /** 移除子节点 **/
+    remove(...ages: (this | T)[]): this;
+    /** 从父节点中移除 */
+    removeFromParent(): this;
+    /** 清除 children */
+    clear(): this;
+    /** 根据属性名称找到对应的Node节点
+     * @param name 属性名称
+     * @param value 属性值
+     * @example
+     * ```ts
+     * new Node().getNodeByProperty("id", "23548")
+     * ```
+     *   */
+    getNodeByProperty<V = any>(name: string, value: V): (this | T) | undefined;
+    /** 根据属性名称找到对应的Node节点
+    * @param name 属性名称
+    * @param value 属性值
+    * @example
+    * ```ts
+    * new Node().getNodeByProperty("id", "23548")
+    * ```
+    *   */
+    getNodesByProperty<V = any>(name: string, value: V): (T | this)[];
+    /** 遍历它的所有子节点包括孙子节点，直到它包含的节点全部遍历完成并都执行传入的方法
+     * @param callback 回调函数
+     *  */
+    traverse(callback: (node: this) => void): void;
+    /***
+     * 让它的父节点依次冒泡执行传入的方法的方法
+     * @param callback 回调函数，第一个参数是父节点, callback的返回值为false 将停止继续传递
+     * */
+    traverseParent<V extends (Node<any, any>) = this>(callback: (node: V) => boolean | void): void;
+    /***
+     * 发布
+     * @param event — 事件名称
+     * @param data — 载荷
+    **/
+    emit<Key extends keyof E>(event: number | Key, ...data: Parameters<E[Key]>): void;
+}
+declare class RenderOrderNode<E extends PubSubEvent = PubSubEvent, T extends Node<any, any> = Node<any, any>> extends Node<E & RendererEventsType, T> {
+    constructor();
     /**
-    * 添加一个事件处理
-    * @returns void
-    */
-    addEvent: <Key extends keyof T>(event: Key, callback: Handler<T[keyof T]>) => void;
+   * 显示顺序
+   * */
+    renderOrder: number;
     /**
-    * 删除一个事件处理
-    * @returns void
-    */
-    removeEvent: <Key extends keyof T>(event: Key, callback?: Handler<T[keyof T]> | undefined) => void;
-    protected callEvent: <Key extends keyof T>(event: number | Key, data?: T[Key] | undefined) => void;
+     * 设置显示顺序 (通过显示顺序控制图层)
+     * @param renderOrder 显示顺序
+     */
+    setRenderOrder(renderOrder: number): void;
+    /**
+     * 得到显示顺序
+     * @returns number
+     */
+    getRenderOrder(): number;
+    /**
+     * top 同层级下最上层
+     * **/
+    top(): void;
+    /**
+     * bottom 同层级下最上层
+     * */
+    bottom(): void;
+    /** 恢复默认显示顺序 */
+    restoreDefaultRenderOrder(): void;
 }
 
-declare type MxDbEntityEventsType = {
-    "onStartGripEidt": void;
-    "onEndGripEidt": void;
-};
-declare type DOMEventsType = {
-    "click": void;
-    "hover": void;
-    "mousemove": void;
-    "mouseout": void;
-    "mouseover": void;
-    "mousedown": void;
-    "mouseup": void;
+type MxDbEntityEventsType = {
+    "onStartGripEidt": () => void;
+    "onEndGripEidt": () => void;
 };
 /**
  * MxDbEntity 用于构建一个自定义对象的抽象类(该类无法实例化 请通过继承的方式对其抽象方法进行实现)
@@ -520,7 +589,8 @@ declare type DOMEventsType = {
  * }
  * ```
  */
-declare abstract class MxDbEntity extends Events$1<MxDbEntityEventsType & DOMEventsType> {
+type EntityEvent = MxDbEntityEventsType;
+declare abstract class MxDbEntity extends RenderOrderNode<EntityEvent, MxDbEntity> {
     constructor();
     /** 该类注册的cmd命令名称 */
     static cmd: string;
@@ -531,7 +601,7 @@ declare abstract class MxDbEntity extends Events$1<MxDbEntityEventsType & DOMEve
     /** 注册该类的cmd命令和初始化 (引入该类时自动注册 当该类的isRegister为ture时表示已经注册) */
     static register(): void;
     /** 使用该类的cmd命令 执行默认的绘制功能 */
-    static use(): Promise<void>;
+    static use<T extends MxDbEntity = MxDbEntity>(callback?: (obj: T) => any): Promise<T>;
     /**
      * 颜色值
      * */
@@ -831,6 +901,17 @@ declare abstract class MxDbEntity extends Events$1<MxDbEntityEventsType & DOMEve
      */
     guid(): string;
     /**
+  * 添加一个事件处理
+  * @returns void
+  */
+    addEvent: <Key extends keyof MxDbEntityEventsType | keyof RendererEventsType>(event: Key, callback: (() => void) | (() => void) | (() => void) | (() => void) | (() => void) | (() => void) | (() => void) | (() => void) | (() => void)) => void;
+    /**
+    * 删除一个事件处理
+    * @returns void
+    */
+    removeEvent: <Key extends keyof MxDbEntityEventsType | keyof RendererEventsType>(event: Key, callback?: (() => void) | (() => void) | (() => void) | (() => void) | (() => void) | (() => void) | (() => void) | (() => void) | (() => void) | undefined) => void;
+    private callEvent;
+    /**
      * 对象结束开始编辑
      * @returns string
      */
@@ -1052,7 +1133,7 @@ declare class MxVueInterface {
     onKeydown: (keyCode: number) => void;
     setTipCoord: (str: any) => void;
     getCursorType: () => string;
-    setCursorType: (curtype: string) => void;
+    setCursorType: (curtype: string | number) => void;
     getTitle: () => any;
     getTopButtonBarData: () => any;
     getMenuBarData: () => any;
@@ -1073,14 +1154,9 @@ declare class MxVueInterface {
     mountMxEvent: (name: string | number, call: any) => void;
 }
 
-declare let mxUiData: MxVueInterface;
 interface CanvasParent extends HTMLElement {
     tabindex?: number;
 }
-interface CmdMangerType {
-    McEdGetPointWorldDrawObjectClass(): any;
-    getMrxDbgUiPrPointClass(): any;
-}
 /** 控件配置 **/
 interface iniConfig {
     /** 启用智能选择 */
@@ -1101,94 +1177,8 @@ interface iniConfig {
     IntelliSelectType?: number;
 }
 interface MxFunType {
-    createMxObject(canvasId: string, arg1: string | string[], arg2: (mxDraw: MxDrawObjectType) => void, is2d: boolean | undefined, isNewCreate?: boolean, isStaticLoad?: boolean, mapBox?: any, isCPPMxCAD?: 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(): any;
-    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: THREE.MeshLambertMaterial) => void): void;
-    initMxDbEntityType(userObject: any): void;
-    initDynamicCreate(dynCreate: any): void;
-    openFile(sFile: string | string[], useWebsocket: boolean): boolean;
-    getMxJigCmdManager(): CmdMangerType;
-    loadSVG(url: string, color?: number | string | THREE.Color, callResult?: any, loadSet?: any): void;
-    getTHREE(): any;
-}
-declare class MxFunClass {
-    constructor();
-    /**
-     * 创建图纸展示控件实例
-     * @param canvasId 提供一个canvas元素或者唯一的ID或者class类亦或者Jquery选中的元素
-     * @paramType string | HTMLCanvasElement | JQuery<HTMLElement>
-     * @param cadFile 提供要展示的图纸名称
-     * @paramType string
-     * @param callback 图纸展示控件创建完成后的回调函数 回调参数mxDraw和dom
-     * @paramType function
-     * @param isNewFile 是否新建文件
-     * @paramType boolean
-     * @return void
-     * @example
-     * ``` typescript
-     * Mx.MxFun.createMxObject({
-     *   canvasId: "my-app",
-     *   cadFile： "test2.dwg",
-     *   callback(mxDraw, { canvas, canvasParent }) {
-     *       console.log(mxDraw, canvas, canvasParent)
-     *   },
-     *   isNewFile: true
-     * })
-     * ```
-     */
-    createMxObject({ canvasId, cadFile, callback, isNewFile, useWebsocket, isAutoResize, mapBox, isMxCAD, userIdentitySign, isCPPMxCAD }: {
-        canvasId?: string;
-        cadFile?: string | string[];
-        callback?: (mxDraw: MxDrawObject, dom: {
-            canvas: HTMLCanvasElement;
-            canvasParent: CanvasParent;
-        }) => void;
-        isNewFile?: boolean;
-        useWebsocket?: boolean;
-        isAutoResize?: boolean;
-        mapBox?: any;
-        isMxCAD?: boolean;
-        userIdentitySign?: string;
-        isCPPMxCAD?: boolean;
-    }): void;
-    /**
-     * 为程序设置服务器地址
-     * @param MXSERVER 服务器地址
-     * @return void
-     * @example
-     * ``` typescript
-     * Mx.MxFun.setMxServer("ws://localhost:5090")
-     * ```
-     */
-    setMxServer(MXSERVER?: string): void;
+    initUiDataObject(mxUiData: MxVueInterface): unknown;
+    getTHREE(): typeof three;
     /**
      * 设置加载dwg文件，直接使用html get协议加载数据，这样就不需要梦想后台服务器程序。
      * @param isStaticLoad 是否启用html get协议加载数据文件
@@ -1260,14 +1250,6 @@ declare class MxFunClass {
      * ```
      */
     getCurrentDraw(): MxDrawObject;
-    /**
-     * 获得到当前数据库对象.
-     * @return MxDbDatabase
-     * @example
-     * ``` typescript
-     * ```
-     */
-    getCurrentDatabase(): MxDbDatabase;
     /**
      * 屏幕坐标长度转THREE.JS坐标长度
      * @param len 屏幕坐标长度
@@ -1376,39 +1358,13 @@ declare class MxFunClass {
      */
     worldCoord2Doc(x: number, y: number, z: number): THREE.Vector3;
     /**
-     * 屏幕转文档坐标
-     * @param  x 坐标x
-     * @param  y 坐标y
-     * @param  z 坐标z
-     * @return THREE.Vector3 文档坐标
-     * @example
-     * ``` typescript
-     * const vector3 = Mx.MxFun.screenCoord2Doc(36, 21, 0)
-     * console.log(vector3)
-     * ```
-     */
-    screenCoord2Doc(x: number | THREE.Vector3, y?: number): THREE.Vector3;
-    /**
-     * 文档转屏幕坐标.
-     * @param  x 坐标x
-     * @param  y 坐标y
-     * @param  z 坐标z
-     * @return THREE.Vector3 屏幕坐标
-     * @example
-     * ``` typescript
-     * const vector3 = Mx.MxFun.docCoord2Screen(36, 21, 0)
-     * console.log(vector3)
-     * ```
-     */
-    docCoord2Screen(x: number | THREE.Vector3, y?: number): THREE.Vector3;
-    /**
-     * 更新显示，使用Three.js绘制了对象，调用该函数更新显示。
-     * @return void
-     * @example
-     * ``` typescript
-     * Mx.MxFun.updateDisplay()
-     * ```
-     */
+   * 更新显示，使用Three.js绘制了对象，调用该函数更新显示。
+   * @return void
+   * @example
+   * ``` typescript
+   * Mx.MxFun.updateDisplay()
+   * ```
+   */
     updateDisplay(): void;
     /**
      * 设置窗口鼠标等事件的回调操作
@@ -1480,16 +1436,6 @@ declare class MxFunClass {
      * ```
      */
     acutPrintf: ((sval: string, ...val: string[]) => void) | undefined;
-    /**
-     * 获取当前MxCAD对象,该函数在MxCAD模式下使用
-     * @return MxDrawObjectType MxCAD对象
-     * @example
-     * ``` typescript
-     * const mxcad = Mx.MxFun.getCurrentMxCAD()
-     * console.log(mxcad)
-     * ```
-     */
-    getCurrentMxCAD(): MxCADObject;
     /**
      * 得到地址栏参数
      * @param name
@@ -1526,44 +1472,6 @@ declare class MxFunClass {
      * ```
      */
     upDisplayForLayerData(dataLayers: any): boolean;
-    /**
-     * 初始化插件的UI数据对象。
-     * @param uiDataObj
-     * @return
-     * @example
-     * ``` typescript
-     * ```
-     */
-    initUiDataObject(uiDataObj: typeof mxUiData): void;
-    /**
-     * 获取UI数据对象
-     * @param uiDataObj
-     * @return  mxUiData
-     * @example
-     * ``` typescript
-     * ```
-     */
-    getUIData(): MxVueInterface;
-    /**
-     * 梦想开发测试
-     * @param p
-     * @return any
-     * @example
-     * ``` typescript
-     * console.log(Mx.MxFun.TestMX());
-     * ```
-     */
-    testMX(p?: any): any;
-    /**
-     * 加载一个图片对象，返回Three.js材质对象，该函数具有缓存功能，下次加载同样的图片，可以直接返回.
-     * @param p
-     * @return any
-     * @example
-     * ``` typescript
-     *
-     * ```
-     */
-    loadImageMaterial(imageUrlPath: string, callResult?: (material: THREE.MeshLambertMaterial) => void | null): Promise<THREE.MeshLambertMaterial | null>;
     /**
      * 重新打开cad文件，该函数在控件创建完后，需要再次重新打开文件，调用。
      * @param sFile 打的cad文件路径
@@ -1585,59 +1493,9 @@ declare class MxFunClass {
      */
     addToCurrentSpace(ent: MxDbEntity): number;
     /**
-     * 在图上选择一个对象。
-     * @param strPrompt  提示字符串
-     * @param filter  过滤条件
-     * @returns number 返回对象的id
-     * @example
-     * ```typescript
-     *
-     *
-     * ```
-     */
-    selectEnt(strPrompt: string, filter?: any): Promise<number>;
-    /**
-     * 监听命令行消息动态更新的数据
-     * 在取点对象中设置的命令以及我们提供的图形对象中是有一套命令提示和参数化绘图，而该回调函数主要用来监听消息变化
-     * @parma callback 回调函数中data中的msCmdTip表示命令提示 msCmdText表示当前用户输入的输入内容  msCmdDisplay表示所有的消息记录
-     * */
-    listenForCommandLineInput(callback: ((data: {
-        msCmdTip: string;
-        msCmdDisplay: string;
-        msCmdText: string;
-    }) => void) | undefined): void;
-    /**
-     * 设置命令行消息数据 (在监听input输入框的onKeydown事件的回调函数中调用)
-     * @param msCmdText 用户输入的数据 input输入框输入的文本信息
-     * @param keyCode 按键Code input输入框的onKeydown事件的event事件对象的keyCode属性
-     * */
-    setCommandLineInputData(msCmdText: string, keyCode: number): void;
-    /**
-     * 监听指针(鼠标光标)移动变化的坐标信息
-     * @parma callback 回调函数中返回坐标信息
-     * */
-    listenForCoordTip(callback: (coordTip: string) => void): void;
-    /**
-     * 监听光标更新
-     * @parma cursorType当前使用的光标类型
-     * */
-    listenForUpdateCursor: (callback: ((cursorType: string) => void) | undefined) => void;
-    /**
-     * 返回mxfun.min.js中的THREE.JS对象，可以用它来创建mxfun.min.js中THREE对象。
-     * */
-    getMxFunTHREE(): any;
-    /**
-     * 返回mxfun.min.js中的ThreeJsTool对象
-     * */
-    getMxFunThreeTool(): any;
-    /**
-     * 创建十字光标图片
-     * */
-    ceneratecursor(cursorSize?: number, squareSize?: number, isRoss?: boolean, color?: string): HTMLImageElement;
-    /**
-     * 调用服务器后台CAD命令.
-     * */
-    callCommand(cmd: string, param: string, retCall?: (param: any) => void): any;
+  * 调用服务器后台CAD命令.
+  * */
+    callCommand(cmd: string, param: string, retCall?: (param: any) => void): void;
     /**
      * CAD坐标到文档坐标.
      * 默认情况下，cad等于doc,当前m_isCorrectLargeCoordinates为true时，doc变成了把cad图纸修改到小范围坐标系下的坐标。
@@ -1671,24 +1529,15 @@ declare class MxFunClass {
      */
     getMxEntity(id: number): MxDbEntity | undefined;
     /**
-     * 得到当前鼠标位置,返回的是屏幕坐标 。
-     * @example
-     * ```typescript
-     *
-     *
-     * ```
-     */
-    getCurrentMousePostion(): THREE.Vector3;
-    /**
-     * 停止运行当前命令
-     * @returns
-     * @example
-     * ```typescript
-     *
-     *
-     * ```
-     */
-    stopRunCommand(): any;
+  * 停止运行当前命令
+  * @returns
+  * @example
+  * ```typescript
+  *
+  *
+  * ```
+  */
+    stopRunCommand(): void;
     /**
      * 设置当前运行MxCAD的MxCPP环境对象。
      */
@@ -1709,15 +1558,7 @@ declare class MxFunClass {
      * MxCAD的DWG坐标长度转View坐标.
      */
     cadCoordLong2View(l: number): number;
-}
-/**
- * MxFun 模块
- * 导出库时已实例化，只需要调用实例方法 例如：
- * ```typescript
- *  Mx.MxFun.createMxObject
- * ```
- */
-declare const MxFun: MxFunClass;
+}
 
 /** @module MxDrawObject */
 
@@ -1778,11 +1619,14 @@ interface MxDrawObjectType {
     getViewCenterDocCoord(): THREE.Vector3;
     updateCanvasSize(): void;
 }
-declare type Events = {
-    "loadComplete": [void];
-    "render": [void];
-    "addResizeEvent": [void];
-};
+type Events = {
+    "loadComplete": () => void;
+    "render": () => void;
+    "addResizeEvent": (resize: Function) => void;
+    "initObject": () => void;
+    "openFileComplete": (iResult: number) => void;
+    "saveFileComplete": (iResult: number, sServerResult: string) => void;
+} & RendererEventsType;
 /**
  * 引入mxdraw库不会挂载MxDrawObject 只能在以下特定函数中获取
  * @function
@@ -1793,8 +1637,9 @@ declare type Events = {
  * {@link MxFun.getCurrentMxCAD} 方法返回值的构造类
  *
  */
-declare class MxDrawObject {
+declare class MxDrawObject extends Node<Events, Node<any, any>> {
     private _mxdrawObj;
+    private rootLayer;
     constructor(Mxdraw: MxDrawObjectType);
     /**
      * @instance
@@ -1989,17 +1834,6 @@ declare class MxDrawObject {
      * ```
      */
     initZoomW(pt1Doc: THREE.Vector3, pt2Doc: THREE.Vector3): void;
-    /**
-     * 初始化控件默认加载后，显示视区范围，默认使用图纸转换时的显示范围。。
-     * @param minPt DWG文档坐标1显示区域的左下角 THREE.Vector3
-     * @param maxPt DWG文档坐标2显示区域的右上角 THREE.Vector3
-     * @returns void
-     * @example
-     * ```typescript
-     * Mx.MxFun.getCurrentDraw().addEvent(new THREE.Vector3(0,10,10), new THREE.Vector3(3,8,20))
-     *
-     * ```
-     */
     /**
      * 控件对象的事件监听
      * @param eventNaem 事件名称
@@ -2019,7 +1853,9 @@ declare class MxDrawObject {
      * Mx.MxFun.getCurrentDraw().addEvent("MxEntitySelectChange", (aryId:Array<number>)=> {})
      * ```
      */
-    addEvent(eventNaem: keyof Events, fun: (...parmes: Events[keyof Events]) => any): void;
+    addEvent(eventNaem: keyof Events, fun: Events[keyof Events]): void;
+    on(event: keyof Events, callback: Events[keyof Events]): void;
+    off(event: keyof Events, callback: Events[keyof Events]): boolean;
     /**
      * 移除事件函数。
      * @param options { eventNaem: string, fun:any; }
@@ -2027,27 +1863,7 @@ declare class MxDrawObject {
      * @example
      * ```
      */
-    removeEventFuction(eventNaem: string, fun: any): boolean;
-    /**
-     * 控件对象的事件监听
-     * @param eventNaem 事件名称
-     * @param fun 回调函数
-     * @returns void
-     * @example
-     * ```typescript
-     * Mx.MxFun.getCurrentDraw().on("addResizeEvent", ()=> {})
-     * Mx.MxFun.getCurrentDraw().on("viewchange", ()=> {})
-     * 图纸加载完成
-     * Mx.MxFun.getCurrentDraw().on("loadComplete", ()=> {})
-     * 视区重绘事件.
-     * Mx.MxFun.getCurrentDraw().on("render", (renderer)=> {})
-     * 视区大小被修改事件.,viewsize={viewWidth:viewWidth,viewHeight:viewHeight}
-     * Mx.MxFun.getCurrentDraw().on("viewsizechange", (viewsize)=> {})
-     * 实体选择状态发生改变的事件.
-     * Mx.MxFun.getCurrentDraw().on("MxEntitySelectChange", (aryId:Array<number>)=> {})
-     * ```
-     */
-    on(eventNaem: string, fun: (...parmes: any) => any): void;
+    removeEventFuction(eventNaem: keyof Events, fun: Events[keyof Events]): boolean;
     /**
      * INI设置
      * @param options { EnableOsnapFunction: boolean; }
@@ -2723,7 +2539,15 @@ declare class Store<T extends {}> {
     };
     state: T;
     status: string;
-    events: PubSub;
+    events: PubSub<{
+        "MxUiMain": (call: Function) => void;
+        "MxMain": (call: Function) => void;
+        "use:create:MxDbEntity": (obj: MxDbEntity) => void;
+        "use:error": (e: any) => void;
+        "onUseCreateMxDbEntity": (obj: MxDbEntity) => void;
+        "MxDbEntityRegister": () => void;
+        "stateChange": (state: any) => void;
+    }>;
     constructor(params: {
         state: T;
         mutations: {
@@ -2747,14 +2571,239 @@ declare class Store<T extends {}> {
     commit<T>(mutationKey: string | number, payload: T | any): boolean;
 }
 
-declare type stateType = {
+type stateType = {
     [x: string]: any;
-    MxFun: MxFunType | null;
+    MxFun: any | null;
     Mxassembly: MxassemblyType | null;
     isCreateDrawObj: boolean;
 };
 declare const store: Store<stateType>;
 
+/**
+  * 创建图纸展示控件实例
+  * @param canvasId 提供一个canvas元素或者唯一的ID或者class类亦或者Jquery选中的元素
+  * @paramType string | HTMLCanvasElement | JQuery<HTMLElement>
+  * @param cadFile 提供要展示的图纸名称
+  * @paramType string
+  * @param callback 图纸展示控件创建完成后的回调函数 回调参数mxDraw和dom
+  * @paramType function
+  * @param isNewFile 是否新建文件
+  * @paramType boolean
+  * @return void
+  * @example
+  * ``` typescript
+  * Mx.MxFun.createMxObject({
+  *   canvasId: "my-app",
+  *   cadFile： "test2.dwg",
+  *   callback(mxDraw, { canvas, canvasParent }) {
+  *       console.log(mxDraw, canvas, canvasParent)
+  *   },
+  *   isNewFile: true
+  * })
+  * ```
+  */
+declare function createMxObject(this: MxFunType, { canvasId, cadFile, callback, isNewFile, useWebsocket, isAutoResize, mapBox, isMxCAD, userIdentitySign, isCPPMxCAD }: {
+    canvasId?: string;
+    cadFile?: string | string[];
+    callback?: (mxDraw: MxDrawObject, dom: {
+        canvas: HTMLCanvasElement;
+        canvasParent: CanvasParent;
+    }) => void;
+    isNewFile?: boolean;
+    useWebsocket?: boolean;
+    isAutoResize?: boolean;
+    mapBox?: any;
+    isMxCAD?: boolean;
+    userIdentitySign?: string;
+    isCPPMxCAD?: boolean;
+}): void;
+
+declare let mxUiData: MxVueInterface;
+/**
+ * MxFun 模块
+ * 导出库时已实例化，只需要调用实例方法 例如：
+ * ```typescript
+ *  Mx.MxFun.createMxObject
+ * ```
+ */
+declare const MxFun: MxFunType & {
+    createMxObject: typeof createMxObject;
+    /**
+     * 为程序设置服务器地址
+     * @param MXSERVER 服务器地址
+     * @return void
+     * @example
+     * ``` typescript
+     * Mx.MxFun.setMxServer("ws://localhost:5090")
+     * ```
+     */
+    setMxServer(MXSERVER?: string): void;
+    /**
+    * 屏幕转文档坐标
+    * @param  x 坐标x
+    * @param  y 坐标y
+    * @param  z 坐标z
+    * @return THREE.Vector3 文档坐标
+    * @example
+    * ``` typescript
+    * const vector3 = Mx.MxFun.screenCoord2Doc(36, 21, 0)
+    * console.log(vector3)
+    * ```
+    */
+    screenCoord2Doc(x: number | THREE.Vector3, y?: number): THREE.Vector3;
+    /**
+  * 文档转屏幕坐标.
+  * @param  x 坐标x
+  * @param  y 坐标y
+  * @param  z 坐标z
+  * @return THREE.Vector3 屏幕坐标
+  * @example
+  * ``` typescript
+  * const vector3 = Mx.MxFun.docCoord2Screen(36, 21, 0)
+  * console.log(vector3)
+  * ```
+  */
+    docCoord2Screen(x: number | THREE.Vector3, y?: number): THREE.Vector3;
+    /**
+     * 获取当前MxCAD对象,该函数在MxCAD模式下使用
+     * @return MxDrawObjectType MxCAD对象
+     * @example
+     * ``` typescript
+     * const mxcad = Mx.MxFun.getCurrentMxCAD()
+     * console.log(mxcad)
+     * ```
+     */
+    getCurrentMxCAD(): MxCADObject;
+    /**
+    * 获取当前绘图控件对象
+    * @return MxDrawObjectType 当前绘图控件对象
+    * @example
+    * ``` typescript
+    * const mxDraw = Mx.MxFun.getCurrentDraw()
+    * mxDraw.getScene()
+    * ```
+    */
+    getCurrentDraw(): MxDrawObject;
+    /**
+    * 添加一个MxDbEntity实体到当前绘图对象上。
+    * @param ent  实体对象
+    * @returns number 返回对象的id.
+    * @example
+    * ```typescript
+    *
+    *
+    * ```
+    */
+    addToCurrentSpace(ent: MxDbEntity): number;
+    /**
+    * 初始化插件的UI数据对象。
+    * @param uiDataObj
+    * @return
+    * @example
+    * ``` typescript
+    * ```
+    */
+    initUiDataObject(uiDataObj: typeof mxUiData): void;
+    /**
+   * 获取UI数据对象
+   * @param uiDataObj
+   * @return  mxUiData
+   * @example
+   * ``` typescript
+   * ```
+   */
+    getUIData(): MxVueInterface;
+    /**
+     * 获得到当前数据库对象.
+     * @return MxDbDatabase
+     * @example
+     * ``` typescript
+     * ```
+     */
+    getCurrentDatabase(): MxDbDatabase;
+    /**
+   * 梦想开发测试
+   * @param p
+   * @return any
+   * @example
+   * ``` typescript
+   * console.log(Mx.MxFun.TestMX());
+   * ```
+   */
+    testMX(p?: any): any;
+    /**
+   * 加载一个图片对象，返回Three.js材质对象，该函数具有缓存功能，下次加载同样的图片，可以直接返回.
+   * @param p
+   * @return any
+   * @example
+   * ``` typescript
+   *
+   * ```
+   */
+    loadImageMaterial(imageUrlPath: string, callResult?: ((material: THREE.MeshLambertMaterial) => void | null) | undefined): Promise<THREE.MeshLambertMaterial | null>;
+    /**
+   * 在图上选择一个对象。
+   * @param strPrompt  提示字符串
+   * @param filter  过滤条件
+   * @returns number 返回对象的id
+   * @example
+   * ```typescript
+   *
+   *
+   * ```
+   */
+    selectEnt(strPrompt: string, filter?: any): Promise<number>;
+    /**
+     * 监听命令行消息动态更新的数据
+     * 在取点对象中设置的命令以及我们提供的图形对象中是有一套命令提示和参数化绘图，而该回调函数主要用来监听消息变化
+     * @parma callback 回调函数中data中的msCmdTip表示命令提示 msCmdText表示当前用户输入的输入内容  msCmdDisplay表示所有的消息记录
+     * */
+    listenForCommandLineInput(callback: ((data: {
+        msCmdTip: string;
+        msCmdDisplay: string;
+        msCmdText: string;
+    }) => void) | undefined): void;
+    /**
+     * 设置命令行消息数据 (在监听input输入框的onKeydown事件的回调函数中调用)
+     * @param msCmdText 用户输入的数据 input输入框输入的文本信息
+     * @param keyCode 按键Code input输入框的onKeydown事件的event事件对象的keyCode属性
+     * */
+    setCommandLineInputData(msCmdText: string, keyCode: number): void;
+    /**
+     * 监听指针(鼠标光标)移动变化的坐标信息
+     * @parma callback 回调函数中返回坐标信息
+     * */
+    listenForCoordTip(callback: (coordTip: string) => void): void;
+    /**
+     * 监听光标更新
+     * @parma cursorType当前使用的光标类型
+     * */
+    listenForUpdateCursor(callback: ((cursorType: string) => void) | undefined): void;
+    /**
+     * 返回mxfun.min.js中的THREE.JS对象，可以用它来创建mxfun.min.js中THREE对象。
+     * */
+    getMxFunTHREE: () => any;
+    /**
+   * 返回mxfun.min.js中的ThreeJsTool对象
+   * */
+    getMxFunThreeTool(): any;
+    /**
+   * 创建十字光标图片
+   * */
+    ceneratecursor(cursorSize?: number, squareSize?: number, isRoss?: boolean, color?: string): HTMLImageElement;
+    /**
+   * 得到当前鼠标位置,返回的是屏幕坐标 。
+   * @example
+   * ```typescript
+   *
+   *
+   * ```
+   */
+    getCurrentMousePostion(): THREE.Vector3;
+    /** 监听use或者调用自定义图形定义的绘制命令后创建图形对象的回调 */
+    onUseCreateMxDbEntity(callback: (ages_0: MxDbEntity) => any): void;
+};
+
 /**
  * MxThreeJS 模块
  * ##### 使用说明:
@@ -3121,14 +3170,14 @@ declare class McEdGetPointWorldDrawObject {
      */
     drawMcDbEntity(mcdbEntity: any): any;
     /**
-     * 绘制一个MxCAD数据库对象
-     * @param mcdbEntity MxCAD数据库对象
-     * @returns void
-     * @example
-     * ``` typescript
-     * ```
-     *
-     */
+   * 绘制一个MxCAD数据库对象
+   * @param mcdbEntity MxCAD数据库对象
+   * @returns void
+   * @example
+   * ``` typescript
+   * ```
+   *
+   */
     drawMcDbLine(x1: number, y1: number, z1: number, x2: number, y2: number, z2: number): any;
     /**
      * 绘制一个文档对象
@@ -3428,6 +3477,8 @@ declare class MxDbSVGText {
 
 declare function drawMxDbSVG(): Promise<void>;
 
+/** @module MxDbSVG*/
+
 /**
  * MxDbSVG 绘制SVG图形.
  */
@@ -3740,10 +3791,14 @@ declare class MxDbShape extends MxDbEntity {
     isFill: boolean;
     setIsFill(isFill: boolean): this;
     /** 填充图片路径 */
-    protected _fillImageSrc: string | false | null;
-    get fillImageSrc(): string | false | null;
-    set fillImageSrc(src: string | false | null);
-    setFillImageSrc(fillImageSrc: string): this;
+    protected _fillImageSrc: string | false | null | undefined;
+    get fillImageSrc(): string | false | null | undefined;
+    set fillImageSrc(src: string | false | null | undefined);
+    /**
+     * 设置图片值
+     * fillImageSrc 当设置为null | false 时取消图片填充
+     * */
+    setFillImageSrc(fillImageSrc: string | null | false | undefined): this;
     /**
      * fillImageParam 填充背景图片的参数设置(如果使用了滤镜则部分参数功能失效)
      * */
@@ -3753,6 +3808,7 @@ declare class MxDbShape extends MxDbEntity {
         rotation?: number;
         center?: THREE.Vector2;
     } | undefined;
+    setFillImageParam(param: typeof this$1.fillImageParam): void;
     /** 线段细分数值 */
     curveSegments: number;
     setCurveSegments(curveSegments: number): this;
@@ -3763,30 +3819,34 @@ declare class MxDbShape extends MxDbEntity {
      * 设置滤镜对象{@link MxFilters} 默认为undefined | null 则不使用该滤镜效果
      * */
     filter: MxFilters | undefined | null;
+    /** 获取当前滤镜对象 {@link MxFilters} */
+    getFilter(): MxFilters | undefined | null;
+    setFilter(filter: MxFilters | undefined | null): void;
     /** 圆角半径 (一个向量点对应一个角的半径值)*/
     cornerRadius: number[] | number;
     /**
      * 设置圆角 圆角的半径（如果参数为数组则一个角度对应一个圆角半径）
      * @param { number | number[] } radius 圆角半径 为数组时[3, 2, 1, 4]分别对应左上角圆角半径3  右上角2  右下角1 左下角4； 或者直接设置半径值 则四个角统一半径
+     * @param isScreenCoord 是否根据屏幕坐标设置
      * */
     setCornerRadius(radius: number | number[], isScreenCoord?: boolean): void;
     /** 需要输入和输出的属性 */
     protected _propertyDbKeys: string[];
     getTypeName(): string;
     /** 获取坐标集合 */
-    getShapePoints(paths: THREE.CurvePath<THREE.Vector3 | THREE.Vector2>): three.Vector3[];
+    protected getShapePoints(paths: THREE.CurvePath<THREE.Vector3 | THREE.Vector2>): three.Vector3[];
     /*** 创建路径 */
-    createPaths(shapes: THREE.Curve<THREE.Vector3 | THREE.Vector2> | THREE.Curve<THREE.Vector3 | THREE.Vector2>[]): three.CurvePath<three.Vector3 | three.Vector2>;
+    protected createPaths(shapes: THREE.Curve<THREE.Vector3 | THREE.Vector2> | THREE.Curve<THREE.Vector3 | THREE.Vector2>[]): three.CurvePath<three.Vector3 | three.Vector2>;
     /** 动态绘制函数*/
-    _draw(pWorldDraw: McGiWorldDraw, vertices: THREE.Vector3[]): void;
+    protected _draw(pWorldDraw: McGiWorldDraw, vertices: THREE.Vector3[]): void;
     /** 获取生成圆角后的点 */
     getCornerRadiusPoints(points: THREE.Vector3[]): three.Vector3[];
     /** 绘制描边 */
-    _drawStoreLine(pWorldDraw: McGiWorldDraw, points: THREE.Vector3[], draw?: (pWorldDraw: McGiWorldDraw) => void): void;
+    protected _drawStoreLine(pWorldDraw: McGiWorldDraw, points: THREE.Vector3[], draw?: (pWorldDraw: McGiWorldDraw) => void): void;
     /** 获取线段闭合后的曲线点数 */
     getClosedPoints(points: THREE.Vector3[]): three.Vector3[];
     /** 获取长度 */
-    getTotalLength(): number;
+    getTotalLength(): number | undefined;
     /** 获取面积 */
     getArea(): number;
     worldDraw(pWorldDraw: McGiWorldDraw): void;
@@ -3796,6 +3856,7 @@ declare class MxDbShape extends MxDbEntity {
     moveGripPointsAt(index: number, offset: THREE.Vector3): boolean;
     dwgIn(obj: any): boolean;
     dwgOut(obj: any): object;
+    transformBy(mat: THREE.Matrix4): void;
 }
 
 /*** 椭圆(弧)形状 */
@@ -4313,10 +4374,10 @@ declare class MxDbEllipse extends MxDbEllipseShape {
 
 declare function drawMxDbText(): Promise<void>;
 
-declare type SpriteTextColorType = THREE.Color | string | number | CanvasGradient | CanvasPattern | undefined;
-declare type SpriteTextObj = SpriteText;
-declare type TextFontWeight = 'normal' | 'bold' | 'lighter' | 'bolder' | 'inherit' | number;
-declare type TextFontStyle = 'normal' | 'italic' | 'oblique';
+type SpriteTextColorType = THREE.Color | string | number | CanvasGradient | CanvasPattern | undefined;
+type SpriteTextObj = SpriteText;
+type TextFontWeight = 'normal' | 'bold' | 'lighter' | 'bolder' | 'inherit' | number;
+type TextFontStyle = 'normal' | 'italic' | 'oblique';
 declare class SpriteText extends THREE.Sprite {
     constructor(options?: SpriteTextOptions);
     text: string;
@@ -4713,7 +4774,7 @@ declare function drawMxDbArrow(): void;
 declare class MxDbArrow extends MxDbShape {
     static cmd: string;
     static draw: typeof drawMxDbArrow;
-    /** 箭头图形 */
+    /** 箭头图形  */
     constructor();
     /** 开始是否为尖角 */
     isSharpCorner: boolean;
@@ -4751,6 +4812,40 @@ declare class MxDbLineShape extends MxDbShape {
     getGetLength(): number;
 }
 
+/** 图层管理 */
+declare class Layer extends RenderOrderNode<{}, MxDbEntity> {
+    isLayer: boolean;
+    name: string;
+    constructor(name?: string);
+    get visible(): boolean;
+    set visible(val: boolean);
+    /** 设置层是否可见 */
+    setVisible(val: boolean): void;
+    private _database;
+    private getDatabase;
+    private getLayer;
+    private getLayerMap;
+    private getEntityMap;
+    private getCurrentName;
+    private callLayerContextFun;
+    /** 默认的层名称 **/
+    getRootLayerName: () => string;
+    /*** 获取该数据库下的所有层的名称 */
+    getNames(): string[];
+    /*** 获取该层包含的所有MxDbEntity */
+    getAllEntity(): MxDbEntity[];
+    /** 将MxDbEntity添加到层
+     * @param entityList 可以是id也可以是MxDbEntity实例
+     * @example
+     * ```
+     * new Layer().add(new MxDbLine(), new MxDbLine(), 3)
+     * ```
+     */
+    add(...entityList: typeof this$1.children): this;
+    /*** 移除该层的MxDbEntity,  MxDbEntity回退到默认层*/
+    remove(...entityList: typeof this$1.children): this;
+}
+
 declare const Mx_loadCoreCode: typeof loadCoreCode;
 declare const Mx_useCanvasResizeListener: typeof useCanvasResizeListener;
 declare const Mx_store: typeof store;
@@ -4848,6 +4943,8 @@ type Mx_MxDbArrow = MxDbArrow;
 declare const Mx_MxDbArrow: typeof MxDbArrow;
 type Mx_MxDbLineShape = MxDbLineShape;
 declare const Mx_MxDbLineShape: typeof MxDbLineShape;
+type Mx_Layer = Layer;
+declare const Mx_Layer: typeof Layer;
 declare namespace Mx {
   export {
     Mx_loadCoreCode as loadCoreCode,
@@ -4906,6 +5003,7 @@ declare namespace Mx {
     Mx_MxDbRegularPolygonShape as MxDbRegularPolygonShape,
     Mx_MxDbArrow as MxDbArrow,
     Mx_MxDbLineShape as MxDbLineShape,
+    Mx_Layer as Layer,
   };
 }
 
@@ -4916,4 +5014,4 @@ declare global {
     }
 }
 
-export { McEdGetPointWorldDrawObject, McGePoint3d, McGePoint3dArray, McGeTool, McGiWorldDraw, McGiWorldDrawType, MrxDbgUiPrBaseReturn, MrxDbgUiPrPoint, MrxDbgUtils, Mx3PointArc, MxCADObject, MxDb2LineAngularDimension, MxDbAlignedDimension, MxDbAnyLine, MxDbArcShapeDraw, MxDbArea, MxDbArrow, MxDbCircleArc, MxDbCircleShape, MxDbCloudLine, MxDbCoord, MxDbDatabase, MxDbEllipse, MxDbEllipseArc, MxDbEllipseShape, MxDbEntity, MxDbGradientLine, MxDbGroup, MxDbHatch, MxDbImage, MxDbLayerTableRecord, MxDbLeadComment, MxDbLeadTag, MxDbLine, MxDbLineShape, MxDbPolyline, MxDbRect, MxDbRectBoxLeadComment, MxDbRegularPolygon, MxDbRegularPolygonShape, MxDbRingShape, MxDbSVG, MxDbSVGText, MxDbShape, MxDbStarShape, MxDbText, MxDrawObject, MxFilters, MxFun, MxPaintBrush, MxThreeJS, MxType, Mxassembly, Mx as default, loadCoreCode, store, useCanvasResizeListener };
+export { Layer, McEdGetPointWorldDrawObject, McGePoint3d, McGePoint3dArray, McGeTool, McGiWorldDraw, McGiWorldDrawType, MrxDbgUiPrBaseReturn, MrxDbgUiPrPoint, MrxDbgUtils, Mx3PointArc, MxCADObject, MxDb2LineAngularDimension, MxDbAlignedDimension, MxDbAnyLine, MxDbArcShapeDraw, MxDbArea, MxDbArrow, MxDbCircleArc, MxDbCircleShape, MxDbCloudLine, MxDbCoord, MxDbDatabase, MxDbEllipse, MxDbEllipseArc, MxDbEllipseShape, MxDbEntity, MxDbGradientLine, MxDbGroup, MxDbHatch, MxDbImage, MxDbLayerTableRecord, MxDbLeadComment, MxDbLeadTag, MxDbLine, MxDbLineShape, MxDbPolyline, MxDbRect, MxDbRectBoxLeadComment, MxDbRegularPolygon, MxDbRegularPolygonShape, MxDbRingShape, MxDbSVG, MxDbSVGText, MxDbShape, MxDbStarShape, MxDbText, MxDrawObject, MxFilters, MxFun, MxPaintBrush, MxThreeJS, MxType, Mxassembly, Mx as default, loadCoreCode, store, useCanvasResizeListener };