mxdraw 0.1.8 → 0.1.11

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,9 +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 MxFun_1 = require("../MxFun");
+var MxDbSVGText_1 = require("../MxDbSVGText");
 var MxThreeJS_1 = require("../MxThreeJS");
 var MxType_1 = require("../MxType");
 /**
@@ -34,74 +34,132 @@ 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.txtPos = new THREE.Vector3();
-        _this.txt = '';
-        _this.txtHeight = 1;
+        _this.aryText = [];
+        _this.svgBoxSize = null;
+        // 固定尺寸，图片和文字大小，取屏幕像素绘图单位。
+        _this.fixedSize = false;
+        _this.useSvgColor = false;
         return _this;
     }
     MxDbSVG.prototype.worldDraw = function (pWorldDraw) {
-        this.calcSvgPosition();
-        if (this.txt.length > 0) {
-            var posTxt = new THREE.Vector3(this.txtPos.x, this.txtPos.y, 0);
-            pWorldDraw.drawText(this.txt, this.txtHeight, 0, posTxt);
+        var _this = this;
+        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 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 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(pWorldDraw.getColor());
                             obj.traverse(function (child) {
                                 if (child.material) {
+                                    child.material = child.material.clone();
                                     child.material.transparent = true;
+                                    if (!myThis_1.useSvgColor)
+                                        child.material.color = color_1;
                                 }
                             });
                             //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;
     };
     MxDbSVG.prototype.setSvgPostion = function (pos) {
-        this.svgPos = pos;
+        this.svgPos = pos.clone();
         this.isSvgDirtyLocation = true;
     };
     MxDbSVG.prototype.getSvgPostion = function () {
@@ -121,24 +179,16 @@ var MxDbSVG = /** @class */ (function (_super) {
     MxDbSVG.prototype.getSvgAlignmentRatio = function () {
         return this.svgAlignmentRatio;
     };
-    //
-    MxDbSVG.prototype.setTextHeight = function (height) {
-        this.txtHeight = height;
-    };
-    MxDbSVG.prototype.getTextHeight = function () {
-        return this.txtHeight;
-    };
-    MxDbSVG.prototype.setText = function (txt) {
-        this.txt = txt;
-    };
-    MxDbSVG.prototype.getText = function () {
-        return this.txt;
-    };
-    MxDbSVG.prototype.setTextPostion = function (pos) {
-        this.txtPos = pos;
+    MxDbSVG.prototype.getText = function (index) {
+        if (index < this.aryText.length) {
+            return this.aryText[index];
+        }
+        else {
+            return null;
+        }
     };
-    MxDbSVG.prototype.getTextPostion = function () {
-        return this.txtPos;
+    MxDbSVG.prototype.addText = function (txt) {
+        this.aryText.push(txt);
     };
     MxDbSVG.prototype.getGripPoints = function () {
         var ret = [];
@@ -148,22 +198,38 @@ var MxDbSVG = /** @class */ (function (_super) {
     MxDbSVG.prototype.moveGripPointsAt = function (index, offset) {
         if (index == 0) {
             this.svgPos.add(offset);
-            this.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,9 +239,18 @@ var MxDbSVG = /** @class */ (function (_super) {
         this.isSvgDirtyLocation = true;
         if (!this.svg)
             this.isLoadFromPath = true;
-        this.txt = obj['txt'];
-        this.txtHeight = obj['txtHeight'];
-        this.txtPos.copy(obj['txtPos']);
+        this.svgBoxSize = null;
+        var aryText = obj['txts'];
+        this.aryText = [];
+        aryText.forEach(function (txt) {
+            var copyTxt = new MxDbSVGText_1.default();
+            copyTxt.txt = txt.txt;
+            copyTxt.txtHeight = txt.txtHeight;
+            copyTxt.txtPos.copy(txt.txtPos);
+            _this.aryText.push(copyTxt);
+        });
+        this.svgRotate = obj['svgRotate'];
+        this.useSvgColor = obj['useSvgColor'];
         return true;
     };
     MxDbSVG.prototype.dwgOut = function (obj) {
@@ -187,9 +262,10 @@ var MxDbSVG = /** @class */ (function (_super) {
         obj['svgPos'] = this.svgPos;
         obj['svgSize'] = this.svgSize;
         obj['svgAlignmentRatio'] = this.svgAlignmentRatio;
-        obj['txt'] = this.txt;
-        obj['txtHeight'] = this.txtHeight;
-        obj['txtPos'] = this.txtPos;
+        obj['txts'] = this.aryText;
+        obj['fixedSize'] = this.fixedSize;
+        obj['svgRotate'] = this.svgRotate;
+        obj['useSvgColor'] = this.useSvgColor;
         return obj;
     };
     MxDbSVG.prototype.create = function () {
@@ -197,12 +273,72 @@ var MxDbSVG = /** @class */ (function (_super) {
     };
     MxDbSVG.prototype.transformBy = function (mat) {
         this.svgPos.applyMatrix4(mat);
-        this.txtPos.applyMatrix4(mat);
         this.isSvgDirtyLocation = true;
+        if (!this.fixedSize) {
+            this.aryText.forEach(function (txt) {
+                txt.txtPos.applyMatrix4(mat);
+            });
+        }
     };
     MxDbSVG.prototype.getTypeName = function () {
         return 'MxDbSVG';
     };
+    MxDbSVG.prototype.setColor = function (color) {
+        _super.prototype.setColor.call(this, color);
+        if (this.svg) {
+            var color_2 = new THREE.Color(this.color);
+            this.svg.traverse(function (child) {
+                if (child.material) {
+                    child.material.color = color_2;
+                }
+            });
+        }
+    };
+    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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+///////////////////////////////////////////////////////////////////////////////
+//版权所有（C）2002-2022，成都梦想凯德科技有限公司。
+//本软件代码及其文档和相关资料归成都梦想凯德科技有限公司,应用包含本软件的程序必须包括以下版权声明
+//此应用程序与成都梦想凯德科技有限公司成协议。通过使用本软件、其文档或相关材料
+///////////////////////////////////////////////////////////////////////////////
+/** @module MxDbSVG*/
+var THREE = require("three");
+var MxDbSVGText = /** @class */ (function () {
+    function MxDbSVGText() {
+        this.txtPos = new THREE.Vector3();
+        this.txt = '';
+        this.txtHeight = 1;
+        this.color = undefined;
+        this._txtObject = null;
+        this._txtAspectRatio = -1;
+    }
+    return MxDbSVGText;
+}());
+exports.default = MxDbSVGText;

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

@@ -0,0 +1,5 @@
+"use strict";
+/** @module McEdGetPointWorldDrawObject*/
+Object.defineProperty(exports, "__esModule", { value: true });
+var MxDbSVGText_1 = require("./MxDbSVGText");
+exports.default = MxDbSVGText_1.default;

package/dist/lib/MxModule/MxDrawObject/MxDrawObject.js

@@ -1,6 +1,43 @@
 "use strict";
 /** @module MxDrawObject */
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+var MxThreeJS_1 = require("../MxThreeJS");
 /**
  * 引入mxdraw库不会挂载MxDrawObject 只能在以下特定函数中获取
  * @function
@@ -661,8 +698,30 @@ var MxDrawObject = /** @class */ (function () {
      *
      * ```
      */
-    MxDrawObject.prototype.loadMxEntityFromJson = function (dataString) {
-        return this._mxdrawObj.loadMxEntityFromJson(dataString);
+    MxDrawObject.prototype.loadMxEntityFromJson = function (dataString, aryPreloadSVG) {
+        if (aryPreloadSVG === void 0) { aryPreloadSVG = null; }
+        return __awaiter(this, void 0, void 0, function () {
+            var iLen, i;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!aryPreloadSVG) return [3 /*break*/, 4];
+                        iLen = aryPreloadSVG.length;
+                        i = 0;
+                        _a.label = 1;
+                    case 1:
+                        if (!(i < iLen)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, MxThreeJS_1.default.loadSVG(aryPreloadSVG[i])];
+                    case 2:
+                        _a.sent();
+                        _a.label = 3;
+                    case 3:
+                        i++;
+                        return [3 /*break*/, 1];
+                    case 4: return [2 /*return*/, this._mxdrawObj.loadMxEntityFromJson(dataString)];
+                }
+            });
+        });
     };
     /**
      * 删除所有对MxEntity
@@ -677,6 +736,19 @@ var MxDrawObject = /** @class */ (function () {
     MxDrawObject.prototype.eraseAllMxEntity = function () {
         return this._mxdrawObj.eraseAllMxEntity();
     };
+    /**
+     * 把该控件对象，设置成当前控件.
+     * @param
+     * @returns
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
+    MxDrawObject.prototype.makeCurrent = function () {
+        this._mxdrawObj.makeCurrent();
+    };
     return MxDrawObject;
 }());
 exports.default = MxDrawObject;

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 模块
  * 导出库时已实例化，只需要调用实例方法 例如：
@@ -560,8 +561,69 @@ var MxFun = /** @class */ (function () {
      * ``` typescript
      * ```
      */
-    MxFun.prototype.openFile = function (sFile) {
-        return store_1.default.state.MxFun.openFile(sFile);
+    MxFun.prototype.openFile = function (sFile, useWebsocket) {
+        if (useWebsocket === void 0) { useWebsocket = false; }
+        return store_1.default.state.MxFun.openFile(sFile, useWebsocket);
+    };
+    /**
+     * 添加一个MxDbEntity实体到当前绘图对象上。
+     * @param ent  实体对象
+     * @returns number 返回对象的id.
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
+    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;
 }());

package/dist/lib/MxModule/MxThreeJS/MxThreeJS.js

@@ -273,7 +273,11 @@ var MxThreeJS = /** @class */ (function () {
      * })
      * ```
      */
-    MxThreeJS.prototype.loadSVG = function (url, color, callResult) { };
+    MxThreeJS.prototype.loadSVG = function (url, color, callResult) {
+        return new Promise(function (resolve) {
+            resolve(null);
+        });
+    };
     return MxThreeJS;
 }());
 exports.default = MxThreeJS;

package/dist/lib/MxModule/MxThreeJS/MxThreeJS.mixin.js

@@ -128,7 +128,19 @@ function default_1(MxThreeJS) {
         });
     };
     MxThreeJS.loadSVG = function (url, color, callResult) {
-        mxThreeJsBuffer.loadSVG(url, color, callResult);
+        if (callResult) {
+            mxThreeJsBuffer.loadSVG(url, color, callResult);
+            return new Promise(function (resolve) {
+                resolve(null);
+            });
+        }
+        else {
+            return new Promise(function (resolve) {
+                mxThreeJsBuffer.loadSVG(url, color, function (threeobj) {
+                    resolve(threeobj);
+                });
+            });
+        }
     };
 }
 exports.default = default_1;

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

@@ -41,15 +41,16 @@ var dynamicImport_1 = require("../../tools/dynamicImport");
 var store_1 = require("../store/store");
 var mxfun_es5_js_1 = require("./mxfun.es5.js");
 var mxcadassembly_es5_js_1 = require("./mxcadassembly_es5.js");
-var MxDbImage_1 = require("../MxDbImage");
-var MxDbSVG_1 = require("../MxDbSVG");
-var MxDbAlignedDimension_1 = require("../MxDbAlignedDimension");
-var MxDbLine_1 = require("../MxDbLine");
 function rxInitMxEntity() {
-    new MxDbImage_1.default().rxInit();
-    new MxDbSVG_1.default().rxInit();
-    new MxDbAlignedDimension_1.default().rxInit();
-    new MxDbLine_1.default().rxInit();
+    /*
+    new MxDbImage().rxInit()
+    new MxDbSVG().rxInit()
+    new MxDbAlignedDimension().rxInit()
+    new MxDbLine().rxInit()
+    new MxDbRect().rxInit()
+    */
+    ;
+    store_1.default.state.MxFun.initDynamicCreate(dynamicImport_1.dynamicCreateMxObject);
 }
 /**
  * 加载MxDraw库的核心代码 才能使用Mx的其他模块