mxcad 1.0.225 → 1.0.226

package/dist/mxcad.d.ts

@@ -2249,7 +2249,7 @@ export declare class MxCADResbuf extends McRxObject {
 		// dxf: 10
 	 * ```
 	 */
-	forEach(call: (val: any, type: number, dxf: number) => void): void;
+	forEach(call: (val: any, type: number, dxf: number, index: number) => void): void;
 	/**
 	 * 获取 resbuf 数据项个数。
 	 * @returns resbuf 数据项个数。
@@ -12576,6 +12576,23 @@ export declare class MxPropertiesWindowCustom {
 	/** 属性UI程序调用，设置给定实体的自定义属性 */
 	setEntityProperties(id: McObjectId, prop: MxPropertiesWindowCustomValue): void;
 }
+/**
+ * MxCompare 两个图纸比较
+ */
+export declare class MxCompare {
+	private imp;
+	private result;
+	constructor();
+	private getTypeString;
+	/**
+	* 把当前控件显示的内容和database的图纸进行比较
+	*/
+	do(database: McDbDatabase): boolean;
+	/**
+	* 得到图纸比较结果
+	*/
+	getResult(): any[];
+}
 /**
  * 指定执行克隆操作时的行为类型
  */

package/dist/mxcad.es.js

@@ -14145,7 +14145,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312(hexstr);
 };
 
-const version$1 = "1.0.225";
+const version$1 = "1.0.226";
 
 var isSharedArrayBuffer = ("SharedArrayBuffer" in window);
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -14778,19 +14778,19 @@ var MxCADResbuf = /*#__PURE__*/function (_McRxObject) {
         var iType = this.ItemDataType(i);
         var iDxf = this.ItemDataDxf(i);
         if (iType == 5005) {
-          call(this.AtString(i, true).val, iType, iDxf);
+          call(this.AtString(i, true).val, iType, iDxf, i);
         } else if (iType == 5009) {
-          call(this.AtPoint(i).val, iType, iDxf);
+          call(this.AtPoint(i).val, iType, iDxf, i);
         } else if (iType == 5001) {
-          call(this.AtDouble(i).val, iType, iDxf);
+          call(this.AtDouble(i).val, iType, iDxf, i);
         } else if (iType == 5003 || iType == 5010) {
-          call(this.AtLong(i).val, 5010, iDxf);
+          call(this.AtLong(i).val, 5010, iDxf, i);
         } else if (iDxf == -8500) {
-          call(this.AtObject(i).val, -8500, -8500);
+          call(this.AtObject(i).val, -8500, -8500, i);
         } else if (iType == -8e3 || iType == -8001 || iType == -8002 || iType == -8003 || iType == -8004) {
-          call(this.AtObjectId(i).val, -8e3, -8e3);
+          call(this.AtObjectId(i).val, -8e3, -8e3, i);
         } else {
-          call(void 0, iType, iDxf);
+          call(void 0, iType, iDxf, i);
         }
       }
     }
@@ -20550,10 +20550,10 @@ var McObject = /*#__PURE__*/function () {
         param = JSON.parse(param);
         if (param.callid != callID) return;
         mxObject.removeEventFuction("load_dwg_gackground_result", funOpenCall);
+        call(param.l_param == 1);
         if (param.l_param == 1 && isShow) {
           _this5.regen(100);
         }
-        call(param.l_param == 1);
       };
       mxObject.addEvent("load_dwg_gackground_result", funOpenCall);
       this.imp.loadDwgBackground(sFileUrl, color, callID, isShow);
@@ -21373,6 +21373,71 @@ var MxPropertiesWindowCustom = /*#__PURE__*/function () {
   }]);
   return MxPropertiesWindowCustom;
 }();
+var MxCompare = /*#__PURE__*/function () {
+  function MxCompare() {
+    _classCallCheck$1(this, MxCompare);
+    _defineProperty(this, "imp", void 0);
+    _defineProperty(this, "result", []);
+    this.imp = new MxCpp.mxcadassemblyimp.MxCompare();
+  }
+  _createClass$1(MxCompare, [{
+    key: "getTypeString",
+    value: function getTypeString(type) {
+      var ret = "";
+      switch (type) {
+        case 0:
+          ret = "no modify";
+          break;
+        case 1:
+          ret = "unknown";
+          break;
+        case 2:
+          ret = "object modify";
+          break;
+        case 3:
+          ret = "object erase";
+          break;
+        case 4:
+          ret = "object add";
+          break;
+        default:
+          ret = "unknown";
+      }
+      return ret;
+    }
+  }, {
+    key: "do",
+    value: function _do(database) {
+      this.result = [];
+      if (this.imp.Do(database.imp)) {
+        var ret = new MxCADResbuf(this.imp.getResult());
+        var count = ret.GetCount();
+        for (var i = 0; i + 2 < count; i += 3) {
+          var id = ret.AtLong(i);
+          if (!id.ret) break;
+          var pos = ret.AtPoint(i + 1);
+          if (!pos.ret) break;
+          var type = ret.AtLong(i + 2);
+          if (!type.ret) break;
+          this.result.push({
+            id: new McObjectId(id.val),
+            pos: pos.val,
+            type: type.val,
+            str: this.getTypeString(type.val)
+          });
+        }
+        return true;
+      }
+      return false;
+    }
+  }, {
+    key: "getResult",
+    value: function getResult() {
+      return this.result;
+    }
+  }]);
+  return MxCompare;
+}();
 
 var MxCpp;
 function loadMxCADassembly(_x) {
@@ -59612,6 +59677,7 @@ const mxcad = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   MxPropertiesWindowCustomValueType,
   MxPropertiesWindowCustomValue,
   MxPropertiesWindowCustom,
+  MxCompare,
   MxCADCloneType,
   IMcDbDwgFiler,
   MxCADWorldDraw,
@@ -59843,4 +59909,4 @@ const mxcad = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   mx_gcj02_To_gps84
 }, Symbol.toStringTag, { value: 'Module' }));
 
-export { ColorIndexType, ColorMethod, DxfCode, FetchAttributes, IMcDbDwgFiler, IsZero, McAppType, McCmColor, McDb, McDb2LineAngularDimension, McDbAlignedDimension, McDbArc, McDbAttribute, McDbAttributeDefinition, McDbBackgroundEntity, McDbBlockReference, McDbBlockTable, McDbBlockTableRecord, McDbCircle, McDbCurve, McDbCustomEntity, McDbDatabase, McDbDictionary, McDbDimension, McDbEllipse, McDbEntity, McDbGroup, McDbHatch, McDbLayerTable, McDbLayerTableRecord, McDbLine, McDbLinetypeTable, McDbLinetypeTableRecord, McDbMText, McDbObject, McDbObjectArray, McDbPoint, McDbPolyline, McDbProxyEntity, McDbRasterImage, McDbRasterImageDef, McDbRotatedDimension, McDbText, McDbTextStyleTable, McDbTextStyleTableRecord, McDbXrecord, McGeBound, McGeDoubleArray, McGeLongArray, McGeMatrix3d, McGePoint3d, McGePoint3dArray, McGeStringArray, McGeVector3d, McObject, McObjectId, McObjectIdType, McRxObject, MdGe, MdGeAisContext, MdGeAisObject, MdGeAisShape, MdGeAisTexturedShape, MdGeAngleDim, MdGeApplication, MdGeArray1OfInteger, MdGeArray1OfPnt, MdGeArray1OfReal, MdGeArray2OfPnt, MdGeArray2OfReal, MdGeArrowAspect, MdGeAxis, MdGeBRep, MdGeBSplineCurve, MdGeBSplineSurface, MdGeBezierCurve, MdGeBezierSurface, MdGeBndBox, MdGeBox, MdGeCSYS, MdGeCSYSR, MdGeChamfer, MdGeCircle, MdGeColor, MdGeCompSolid, MdGeCompound, MdGeCone, MdGeCylinder, MdGeDiameterDim, MdGeDimAspect, MdGeDir, MdGeDocColorTool, MdGeDocReader, MdGeDocShapeTool, MdGeDocWriter, MdGeDocument, MdGeEdge, MdGeEllipse, MdGeExplorer, MdGeFace, MdGeFillet, MdGeHGeomPlane, MdGeHGeomSurface, MdGeHypr, MdGeInterpolateBSpl, MdGeLabel, MdGeLabelSequence, MdGeLabelTree, MdGeLengthDim, MdGeLight, MdGeLine, MdGeLineAspect, MdGeListIteratorOfListOfShape, MdGeListOfShape, MdGeLocation, MdGeLoft, MdGeMakeArcOfCircle, MdGeMakeFace, MdGeMakeThickSolid, MdGeMakeWires, MdGeMat, MdGeMaterialAspect, MdGeParab, MdGePipe, MdGePlane, MdGePoint, MdGePointsToBSpl, MdGePointsToBSplSurface, MdGePrism, MdGeRadiusDim, MdGeRect, MdGeRevol, MdGeSequenceIteratorOfSequenceOfShape, MdGeSequenceOfShape, MdGeShape, MdGeShell, MdGeSolid, MdGeSphere, MdGeSpliter, MdGeText, MdGeTextAspect, MdGeTextLabel, MdGeTopo, MdGeTorus, MdGeTransform, MdGeTrsf, MdGeVec, MdGeVertex, MdGeWedge, MdGeWire, MdGeXYZ, Mx3dAlgoChamfer, Mx3dAlgoFillet, Mx3dAlgoObject, Mx3dApplication, Mx3dAspectArrow, Mx3dAspectDim, Mx3dAspectLine, Mx3dAspectObject, Mx3dAspectText, Mx3dBaseObject, Mx3dBrepCastGeom, Mx3dDbDocument, Mx3dDbLabel, Mx3dDbObject, Mx3dDimAngle, Mx3dDimDiameter, Mx3dDimLength, Mx3dDimObject, Mx3dDimRadius, Mx3dGeAxis, Mx3dGeBndBox, Mx3dGeCSYS, Mx3dGeCSYSR, Mx3dGeCircle, Mx3dGeColor, Mx3dGeConic, Mx3dGeCurve, Mx3dGeCylinder, Mx3dGeDir, Mx3dGeEllipse, Mx3dGeHyperbola, Mx3dGeLine, Mx3dGeLocation, Mx3dGeMaterial, Mx3dGeObject, Mx3dGePlane, Mx3dGePoint, Mx3dGeTrsf, Mx3dGeVec, Mx3dGeomBSplineCurve, Mx3dGeomBSplineSurface, Mx3dGeomBezierCurve, Mx3dGeomBezierSurface, Mx3dGeomBoundedCurve, Mx3dGeomBoundedSurface, Mx3dGeomCircle, Mx3dGeomConic, Mx3dGeomConicalSurface, Mx3dGeomCurve, Mx3dGeomCylindricalSurface, Mx3dGeomElementarySurface, Mx3dGeomEllipse, Mx3dGeomHyperbola, Mx3dGeomLine, Mx3dGeomObject, Mx3dGeomParabola, Mx3dGeomPlane, Mx3dGeomSphericalSurface, Mx3dGeomSurface, Mx3dGeomToroidalSurface, Mx3dInterpolateBSplineCurve, Mx3dMkBox, Mx3dMkCone, Mx3dMkCylinder, Mx3dMkFace, Mx3dMkLoft, Mx3dMkObject, Mx3dMkPipe, Mx3dMkPolygon, Mx3dMkPrism, Mx3dMkRevol, Mx3dMkSphere, Mx3dMkThickSolid, Mx3dMkTorus, Mx3dMkWedge, Mx3dShapeCompSolid, Mx3dShapeCompound, Mx3dShapeDownCast, Mx3dShapeEdge, Mx3dShapeFace, Mx3dShapeObject, Mx3dShapeShell, Mx3dShapeSolid, Mx3dShapeVertex, Mx3dShapeWire, Mx3dSymbolObject, Mx3dSymbolText, Mx3dUtils, Mx3dView, Mx3dWireTool, MxApp3D, MxApp3DType, MxCAD3DObject, MxCADCloneType, MxCADPluginBase, MxCADPluginMapDefaultData, MxCADPluginSampleCode, MxCADResbuf, MxCADSelectionSet, MxCADSelectionSetStatus, MxCADUiPrAngle, MxCADUiPrBase, MxCADUiPrDist, MxCADUiPrEntity, MxCADUiPrInt, MxCADUiPrKeyWord, MxCADUiPrPoint, MxCADUiPrString, MxCADUtility, MxCADUtilityClass, MxCADWorldDraw, MxCheckTheBrowser, MxCoordConvert, MxCoordConvertType, MxCpp, MxCppType, MxDraw3d, MxMap, MxMapAddGoogleCnLayer, MxMapAddRasterTileLayer, MxOldMx3dApplication, MxOldMx3dBaseObject, MxOldMx3dDbDocument, MxOldMx3dDbLabel, MxOldMx3dDbObject, MxOldMx3dGeBndBox, MxOldMx3dGeColor, MxOldMx3dGeLocation, MxOldMx3dGeObject, MxOldMx3dGePoint, MxOldMx3dLabelSequence, MxOldMx3dLabelSequenceIterator, MxOldMx3dShapeObject, MxPropertiesWindowCustom, MxPropertiesWindowCustomValue, MxPropertiesWindowCustomValueType, MxTools, Mx_Erase, _ML_String, b64Decode, b64Encode, createMcCmColor, createMxCad, mxcad as default, downloadFile, downloadFileFromUrl, drawArc, drawCircle, drawEllipticalArc, drawLine, drawMText, drawPolyLine, drawPolygon, drawRectang, drawText, getColorUtils, getFileFromUrl, getFilterImp, getJsonFromUrl, loadMxCADassembly, loadMxCADassembly3d, mx_gcj02_To_gps84, mx_gps84_To_gcj02, postEmscriptenIndexedDBFile, postMemoryFile, saveAsFileDialog, setMcCmColor };
+export { ColorIndexType, ColorMethod, DxfCode, FetchAttributes, IMcDbDwgFiler, IsZero, McAppType, McCmColor, McDb, McDb2LineAngularDimension, McDbAlignedDimension, McDbArc, McDbAttribute, McDbAttributeDefinition, McDbBackgroundEntity, McDbBlockReference, McDbBlockTable, McDbBlockTableRecord, McDbCircle, McDbCurve, McDbCustomEntity, McDbDatabase, McDbDictionary, McDbDimension, McDbEllipse, McDbEntity, McDbGroup, McDbHatch, McDbLayerTable, McDbLayerTableRecord, McDbLine, McDbLinetypeTable, McDbLinetypeTableRecord, McDbMText, McDbObject, McDbObjectArray, McDbPoint, McDbPolyline, McDbProxyEntity, McDbRasterImage, McDbRasterImageDef, McDbRotatedDimension, McDbText, McDbTextStyleTable, McDbTextStyleTableRecord, McDbXrecord, McGeBound, McGeDoubleArray, McGeLongArray, McGeMatrix3d, McGePoint3d, McGePoint3dArray, McGeStringArray, McGeVector3d, McObject, McObjectId, McObjectIdType, McRxObject, MdGe, MdGeAisContext, MdGeAisObject, MdGeAisShape, MdGeAisTexturedShape, MdGeAngleDim, MdGeApplication, MdGeArray1OfInteger, MdGeArray1OfPnt, MdGeArray1OfReal, MdGeArray2OfPnt, MdGeArray2OfReal, MdGeArrowAspect, MdGeAxis, MdGeBRep, MdGeBSplineCurve, MdGeBSplineSurface, MdGeBezierCurve, MdGeBezierSurface, MdGeBndBox, MdGeBox, MdGeCSYS, MdGeCSYSR, MdGeChamfer, MdGeCircle, MdGeColor, MdGeCompSolid, MdGeCompound, MdGeCone, MdGeCylinder, MdGeDiameterDim, MdGeDimAspect, MdGeDir, MdGeDocColorTool, MdGeDocReader, MdGeDocShapeTool, MdGeDocWriter, MdGeDocument, MdGeEdge, MdGeEllipse, MdGeExplorer, MdGeFace, MdGeFillet, MdGeHGeomPlane, MdGeHGeomSurface, MdGeHypr, MdGeInterpolateBSpl, MdGeLabel, MdGeLabelSequence, MdGeLabelTree, MdGeLengthDim, MdGeLight, MdGeLine, MdGeLineAspect, MdGeListIteratorOfListOfShape, MdGeListOfShape, MdGeLocation, MdGeLoft, MdGeMakeArcOfCircle, MdGeMakeFace, MdGeMakeThickSolid, MdGeMakeWires, MdGeMat, MdGeMaterialAspect, MdGeParab, MdGePipe, MdGePlane, MdGePoint, MdGePointsToBSpl, MdGePointsToBSplSurface, MdGePrism, MdGeRadiusDim, MdGeRect, MdGeRevol, MdGeSequenceIteratorOfSequenceOfShape, MdGeSequenceOfShape, MdGeShape, MdGeShell, MdGeSolid, MdGeSphere, MdGeSpliter, MdGeText, MdGeTextAspect, MdGeTextLabel, MdGeTopo, MdGeTorus, MdGeTransform, MdGeTrsf, MdGeVec, MdGeVertex, MdGeWedge, MdGeWire, MdGeXYZ, Mx3dAlgoChamfer, Mx3dAlgoFillet, Mx3dAlgoObject, Mx3dApplication, Mx3dAspectArrow, Mx3dAspectDim, Mx3dAspectLine, Mx3dAspectObject, Mx3dAspectText, Mx3dBaseObject, Mx3dBrepCastGeom, Mx3dDbDocument, Mx3dDbLabel, Mx3dDbObject, Mx3dDimAngle, Mx3dDimDiameter, Mx3dDimLength, Mx3dDimObject, Mx3dDimRadius, Mx3dGeAxis, Mx3dGeBndBox, Mx3dGeCSYS, Mx3dGeCSYSR, Mx3dGeCircle, Mx3dGeColor, Mx3dGeConic, Mx3dGeCurve, Mx3dGeCylinder, Mx3dGeDir, Mx3dGeEllipse, Mx3dGeHyperbola, Mx3dGeLine, Mx3dGeLocation, Mx3dGeMaterial, Mx3dGeObject, Mx3dGePlane, Mx3dGePoint, Mx3dGeTrsf, Mx3dGeVec, Mx3dGeomBSplineCurve, Mx3dGeomBSplineSurface, Mx3dGeomBezierCurve, Mx3dGeomBezierSurface, Mx3dGeomBoundedCurve, Mx3dGeomBoundedSurface, Mx3dGeomCircle, Mx3dGeomConic, Mx3dGeomConicalSurface, Mx3dGeomCurve, Mx3dGeomCylindricalSurface, Mx3dGeomElementarySurface, Mx3dGeomEllipse, Mx3dGeomHyperbola, Mx3dGeomLine, Mx3dGeomObject, Mx3dGeomParabola, Mx3dGeomPlane, Mx3dGeomSphericalSurface, Mx3dGeomSurface, Mx3dGeomToroidalSurface, Mx3dInterpolateBSplineCurve, Mx3dMkBox, Mx3dMkCone, Mx3dMkCylinder, Mx3dMkFace, Mx3dMkLoft, Mx3dMkObject, Mx3dMkPipe, Mx3dMkPolygon, Mx3dMkPrism, Mx3dMkRevol, Mx3dMkSphere, Mx3dMkThickSolid, Mx3dMkTorus, Mx3dMkWedge, Mx3dShapeCompSolid, Mx3dShapeCompound, Mx3dShapeDownCast, Mx3dShapeEdge, Mx3dShapeFace, Mx3dShapeObject, Mx3dShapeShell, Mx3dShapeSolid, Mx3dShapeVertex, Mx3dShapeWire, Mx3dSymbolObject, Mx3dSymbolText, Mx3dUtils, Mx3dView, Mx3dWireTool, MxApp3D, MxApp3DType, MxCAD3DObject, MxCADCloneType, MxCADPluginBase, MxCADPluginMapDefaultData, MxCADPluginSampleCode, MxCADResbuf, MxCADSelectionSet, MxCADSelectionSetStatus, MxCADUiPrAngle, MxCADUiPrBase, MxCADUiPrDist, MxCADUiPrEntity, MxCADUiPrInt, MxCADUiPrKeyWord, MxCADUiPrPoint, MxCADUiPrString, MxCADUtility, MxCADUtilityClass, MxCADWorldDraw, MxCheckTheBrowser, MxCompare, MxCoordConvert, MxCoordConvertType, MxCpp, MxCppType, MxDraw3d, MxMap, MxMapAddGoogleCnLayer, MxMapAddRasterTileLayer, MxOldMx3dApplication, MxOldMx3dBaseObject, MxOldMx3dDbDocument, MxOldMx3dDbLabel, MxOldMx3dDbObject, MxOldMx3dGeBndBox, MxOldMx3dGeColor, MxOldMx3dGeLocation, MxOldMx3dGeObject, MxOldMx3dGePoint, MxOldMx3dLabelSequence, MxOldMx3dLabelSequenceIterator, MxOldMx3dShapeObject, MxPropertiesWindowCustom, MxPropertiesWindowCustomValue, MxPropertiesWindowCustomValueType, MxTools, Mx_Erase, _ML_String, b64Decode, b64Encode, createMcCmColor, createMxCad, mxcad as default, downloadFile, downloadFileFromUrl, drawArc, drawCircle, drawEllipticalArc, drawLine, drawMText, drawPolyLine, drawPolygon, drawRectang, drawText, getColorUtils, getFileFromUrl, getFilterImp, getJsonFromUrl, loadMxCADassembly, loadMxCADassembly3d, mx_gcj02_To_gps84, mx_gps84_To_gcj02, postEmscriptenIndexedDBFile, postMemoryFile, saveAsFileDialog, setMcCmColor };