mxcad 1.0.367 → 1.0.369

package/dist/mxcad.d.ts

@@ -11899,6 +11899,7 @@ declare class McRxObjectImp {
 export declare class McObject {
 	/** 内部对象实现 */
 	private imp;
+	private cooperate;
 	/** 内部事件 */
 	private event;
 	/** 当前打开的文件名 */
@@ -11932,6 +11933,13 @@ export declare class McObject {
 	 * ```
 	*/
 	getTempDraw(): McObjectTempDraw;
+	/**
+	 * 返回协同工作对象
+	 * @example
+	 * ```ts
+	 * ```
+	*/
+	getCooperate(): MxCooperate;
 	/**
 	 * 判断层是不是一个在使用的有用层，删除一个层之前调用该函数判断一下。
 	 * @example
@@ -12232,6 +12240,7 @@ export declare class McObject {
 	 * @param sFileUrl 网络文件路径
 	 * @param retCall 回调函数，可选参数，打开文件完成后的回调函数，参数为打开文件的结果,0表示成功，其他值表示失败
 	 * @param isWorkThread 是否使用工作线程打开文件，默认为 true
+	 * @param obj_param: 打开参数，比如传一个请求头{requestHeaders:{aaa:"xxxxx"}}
 	 * @param fetchAttributes 1：EMSCRIPTEN_FETCH_LOAD_TO_MEMORY,把图纸数据加载内存中，0:EMSCRIPTEN_FETCH_LOAD_TO_MEMORY | EMSCRIPTEN_FETCH_PERSIST_FILE | EMSCRIPTEN_FETCH_APPEND，把图纸数据加到IndexedDB。
 	 * @returns 是否成功打开文件
 	 * @example
@@ -12241,7 +12250,7 @@ export declare class McObject {
 	 * mxcad.openWebFile("http://localhost:1337/mxcad/file/a9cbed3d3a351b79f24484e87bd78338.DWG.mxweb");
 	 * ```
 	 */
-	openWebFile(sFileUrl: string, retCall?: (iRet: number) => void, isWorkThread?: boolean, initialParameter?: object, fetchAttributes?: number, isFetchTzFile?: boolean): boolean;
+	openWebFile(sFileUrl: string, retCall?: (iRet: number) => void, isWorkThread?: boolean, obj_param?: object, fetchAttributes?: number, isFetchTzFile?: boolean): boolean;
 	/**
 	* 清空当前图上内容，新建一个文件
 	* @example
@@ -14211,6 +14220,42 @@ export declare class MxCADTempForbiddenIntelliSelect {
 	constructor(isForbidden?: boolean);
 	restoreSettings(): void;
 }
+/**
+ * 协同工作
+ */
+export declare class MxCooperate {
+	private mxcad;
+	constructor(mxcad: McObject);
+	/**
+	*创建协同工作
+	*/
+	createWrok(retCall?: (wrokId: number) => void): number;
+	/**
+	*得到当前正在协同的工作名列表
+	*/
+	getWorks(retCall: (workNames: number[]) => void): number;
+	/**
+	*创建协同工作
+	*/
+	joinWork(workId: number, retCall?: (iRet: number) => void): number;
+	/**
+	*初始化参数
+	*比如：{server_addres:"http://localhost:3091"}
+	*/
+	init(param: object): any;
+	/**
+	*退出当前协同工作
+	*/
+	exitWrok(): number;
+	/**
+	*得到当前协同的状态
+	*/
+	getStatus(): number;
+	/**
+	*挂载协同工作事件处理
+	*/
+	onEvent(retCall: (eventName: string, iRet: number) => void): void;
+}
 /**
  * 指定执行克隆操作时的行为类型
  */

package/dist/mxcad.es.js

@@ -15080,7 +15080,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312Imp(hexstr);
 };
 
-const version$1 = "1.0.365";
+const version$1 = "1.0.368";
 
 var isSharedArrayBuffer = "SharedArrayBuffer" in window;
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -22487,6 +22487,7 @@ var McObject = /*#__PURE__*/function () {
   function McObject(imp) {
     _classCallCheck$1(this, McObject);
     _defineProperty(this, "imp", void 0);
+    _defineProperty(this, "cooperate", void 0);
     _defineProperty(this, "event", {});
     _defineProperty(this, "currentFileName", "");
     _defineProperty(this, "currentOriginalFileName", "");
@@ -22494,6 +22495,7 @@ var McObject = /*#__PURE__*/function () {
     _defineProperty(this, "authorized_service", "");
     _defineProperty(this, "isInitMxObject", false);
     this.imp = imp;
+    this.cooperate = new MxCooperate(this);
   }
   _createClass$1(McObject, [{
     key: "creaeCallId",
@@ -22505,6 +22507,11 @@ var McObject = /*#__PURE__*/function () {
     value: function getTempDraw() {
       return new McObjectTempDraw(this.imp.getTempDraw());
     }
+  }, {
+    key: "getCooperate",
+    value: function getCooperate() {
+      return this.cooperate;
+    }
   }, {
     key: "isUselessLayer",
     value: function isUselessLayer(layerName) {
@@ -22780,7 +22787,7 @@ var McObject = /*#__PURE__*/function () {
     key: "openWebFile",
     value: function openWebFile(sFileUrl, retCall) {
       var isWorkThread = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-      var initialParameter = arguments.length > 3 ? arguments[3] : undefined;
+      var obj_param = arguments.length > 3 ? arguments[3] : undefined;
       var fetchAttributes = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
       var isFetchTzFile = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
       var mxObject = this.imp["mxdrawObject"];
@@ -22802,8 +22809,8 @@ var McObject = /*#__PURE__*/function () {
       this.currentFileName = sFileUrl.split("/").pop();
       this.currentOriginalFileName = this.currentFileName;
       var sParam = "";
-      if (initialParameter) {
-        sParam = JSON.stringify(initialParameter);
+      if (obj_param) {
+        sParam = JSON.stringify(obj_param);
       }
       if (!this.firstTimeOpenFile) {
         this.getMxDrawObject().clearAllObject();
@@ -22831,6 +22838,12 @@ var McObject = /*#__PURE__*/function () {
         var xhr = new XMLHttpRequest();
         xhr.open("POST", sAUrl);
         xhr.setRequestHeader("Content-Type", "application/json");
+        if (obj_param && obj_param["requestHeaders"]) {
+          var requestHeaders = obj_param["requestHeaders"];
+          for (var key in requestHeaders) {
+            xhr.setRequestHeader(key, requestHeaders[key]);
+          }
+        }
         xhr.onreadystatechange = function () {
           if (xhr.status === 200) {
             if (xhr.readyState === 4) {
@@ -23529,11 +23542,13 @@ var McObject = /*#__PURE__*/function () {
     value: function setViewBackgroundColor(red, green, blue) {
       var mxobj = this.getMxDrawObject();
       if (mxobj) {
-        if (red && green && blue) mxobj.setViewColor(red << 16 | green << 8 | blue);else {
+        if (red !== void 0 && green !== void 0 && blue !== void 0) {
+          mxobj.setViewColor(red << 16 | green << 8 | blue);
+        } else {
           mxobj.setViewColor(red);
         }
       }
-      if (red && green && blue) {
+      if (red !== void 0 && green !== void 0 && blue !== void 0) {
         return this.imp.setViewBackgroundColor(red, green, blue);
       } else {
         return this.imp.setViewBackgroundColor((red & 16711680) >> 16, (red & 65280) >> 8, red & 255);
@@ -23650,11 +23665,16 @@ var McAppType = /*#__PURE__*/function () {
   }, {
     key: "getCurrentMxCAD",
     value: function getCurrentMxCAD() {
-      var currentMxCADImp = this.imp.GetCurrentMxDraw();
-      if (!currentMxCADImp["McObject"]) {
-        currentMxCADImp["McObject"] = new McObject(this.imp.GetCurrentMxDraw());
+      if (this.imp) {
+        var currentMxCADImp = this.imp.GetCurrentMxDraw();
+        if (!currentMxCADImp["McObject"]) {
+          currentMxCADImp["McObject"] = new McObject(this.imp.GetCurrentMxDraw());
+        }
+        return currentMxCADImp["McObject"];
+      } else {
+        var _currentMxCADImp = void 0;
+        return _currentMxCADImp;
       }
-      return currentMxCADImp["McObject"];
     }
   }, {
     key: "mcedRGB2Index",
@@ -24400,6 +24420,105 @@ var MxCADTempForbiddenIntelliSelect = /*#__PURE__*/function () {
   }]);
   return MxCADTempForbiddenIntelliSelect;
 }();
+var MxCooperate = /*#__PURE__*/function () {
+  function MxCooperate(mxcad) {
+    _classCallCheck$1(this, MxCooperate);
+    _defineProperty(this, "mxcad", void 0);
+    this.mxcad = mxcad;
+  }
+  _createClass$1(MxCooperate, [{
+    key: "createWrok",
+    value: function createWrok(retCall) {
+      var win = window;
+      win["coordinate_createWrok"] = function (_id, param) {
+        win["coordinate_createWrok"] = void 0;
+        try {
+          var paramobj = JSON.parse(param);
+          retCall && retCall(paramobj.l_param);
+        } catch (error) {
+          console.log(error);
+          retCall && retCall(0);
+        }
+      };
+      return this.mxcad.getImp().cooperate_createWrok();
+    }
+  }, {
+    key: "getWorks",
+    value: function getWorks(retCall) {
+      var win = window;
+      win["coordinate_getWroks"] = function (_id, param) {
+        win["coordinate_getWroks"] = void 0;
+        try {
+          var paramobj = JSON.parse(param);
+          if (paramobj.l_param == 0) {
+            retCall(paramobj.str_param);
+          } else {
+            retCall([]);
+          }
+        } catch (error) {
+          console.log(error);
+          retCall([]);
+        }
+      };
+      return this.mxcad.getImp().cooperate_getWorks();
+    }
+  }, {
+    key: "joinWork",
+    value: function joinWork(workId, retCall) {
+      var win = window;
+      win["coordinate_joinWork"] = function (_id, param) {
+        win["coordinate_joinWork"] = void 0;
+        try {
+          var paramobj = JSON.parse(param);
+          retCall && retCall(paramobj.l_param);
+        } catch (error) {
+          console.log(error);
+          retCall && retCall(-1);
+        }
+      };
+      return this.mxcad.getImp().cooperate_joinWork(workId);
+    }
+  }, {
+    key: "init",
+    value: function init(param) {
+      return this.mxcad.getImp().cooperate_init(JSON.stringify(param));
+    }
+  }, {
+    key: "exitWrok",
+    value: function exitWrok() {
+      return this.mxcad.getImp().cooperate_exitWrok();
+    }
+  }, {
+    key: "getStatus",
+    value: function getStatus() {
+      return this.mxcad.getImp().cooperate_status();
+    }
+  }, {
+    key: "onEvent",
+    value: function onEvent(retCall) {
+      var win = window;
+      win["cooperate_joinWork_complete"] = function (_id, param) {
+        try {
+          var paramobj = JSON.parse(param);
+          retCall("cooperate_joinWork_complete", paramobj.l_param);
+        } catch (error) {
+          console.log(error);
+          retCall("cooperate_joinWork_complete", -1);
+        }
+      };
+      win["cooperate_work_network_disconnection"] = function (_id, param) {
+        try {
+          var paramobj = JSON.parse(param);
+          retCall("cooperate_work_network_disconnection", paramobj.l_param);
+        } catch (error) {
+          console.log(error);
+          retCall("cooperate_work_network_disconnection", -1);
+        }
+      };
+    }
+  }]);
+  return MxCooperate;
+}();
 
 var MxCpp = new MxCppType();
 function loadMxCADassembly(_x) {
@@ -38300,6 +38419,64 @@ function _Mx_Xor() {
   }));
   return _Mx_Xor.apply(this, arguments);
 }
+function Mx_Cooperate_OnEvent() {
+  var cooperate = MxCpp.mxcad.getCooperate();
+  cooperate.onEvent(function (eventName, iRet) {
+    if (eventName == "cooperate_joinWork_complete") {
+      if (iRet == 0) {
+        console.log("cooperate_joinWork_complete");
+      } else {
+        console.log("cooperate_joinWork_complete return failed,error code:" + iRet);
+      }
+    } else if (eventName == "cooperate_work_network_disconnection") {
+      console.log("cooperate_work_network_disconnection");
+    }
+  });
+}
+function Mx_Cooperate_Create() {
+  var cooperate = MxCpp.mxcad.getCooperate();
+  cooperate.createWrok(function (workid) {
+    if (workid > 0) {
+      console.log("create cooperate ok,work name:" + workid);
+    } else {
+      var lErrorCode = -workid;
+      console.log("create cooperate failed,error code:" + lErrorCode);
+      if (lErrorCode == 4) {
+        console.log("create cooperate Has been created");
+      }
+    }
+  });
+  Mx_Cooperate_OnEvent();
+}
+function Mx_Cooperate_Join() {
+  var cooperate = MxCpp.mxcad.getCooperate();
+  cooperate.getWorks(function (works) {
+    if (works.length > 0) {
+      cooperate.joinWork(works[0], function (iRet) {
+        if (iRet == 0) {
+          console.log("join cooperate ok,work name:" + works[0]);
+        } else {
+          console.log("join cooperate failed,error code:" + iRet);
+          if (iRet == 17) {
+            console.log("join cooperate Has been join");
+          }
+        }
+      });
+    } else {
+      console.log("join cooperate works empty");
+    }
+  });
+  Mx_Cooperate_OnEvent();
+}
+function Mx_Cooperate_Exit() {
+  var cooperate = MxCpp.mxcad.getCooperate();
+  var ret = cooperate.exitWrok();
+  if (ret == 0) {
+    console.log("coordinate exit ok");
+  } else {
+    console.log("coordinate exit ok failed,error code:" + ret);
+  }
+}
 MxFun.on("init", function () {
   MxFun.addCommand("Mx_Line", drawLine);
   MxFun.addCommand("Mx_Point", Mx_Point);
@@ -38312,6 +38489,9 @@ MxFun.on("init", function () {
   MxFun.addCommand("Mx_Intersection", Mx_Intersection);
   MxFun.addCommand("Mx_Difference", Mx_Difference);
   MxFun.addCommand("Mx_Xor", Mx_Xor);
+  MxFun.addCommand("Mx_Cooperate_Create", Mx_Cooperate_Create);
+  MxFun.addCommand("Mx_Cooperate_Join", Mx_Cooperate_Join);
+  MxFun.addCommand("Mx_Cooperate_Exit", Mx_Cooperate_Exit);
 });
 
 function drawMText() {
@@ -103685,6 +103865,7 @@ const mxcad = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
 	MxCompare,
 	MxModifyColor,
 	MxCADTempForbiddenIntelliSelect,
+	MxCooperate,
 	MxCADCloneType,
 	MxCADWorldDrawType,
 	IMcDbDwgFiler,
@@ -103729,4 +103910,4 @@ globalThis.Buffer = buffer$1.Buffer;
 globalThis.Buffer.alloc = buffer$1.Buffer.alloc;
 globalThis.Buffer.from = buffer$1.Buffer.from;
 
-export { ColorIndexType, ColorMethod, DxfCode, FetchAttributes, IMcDbDwgFiler, IsZero, MLineJustificationType, McAppType, McCmColor, McDb, McDb2LineAngularDimension, McDbAlignedDimension, McDbArc, McDbAttribute, McDbAttributeDefinition, McDbBackgroundEntity, McDbBlockReference, McDbBlockTable, McDbBlockTableRecord, McDbCircle, McDbCurve, McDbCustomEntity, McDbDatabase, McDbDiametricDimension, McDbDictionary, McDbDimStyleTable, McDbDimStyleTableRecord, McDbDimension, McDbEllipse, McDbEntity, McDbGroup, McDbHatch$1 as McDbHatch, McDbLayerTable, McDbLayerTableRecord, McDbLine, McDbLinetypeTable, McDbLinetypeTableRecord, McDbMLine, McDbMText, McDbMxRegion, McDbObject, McDbObjectArray, McDbPoint, McDbPolyline, McDbProxyEntity, McDbRadialDimension, McDbRasterImage, McDbRasterImageDef, McDbRay, McDbRotatedDimension, McDbSpatialFilter, McDbSpline, McDbText, McDbTextStyleTable, McDbTextStyleTableRecord, McDbWipeout, McDbXline, McDbXlsxTable, McDbXrecord, McGeBound, McGeDoubleArray, McGeLongArray, McGeMatrix3d, McGePoint3d, McGePoint3dArray, McGeStringArray, McGeVector3d, McObject, McObjectId, McObjectIdType, McObjectTempDraw, McRxObject, MxCADBaseCustomElement, MxCADBaseCustomText, MxCADCloneType, MxCADMText, MxCADPluginBase, MxCADPluginMapDefaultData, MxCADPluginSampleCode, MxCADResbuf, MxCADSelectionSet, MxCADSelectionSetStatus, MxCADTempForbiddenIntelliSelect, MxCADUiPrAngle, MxCADUiPrBase, MxCADUiPrDist, MxCADUiPrEntity, MxCADUiPrInt, MxCADUiPrKeyWord, MxCADUiPrPoint, MxCADUiPrPointTransform, MxCADUiPrString, MxCADUtility, MxCADUtilityClass, MxCADWorldDraw, MxCADWorldDrawType, MxCanvas2Image, MxCheckTheBrowser, MxCompare, MxCoordConvert, MxCoordConvertType, MxCpp, MxCppType, MxMap, MxMapAddGoogleCnLayer, MxMapAddRasterTileLayer, MxModifyColor, MxPropertiesWindowCustom, MxPropertiesWindowCustomValue, MxPropertiesWindowCustomValueType, MxTIFFLoader, MxTools, Mx_About, Mx_Erase, TableRenderDirection, _ML_String, b64Decode, b64Encode, crateHexString, createCursor, createMcCmColor, createMxCad, mxcad as default, downloadFile, downloadFileFromUrl, drawArc, drawCircle, drawEllipticalArc, drawLine, drawMText, drawPolyLine, drawPolygon, drawRectang, drawText, getColorUtils, getFileFromUrl, getFilterImp, getJsonFromUrl, loadMxCADassembly, mx_gcj02_To_gps84, mx_gps84_To_gcj02, postEmscriptenIndexedDBFile, postMemoryFile, saveAsFileDialog, setMcCmColor };
+export { ColorIndexType, ColorMethod, DxfCode, FetchAttributes, IMcDbDwgFiler, IsZero, MLineJustificationType, McAppType, McCmColor, McDb, McDb2LineAngularDimension, McDbAlignedDimension, McDbArc, McDbAttribute, McDbAttributeDefinition, McDbBackgroundEntity, McDbBlockReference, McDbBlockTable, McDbBlockTableRecord, McDbCircle, McDbCurve, McDbCustomEntity, McDbDatabase, McDbDiametricDimension, McDbDictionary, McDbDimStyleTable, McDbDimStyleTableRecord, McDbDimension, McDbEllipse, McDbEntity, McDbGroup, McDbHatch$1 as McDbHatch, McDbLayerTable, McDbLayerTableRecord, McDbLine, McDbLinetypeTable, McDbLinetypeTableRecord, McDbMLine, McDbMText, McDbMxRegion, McDbObject, McDbObjectArray, McDbPoint, McDbPolyline, McDbProxyEntity, McDbRadialDimension, McDbRasterImage, McDbRasterImageDef, McDbRay, McDbRotatedDimension, McDbSpatialFilter, McDbSpline, McDbText, McDbTextStyleTable, McDbTextStyleTableRecord, McDbWipeout, McDbXline, McDbXlsxTable, McDbXrecord, McGeBound, McGeDoubleArray, McGeLongArray, McGeMatrix3d, McGePoint3d, McGePoint3dArray, McGeStringArray, McGeVector3d, McObject, McObjectId, McObjectIdType, McObjectTempDraw, McRxObject, MxCADBaseCustomElement, MxCADBaseCustomText, MxCADCloneType, MxCADMText, MxCADPluginBase, MxCADPluginMapDefaultData, MxCADPluginSampleCode, MxCADResbuf, MxCADSelectionSet, MxCADSelectionSetStatus, MxCADTempForbiddenIntelliSelect, MxCADUiPrAngle, MxCADUiPrBase, MxCADUiPrDist, MxCADUiPrEntity, MxCADUiPrInt, MxCADUiPrKeyWord, MxCADUiPrPoint, MxCADUiPrPointTransform, MxCADUiPrString, MxCADUtility, MxCADUtilityClass, MxCADWorldDraw, MxCADWorldDrawType, MxCanvas2Image, MxCheckTheBrowser, MxCompare, MxCooperate, MxCoordConvert, MxCoordConvertType, MxCpp, MxCppType, MxMap, MxMapAddGoogleCnLayer, MxMapAddRasterTileLayer, MxModifyColor, MxPropertiesWindowCustom, MxPropertiesWindowCustomValue, MxPropertiesWindowCustomValueType, MxTIFFLoader, MxTools, Mx_About, Mx_Erase, TableRenderDirection, _ML_String, b64Decode, b64Encode, crateHexString, createCursor, createMcCmColor, createMxCad, mxcad as default, downloadFile, downloadFileFromUrl, drawArc, drawCircle, drawEllipticalArc, drawLine, drawMText, drawPolyLine, drawPolygon, drawRectang, drawText, getColorUtils, getFileFromUrl, getFilterImp, getJsonFromUrl, loadMxCADassembly, mx_gcj02_To_gps84, mx_gps84_To_gcj02, postEmscriptenIndexedDBFile, postMemoryFile, saveAsFileDialog, setMcCmColor };