mxdraw 0.1.5 → 0.1.7

package/dist/lib/MxModule/MrxDbgUiPrPoint/MrxDbgUiPrPointClass.js

@@ -109,7 +109,24 @@ var MrxDbgUiPrPoint = /** @class */ (function () {
      * @returns void
      */
     MrxDbgUiPrPoint.prototype.go = function (retcall) {
-        return _MrxDbgUiPrPoint.go(retcall);
+        if (retcall) {
+            _MrxDbgUiPrPoint.go(retcall);
+            return new Promise(function (resolve, reject) {
+                resolve(null);
+            });
+        }
+        else {
+            return new Promise(function (resolve, reject) {
+                _MrxDbgUiPrPoint.go(function (status) {
+                    if (status != 0) {
+                        resolve(null);
+                    }
+                    else {
+                        resolve(_MrxDbgUiPrPoint.value());
+                    }
+                });
+            });
+        }
     };
     /**
      * 动态拖动，连续取点，直到ESC退出。

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

@@ -47,11 +47,11 @@ var MxDbImage = /** @class */ (function (_super) {
         var _this = this;
         var pt3 = new THREE.Vector3(this.pt1.x, this.pt2.y);
         var pt4 = new THREE.Vector3(this.pt2.x, this.pt1.y);
-        pWorldDraw.drawLine(this.pt1, pt3);
-        pWorldDraw.drawLine(pt3, this.pt2);
-        pWorldDraw.drawLine(this.pt2, pt4);
-        pWorldDraw.drawLine(pt4, this.pt1);
         if (pWorldDraw.getType() == 1) {
+            pWorldDraw.drawSelectLine(this.pt1, pt3);
+            pWorldDraw.drawSelectLine(pt3, this.pt2);
+            pWorldDraw.drawSelectLine(this.pt2, pt4);
+            pWorldDraw.drawSelectLine(pt4, this.pt1);
             // 图片正常的显示绘制.
             if (this.material) {
                 var w = Math.abs(this.pt1.x - this.pt2.x);
@@ -70,7 +70,7 @@ var MxDbImage = /** @class */ (function (_super) {
             }
             else if (this.imagePath.length > 0 && this.isLoadMaterialFromPath) {
                 var myThis_1 = this;
-                MxFun_1.default.loadImageMaterial('./models/img/mxcad.jpg', function (material) {
+                MxFun_1.default.loadImageMaterial(this.imagePath, function (material) {
                     _this.isLoadMaterialFromPath = false;
                     if (!material) {
                         return;
@@ -81,6 +81,12 @@ var MxDbImage = /** @class */ (function (_super) {
                 });
             }
         }
+        else {
+            pWorldDraw.drawLine(this.pt1, pt3);
+            pWorldDraw.drawLine(pt3, this.pt2);
+            pWorldDraw.drawLine(this.pt2, pt4);
+            pWorldDraw.drawLine(pt4, this.pt1);
+        }
     };
     MxDbImage.prototype.setImagePath = function (sPath) {
         this.imagePath = sPath;
@@ -110,6 +116,8 @@ var MxDbImage = /** @class */ (function (_super) {
         var ret = [];
         ret.push(this.pt1);
         ret.push(this.pt2);
+        var midPt = new THREE.Vector3(this.pt1.x + (this.pt2.x - this.pt1.x) * 0.5, this.pt1.y + (this.pt2.y - this.pt1.y) * 0.5);
+        ret.push(midPt);
         return ret;
     };
     // 图片的夹点拖动编辑.
@@ -117,7 +125,11 @@ var MxDbImage = /** @class */ (function (_super) {
         if (index == 0) {
             this.pt1.add(offset);
         }
-        else if ((index = 1)) {
+        else if (index == 1) {
+            this.pt2.add(offset);
+        }
+        else if (index == 2) {
+            this.pt1.add(offset);
             this.pt2.add(offset);
         }
         return true;

package/dist/lib/MxModule/MxDbRect/MxDbRect.js

@@ -29,6 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var MxDbEntity_1 = require("../MxDbEntity");
 var three_1 = require("three");
 var index_1 = require("../../tools/three/index");
+var _ = require("lodash");
 var MxFun_1 = require("../MxFun");
 /**
  * MxRectEntity 矩形对象.
@@ -37,6 +38,8 @@ var MxDbRect = /** @class */ (function (_super) {
     __extends(MxDbRect, _super);
     function MxDbRect() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
+        // 圆角半径
+        _this.cornerRadius = [];
         /**
          * pt1: 构成矩形的第一个点
          * */
@@ -53,10 +56,6 @@ var MxDbRect = /** @class */ (function (_super) {
          * height: 在绘制时自动计算矩形像素高度 单位px
          * */
         _this.height = 0;
-        /**
-         * cornerRadius(优先级大于radius属性): 圆角的半径  如[3, 2, 1, 4]分别对应左上角圆角半径3  右上角2  右下角1 左下角4
-         * */
-        _this.cornerRadius = [];
         /**
          * transparent 开启透明度
          * */
@@ -75,15 +74,6 @@ var MxDbRect = /** @class */ (function (_super) {
         var _this = this;
         //    根据第一个点和对角点 计算矩形的四个点位
         var points = (0, index_1.computeRectPoints)(this.pt1, this.pt2);
-        // 计算圆角顶点坐标
-        if (this.cornerRadius.length <= 0 && this.radius) {
-            this.cornerRadius = [
-                MxFun_1.default.screenCoordLong2Doc(this.radius),
-                MxFun_1.default.screenCoordLong2Doc(this.radius),
-                MxFun_1.default.screenCoordLong2Doc(this.radius),
-                MxFun_1.default.screenCoordLong2Doc(this.radius)
-            ];
-        }
         if (this.cornerRadius.length > 0) {
             points = (0, index_1.getToGenerateRoundedCorners)(points, this.cornerRadius);
         }
@@ -106,10 +96,10 @@ var MxDbRect = /** @class */ (function (_super) {
             // 计算矩形宽高
             geometry = new three_1.ShapeGeometry(new three_1.Shape(points));
             geometry.computeBoundingBox();
-            var size = new three_1.Vector3();
-            geometry.boundingBox.getSize(size);
-            this.width = MxFun_1.default.docCoord2Screen(size.x).x;
-            this.height = MxFun_1.default.docCoord2Screen(size.y).x;
+            var size_1 = new three_1.Vector3();
+            geometry.boundingBox.getSize(size_1);
+            this.width = MxFun_1.default.docCoord2Screen(size_1.x).x;
+            this.height = MxFun_1.default.docCoord2Screen(size_1.y).x;
             // 如果是图片填充
             if (this.fillImageSrc) {
                 var imgSrc = this.fillImageSrc;
@@ -161,6 +151,12 @@ var MxDbRect = /** @class */ (function (_super) {
             material = new three_1.LineBasicMaterial(__assign({ color: this.getColor() }, materialParam));
             line = new three_1.LineLoop(geometry, material);
         }
+        // 计算矩形宽高
+        geometry.computeBoundingBox();
+        var size = new three_1.Vector3();
+        geometry.boundingBox.getSize(size);
+        this.width = MxFun_1.default.docCoord2Screen(size.x).x;
+        this.height = MxFun_1.default.docCoord2Screen(size.y).x;
         pWorldDraw.drawEntity(line);
     };
     MxDbRect.prototype.getGripPoints = function () {
@@ -190,18 +186,28 @@ var MxDbRect = /** @class */ (function (_super) {
         this.onDwgIn(obj);
         this.pt1.copy(obj['pt1']);
         this.pt2.copy(obj['pt2']);
+        this.fillColor = obj['fillColor'];
+        this.fillImageSrc = obj['fillImageSrc'];
+        this.fillImageSrc = obj['fillImageParam'];
         this.cornerRadius = obj['cornerRadius'];
-        this.radius = obj['radius'];
         this.filter = obj['filter'];
+        this.transparent = obj['transparent'];
+        this.opacity = obj['opacity'];
+        this.visible = obj['visible'];
         return true;
     };
     MxDbRect.prototype.dwgOut = function (obj) {
         this.onDwgOut(obj);
         obj['pt1'] = this.pt1;
         obj['pt2'] = this.pt2;
+        obj['fillColor'] = this.fillColor;
+        obj['fillImageSrc'] = this.fillImageSrc;
+        obj['fillImageParam'] = this.fillImageParam;
         obj['cornerRadius'] = this.cornerRadius;
-        obj['radius'] = this.radius;
         obj['filter'] = this.filter;
+        obj['transparent'] = this.transparent;
+        obj['opacity'] = this.opacity;
+        obj['visible'] = this.visible;
         return obj;
     };
     MxDbRect.prototype.create = function () {
@@ -211,8 +217,32 @@ var MxDbRect = /** @class */ (function (_super) {
         this.pt1.applyMatrix4(mat);
         this.pt2.applyMatrix4(mat);
     };
+    /**
+     * setRadius 设置圆角 圆角的半径  如[3, 2, 1, 4]分别对应左上角圆角半径3  右上角2  右下角1 左下角4
+     * @param { number | number[] } radius 圆角半径 为数组时[3, 2, 1, 4]分别对应左上角圆角半径3  右上角2  右下角1 左下角4； 或者直接设置半径值 则四个角统一半径
+     * */
+    MxDbRect.prototype.setRadius = function (radius) {
+        if (_.isArray(radius)) {
+            this.cornerRadius = radius.map(function (r) {
+                return MxFun_1.default.screenCoordLong2Doc(r);
+            });
+        }
+        else if (_.isNumber(radius)) {
+            if (radius > 0) {
+                this.cornerRadius = [
+                    MxFun_1.default.screenCoordLong2Doc(radius),
+                    MxFun_1.default.screenCoordLong2Doc(radius),
+                    MxFun_1.default.screenCoordLong2Doc(radius),
+                    MxFun_1.default.screenCoordLong2Doc(radius)
+                ];
+            }
+            else {
+                this.cornerRadius = [];
+            }
+        }
+    };
     MxDbRect.prototype.getTypeName = function () {
-        return 'MxRectEntity';
+        return 'MxDbRect';
     };
     return MxDbRect;
 }(MxDbEntity_1.default));

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

@@ -51,7 +51,7 @@ var MxFun = /** @class */ (function () {
      * ```
      */
     MxFun.prototype.createMxObject = function (_a) {
-        var _b = _a.canvasId, canvasId = _b === void 0 ? (0, random_1.createReandomId)() : _b, _c = _a.cadFile, cadFile = _c === void 0 ? '' : _c, callback = _a.callback, _d = _a.isNewFile, isNewFile = _d === void 0 ? false : _d, _e = _a.useWebsocket, useWebsocket = _e === void 0 ? false : _e;
+        var _b = _a.canvasId, canvasId = _b === void 0 ? (0, random_1.createReandomId)() : _b, _c = _a.cadFile, cadFile = _c === void 0 ? '' : _c, callback = _a.callback, _d = _a.isNewFile, isNewFile = _d === void 0 ? false : _d, _e = _a.useWebsocket, useWebsocket = _e === void 0 ? false : _e, _f = _a.isAutoResize, isAutoResize = _f === void 0 ? true : _f;
         // 获取canvas和其父级
         var canvas = (0, create_1.createCanvas)(canvasId);
         var canvasParent = (0, create_1.createCanvasParent)(canvas);
@@ -77,7 +77,8 @@ var MxFun = /** @class */ (function () {
                 };
             });
             // 使用canvas侦听器 监听canvas元素的大小变化
-            (0, useCanvasResizeListener_1.default)(mxdrawObj, canvas);
+            if (isAutoResize)
+                (0, useCanvasResizeListener_1.default)(mxdrawObj, canvas);
             callback &&
                 callback(mxdrawObj, {
                     canvas: canvas,

package/dist/lib/MxModule/store/store.js

@@ -7,9 +7,7 @@ var options = {
         MxFun: null,
         Mxassembly: null,
         /* 是否创建了mxdrawObj实例 MxFun.createMxObject */
-        isCreateDrawObj: false,
-        /* 是否加载了canvas大小侦听器 */
-        isLoadCanvasResizeListene: false
+        isCreateDrawObj: false
     },
     actions: {},
     mutations: {}

package/dist/lib/MxModule/useCanvasResizeListener/useCanvasResizeListener.js

@@ -55,7 +55,7 @@ function useCanvasResizeListener(mxdrawObj, canvas, time, autoAdjust, callback)
     if (time === void 0) { time = 100; }
     if (autoAdjust === void 0) { autoAdjust = true; }
     return __awaiter(this, void 0, void 0, function () {
-        var MxFun;
+        var MxFun, mxObj;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -68,17 +68,24 @@ function useCanvasResizeListener(mxdrawObj, canvas, time, autoAdjust, callback)
                         console.error('请确保mxdrawObj参数 是通过调用MxFun.createMxObject的callback回调函数拿到的mxDraw对象');
                         return [2 /*return*/];
                     }
-                    if (!!store_1.default.state.isLoadCanvasResizeListene) return [3 /*break*/, 2];
-                    mxdrawObj.addEvent('addResizeEvent', function (callResize) {
-                        (0, create_1.createCanvasParent)(canvas).addEventListener('resize', _.throttle(function (event) {
-                            callback && callback(event);
-                            autoAdjust && callResize(event);
-                        }, time), false);
-                    });
+                    mxObj = mxdrawObj;
+                    if (!!mxObj['isLoadCanvasResizeListene']) return [3 /*break*/, 2];
+                    mxObj['isLoadCanvasResizeListene'] = true;
                     return [4 /*yield*/, (0, dynamicImport_1.dynamicImport)('element-resize-event-polyfill')];
                 case 1:
                     _a.sent();
-                    store_1.default.commit('setIsLoadCanvasResizeListene', true);
+                    mxdrawObj.addEvent('addResizeEvent', function (callResize) {
+                        var parentdiv = (0, create_1.createCanvasParent)(canvas);
+                        if (parentdiv['addEventListener']) {
+                            (0, create_1.createCanvasParent)(canvas).addEventListener('resize', _.throttle(function (event) {
+                                callback && callback(event);
+                                autoAdjust && callResize(event);
+                            }, time), false);
+                        }
+                        else {
+                            console.log('mx: parentdiv[addEventListener] invalid');
+                        }
+                    });
                     _a.label = 2;
                 case 2: return [2 /*return*/];
             }

package/dist/lib/tools/three/index.js

@@ -57,6 +57,9 @@ function getToGenerateRoundedCorners(points, cornerRadius, isClose) {
     if (isClose === void 0) { isClose = true; }
     if (cornerRadius.length > 0) {
         var curve = new three_1.CurvePath();
+        if (!isClose) {
+            points.push(points[0]);
+        }
         for (var i = 0; i < points.length - 1; i++) {
             //作为拐弯的弧度
             var R = cornerRadius[i] || 0;
@@ -65,16 +68,17 @@ function getToGenerateRoundedCorners(points, cornerRadius, isClose) {
                 dir.normalize();
                 var p2_1 = points[1].clone();
                 p2_1.add(dir.clone().multiplyScalar(R));
-                var line_1 = new three_1.LineCurve3(points[0], p2_1);
-                curve.curves.push(line_1);
+                var line = new three_1.LineCurve3(points[0], p2_1);
+                curve.curves.push(line);
                 continue;
             }
             // 计算三个点构成的两条线的方向
-            var dir1 = !isClose && points[i - 1]
+            var dir1 = !isClose || points[i - 1]
                 ? points[i - 1].clone().sub(points[i])
                 : points[points.length - 1].clone().sub(points[0]);
             dir1.normalize();
-            var dir2 = !isClose && points[i + 1]
+            /* istanbul ignore next */
+            var dir2 = !isClose || points[i + 1]
                 ? points[i + 1].clone().sub(points[i])
                 : points[1].clone().sub(points[0]);
             dir2.normalize();
@@ -84,24 +88,26 @@ function getToGenerateRoundedCorners(points, cornerRadius, isClose) {
             var p2 = points[i].clone();
             var p3 = points[i].clone().add(dir2.clone().multiplyScalar(R));
             var beziercurve = new three_1.QuadraticBezierCurve3(p1, p2, p3);
-            var line1 = points[i].clone();
-            line1.add(dir2.clone().multiplyScalar(R));
-            var line2 = points[i + 1].clone();
-            if (i < points.length - (isClose ? 1 : 2)) {
-                //最后一段不用减掉半径尺寸
-                line2.add(dir2.clone().multiplyScalar(-R));
+            if (i === points.length - 2) {
+                var line1 = points[i].clone();
+                line1.add(dir2.clone().multiplyScalar(R));
+                var line2 = points[i + 1].clone();
+                isClose ? line2.add(dir2.clone().multiplyScalar(-R)) : line2.add(dir2.clone());
+                var line = new three_1.LineCurve3(line1, line2);
+                curve.curves.push(beziercurve, line);
+            }
+            else {
+                // 把转换曲线和直线插入曲线中
+                curve.curves.push(beziercurve);
             }
-            var line = new three_1.LineCurve3(line1, line2);
-            // 把转换曲线和直线插入曲线中
-            curve.curves.push(beziercurve, line);
             if (i === 0) {
                 points.push(points[0]);
             }
         }
-        return curve.getPoints(5);
+        return curve.getPoints(50);
     }
     else {
-        return [];
+        return points;
     }
 }
 exports.getToGenerateRoundedCorners = getToGenerateRoundedCorners;