mxdraw 0.1.10 → 0.1.11

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

@@ -45,6 +45,7 @@ var MxDbSVG = /** @class */ (function (_super) {
         _this.svgBoxSize = null;
         // 固定尺寸，图片和文字大小，取屏幕像素绘图单位。
         _this.fixedSize = false;
+        _this.useSvgColor = false;
         return _this;
     }
     MxDbSVG.prototype.worldDraw = function (pWorldDraw) {
@@ -120,12 +121,13 @@ var MxDbSVG = /** @class */ (function (_super) {
                             obj.scale.z = obj.scale.x;
                             obj.rotateZ(myThis_1.svgRotate);
                             myThis_1.isSvgDirtyLocation = true;
-                            var color_1 = new THREE.Color(_this.color);
+                            var color_1 = new THREE.Color(pWorldDraw.getColor());
                             obj.traverse(function (child) {
                                 if (child.material) {
                                     child.material = child.material.clone();
                                     child.material.transparent = true;
-                                    child.material.color = color_1;
+                                    if (!myThis_1.useSvgColor)
+                                        child.material.color = color_1;
                                 }
                             });
                             //this.svgPos.multiply
@@ -157,7 +159,7 @@ var MxDbSVG = /** @class */ (function (_super) {
         return this.svgPath;
     };
     MxDbSVG.prototype.setSvgPostion = function (pos) {
-        this.svgPos = pos;
+        this.svgPos = pos.clone();
         this.isSvgDirtyLocation = true;
     };
     MxDbSVG.prototype.getSvgPostion = function () {
@@ -248,6 +250,7 @@ var MxDbSVG = /** @class */ (function (_super) {
             _this.aryText.push(copyTxt);
         });
         this.svgRotate = obj['svgRotate'];
+        this.useSvgColor = obj['useSvgColor'];
         return true;
     };
     MxDbSVG.prototype.dwgOut = function (obj) {
@@ -262,6 +265,7 @@ var MxDbSVG = /** @class */ (function (_super) {
         obj['txts'] = this.aryText;
         obj['fixedSize'] = this.fixedSize;
         obj['svgRotate'] = this.svgRotate;
+        obj['useSvgColor'] = this.useSvgColor;
         return obj;
     };
     MxDbSVG.prototype.create = function () {

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

@@ -561,8 +561,9 @@ 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实体到当前绘图对象上。

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,17 +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");
-var MxDbRect_1 = require("../MxDbRect");
 function rxInitMxEntity() {
-    new MxDbImage_1.default().rxInit();
-    new MxDbSVG_1.default().rxInit();
-    new MxDbAlignedDimension_1.default().rxInit();
-    new MxDbLine_1.default().rxInit();
-    new MxDbRect_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的其他模块

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

@@ -0,0 +1,317 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MxVueInterface = void 0;
+var store_1 = require("../store/store");
+var MxVueComandLine = /** @class */ (function () {
+    function MxVueComandLine() {
+        var _this = this;
+        // 命令行
+        this.msCmdText = '';
+        this.msCmdDisplay = '';
+        this.msCmdTip = '';
+        this.mUpDisplayFun = undefined;
+        this.mxFunObject = undefined;
+        // 命令行更新
+        this.mountUpDisplayFun = function (fun) {
+            _this.mUpDisplayFun = fun;
+        };
+        this.setCmdText = function (str) {
+            console.log(str);
+            _this.msCmdText = str;
+        };
+        this.getCmdText = function () {
+            return _this.msCmdText;
+        };
+        this.getCmdDisplay = function () {
+            return _this.msCmdDisplay;
+        };
+        this.setCmdDisplay = function (str) {
+            // console.log(str)
+            _this.msCmdDisplay = str;
+            store_1.default.commit('setMsCmdDisplay', _this.msCmdDisplay);
+        };
+        this.addCmdDisplay = function (str) {
+            if (_this.msCmdDisplay.length > 1024) {
+                _this.msCmdDisplay = _this.msCmdDisplay.substring(_this.msCmdDisplay.length - 1024, _this.msCmdDisplay.length);
+                _this.msCmdDisplay = _this.msCmdDisplay + str;
+            }
+            else {
+                _this.msCmdDisplay = _this.msCmdDisplay + str;
+            }
+        };
+        this.setCmdTip = function (str) {
+            _this.msCmdTip = str;
+        };
+        this.getCmdTip = function () {
+            return _this.msCmdTip;
+        };
+    }
+    MxVueComandLine.prototype.upDisplay = function () {
+        var _a = this, msCmdTip = _a.msCmdTip, msCmdDisplay = _a.msCmdDisplay, msCmdText = _a.msCmdText;
+        if (this.mUpDisplayFun == undefined) {
+            return;
+        }
+        this.mUpDisplayFun({
+            msCmdTip: msCmdTip,
+            msCmdDisplay: msCmdDisplay,
+            msCmdText: msCmdText
+        });
+    };
+    return MxVueComandLine;
+}());
+var MxInputType = {
+    kNoInput: 0,
+    kXYCoordInput: 1,
+    kDistanceInput: 2,
+    kDynTip: 3
+};
+var MxInputPostionType = {
+    kRelative: 0,
+    kAbsolutely: 1 // 绝对位置，指定位置。
+};
+var MxDynamicInput = /** @class */ (function () {
+    function MxDynamicInput() {
+        var _this = this;
+        this.mType = MxInputType.kNoInput;
+        this.mPos = [0, 0];
+        this.mTip = '';
+        this.mValue1 = '';
+        this.mValue1Pos = [0, 0];
+        this.mValue2 = '';
+        this.mValue2Pos = [0, 0];
+        this.misShow = false;
+        this.mOnKeydownEvent = undefined;
+        this.mFocusValue = '';
+        this.setFocusValue = function (value) {
+            _this.mFocusValue = value;
+        };
+        this.getFocusValue = function () {
+            return _this.mFocusValue;
+        };
+        this.mountKeydownEvent = function (fun) {
+            _this.mOnKeydownEvent = fun;
+        };
+        this.onKeydown = function (keyCode) {
+            if (_this.mOnKeydownEvent == undefined) {
+                return;
+            }
+            _this.mOnKeydownEvent(keyCode);
+        };
+        this.setType = function (type) {
+            _this.mType = type;
+        };
+        this.getType = function () {
+            return _this.mType;
+        };
+        this.isShow = function () {
+            return _this.misShow;
+        };
+        this.setPos = function (pos) {
+            _this.mPos = pos;
+        };
+        this.setTip = function (tip) {
+            _this.mTip = tip;
+        };
+        this.setValue1 = function (val) {
+            _this.mValue1 = val;
+        };
+        this.getValue1 = function () {
+            return _this.mValue1;
+        };
+        this.setValue1Pos = function (pos) {
+            _this.mValue1Pos = pos;
+        };
+        this.setValue2 = function (val) {
+            _this.mValue2 = val;
+        };
+        this.getValue2 = function () {
+            return _this.mValue2;
+        };
+        this.setValue2Pos = function (pos) {
+            _this.mValue2Pos = pos;
+        };
+        this.setShow = function (isShow) {
+            _this.misShow = isShow;
+        };
+        this.getData = function () {
+            if (!_this.misShow) {
+                return undefined;
+            }
+            var ret = {
+                list: [
+                    { value: '', readonly: true },
+                    { value: '', readonly: false },
+                    { value: '', readonly: false }
+                ],
+                pos: _this.mPos,
+                postype: MxInputPostionType.kRelative
+            };
+            if (_this.mType == MxInputType.kNoInput) {
+                return undefined;
+            }
+            else if (_this.mType == MxInputType.kXYCoordInput) {
+                ret.list[0].show = true;
+                ret.list[0].value = _this.mTip;
+                ret.list[0].readonly = true;
+                ret.list[1].show = true;
+                ret.list[1].value = _this.mValue1;
+                ret.list[1].readonly = false;
+                ret.list[2].show = true;
+                ret.list[2].value = _this.mValue2;
+                ret.list[2].readonly = false;
+            }
+            else if (_this.mType == MxInputType.kDistanceInput) {
+                ret.list[0].show = true;
+                ret.list[0].value = _this.mTip;
+                ret.list[0].readonly = true;
+                ret.list[1].show = true;
+                ret.list[1].value = _this.mValue1;
+                ret.list[1].readonly = false;
+                ret.list[1].pos = _this.mValue1Pos;
+                ret.list[2].show = true;
+                ret.list[2].value = _this.mValue2;
+                ret.list[2].readonly = true;
+                ret.list[2].pos = _this.mValue2Pos;
+                ret.postype = MxInputPostionType.kAbsolutely;
+            }
+            else if (_this.mType == MxInputType.kDynTip) {
+                ret.list[0].show = true;
+                ret.list[0].value = _this.mTip;
+                ret.list[0].readonly = true;
+                ret.list[1].show = false;
+                ret.list[2].show = false;
+            }
+            else {
+                ret = undefined;
+            }
+            return ret;
+        };
+    }
+    return MxDynamicInput;
+}());
+var CursorType = {
+    kNormal: 'cursor3',
+    kRect: 'cursor1',
+    kCross: 'cursor2'
+};
+var MxVueInterface = /** @class */ (function () {
+    function MxVueInterface() {
+        var _this = this;
+        this.mSetCoordFun = undefined;
+        this.mUpdateCursorFun = undefined;
+        this.mOnKeydownEvent = undefined;
+        this.mCursorType = CursorType.kNormal;
+        this.mComandLine = new MxVueComandLine();
+        this.mdynamicInput = new MxDynamicInput();
+        this.mMxEvents = {};
+        this.mountSetCoordFun = function (fun) {
+            _this.mSetCoordFun = fun;
+        };
+        this.mountUpdateCursorFun = function (fun) {
+            _this.mUpdateCursorFun = fun;
+        };
+        this.mountKeydownEvent = function (fun) {
+            _this.mOnKeydownEvent = fun;
+        };
+        this.onKeydown = function (keyCode) {
+            if (_this.mOnKeydownEvent == undefined) {
+                return;
+            }
+            _this.mOnKeydownEvent(keyCode);
+        };
+        this.setTipCoord = function (str) {
+            store_1.default.commit('setTipCoord', str);
+            if (_this.mSetCoordFun == undefined) {
+                return;
+            }
+            _this.mSetCoordFun(str);
+        };
+        this.getCursorType = function () {
+            return _this.mCursorType;
+        };
+        this.setCursorType = function (curtype) {
+            if (typeof curtype == 'number') {
+                switch (curtype) {
+                    case 0: {
+                        _this.mCursorType = CursorType.kNormal;
+                        break;
+                    }
+                    case 1: {
+                        _this.mCursorType = CursorType.kRect;
+                        break;
+                    }
+                    case 2: {
+                        _this.mCursorType = CursorType.kCross;
+                        break;
+                    }
+                }
+            }
+            else {
+                _this.mCursorType = curtype;
+            }
+            if (_this.mUpdateCursorFun == undefined) {
+                return;
+            }
+            _this.mUpdateCursorFun();
+        };
+        this.getTitle = function () {
+            return _this.mTitle;
+        };
+        this.getTopButtonBarData = function () {
+            return _this.mTopButtonBarData;
+        };
+        this.getMenuBarData = function () {
+            return _this.mMenuBarData;
+        };
+        this.getRighButtonBarData = function () {
+            return _this.mRighButtonBarData;
+        };
+        this.getLeftButtonBarData = function () {
+            return _this.mLeftButtonBarData;
+        };
+        this.getTitleButtonBarData = function () {
+            return _this.mTitleButtonBarData;
+        };
+        this.getLayerComboxData = function () {
+            return _this.mLayerComboxData;
+        };
+        this.getColorComboxData = function () {
+            return _this.mColorComboxData;
+        };
+        this.getLinetypeComboxData = function () {
+            return _this.mLinetypeComboxData;
+        };
+        this.getFooterData = function () {
+            return _this.mFooterData;
+        };
+        this.sendStringToExecute = function (sCmd) {
+            _this.mxFunObject.sendStringToExecute(sCmd);
+        };
+        this.getCmdLine = function () {
+            return _this.mComandLine;
+        };
+        this.getDynamicInput = function () {
+            return _this.mdynamicInput;
+        };
+        this.init = function (mxFun) {
+            _this.mxFunObject = mxFun;
+        };
+        this.OnMxEvent = function (event) {
+            var eventName = event.name;
+            if (eventName == undefined) {
+                return;
+            }
+            var call = _this.mMxEvents[eventName];
+            if (call == undefined) {
+                return;
+            }
+            call(event.param);
+        };
+        this.mountMxEvent = function (name, call) {
+            _this.mMxEvents[name] = call;
+        };
+    }
+    return MxVueInterface;
+}());
+exports.MxVueInterface = MxVueInterface;
+exports.default = new MxVueInterface();