mxdraw 0.1.2 → 0.1.5

package/dist/lib/MxModule/MxFilters/MxFilters.js

@@ -0,0 +1,201 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/** 简单颜色滤镜矩阵 */
+var three_1 = require("three");
+var MxFilters = /** @class */ (function () {
+    function MxFilters() {
+        this.uniformObj = {};
+        this.filtersStr = '';
+        this.filtersTypes = '';
+        //顶点着色器代码片段
+        this.VSHADER_SOURCE = "\n  varying vec2 v_Uv; \n  void main () {\n      v_Uv = uv;\n      gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n  }\n  ";
+        //片元着色器代码片段
+        this.FSHADER_SOURCE = "\n  varying vec2 v_Uv;\n  uniform sampler2D e_Texture;\n  uniform mat4 colorMatrix;\n  ".concat(this.filtersStr, "\n  void main () {\n    vec4 color = texture2D( e_Texture, v_Uv );\n    color = color * colorMatrix;\n    ").concat(this.filtersTypes, "\n    gl_FragColor = color;\n  }");
+        this._matrix = new three_1.Matrix4();
+    }
+    /**
+     * 过滤或增强某个颜色通道
+     * @param {ChannelParamTypes}
+     * */
+    MxFilters.prototype.channel = function (_a) {
+        var _b = _a.r, r = _b === void 0 ? 1 : _b, _c = _a.g, g = _c === void 0 ? 1 : _c, _d = _a.b, b = _d === void 0 ? 1 : _d;
+        this._matrix = new three_1.Matrix4()
+            .set(r, 0, 0, 0, 0, g, 0, 0, 0, 0, b, 0, 0, 0, 0, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 改变亮度
+     * @param {number} p
+     * p = 0 全暗，p > 0 且 p < 1 调暗，p = 1 原色， p > 1 调亮
+     * */
+    MxFilters.prototype.brightness = function (p) {
+        this._matrix = new three_1.Matrix4()
+            .set(p, 0, 0, 0, 0, p, 0, 0, 0, 0, p, 0, 0, 0, 0, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 饱和度
+     * @param {number} p
+     * p = 0 完全灰度化，p = 1 原色，p > 1 增强饱和度
+     * */
+    MxFilters.prototype.saturate = function (p) {
+        var r = 0.2126 * (1 - p);
+        var g = 0.7152 * (1 - p);
+        var b = 0.0722 * (1 - p);
+        this._matrix = new three_1.Matrix4()
+            .set(r + p, g, b, 0, r, g + p, b, 0, r, g, b + p, 0, 0, 0, 0, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 对比度
+     * @param {number} p
+     *  p = 1 原色， p < 1 减弱对比度，p > 1 增强对比度
+     * */
+    MxFilters.prototype.contrast = function (p) {
+        var d = 0.5 * (1 - p);
+        this._matrix = new three_1.Matrix4()
+            .set(p, 0, 0, 0, 0, p, 0, 0, 0, 0, p, 0, d, d, d, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 透明度
+     * @param {number} p
+     * p = 0 全透明，p = 1 原色
+     * */
+    MxFilters.prototype.opacity = function (p) {
+        this._matrix = new three_1.Matrix4()
+            .set(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, p)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 反色
+     * @param {number} p
+     * p = 0 原色， p = 1 完全反色
+     * */
+    MxFilters.prototype.invert = function (p) {
+        var d = 1 - 2 * p;
+        this._matrix = new three_1.Matrix4()
+            .set(d, 0, 0, 0, 0, d, 0, 0, 0, 0, d, 0, p, p, p, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 灰度
+     * @param {number} p 0~1
+     * */
+    MxFilters.prototype.grayscale = function (p) {
+        if (p === void 0) { p = 1; }
+        var r = 0.2126 * p;
+        var g = 0.7152 * p;
+        var b = 0.0722 * p;
+        this._matrix = new three_1.Matrix4()
+            .set(r + 1 - p, g, b, 0, r, g + 1 - p, b, 0, r, g, b + 1 - p, 0, 0, 0, 0, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 深褐色
+     * @param {number} p 0~1
+     * */
+    MxFilters.prototype.sepia = function (p) {
+        if (p === void 0) { p = 1; }
+        this._matrix = new three_1.Matrix4()
+            .set(1 - 0.607 * p, 0.769 * p, 0.189 * p, 0, 0.349 * p, 1 - 0.314 * p, 0.168 * p, 0, 0.272 * p, 0.534 * p, 1 - 0.869 * p, 0, 0, 0, 0, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 色相旋转，将色调沿极坐标转过deg角度
+     * @param {number} deg 0~360
+     * */
+    MxFilters.prototype.hueRotate = function (deg) {
+        var rotation = (deg / 180) * Math.PI;
+        var cos = Math.cos(rotation), sin = Math.sin(rotation), lumR = 0.2126, lumG = 0.7152, lumB = 0.0722;
+        this._matrix = new three_1.Matrix4()
+            .set(lumR + cos * (1 - lumR) + sin * -lumR, lumG + cos * -lumG + sin * -lumG, lumB + cos * -lumB + sin * (1 - lumB), 0, lumR + cos * -lumR + sin * 0.143, lumG + cos * (1 - lumG) + sin * 0.14, lumB + cos * -lumB + sin * -0.283, 0, lumR + cos * -lumR + sin * -(1 - lumR), lumG + cos * -lumG + sin * lumG, lumB + cos * (1 - lumB) + sin * lumB, 0, 0, 0, 0, 1)
+            .multiply(this._matrix);
+        return this;
+    };
+    /**
+     * 色相旋转，将色调沿极坐标转过deg角度
+     * @param {number} deg 0~360
+     * */
+    /**
+     * 卷积
+     * @param {Matrix3} cKernel 3*3的矩阵
+     * @param {number} stStep 1 / 9
+     * @param {number} scaleFactor 521
+     * */
+    MxFilters.prototype.convolution = function (cKernel, stStep, scaleFactor) {
+        if (stStep === void 0) { stStep = 1 / 9; }
+        if (scaleFactor === void 0) { scaleFactor = 521; }
+        this.uniformObj = __assign(__assign({}, this.uniformObj), { cKernel: {
+                value: cKernel.toArray()
+            }, stStep: {
+                value: stStep
+            }, scaleFactor: {
+                value: scaleFactor
+            } });
+        if (this.filtersTypes.indexOf('convolutionTextureColor') < 0) {
+            this.filtersStr += "\n        uniform float cKernel[9];\n        uniform float stStep;\n        uniform float scaleFactor;\n        vec4 convolutionTextureColor(vec4 color) {\n            vec2 offsets[9];\n            offsets[0] = vec2(-1.0,-1.0);\n            offsets[1] =  vec2(0.0,-1.0);\n            offsets[2] = vec2(1.0,-1.0);\n            offsets[3] =  vec2(-1.0,0.0);\n            offsets[4] = vec2(0.0,0.0);\n            offsets[5] = vec2(1.0,0.0);\n            offsets[6] =  vec2(-1.0,1.0);\n            offsets[7] = vec2(0.0,1.0);\n            offsets[8] = vec2(1.0,1.0);\n        \n            vec4 sum = color;\n            for(int i = 0; i < 9; i++) {\n                sum = sum + cKernel[i] * scaleFactor * texture2D(e_Texture, v_Uv + offsets[i] / stStep);\n            };\n            return sum;\n        }";
+            this.filtersTypes += 'color = convolutionTextureColor(color);\n';
+        }
+        return this;
+    };
+    /**
+     * 重置所有滤镜效果
+     * */
+    MxFilters.prototype.reset = function () {
+        this.uniformObj = {};
+        this.filtersStr = '';
+        this.filtersTypes = '';
+        this._matrix = new three_1.Matrix4();
+        return this;
+    };
+    // 获取滤镜自定义着色器数据
+    MxFilters.prototype._getFilterShaderData = function (texture) {
+        return {
+            uniforms: __assign({ e_Texture: {
+                    value: texture
+                }, colorMatrix: {
+                    value: this._matrix
+                } }, this.uniformObj),
+            // 顶点着色器
+            vertexShader: this.VSHADER_SOURCE,
+            // 片元着色器
+            fragmentShader: this.FSHADER_SOURCE
+        };
+    };
+    // 获取转换后的颜色
+    MxFilters.prototype._getFilterColor = function (color, opacity) {
+        if (color === void 0) { color = '#000000'; }
+        if (opacity === void 0) { opacity = 1; }
+        color = new three_1.Color(color);
+        var r = color.r, g = color.g, b = color.b;
+        var arr = this._matrix.toArray();
+        var A = arr[12] * opacity + arr[13] * opacity + arr[14] * opacity + arr[15] * opacity + 0;
+        var R = arr[0] * r + arr[1] * r + arr[2] * r + arr[3] * opacity;
+        var G = arr[4] * g + arr[5] * g + arr[6] * g + arr[7] * opacity;
+        var B = arr[8] * b + arr[9] * b + arr[10] * b + arr[11] * opacity;
+        color.setRGB(R, G, B);
+        return color;
+    };
+    return MxFilters;
+}());
+exports.default = MxFilters;

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

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var MxFilters_1 = require("./MxFilters");
+exports.default = MxFilters_1.default;

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

@@ -14,6 +14,7 @@ var create_1 = require("../../tools/dom/create");
 var proxy_1 = require("../../tools/proxy");
 var MxDrawObject_1 = require("../MxDrawObject");
 var store_1 = require("../store/store");
+var useCanvasResizeListener_1 = require("../useCanvasResizeListener");
 /**
  * MxFun 模块
  * 导出库时已实例化，只需要调用实例方法 例如：
@@ -50,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 ? 'test2.dwg' : _c, callback = _a.callback, _d = _a.isNewFile, isNewFile = _d === void 0 ? true : _d;
+        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;
         // 获取canvas和其父级
         var canvas = (0, create_1.createCanvas)(canvasId);
         var canvasParent = (0, create_1.createCanvasParent)(canvas);
@@ -75,12 +76,14 @@ var MxFun = /** @class */ (function () {
                     height: canvasParent.clientHeight
                 };
             });
+            // 使用canvas侦听器 监听canvas元素的大小变化
+            (0, useCanvasResizeListener_1.default)(mxdrawObj, canvas);
             callback &&
                 callback(mxdrawObj, {
                     canvas: canvas,
                     canvasParent: canvasParent
                 });
-        }, isNewFile);
+        }, undefined, isNewFile, useWebsocket);
     };
     /**
      * 为程序设置服务器地址
@@ -200,6 +203,32 @@ var MxFun = /** @class */ (function () {
     MxFun.prototype.screenCoordLong2World = function (len) {
         return store_1.default.state.MxFun.screenCoordLong2World(len);
     };
+    /**
+     * 屏幕坐标长度转文档坐标长度
+     * @param len 屏幕坐标长度
+     * @return number 文档坐标长度
+     * @example
+     * ``` typescript
+     * const len = Mx.MxFun.screenCoordLong2Doc(36)
+     * console.log(len)
+     * ```
+     */
+    MxFun.prototype.screenCoordLong2Doc = function (len) {
+        return store_1.default.state.MxFun.screenCoordLong2Doc(len);
+    };
+    /**
+     * 文档坐标长度转屏幕坐标长度
+     * @param len 文档坐标长度
+     * @return number 屏幕坐标长度
+     * @example
+     * ``` typescript
+     * const len = Mx.MxFun.docCoordLong2Screen(36)
+     * console.log(len)
+     * ```
+     */
+    MxFun.prototype.docCoordLong2Screen = function (len) {
+        return store_1.default.state.MxFun.docCoordLong2Screen(len);
+    };
     /**
      * THREE.JS坐标长度转屏幕坐标长度
      * @param len THREE.JS坐标长度
@@ -214,14 +243,14 @@ var MxFun = /** @class */ (function () {
         return store_1.default.state.MxFun.worldCoordLong2Doc(len);
     };
     /**
-   * DWG文档坐标长度到ThreeJS坐标长度
-   * @returns number
-   * @example
-   * ```typescript
-   *
-   *
-   * ```
-   */
+     * DWG文档坐标长度到ThreeJS坐标长度
+     * @returns number
+     * @example
+     * ```typescript
+     *
+     *
+     * ```
+     */
     MxFun.prototype.docCoordLong2World = function (l) {
         return store_1.default.state.MxFun.docCoordLong2World(l);
     };
@@ -298,8 +327,8 @@ var MxFun = /** @class */ (function () {
      * console.log(vector3)
      * ```
      */
-    MxFun.prototype.screenCoord2Doc = function (x, y, z) {
-        return store_1.default.state.MxFun.screenCoord2Doc(x, y, z);
+    MxFun.prototype.screenCoord2Doc = function (x, y) {
+        return store_1.default.state.MxFun.screenCoord2Doc(x, y, 0);
     };
     /**
      * 文档转屏幕坐标.
@@ -313,8 +342,8 @@ var MxFun = /** @class */ (function () {
      * console.log(vector3)
      * ```
      */
-    MxFun.prototype.docCoord2Screen = function (x, y, z) {
-        return store_1.default.state.MxFun.docCoord2Screen(x, y, z);
+    MxFun.prototype.docCoord2Screen = function (x, y) {
+        return store_1.default.state.MxFun.docCoord2Screen(x, y, 0);
     };
     /**
      * 更新显示，使用Three.js绘制了对象，调用该函数更新显示。
@@ -488,22 +517,22 @@ var MxFun = /** @class */ (function () {
         return store_1.default.state.MxFun.loadImageMaterial(imageUrlPath, callResult);
     };
     /**
-    * 判断点是否在一个闭合的多边形区域。
-    * @param p
-    * @return any
-    * @example
-    * ``` typescript
-    *      let aryPoint:Array<THREE.Vector3> = [];
-    *      aryPoint.push(new THREE.Vector3(0,0,0));
-    *      aryPoint.push(new THREE.Vector3(0,100,0));
-    *      aryPoint.push(new THREE.Vector3(100,100,0));
-    *      aryPoint.push(new THREE.Vector3(100,0,0));
-    *      let pt:THREE.Vector3 = new THREE.Vector3(150,150);
-    *      if(MxFun.pointInPolyline(pt,aryPoint) ){
-    *        console.log("in");
-    *      }
-    * ```
-    */
+     * 判断点是否在一个闭合的多边形区域。
+     * @param p
+     * @return any
+     * @example
+     * ``` typescript
+     *      let aryPoint:Array<THREE.Vector3> = [];
+     *      aryPoint.push(new THREE.Vector3(0,0,0));
+     *      aryPoint.push(new THREE.Vector3(0,100,0));
+     *      aryPoint.push(new THREE.Vector3(100,100,0));
+     *      aryPoint.push(new THREE.Vector3(100,0,0));
+     *      let pt:THREE.Vector3 = new THREE.Vector3(150,150);
+     *      if(MxFun.pointInPolyline(pt,aryPoint) ){
+     *        console.log("in");
+     *      }
+     * ```
+     */
     MxFun.prototype.pointInPolyline = function (pt, vecPolyline) {
         return store_1.default.state.MxFun.pointInPolyline(pt, vecPolyline);
     };
@@ -518,6 +547,17 @@ var MxFun = /** @class */ (function () {
     MxFun.prototype.calcArea = function (aryPoint) {
         return store_1.default.state.MxFun.calcArea(aryPoint);
     };
+    /**
+     * 重新打开cad文件，该函数在控件创建完后，需要再次重新打开文件，调用。
+     * @param sFile 打的cad文件路径
+     * @return any
+     * @example
+     * ``` typescript
+     * ```
+     */
+    MxFun.prototype.openFile = function (sFile) {
+        return store_1.default.state.MxFun.openFile(sFile);
+    };
     return MxFun;
 }());
 exports.default = MxFun;

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

@@ -1,5 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+///////////////////////////////////////////////////////////////////////////////
+//版权所有（C）2002-2022，成都梦想凯德科技有限公司。
+//本软件代码及其文档和相关资料归成都梦想凯德科技有限公司,应用包含本软件的程序必须包括以下版权声明
+//此应用程序与成都梦想凯德科技有限公司成协议。通过使用本软件、其文档或相关材料
+///////////////////////////////////////////////////////////////////////////////
 var three_1 = require("three");
 var math_1 = require("../../tools/algorithm/math");
 var formatting_1 = require("../../tools/formatting");
@@ -139,7 +144,7 @@ var MxThreeJS = /** @class */ (function () {
         context.font = sFont;
         context.textAlign = 'center';
         context.textBaseline = 'middle';
-        context.fillStyle = (0, formatting_1.formatString)('rgba({0}, {1}, {2}, 1.0)', ((iColor >> 16) & 0xff) + "", ((iColor >> 8) & 0xff) + "", (iColor & 0xff) + "");
+        context.fillStyle = (0, formatting_1.formatString)('rgba({0}, {1}, {2}, 1.0)', ((iColor >> 16) & 0xff) + '', ((iColor >> 8) & 0xff) + '', (iColor & 0xff) + '');
         //const sColor = formatString('#{0}', iColor.toString(16))
         context.fillText(message, textWidth / 2, textHeight / 2);
         var texture = new three_1.Texture(canvas);

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

@@ -88,7 +88,7 @@ var MxThreeJSBuffer = /** @class */ (function () {
         else {
             this.loadSVGImp(url, color, function (group, aryMeterial) {
                 if (group && aryMeterial) {
-                    var data_1 = new MxThreeJSSVGData;
+                    var data_1 = new MxThreeJSSVGData();
                     data_1.svg = group;
                     data_1.aryMeterial = aryMeterial;
                     _this.mapSvgUrlToData.set(url, data_1);
@@ -104,7 +104,7 @@ var MxThreeJSBuffer = /** @class */ (function () {
     return MxThreeJSBuffer;
 }());
 function default_1(MxThreeJS) {
-    var mxThreeJsBuffer = new MxThreeJSBuffer;
+    var mxThreeJsBuffer = new MxThreeJSBuffer();
     MxThreeJS.createImage = function (pos, w, h, imageUrlPath, callResult) {
         new three_1.TextureLoader().load(imageUrlPath, function (texture) {
             var geometry = new three_1.PlaneGeometry(w, h);
@@ -116,7 +116,7 @@ function default_1(MxThreeJS) {
             });
             if (materialTexture.map)
                 materialTexture.map.needsUpdate = true;
-            (0, three_2.setGeometryPostion)(geometry, pos);
+            (0, three_2.setGeometrPostion)(geometry, pos);
             //var mesh = new Mesh(geometry, material);
             var mesh = new three_1.Mesh(geometry, materialTexture);
             mesh.material['depthTest'] = false;

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

@@ -1185,13 +1185,13 @@ var SVGLoader = /** @class */ (function (_super) {
             var center = new three_1.Vector2();
             boundingBox.getCenter(center);
             var allIntersections = [];
-            paths && paths.forEach(function (path) {
+            paths.forEach(function (path) {
                 // check if the center of the bounding box is in the bounding box of the paths.
                 // this is a pruning method to limit the search of intersections in paths that can't envelop of the current path.
                 // if a path envelops another path. The center of that oter path, has to be inside the bounding box of the enveloping path.
                 if (path.boundingBox.containsPoint(center)) {
                     var intersections = getIntersections(scanline, path.points);
-                    intersections && intersections.forEach(function (p) {
+                    intersections.forEach(function (p) {
                         allIntersections.push({ identifier: path.identifier, isCW: path.isCW, point: p });
                     });
                 }
@@ -1307,13 +1307,13 @@ var SVGLoader = /** @class */ (function (_super) {
         // check if path is solid or a hole
         var isAHole = simplePaths.map(function (p) { return isHoleTo(p, simplePaths, scanlineMinX, scanlineMaxX, shapePath.userData.style.fillRule); });
         var shapesToReturn = [];
-        simplePaths && simplePaths.forEach(function (p) {
+        simplePaths.forEach(function (p) {
             var amIAHole = isAHole[p.identifier];
             if (!amIAHole.isHole) {
                 var shape_1 = new three_1.Shape();
                 shape_1.curves = p.curves;
                 var holes = isAHole.filter(function (h) { return h.isHole && h.for === p.identifier; });
-                holes && holes.forEach(function (h) {
+                holes.forEach(function (h) {
                     var hole = simplePaths[h.identifier];
                     var path = new three_1.Path();
                     path.curves = hole.curves;

package/dist/lib/MxModule/Mxassembly/Mxassembly.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var store_1 = require("../store/store");
+/**
+ * Mxassembly 模块
+ * 导出库时已实例化，只需要调用实例方法 例如：
+ * ```typescript
+ * ```
+ */
+var Mxassembly = /** @class */ (function () {
+    function Mxassembly() {
+    }
+    Mxassembly.prototype.NewMcGeVector3d = function () {
+        return new store_1.default.state.Mxassembly.McGeVector3d();
+    };
+    return Mxassembly;
+}());
+exports.default = Mxassembly;

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

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var Mxassembly_1 = require("./Mxassembly");
+// import store from '../store/_index'
+// import loadCoreCode from '../loadCoreCode'
+// if (!store.state.MxFUn) {
+//   loadCoreCode()
+// }
+exports.default = new Mxassembly_1.default();

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

@@ -40,6 +40,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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();
+}
 /**
  * 加载MxDraw库的核心代码 才能使用Mx的其他模块
  * @returns Promise<{@link MxFun}>
@@ -85,9 +96,14 @@ function loadCoreCode() {
                                 window.MxMain = function (requireFun) {
                                     store_1.default.events.emit('MxMain', requireFun);
                                     window.MxMain = undefined;
+                                    rxInitMxEntity();
                                     res();
                                     return 0;
                                 };
+                                (0, mxcadassembly_es5_js_1.default)().then(function (mxassembly) {
+                                    //console.log(mxassembly);
+                                    store_1.default.commit('setMxassembly', mxassembly);
+                                });
                                 // 加载mxfun.min.js,mxfun()相当直接模拟了mxfun.min.js的加载。
                                 (0, mxfun_es5_js_1.default)();
                                 return [3 /*break*/, 3];