mxdraw 0.1.9 → 0.1.10

package/dist/lib/MxModule/MxDbEntity/MxDbEntity.js

@@ -79,6 +79,34 @@ var MxDbEntity = /** @class */ (function () {
             return false;
         }
     };
+    /**
+     * 返回对象所在的控件对象。
+     * @param
+     * @returns boolean
+     * @example
+     * ``` typescript
+     *
+     * ```
+     */
+    MxDbEntity.prototype.getMxObject = function () {
+        var imp = this.getImp();
+        if (imp)
+            return imp.getMxObject();
+        else
+            return null;
+    };
+    /**
+     * 视区显示比较发生成变化，继承类可以向应该事件，更新显示大小。
+     * @param
+     * @returns boolean
+     * @example
+     * ``` typescript
+     *
+     * ```
+     */
+    MxDbEntity.prototype.onViewChange = function () {
+        return false;
+    };
     /**
      * 得到对象的id.
      * @param

package/dist/lib/MxModule/MxDbImage/MxDbImage.js

@@ -70,6 +70,7 @@ var MxDbImage = /** @class */ (function (_super) {
             }
             else if (this.imagePath.length > 0 && this.isLoadMaterialFromPath) {
                 var myThis_1 = this;
+                var mxobj_1 = pWorldDraw.getMxObject();
                 MxFun_1.default.loadImageMaterial(this.imagePath, function (material) {
                     _this.isLoadMaterialFromPath = false;
                     if (!material) {
@@ -77,7 +78,7 @@ var MxDbImage = /** @class */ (function (_super) {
                     }
                     myThis_1.setMaterial(material);
                     myThis_1.setNeedUpdateDisplay();
-                    MxFun_1.default.updateDisplay();
+                    mxobj_1.updateDisplay();
                 });
             }
         }

package/dist/lib/MxModule/MxDbSVG/MxDbSVG.js

@@ -1,10 +1,4 @@
 "use strict";
-///////////////////////////////////////////////////////////////////////////////
-//版权所有（C）2002-2022，成都梦想凯德科技有限公司。
-//本软件代码及其文档和相关资料归成都梦想凯德科技有限公司,应用包含本软件的程序必须包括以下版权声明
-//此应用程序与成都梦想凯德科技有限公司成协议。通过使用本软件、其文档或相关材料
-///////////////////////////////////////////////////////////////////////////////
-/** @module MxDbSVG*/
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -21,10 +15,15 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+///////////////////////////////////////////////////////////////////////////////
+//版权所有（C）2002-2022，成都梦想凯德科技有限公司。
+//本软件代码及其文档和相关资料归成都梦想凯德科技有限公司,应用包含本软件的程序必须包括以下版权声明
+//此应用程序与成都梦想凯德科技有限公司成协议。通过使用本软件、其文档或相关材料
+///////////////////////////////////////////////////////////////////////////////
+/** @module MxDbSVG*/
 var THREE = require("three");
 var MxDbEntity_1 = require("../MxDbEntity");
 var MxDbSVGText_1 = require("../MxDbSVGText");
-var MxFun_1 = require("../MxFun");
 var MxThreeJS_1 = require("../MxThreeJS");
 var MxType_1 = require("../MxType");
 /**
@@ -35,40 +34,91 @@ var MxDbSVG = /** @class */ (function (_super) {
     function MxDbSVG() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.svgPos = new THREE.Vector3();
+        _this.svg = null;
         _this.svgPath = '';
         _this.svgSize = new THREE.Vector2(50, 50);
         _this.svgAlignmentRatio = new THREE.Vector2(0, 0);
+        _this.svgRotate = 0;
         _this.isSvgDirtyLocation = false;
         _this.isLoadFromPath = true;
         _this.aryText = [];
+        _this.svgBoxSize = null;
+        // 固定尺寸，图片和文字大小，取屏幕像素绘图单位。
+        _this.fixedSize = false;
         return _this;
     }
     MxDbSVG.prototype.worldDraw = function (pWorldDraw) {
         var _this = this;
-        this.calcSvgPosition();
-        this.aryText.forEach(function (txt) {
-            if (txt.txt.length > 0) {
-                var posTxt = new THREE.Vector3(txt.txtPos.x, txt.txtPos.y, 0);
-                pWorldDraw.drawText(txt.txt, txt.txtHeight, 0, posTxt);
-            }
-        });
-        var svgPosX = this.svgPos.x - this.svgSize.x * this.svgAlignmentRatio.x;
-        var svgPosY = this.svgPos.y - this.svgSize.y * this.svgAlignmentRatio.y;
-        var pt1 = new THREE.Vector3(svgPosX, svgPosY, 0);
-        var pt2 = new THREE.Vector3(svgPosX + this.svgSize.x, svgPosY + this.svgSize.y, 0);
+        var mxObj = pWorldDraw.getMxObject();
+        this.calcSvgPosition(mxObj);
+        var sizew = this.svgSize.x;
+        var sizeh = this.svgSize.y;
+        if (this.fixedSize) {
+            sizew = mxObj.screenCoordLong2Doc(sizew);
+            sizeh = mxObj.screenCoordLong2Doc(sizeh);
+        }
+        var mat = new THREE.Matrix4();
+        mat.makeRotationZ(this.svgRotate);
+        var matMove = new THREE.Matrix4();
+        var svgNewPos = new THREE.Vector3(this.svgPos.x - sizew * this.svgAlignmentRatio.x, this.svgPos.y - sizeh * this.svgAlignmentRatio.y, 0);
+        matMove.makeTranslation(svgNewPos.x, svgNewPos.y, svgNewPos.z);
+        mat.premultiply(matMove);
+        var pt1 = new THREE.Vector3(0, 0, 0);
+        var pt3 = new THREE.Vector3(sizew, 0, 0);
+        var pt2 = new THREE.Vector3(sizew, sizeh, 0);
+        var pt4 = new THREE.Vector3(0, sizeh, 0);
+        pt1.applyMatrix4(mat);
+        pt3.applyMatrix4(mat);
+        pt2.applyMatrix4(mat);
+        pt4.applyMatrix4(mat);
         if (pWorldDraw.getType() == 1) {
+            this.aryText.forEach(function (txt) {
+                if (txt.txt.length > 0) {
+                    var posTxt = new THREE.Vector3(txt.txtPos.x, txt.txtPos.y, 0);
+                    if (_this.fixedSize) {
+                        if (txt.txtPos.x > 0)
+                            posTxt.x = _this.svgPos.x + mxObj.screenCoordLong2Doc(txt.txtPos.x);
+                        else
+                            posTxt.x = _this.svgPos.x - mxObj.screenCoordLong2Doc(txt.txtPos.x);
+                        if (txt.txtPos.y > 0)
+                            posTxt.y = _this.svgPos.y + mxObj.screenCoordLong2Doc(txt.txtPos.y);
+                        else
+                            posTxt.y = _this.svgPos.y - mxObj.screenCoordLong2Doc(txt.txtPos.y);
+                    }
+                    var bakColor = undefined;
+                    if (txt.color) {
+                        bakColor = pWorldDraw.getColor();
+                        pWorldDraw.setColor(txt.color);
+                    }
+                    var iSize = txt.txtHeight;
+                    if (_this.fixedSize)
+                        iSize = mxObj.screenCoordLong2Doc(txt.txtHeight);
+                    txt._txtObject = pWorldDraw.drawText(txt.txt, iSize, 0, posTxt);
+                    txt._txtAspectRatio = -1;
+                    if (bakColor) {
+                        pWorldDraw.setColor(bakColor);
+                    }
+                }
+            });
             if (this.svg) {
                 pWorldDraw.drawEntity(this.svg);
             }
             else {
                 if (this.svgPath.length > 0 && this.isLoadFromPath) {
                     var myThis_1 = this;
+                    var mxobj_1 = pWorldDraw.getMxObject();
                     MxThreeJS_1.default.loadSVG(this.svgPath, undefined, function (obj) {
                         if (obj) {
                             var box = new THREE.Box3().setFromObject(obj);
-                            obj.scale.x = myThis_1.svgSize.x / (box.max.x - box.min.x);
-                            obj.scale.y = myThis_1.svgSize.y / (box.max.y - box.min.y);
+                            if (!myThis_1.svgBoxSize) {
+                                myThis_1.svgBoxSize = new THREE.Vector3();
+                            }
+                            myThis_1.svgBoxSize.x = box.max.x - box.min.x;
+                            myThis_1.svgBoxSize.y = box.max.y - box.min.y;
+                            obj.scale.x = sizew / myThis_1.svgBoxSize.x;
+                            obj.scale.y = sizeh / myThis_1.svgBoxSize.y;
                             obj.scale.z = obj.scale.x;
+                            obj.rotateZ(myThis_1.svgRotate);
                             myThis_1.isSvgDirtyLocation = true;
                             var color_1 = new THREE.Color(_this.color);
                             obj.traverse(function (child) {
@@ -80,27 +130,28 @@ var MxDbSVG = /** @class */ (function (_super) {
                             });
                             //this.svgPos.multiply
                             myThis_1.svg = obj;
-                            myThis_1.setNeedUpdateDisplay(true);
-                            MxFun_1.default.updateDisplay();
+                            myThis_1.setNeedUpdateDisplay();
+                            mxobj_1.updateDisplay();
                         }
                         myThis_1.isLoadFromPath = false;
                     });
                 }
             }
-            pWorldDraw.drawSelectLine(pt1.x, pt1.y, pt2.x, pt2.y);
-            pWorldDraw.drawSelectLine(pt1.x, pt2.y, pt2.x, pt1.y);
+            pWorldDraw.drawSelectLine(pt1, pt2);
+            pWorldDraw.drawSelectLine(pt3, pt4);
         }
         else {
-            pWorldDraw.drawLine(pt1.x, pt1.y, pt1.x, pt2.y);
-            pWorldDraw.drawLine(pt1.x, pt2.y, pt2.x, pt2.y);
-            pWorldDraw.drawLine(pt2.x, pt2.y, pt2.x, pt1.y);
-            pWorldDraw.drawLine(pt2.x, pt1.y, pt1.x, pt1.y);
+            pWorldDraw.drawLine(pt1, pt3);
+            pWorldDraw.drawLine(pt3, pt2);
+            pWorldDraw.drawLine(pt2, pt4);
+            pWorldDraw.drawLine(pt4, pt1);
         }
     };
     MxDbSVG.prototype.setSvgPath = function (path) {
         this.svgPath = path;
         this.svg = null;
         this.isLoadFromPath = true;
+        this.svgBoxSize = null;
     };
     MxDbSVG.prototype.getSvgPath = function () {
         return this.svgPath;
@@ -145,25 +196,38 @@ var MxDbSVG = /** @class */ (function (_super) {
     MxDbSVG.prototype.moveGripPointsAt = function (index, offset) {
         if (index == 0) {
             this.svgPos.add(offset);
-            this.aryText.forEach(function (txt) {
-                txt.txtPos.add(offset);
-            });
+            if (!this.fixedSize) {
+                this.aryText.forEach(function (txt) {
+                    txt.txtPos.add(offset);
+                });
+            }
         }
         this.isSvgDirtyLocation = true;
         return true;
     };
-    MxDbSVG.prototype.calcSvgPosition = function () {
+    MxDbSVG.prototype.calcSvgPosition = function (mxObj) {
         if (!this.svg || !this.isSvgDirtyLocation) {
             return;
         }
         this.isSvgDirtyLocation = false;
-        this.svg.position.x = this.svgPos.x - this.svgSize.x * this.svgAlignmentRatio.x;
-        this.svg.position.y = this.svgPos.y - this.svgSize.y * this.svgAlignmentRatio.y;
+        var sizew = this.svgSize.x;
+        var sizeh = this.svgSize.y;
+        if (this.fixedSize) {
+            sizew = mxObj.screenCoordLong2Doc(sizew);
+            sizeh = mxObj.screenCoordLong2Doc(sizeh);
+        }
+        this.svg.position.x = this.svgPos.x - sizew * this.svgAlignmentRatio.x;
+        this.svg.position.y = this.svgPos.y - sizeh * this.svgAlignmentRatio.y;
     };
     MxDbSVG.prototype.dwgIn = function (obj) {
         var _this = this;
         this.onDwgIn(obj);
-        if (obj.type == MxType_1.default.MxCloneType.kClone && obj['svg']) {
+        this.fixedSize = obj['fixedSize'];
+        if (this.fixedSize) {
+            // svg = null,重新加载svg.
+            this.svg = null;
+        }
+        else if (obj.type == MxType_1.default.MxCloneType.kClone && obj['svg']) {
             this.svg = obj['svg'].clone();
         }
         this.svgPos.copy(obj['svgPos']);
@@ -173,6 +237,7 @@ var MxDbSVG = /** @class */ (function (_super) {
         this.isSvgDirtyLocation = true;
         if (!this.svg)
             this.isLoadFromPath = true;
+        this.svgBoxSize = null;
         var aryText = obj['txts'];
         this.aryText = [];
         aryText.forEach(function (txt) {
@@ -182,6 +247,7 @@ var MxDbSVG = /** @class */ (function (_super) {
             copyTxt.txtPos.copy(txt.txtPos);
             _this.aryText.push(copyTxt);
         });
+        this.svgRotate = obj['svgRotate'];
         return true;
     };
     MxDbSVG.prototype.dwgOut = function (obj) {
@@ -194,6 +260,8 @@ var MxDbSVG = /** @class */ (function (_super) {
         obj['svgSize'] = this.svgSize;
         obj['svgAlignmentRatio'] = this.svgAlignmentRatio;
         obj['txts'] = this.aryText;
+        obj['fixedSize'] = this.fixedSize;
+        obj['svgRotate'] = this.svgRotate;
         return obj;
     };
     MxDbSVG.prototype.create = function () {
@@ -202,9 +270,11 @@ var MxDbSVG = /** @class */ (function (_super) {
     MxDbSVG.prototype.transformBy = function (mat) {
         this.svgPos.applyMatrix4(mat);
         this.isSvgDirtyLocation = true;
-        this.aryText.forEach(function (txt) {
-            txt.txtPos.applyMatrix4(mat);
-        });
+        if (!this.fixedSize) {
+            this.aryText.forEach(function (txt) {
+                txt.txtPos.applyMatrix4(mat);
+            });
+        }
     };
     MxDbSVG.prototype.getTypeName = function () {
         return 'MxDbSVG';
@@ -220,6 +290,51 @@ var MxDbSVG = /** @class */ (function (_super) {
             });
         }
     };
+    MxDbSVG.prototype.onViewChange = function () {
+        if (!this.fixedSize) {
+            return false;
+        }
+        var mxObj = this.getMxObject();
+        if (mxObj == null)
+            return false;
+        if (this.svg) {
+            if (!this.svgBoxSize) {
+                this.svgBoxSize = new THREE.Vector3();
+                var box = new THREE.Box3().setFromObject(this.svg);
+                this.svgBoxSize.x = box.max.x - box.min.x;
+                this.svgBoxSize.y = box.max.y - box.min.y;
+            }
+            var sizew = mxObj.screenCoordLong2Doc(this.svgSize.x);
+            var sizeh = mxObj.screenCoordLong2Doc(this.svgSize.y);
+            this.svg.scale.x = sizew / this.svgBoxSize.x;
+            this.svg.scale.y = sizeh / this.svgBoxSize.y;
+            this.svg.scale.z = this.svg.scale.x;
+            this.isSvgDirtyLocation = true;
+            this.calcSvgPosition(mxObj);
+        }
+        var myThis = this;
+        this.aryText.forEach(function (txt) {
+            if (txt._txtObject && mxObj) {
+                var iSize = mxObj.screenCoordLong2Doc(txt.txtHeight);
+                if (iSize > 0.00001) {
+                    if (txt._txtAspectRatio <= 0) {
+                        txt._txtAspectRatio = txt._txtObject.scale.x / txt._txtObject.scale.y;
+                    }
+                    txt._txtObject.scale.set(txt._txtAspectRatio * iSize, iSize, 1);
+                    if (txt.txtPos.x > 0)
+                        txt._txtObject.position.x = myThis.svgPos.x + mxObj.screenCoordLong2Doc(txt.txtPos.x);
+                    else
+                        txt._txtObject.position.x = myThis.svgPos.x - mxObj.screenCoordLong2Doc(txt.txtPos.x);
+                    if (txt.txtPos.y > 0)
+                        txt._txtObject.position.y = myThis.svgPos.y + mxObj.screenCoordLong2Doc(txt.txtPos.y);
+                    else
+                        txt._txtObject.position.y = myThis.svgPos.y - mxObj.screenCoordLong2Doc(txt.txtPos.y);
+                    txt._txtObject.updateMatrix();
+                }
+            }
+        });
+        return true;
+    };
     return MxDbSVG;
 }(MxDbEntity_1.default));
 exports.default = MxDbSVG;

package/dist/lib/MxModule/MxDbSVGText/MxDbSVGText.js

@@ -12,6 +12,9 @@ var MxDbSVGText = /** @class */ (function () {
         this.txtPos = new THREE.Vector3();
         this.txt = '';
         this.txtHeight = 1;
+        this.color = undefined;
+        this._txtObject = null;
+        this._txtAspectRatio = -1;
     }
     return MxDbSVGText;
 }());

package/dist/lib/MxModule/MxFun/MxFun.js

@@ -15,6 +15,7 @@ var proxy_1 = require("../../tools/proxy");
 var MxDrawObject_1 = require("../MxDrawObject");
 var store_1 = require("../store/store");
 var useCanvasResizeListener_1 = require("../useCanvasResizeListener");
+var MrxDbgUiPrPoint_1 = require("../MrxDbgUiPrPoint");
 /**
  * MxFun 模块
  * 导出库时已实例化，只需要调用实例方法 例如：
@@ -576,6 +577,53 @@ var MxFun = /** @class */ (function () {
     MxFun.prototype.addToCurrentSpace = function (ent) {
         return this.getCurrentDraw().addMxEntity(ent);
     };
+    /**
+     * 在图上选择一个对象。
+     * @param strPrompt  提示字符串
+     * @param filter  过滤条件
+     * @returns number 返回对象的id
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
+    MxFun.prototype.selectEnt = function (strPrompt, filter) {
+        var _this = this;
+        if (filter === void 0) { filter = null; }
+        return new Promise(function (resolve, reject) {
+            var getPoint = new MrxDbgUiPrPoint_1.default();
+            getPoint.setMessage(strPrompt);
+            getPoint.go(function (status) {
+                if (status != 0) {
+                    resolve(0);
+                    return;
+                }
+                var pt = getPoint.value();
+                var mxobj = _this.getCurrentDraw();
+                var aryFind = mxobj.findMxEntityAtPoint(pt);
+                var iFindId = 0;
+                while (true) {
+                    if (aryFind.length == 0) {
+                        break;
+                    }
+                    var iLen = aryFind.length;
+                    for (var i = 0; i < iLen; i++) {
+                        var ent = aryFind[i];
+                        if (filter) {
+                            if (filter['type'] && filter['type'] != ent.getTypeName()) {
+                                continue;
+                            }
+                        }
+                        iFindId = ent.objectId();
+                        break;
+                    }
+                    break;
+                }
+                resolve(iFindId);
+            });
+        });
+    };
     return MxFun;
 }());
 exports.default = MxFun;

package/dist/lib/MxModule/loadCoreCode/mxfun.es5.js

@@ -5328,10 +5328,10 @@ function mxfun() { !function a(o, s, l) { function c(e, t) { if (!s[e]) {
                 l.renderOrder = this.iRenderOrder, this.drawEntity(l), this.drawSelectLine(r, a);
             }
             else
-                this.drawEntity(u.MxThreeJS.createLine(r, a, this.iColor, this.opacity)); }, d.prototype.drawCircle = function (t, e) { this.drawEntity(u.MxThreeJS.createCircle(t, e, this.iColor)); }, d.prototype.drawText = function (t, e, n, i) { var r = u.MxThreeJS.creatTextSprite(t, i, e, n, this.iColor); this.drawEntity(r); }, d.prototype.setupForEntity = function (t) { this.iColor = t.getColor(), this.iRenderOrder = t.getRenderOrder(), this.opacity = t.opacity; }, d);
+                this.drawEntity(u.MxThreeJS.createLine(r, a, this.iColor, this.opacity)); }, d.prototype.drawCircle = function (t, e) { this.drawEntity(u.MxThreeJS.createCircle(t, e, this.iColor)); }, d.prototype.drawText = function (t, e, n, i) { var r = u.MxThreeJS.creatTextSprite(t, i, e, n, this.iColor); return this.drawEntity(r), r; }, d.prototype.setupForEntity = function (t) { this.iColor = t.getColor(), this.iRenderOrder = t.getRenderOrder(), this.opacity = t.opacity; }, d);
             function d(t, e) { this.aryEntity = [], this.iColor = 16777215, this.dLineWidth = 0, this.lineWidthIsPixels = !0, this.iRenderOrder = s.MxData.iMxEntityRenderOrder, this.worldDrawType = 1, this.widthMaterial = null, this.dDashArray = 0, this.dDashRatio = 0, this.opacity = 1, this.mxObj = t, this.worldDrawType = e; }
             n.McGiWorldDraw = l;
-            var p, f = (r(m, p = l), m.prototype.setCurEntityId = function (t) { this.curEntityId = t; }, m.prototype.drawEntity = function (t) { }, m.prototype.drawText = function (t, e, n, i) { }, m.prototype.drawSelectLine = function (t, e, n, i) { }, m.prototype.isValid = function () { return 0 != this.curEntityId || (console.log("this.curEntityId == 0"), !1); }, m.prototype.drawLine = function (t, e, n, i) { var r, a; this.isValid() && (t instanceof Object && e instanceof Object ? (r = t, a = e) : "number" == typeof t && "number" == typeof e && (r = new c.Vector3(t, e, 0), a = new c.Vector3(n, i, 0)), this.selectManager.addLineDisplay(this.curEntityId, r, a)); }, m.prototype.drawCircle = function (t, e) { this.isValid() && this.selectManager.addCircleDisplay(this.curEntityId, t, e); }, m.prototype.drawLines = function (t) { if (!(t.length < 2))
+            var p, f = (r(m, p = l), m.prototype.setCurEntityId = function (t) { this.curEntityId = t; }, m.prototype.drawEntity = function (t) { }, m.prototype.drawText = function (t, e, n, i) { return null; }, m.prototype.drawSelectLine = function (t, e, n, i) { }, m.prototype.isValid = function () { return 0 != this.curEntityId || (console.log("this.curEntityId == 0"), !1); }, m.prototype.drawLine = function (t, e, n, i) { var r, a; this.isValid() && (t instanceof Object && e instanceof Object ? (r = t, a = e) : "number" == typeof t && "number" == typeof e && (r = new c.Vector3(t, e, 0), a = new c.Vector3(n, i, 0)), this.selectManager.addLineDisplay(this.curEntityId, r, a)); }, m.prototype.drawCircle = function (t, e) { this.isValid() && this.selectManager.addCircleDisplay(this.curEntityId, t, e); }, m.prototype.drawLines = function (t) { if (!(t.length < 2))
                 for (var e = t.length, n = 0; n < e - 1; n++)
                     this.selectManager.addLineDisplay(this.curEntityId, t[n], t[n + 1]); }, m);
             function m(t, e) { var n = p.call(this, t, a.kSelectDraw) || this; return n.selectManager = e, n.curEntityId = 0, n; }
@@ -5973,7 +5973,7 @@ function mxfun() { !function a(o, s, l) { function c(e, t) { if (!s[e]) {
         }, { "./MxFun": 45, "./MxJigCmdManager": 48, "./MxType": 60, "./MxUiVue": 64 }], 34: [function (t, e, n) {
             "use strict";
             Object.defineProperty(n, "__esModule", { value: !0 }), n.MxDbDatabase = void 0;
-            var o = t("three"), i = t("./MxFun"), c = t("./MxDbEntity"), r = t("./MxDbEntityGrip"), a = t("./MxDbEntitySelect"), u = t("./MxManager"), s = t("./MxType"), l = (h.prototype.getAllEntity = function () { return this.mapIdToEntity; }, h.prototype.upDirtyDisplay = function () { var e = !1; return this.mapIdToEntity.forEach(function (t) { t.getDirtyDisplay() && (t.upDisplay(), t.setDirtyDisplay(!1), e = !0); }), e; }, h.prototype.saveJson = function () { var t = { ver: 1 }, e = new o.Vector3(0, 0, 0), n = new o.Vector3(this.mxObj.getViewWidth(), this.mxObj.getViewHeight(), 0), i = (this.mxObj.screenCoord2World(e.x, e.y, 0), this.mxObj.screenCoord2World(n.x, n.y, 0), this.mxObj.screenCoord2Doc(e.x, e.y, 0)), r = this.mxObj.screenCoord2Doc(n.x, n.y, 0); t.view = { ptView1: i, ptView2: r }; var a = []; return this.mapIdToEntity.forEach(function (t) { var e = t.getUserObject(), n = { type: s.MxType.MxCloneType.kMxFileClone }; e.dwgOut(n), n.TypeName = e.getTypeName(), a.push(n); }), t.entitys = a, JSON.stringify(t); }, h.prototype.loadJson = function (t) { var e = JSON.parse(t); if (e.view) {
+            var o = t("three"), i = t("./MxFun"), c = t("./MxDbEntity"), r = t("./MxDbEntityGrip"), a = t("./MxDbEntitySelect"), u = t("./MxManager"), s = t("./MxType"), l = (h.prototype.getAllEntity = function () { return this.mapIdToEntity; }, h.prototype.upDirtyDisplay = function () { var e = !1; return this.mapIdToEntity.forEach(function (t) { t.getDirtyDisplay() && (t.upDisplay(), t.setDirtyDisplay(!1), e = !0); }), e; }, h.prototype.onViewChange = function () { var e = !1; return this.mapIdToEntity.forEach(function (t) { t.onViewChange() && (e = !0); }), e; }, h.prototype.saveJson = function () { var t = { ver: 1 }, e = new o.Vector3(0, 0, 0), n = new o.Vector3(this.mxObj.getViewWidth(), this.mxObj.getViewHeight(), 0), i = this.mxObj.screenCoord2Doc(e.x, e.y, 0), r = this.mxObj.screenCoord2Doc(n.x, n.y, 0); t.view = { ptView1: i, ptView2: r }; var a = []; return this.mapIdToEntity.forEach(function (t) { var e = t.getUserObject(), n = { type: s.MxType.MxCloneType.kMxFileClone }; e.dwgOut(n), n.TypeName = e.getTypeName(), a.push(n); }), t.entitys = a, JSON.stringify(t); }, h.prototype.loadJson = function (t) { var e = JSON.parse(t); if (e.view) {
                 var n = e.view;
                 this.mxObj.zoomW(n.ptView1, n.ptView2, !1);
             } for (var i = e.entitys, r = i.length, a = 0; a < r; a++) {
@@ -5989,7 +5989,7 @@ function mxfun() { !function a(o, s, l) { function c(e, t) { if (!s[e]) {
         }, { "./MxDbEntity": 35, "./MxDbEntityGrip": 36, "./MxDbEntitySelect": 37, "./MxFun": 45, "./MxManager": 51, "./MxType": 60, three: 19 }], 35: [function (t, e, n) {
             "use strict";
             Object.defineProperty(n, "__esModule", { value: !0 }), n.MxDbEntity = n.MxDbEntityClassHierarchy = n.MxDbEntityUserObject = void 0;
-            var s = t("three"), l = t("./McGiWorldDraw"), i = t("./MxManager"), c = t("./MxTools"), r = t("./MxType"), a = (o.prototype.getTypeName = function () { return ""; }, o.prototype.getImp = function () { return this.MxDbEntityImp; }, o.prototype.upDisplay = function () { var t = this.getImp(); return !!t && t.upDisplay(); }, o.prototype.erase = function () { var t = this.getImp(); return !!t && t.erase(); }, o.prototype.setColor = function (t) { this.iColor = t; }, o.prototype.getColor = function () { return this.iColor; }, o.prototype.setRenderOrder = function (t) { this.iRenderOrder = t; }, o.prototype.getRenderOrder = function () { return this.iRenderOrder; }, o.prototype.dwgIn = function (t) { return this.iColor = t.iColor, this.iRenderOrder = t.iRenderOrder, this.opacity = t.opacity, this.visible = t.visible, !0; }, o.prototype.dwgOut = function (t) { return t.iColor = this.iColor, t.iRenderOrder = this.iRenderOrder, t.opacity = this.opacity, t.visible = this.visible, t; }, o.prototype.clone = function (t) { var e = this.create(), n = { type: t || r.MxType.MxCloneType.kClone }; return this.dwgOut(n), e.dwgIn(n), e; }, o.prototype.init = function () { i.MxManager.getMxDbEntityClassHierarchy().init(this); }, o.prototype.transformBy = function (t) { }, o.prototype.objectId = function () { var t = this.getImp(); return t ? t.objectId() : 0; }, o);
+            var s = t("three"), l = t("./McGiWorldDraw"), i = t("./MxManager"), c = t("./MxTools"), r = t("./MxType"), a = (o.prototype.getTypeName = function () { return ""; }, o.prototype.getMxObject = function () { var t = this.getImp(); return t ? t.getMxObject() : null; }, o.prototype.onViewChange = function () { return !1; }, o.prototype.getImp = function () { return this.MxDbEntityImp; }, o.prototype.upDisplay = function () { var t = this.getImp(); return !!t && t.upDisplay(); }, o.prototype.erase = function () { var t = this.getImp(); return !!t && t.erase(); }, o.prototype.setColor = function (t) { this.iColor = t; }, o.prototype.getColor = function () { return this.iColor; }, o.prototype.setRenderOrder = function (t) { this.iRenderOrder = t; }, o.prototype.getRenderOrder = function () { return this.iRenderOrder; }, o.prototype.dwgIn = function (t) { return this.iColor = t.iColor, this.iRenderOrder = t.iRenderOrder, this.opacity = t.opacity, this.visible = t.visible, !0; }, o.prototype.dwgOut = function (t) { return t.iColor = this.iColor, t.iRenderOrder = this.iRenderOrder, t.opacity = this.opacity, t.visible = this.visible, t; }, o.prototype.clone = function (t) { var e = this.create(), n = { type: t || r.MxType.MxCloneType.kClone }; return this.dwgOut(n), e.dwgIn(n), e; }, o.prototype.init = function () { i.MxManager.getMxDbEntityClassHierarchy().init(this); }, o.prototype.transformBy = function (t) { }, o.prototype.objectId = function () { var t = this.getImp(); return t ? t.objectId() : 0; }, o);
             function o() { this.iColor = 16777215, this.iRenderOrder = i.MxData.iMxEntityRenderOrder, this.opacity = 1, this.visible = !0; }
             n.MxDbEntityUserObject = a;
             var u = (h.prototype.init = function (t) { var e = t.getTypeName(); this.mapType2Create.get(e) && console.log("MxError:already has this class name " + e), this.mapType2Create.set(e, t); }, h.prototype.createMxEntity = function (t) { var e = this.mapType2Create.get(t); return e ? e.create() : null; }, h);
@@ -6010,7 +6010,7 @@ function mxfun() { !function a(o, s, l) { function c(e, t) { if (!s[e]) {
                 }
             }
             else
-                c.MxTools.MxASSERT(!1, "this.userObject == null"); }, p.prototype.worldDraw = function (t) { this.userObject.worldDraw(t); }, p.prototype.getGripPoints = function () { return this.userObject.getGripPoints(); }, p.prototype.getUserObject = function () { return this.userObject; }, p.prototype.clone = function (t) { var e = new p; return e.initUserObject(this.userObject.clone(t)), e; }, p.prototype.transformBy = function (t) { this.userObject.transformBy(t); }, p.prototype.setColor = function (t) { this.userObject.setColor(t); }, p.prototype.getColor = function () { return this.userObject.getColor(); }, p);
+                c.MxTools.MxASSERT(!1, "this.userObject == null"); }, p.prototype.worldDraw = function (t) { this.userObject.worldDraw(t); }, p.prototype.getGripPoints = function () { return this.userObject.getGripPoints(); }, p.prototype.getUserObject = function () { return this.userObject; }, p.prototype.clone = function (t) { var e = new p; return e.initUserObject(this.userObject.clone(t)), e; }, p.prototype.transformBy = function (t) { this.userObject.transformBy(t); }, p.prototype.setColor = function (t) { this.userObject.setColor(t); }, p.prototype.getColor = function () { return this.userObject.getColor(); }, p.prototype.getMxObject = function () { return this.mxDatabase ? this.mxDatabase.getMxObject() : null; }, p.prototype.onViewChange = function () { return !!this.userObject && this.userObject.onViewChange(); }, p);
             function p() { this.threeObjectGroup = null, this.userObject = null, this.mxDatabase = null, this.isDirtyDisplay = !1, this.id = 0; }
             n.MxDbEntity = d;
         }, { "./McGiWorldDraw": 21, "./MxManager": 51, "./MxTools": 59, "./MxType": 60, three: 19 }], 36: [function (t, e, n) {
@@ -6191,7 +6191,7 @@ function mxfun() { !function a(o, s, l) { function c(e, t) { if (!s[e]) {
                 return !1; this.reInit(), this._devicePixelRatio = window.devicePixelRatio, this._openFile = t, this._openFileExtName = t.substring(t.lastIndexOf(".") + 1), this._iniParam = []; var e = new Array; return e.push("file"), e.push(this._openFile), this._iniParam.push(e), this.onLoad(), !0; }, _.prototype.create = function (t, e) { if (this._callCreateCanvasImageData = void 0, this._devicePixelRatio = window.devicePixelRatio, this._openFile = e, this._iniParam = u.MxFun.getUrlParams(), this._openFileExtName = e.substring(e.lastIndexOf(".") + 1), "" != this._openFile && this._runMode != s.kMxCAD && this._runMode != s.kMxCADBrowseApp) {
                 var n = new Array;
                 n.push("file"), n.push(this._openFile), this._iniParam.push(n);
-            } "" != this._userIdentitySign && (this.addInitParam("userIdentitySign", this._userIdentitySign), this.addInitParam("userRandomToken", this._userRandomToken)), this.addInitParam("runMode", this._runMode == s.kMxCAD || this._runMode == s.kMxCADBrowseApp ? "mxcad" : "browse"), this._runMode == s.kMxCAD || this._runMode == s.kMxCADBrowseApp ? ("empty" == this._openFile && (this._openFile = ""), this._mxCAD = new g.MxCADObject(this)) : this._mxCAD = null, this._userCanvas = t; var i = window.innerWidth, r = window.innerHeight; null != t && (i = t.clientWidth, r = t.clientHeight), this._viewWidth = i, this._viewHeight = r, this.m_mxDatabase.getSelectManager().setCanvasSize(i, r), this.onInitThreejs(), this.onCreate(), this.m_mxDatabase.init(this), this._parentDocObject = new c.Object3D, this.scene.add(this._parentDocObject), this.threejsselectObjects = new c.Object3D, this.scene.add(this.threejsselectObjects), this._objectsOsnap = new y.MxDrawObjectOsnap(this), this._is2d && (this._runMode != s.kMxCAD && this._runMode != s.kMxCADBrowseApp || (this.controls.mouseButtons.LEFT = -1, this.controls.mouseButtons.RIGHT = -1, this.controls.mouseButtons.MIDDLE = c.MOUSE.PAN)), this._select = new d.MxSelect(this, this.getCanvas()), this._select.enabled = u.MxFun.isEnableSelect(), this._select.init(), this._is2d || (this._select.enabled = !1), this._runMode != s.kBrowse && (this._select.enabled = !1), p.MxManager.add(this), p.MxManager.setCurrentMx(this); var a = this; if (this.controls.addEventListener("change", function () { f.MxJigCmdManager.OnThreeControlsChage(), a.callEvent("viewchange"); var t = a.getMxCAD(); t && t.getGrip().onControlsChage(), a.updateDisplay(); }), this.updateDisplay(), null == t)
+            } "" != this._userIdentitySign && (this.addInitParam("userIdentitySign", this._userIdentitySign), this.addInitParam("userRandomToken", this._userRandomToken)), this.addInitParam("runMode", this._runMode == s.kMxCAD || this._runMode == s.kMxCADBrowseApp ? "mxcad" : "browse"), this._runMode == s.kMxCAD || this._runMode == s.kMxCADBrowseApp ? ("empty" == this._openFile && (this._openFile = ""), this._mxCAD = new g.MxCADObject(this)) : this._mxCAD = null, this._userCanvas = t; var i = window.innerWidth, r = window.innerHeight; null != t && (i = t.clientWidth, r = t.clientHeight), this._viewWidth = i, this._viewHeight = r, this.m_mxDatabase.getSelectManager().setCanvasSize(i, r), this.onInitThreejs(), this.onCreate(), this.m_mxDatabase.init(this), this._parentDocObject = new c.Object3D, this.scene.add(this._parentDocObject), this.threejsselectObjects = new c.Object3D, this.scene.add(this.threejsselectObjects), this._objectsOsnap = new y.MxDrawObjectOsnap(this), this._is2d && (this._runMode != s.kMxCAD && this._runMode != s.kMxCADBrowseApp || (this.controls.mouseButtons.LEFT = -1, this.controls.mouseButtons.RIGHT = -1, this.controls.mouseButtons.MIDDLE = c.MOUSE.PAN)), this._select = new d.MxSelect(this, this.getCanvas()), this._select.enabled = u.MxFun.isEnableSelect(), this._select.init(), this._is2d || (this._select.enabled = !1), this._runMode != s.kBrowse && (this._select.enabled = !1), p.MxManager.add(this), p.MxManager.setCurrentMx(this); var a = this; if (this.controls.addEventListener("change", function () { f.MxJigCmdManager.OnThreeControlsChage(), a.callEvent("viewchange"), a.m_mxDatabase.onViewChange(); var t = a.getMxCAD(); t && t.getGrip().onControlsChage(), a.updateDisplay(); }), this.updateDisplay(), null == t)
                 window.addEventListener("resize", function () { a._viewWidth = window.innerWidth, a._viewHeight = window.innerHeight, a.onResizeImp(), a.updateDisplay(); }, !1);
             else {
                 var o = function () { if (a._viewWidth = a._userCanvas.clientWidth, a._viewHeight = a._userCanvas.clientHeight, null != a._event.onResize) {
@@ -6367,7 +6367,7 @@ function mxfun() { !function a(o, s, l) { function c(e, t) { if (!s[e]) {
             else {
                 var s = Math.abs(this._minDisplayPoint.x - this._maxDisplayPoint.x), l = Math.abs(this._minDisplayPoint.y - this._maxDisplayPoint.y);
                 s / l < n / i ? (a = .5 * l, o = n / i, r.left = -a * o, r.right = a * o, r.top = a, r.bottom = -a) : (a = .5 * s, o = i / n, r.left = -a, r.right = a, r.top = a * o, r.bottom = -a * o), r.updateProjectionMatrix();
-            } this.renderer.setSize(n, i), this.updataClipMaterial(), this.updataCameraView(n, i), this.callEvent("viewsizechange", { width: n, height: i }), this.callEvent("viewchange"), this.m_mxDatabase.getSelectManager().setCanvasSize(n, i); }, d);
+            } this.renderer.setSize(n, i), this.updataClipMaterial(), this.updataCameraView(n, i), this.callEvent("viewsizechange", { width: n, height: i }), this.callEvent("viewchange"), this.m_mxDatabase.getSelectManager().setCanvasSize(n, i), this.m_mxDatabase.onViewChange(); }, d);
             function d() { var t = null !== a && a.apply(this, arguments) || this; return t._minDisplayPoint = null, t._maxDisplayPoint = null, t.is3DDraw = o.MxFun.is3DDwg(), t; }
             n.MxDrawObject2d = h;
         }, { "./MxDrawObject": 41, "./MxFun": 45, "./MxMaterial": 52, "./MxNetData": 53, three: 19, "three-orbitcontrols": 17 }], 43: [function (t, e, n) {
@@ -7135,7 +7135,7 @@ function mxfun() { !function a(o, s, l) { function c(e, t) { if (!s[e]) {
                 return !1; d.OnMxEvent(t); };
         }, { "./MxCmdRunManager": 33, "./MxFun": 45, "./MxJigCmdManager": 48, "./MxTools": 59 }], 65: [function (t, e, n) {
             "use strict";
-            Object.defineProperty(n, "__esModule", { value: !0 }), n.MxBulid = void 0, window.MxDrawVersion = "1.0(2022-04-23 17:25)", (n.MxBulid || (n.MxBulid = {})).getVersion = function () { return window.MxDrawVersion ? window.MxDrawVersion : "inalid version"; };
+            Object.defineProperty(n, "__esModule", { value: !0 }), n.MxBulid = void 0, window.MxDrawVersion = "1.0(2022-04-24 16:08)", (n.MxBulid || (n.MxBulid = {})).getVersion = function () { return window.MxDrawVersion ? window.MxDrawVersion : "inalid version"; };
         }, {}], 66: [function (t, e, n) {
             "use strict";
             Object.defineProperty(n, "__esModule", { value: !0 }), n.MxWindowsEvent = void 0;