mxcad 1.0.283 → 1.0.284

package/dist/mxcad.d.ts

@@ -1454,7 +1454,6 @@ export declare class McGeMatrix3d {
 	 * 获取矩阵在XY平面的旋转角度因子。
 	 * @returns旋转角度因子。
 	 * @example
-	 * ```
 	 */
 	angleXYPlane(): number;
 	/**
@@ -2610,7 +2609,7 @@ export declare class MxCADUtilityClass {
 	 * import { MxCADUtility, McGePoint3d } from "mxcad";
 	 *
 	 * const lineId = new McDbLine(new McGePoint3d(0,0,0), new McGePoint3d(20,1,0));
-	 * MxCADUtility.highlightEntity(lineId, true)
+	 * MxCADUtility.highlightEntity(lineId.id, true)
 	 * ```
 	 */
 	highlightEntity(lId: number, isHighlight?: boolean): any;
@@ -10098,15 +10097,11 @@ export declare class McDbDatabase extends McRxObject {
 	/**
    * 得到对象所在组中的所有对象id
    * @returns McDbDictionary
-   * @example
-   * ```
    */
 	getEntitiesInTheGroup(id: McObjectId): McObjectId[];
 	/**
 	* 得到图纸的组字典对象。
 	* @returns McDbDictionary
-	* @example
-	* ```
 	*/
 	GetGroupDictionary(): McDbDictionary;
 	/**
@@ -11166,6 +11161,7 @@ export declare class McObject {
 	/** 是否是第一次打开文件 */
 	private firstTimeOpenFile;
 	private authorized_service;
+	private isInitMxObject;
 	/**
 	 * 构造函数
 	 * @param imp 对象实现
@@ -11287,6 +11283,14 @@ export declare class McObject {
 	on(name: "layerChanged", fun: () => void): void;
 	/** 线型数据发生了变化 */
 	on(name: "lineTypeChanged", fun: () => void): void;
+	/** 对象被修改事件，默认不会通知，配制EnableObjectModificationEvent变量启用 */
+	on(name: "objectModified", fun: (param: {
+		cmd: string;
+		entitys: {
+			id: McObjectId;
+			erase: boolean;
+		}[];
+	}) => void): void;
 	/**
 	 * 关闭事件监听
 	 * @param name 监听事件名
@@ -11314,6 +11318,7 @@ export declare class McObject {
 	 * ```
 	 */
 	callEvent(sEventName: string, param?: any): boolean;
+	private synchronizeMxDrawEvent;
 	/**
 	 * 初始化对象模型
 	 * @description
@@ -11486,6 +11491,7 @@ export declare class McObject {
 	 * 找到MxDrawCloudServer\Bin\MxCAD\MxCADSaveFile\server.js 可以找到对应的实现接口"/mxcad/savefiledwg",
 	 * "/mxcad/savefiledwg":保存dwg文件到服务器
 	 * "/mxcad/savefile":保存mxweb文件到服务器
+	 * "/mxcad/savepdf":保存pdf文件到服务器
 	 * 如果没有找到则在该项目下寻找这个接口的定义, 必须符合该接口的定义才能作为参数
 	 * @param call 保存文件的结果回调 这里接收到的参数请自己根据接口定义中保存图纸的位置, ref.file 不是完整请求路径，只是保存后的图纸名称
 	 * @returns 是否成功保存文件
@@ -11493,12 +11499,23 @@ export declare class McObject {
 	 * ```ts
 	 * import { MxCpp, McObject } from "mxcad"
 	 * const mxcad:McObject = MxCpp.getCurrentMxCAD()
-	 *  MxCpp.getCurrentMxCAD().saveFileToUrl("http://localhost:3337/mxcad/savefiledwg", (iResult, sserverResult) => {
+	 *  MxCpp.getCurrentMxCAD().saveFileToUrl("http://localhost:1337/mxcad/savefiledwg", (iResult, sserverResult) => {
 	 *    let ret = JSON.parse(sserverResult);
 	 *    if (ret.ret == "ok") {
 	 *        console.log(ret.file)
 	 *    }
 	 * })
+	 * //保存pdf文件。
+	 * import { MxCpp, McObject } from "mxcad"
+	 * const mxcad:McObject = MxCpp.getCurrentMxCAD()
+	 *  MxCpp.getCurrentMxCAD().saveFileToUrl("http://localhost:1337/mxcad/savepdf", (iResult, sserverResult) => {
+	 *    let ret = JSON.parse(sserverResult);
+	 *    if (ret.ret == "ok") {
+	 *        console.log(ret.file)
+	 *        let saveFileUrl = "http://localhost:1337/mxcad/file/" + ret.file;
+	 *        MxTools.downloadFileFromUrl(saveFileUrl, ret.file);
+	 *    }
+	 * },"",JSON.stringify({ width: "2000", height: "2000" }));
 	 * ```
 	 */
 	saveFileToUrl(sSaveProgramUrl: string, call: (iResult: number, sServerResult: string) => void, filename?: string, param?: any): boolean;
@@ -12750,6 +12767,7 @@ export declare class McAppType {
    * @param ini 初始设置值
    * ini.UseUtf8: c++程序是否使用utf8编码格式。
    * ini.McGeTol: 几何计算时，点和向量变量判断是否相等的精度范围，默认值是1.0E-7。
+   * ini.EnableObjectModificationEvent: 1启用对象被增加，删除通知道事件，2：启用对象被修改知道事件，默认值为0
    * @example
    * ```ts
    * ```
@@ -12893,6 +12911,11 @@ export declare class McAppType {
 	 * @return 数字日期版本信息
 	 */
 	GetVersionDateString(): string;
+	/**
+	 * new 一个McObjectId对象。
+	 * @return 返回新创建的McObjectId
+	 */
+	newMcObjectId(id?: number, type?: McObjectIdType): McObjectId;
 }
 /**
  * MxCppType 类封装了一系列与 CAD 相关的操作，包括创建点、向量、获取当前对象等

package/dist/mxcad.es.js

@@ -14199,7 +14199,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312Imp(hexstr);
 };
 
-const version$1 = "1.0.283";
+const version$1 = "1.0.284";
 
 var isSharedArrayBuffer = ("SharedArrayBuffer" in window);
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -14930,14 +14930,14 @@ var MxCADResbuf = /*#__PURE__*/function (_McRxObject) {
     value: function AtString(lItem) {
       var decodeFromGb2312 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       if (decodeFromGb2312) {
-        var str = MxG2312Obj.decodeFromGb2312(this.imp.AtString(lItem));
+        var str = MxG2312Obj.decodeFromGb2312(this.imp.AtString(lItem, true));
         return {
           val: str,
           ret: MxCpp.getCallResult() == 0
         };
       } else {
         return {
-          val: this.imp.AtString(lItem),
+          val: this.imp.AtString(lItem, true),
           ret: MxCpp.getCallResult() == 0
         };
       }
@@ -19262,7 +19262,7 @@ var McDbTextStyleTableRecord = /*#__PURE__*/function (_McDbObject3) {
           pitchAndFamily: 0
         };
       }
-      var sTypeface = MxG2312Obj.decodeFromGb2312(ret.AtString(0));
+      var sTypeface = MxG2312Obj.decodeFromGb2312(ret.AtString(0, true));
       var bold = ret.Atlong(1) != 0;
       var italic = ret.Atlong(2) != 0;
       var charset = ret.Atlong(3);
@@ -20499,6 +20499,7 @@ var McObject = /*#__PURE__*/function () {
     _defineProperty(this, "currentOriginalFileName", "");
     _defineProperty(this, "firstTimeOpenFile", true);
     _defineProperty(this, "authorized_service", "");
+    _defineProperty(this, "isInitMxObject", false);
     this.imp = imp;
   }
   _createClass$1(McObject, [{
@@ -20554,6 +20555,9 @@ var McObject = /*#__PURE__*/function () {
       } else {
         this.event[name] = fun;
       }
+      if (this.isInitMxObject) {
+        this.event = this.synchronizeMxDrawEvent(this.event);
+      }
     }
   }, {
     key: "off",
@@ -20593,10 +20597,40 @@ var McObject = /*#__PURE__*/function () {
         throw error;
       }
     }
+  }, {
+    key: "synchronizeMxDrawEvent",
+    value: function synchronizeMxDrawEvent(event) {
+      var mxObject = this.getMxDrawObject().getMxObjectImplement();
+      var tmp_is_mxcad_event = {
+        selectChange: true,
+        openFileComplete: true,
+        init: true,
+        init_mxdraw: true,
+        init_mxcad: true,
+        init_before_mxdraw: true
+      };
+      var tmp_event = {};
+      for (var name in event) {
+        var call = event[name];
+        if (tmp_is_mxcad_event[name]) {
+          tmp_event[name] = call;
+          continue;
+        }
+        if (call instanceof Array) {
+          call.forEach(function (val) {
+            mxObject.addEvent(name, val);
+          });
+        } else {
+          mxObject.addEvent(name, call);
+        }
+      }
+      return tmp_event;
+    }
   }, {
     key: "initMxObject",
     value: function initMxObject(mxObject) {
       var _this = this;
+      this.isInitMxObject = true;
       if (!mxObject.tmp) mxObject.tmp = new MxDrawObject(mxObject);
       this.imp["mxdrawObject"] = mxObject.tmp;
       mxObject.addEvent("selectChange", function (id) {
@@ -20625,30 +20659,7 @@ var McObject = /*#__PURE__*/function () {
       mxObject.addEvent("openFileComplete", function () {
         _this.callEvent("openFileComplete", myThis);
       });
-      var tmp_is_mxcad_event = {
-        selectChange: true,
-        openFileComplete: true,
-        init: true,
-        init_mxdraw: true,
-        init_mxcad: true,
-        init_before_mxdraw: true
-      };
-      var tmp_event = {};
-      for (var name in this.event) {
-        var call = this.event[name];
-        if (tmp_is_mxcad_event[name]) {
-          tmp_event[name] = call;
-          continue;
-        }
-        if (call instanceof Array) {
-          call.forEach(function (val) {
-            mxObject.addEvent(name, val);
-          });
-        } else {
-          mxObject.addEvent(name, call);
-        }
-      }
-      this.event = tmp_event;
+      this.event = this.synchronizeMxDrawEvent(this.event);
     }
   }, {
     key: "regen",
@@ -21958,6 +21969,11 @@ var McAppType = /*#__PURE__*/function () {
     value: function GetVersionDateString() {
       return this.imp.GetVersionDateString();
     }
+  }, {
+    key: "newMcObjectId",
+    value: function newMcObjectId(id, type) {
+      return new McObjectId(id, type);
+    }
   }]);
   return McAppType;
 }();