mxcad 1.0.322 → 1.0.324

package/dist/mxcad.d.ts

@@ -11375,6 +11375,8 @@ export declare class McObject {
 	on(name: "selectChange", fun: (ids: McObjectId[]) => void | ((ids: McObjectId[]) => void)[]): void;
 	/** 监听文件完全打开 */
 	on(name: "openFileComplete", fun: () => void): void;
+	/**mxdraw mxcad程序已经加载，准备初始化cpp程序 */
+	on(name: "init_cpp", fun: () => void): void;
 	/**mxdraw mxcad程序已经加载，准备创建mxdraw对象时触发 */
 	on(name: "init", fun: () => void): void;
 	/** mxdraw对象创建了,准备初始相关参数时触发 */
@@ -12718,6 +12720,14 @@ export declare class McAppType {
 	 * ```
 	 */
 	init(imp: any): void;
+	/**
+	 * 设置McAppType的 imp 对象。
+	 * @param imp 传入的 imp 对象。
+	 * @example
+	 * ```ts
+	 * ```
+	 */
+	setImp(imp: any): void;
 	/**
 	 * 获取 imp 对象。
 	 * @returns 返回 imp 对象。
@@ -12867,11 +12877,25 @@ export declare class McAppType {
 	 * ```ts
 	 * import { MxCpp } from "mxcad";
 	 * //设置默认TrueType字体为Arial.ttf
-	 * MxCpp.setDefaultTrueTypeFontFile("Arial.ttf");
+	 * mxcad.on("init_cpp", async () => {
+	 *    MxCpp.App.setDefaultTrueTypeFontFile("Arial.ttf");
+	 * })
 	 * ```
 	 */
 	setDefaultTrueTypeFontFile(sTrueTypeFontName: string): void;
 	/**
+   * 配置默认的shx,bigshx字体
+   * @param shx,bigshx shx字体名
+   * @example
+   * ```ts
+   * import { MxCpp } from "mxcad";
+   * mxcad.on("init_cpp", async () => {
+   *   MxCpp.App.setDefaultShxFontFile("txt.shx","hztxt.shx");
+   * })
+   * ```
+   */
+	setDefaultShxFontFile(sShxFile: string, sBigShxFile: string): void;
+	/**
 	* 配置需要通过网络加载的shx字体
 	* @param fontfiles 加载的字体文件
 	* @example
@@ -15221,7 +15245,7 @@ export declare let MxCpp: MxCppType;
 	});
  * ```
  */
-export declare function loadMxCADassembly(call?: (MxCpp: MxCppType) => void, locateFile?: (fileName: string, base?: string | URL) => string, wasmBinary?: ArrayBuffer, fontspath?: string, networkFonts?: string[]): Promise<MxCppType>;
+export declare function loadMxCADassembly(call?: (MxCpp: MxCppType) => void, locateFile?: (fileName: string, base?: string | URL) => string, wasmBinary?: ArrayBuffer, fontspath?: string, networkFonts?: string[], mxcad?: any): Promise<MxCppType>;
 /**
  * 检查浏览器类型和版本
  * @returns { object } ok 布尔值，表示浏览器是否符合要求 | error 如果浏览器不符合要求，则包含错误信息；否则为空字符串 | var 包含了浏览器信息的对象

package/dist/mxcad.es.js

@@ -14373,7 +14373,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312Imp(hexstr);
 };
 
-const version$1 = "1.0.322";
+const version$1 = "1.0.324";
 
 var isSharedArrayBuffer = ("SharedArrayBuffer" in window);
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -21959,6 +21959,11 @@ var McAppType = /*#__PURE__*/function () {
       this.initCalls();
       McAppFuncton.init();
     }
+  }, {
+    key: "setImp",
+    value: function setImp(imp) {
+      this.imp = imp;
+    }
   }, {
     key: "getImp",
     value: function getImp() {
@@ -22273,6 +22278,11 @@ var McAppType = /*#__PURE__*/function () {
     value: function setDefaultTrueTypeFontFile(sTrueTypeFontName) {
       this.imp.setDefaultTrueTypeFontFile(sTrueTypeFontName);
     }
+  }, {
+    key: "setDefaultShxFontFile",
+    value: function setDefaultShxFontFile(sShxFile, sBigShxFile) {
+      this.imp.setDefaultShxFontFile(sShxFile, sBigShxFile);
+    }
   }, {
     key: "addNetworkLoadingFont",
     value: function addNetworkLoadingFont(fontfiles) {
@@ -22683,6 +22693,7 @@ function _loadMxCADassembly() {
       wasmBinary,
       fontspath,
       networkFonts,
+      mxcad,
       _args2 = arguments;
     return regenerator.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -22691,6 +22702,7 @@ function _loadMxCADassembly() {
           wasmBinary = _args2.length > 2 ? _args2[2] : undefined;
           fontspath = _args2.length > 3 ? _args2[3] : undefined;
           networkFonts = _args2.length > 4 ? _args2[4] : undefined;
+          mxcad = _args2.length > 5 ? _args2[5] : undefined;
           return _context2.abrupt("return", new Promise( /*#__PURE__*/function () {
             var _ref = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(resolve, reject) {
               var baseFileName, mxcadassemblyimp, app, win;
@@ -22721,6 +22733,10 @@ function _loadMxCADassembly() {
                     } else {
                       app.setFontFilePath("fonts");
                     }
+                    MxCpp.App.setImp(app);
+                    if (mxcad) {
+                      mxcad.callEvent("init_cpp");
+                    }
                     app.Init();
                     MxCustomEntityManager.init();
                     MxCpp.App.init(app);
@@ -22733,23 +22749,23 @@ function _loadMxCADassembly() {
                     win["__MxCpp__"] = MxCpp;
                     call && call(MxCpp);
                     resolve(MxCpp);
-                    _context.next = 25;
+                    _context.next = 27;
                     break;
-                  case 22:
-                    _context.prev = 22;
+                  case 24:
+                    _context.prev = 24;
                     _context.t0 = _context["catch"](0);
                     reject(_context.t0);
-                  case 25:
+                  case 27:
                   case "end":
                     return _context.stop();
                 }
-              }, _callee, null, [[0, 22]]);
+              }, _callee, null, [[0, 24]]);
             }));
             return function (_x2, _x3) {
               return _ref.apply(this, arguments);
             };
           }()));
-        case 5:
+        case 6:
         case "end":
           return _context2.stop();
       }
@@ -34456,7 +34472,7 @@ var createMxCad = /*#__PURE__*/function () {
           _context.next = 6;
           return loadMxCADassembly(function () {
             return void 0;
-          }, locateFile, wasmBinary, fontspath, networkFonts);
+          }, locateFile, wasmBinary, fontspath, networkFonts, mxcadobj);
         case 6:
           MxFun.initMxCpp(MxCpp);
           MxCADUtility.init();