mxcad 1.0.310 → 1.0.311

package/dist/mxcad.d.ts

@@ -12662,6 +12662,12 @@ export declare class McObject {
 	 *在当前设置一个回退标记.
 	*/
 	undoMark(): void;
+	/**
+	 *回退标记索引加1.
+	 *在非命令函数里面修改数据据对象，需要回退标记索引加1，这样会记录修改，不然可能会认为上一次的命令修改，跳过当前修改回退记录.
+	 *在命令里面会自动回退标记索引加1
+	*/
+	undoIndexIncrease(): void;
 }
 /**
  * McAppType 类，提供了 MxCAD 的一些基本操作。
@@ -14222,7 +14228,6 @@ declare function convertSlatePointToCadPoint(this: MxCADMText, point: IMxEditorP
 	lineIndex: number;
 } | null;
 declare function transformBy(this: MxCADMText, mat: McGeMatrix3d): boolean;
-declare function worldDraw(this: MxCADMText, draw: MxCADWorldDraw): void;
 /**
  * 自定义编辑器实体类
  * 用于在CAD中渲染和管理富文本编辑器
@@ -14262,7 +14267,7 @@ export declare class MxCADMText extends McDbCustomEntity {
 	dwgOutFields(filter: IMcDbDwgFiler): boolean;
 	moveGripPointsAt(iIndex: number, dXOffset: number, dYOffset: number, dZOffset: number): void;
 	getGripPoints(): McGePoint3dArray;
-	worldDraw: typeof worldDraw;
+	worldDraw(draw: MxCADWorldDraw): void;
 	/** CAD坐标转换为Slate的Point位置 */
 	convertCadPointToSlatePoint: typeof convertCadPointToSlatePoint;
 	/** Slate的Point位置转换为CAD坐标 */

package/dist/mxcad.es.js

@@ -14373,7 +14373,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312Imp(hexstr);
 };
 
-const version$1 = "1.0.310";
+const version$1 = "1.0.311";
 
 var isSharedArrayBuffer = ("SharedArrayBuffer" in window);
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -21223,7 +21223,9 @@ var McObject = /*#__PURE__*/function () {
     value: function newFile() {
       this.currentFileName = "";
       this.currentOriginalFileName = "";
-      this.getMxDrawObject().clearAllObject();
+      var mxobj = this.getMxDrawObject();
+      mxobj.clearAllObject();
+      mxobj.clearMxCurrentSelect();
       return this.imp.newFile();
     }
   }, {
@@ -21911,6 +21913,11 @@ var McObject = /*#__PURE__*/function () {
     value: function undoMark() {
       this.imp.undoMark();
     }
+  }, {
+    key: "undoIndexIncrease",
+    value: function undoIndexIncrease() {
+      this.imp.undoIndexIncrease();
+    }
   }]);
   return McObject;
 }();
@@ -27007,58 +27014,12 @@ function transformBy(mat) {
   return true;
 }
 
-function ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$2(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function worldDraw(draw) {
-  var _this = this;
-  clearCalculateData();
-  clearTextCalculateData();
-  var imp = this.getMTextImp();
-  imp.__PARAGRAPH_INFOS__ = [];
-  var totalHeight = 0;
-  var maxWidth = 0;
-  imp.actualWidth = imp.maxWidth;
-  imp.actualHeight = imp.maxHeight;
-  var paragraphCalcResults = imp.data.map(function (node, index) {
-    if (!isElement(node)) return;
-    var element = MxCADMText.elementTextManager.get(node.type);
-    if (!element) return;
-    var result = element === null || element === void 0 ? void 0 : element.calculate(_this, node, index);
-    if (result) {
-      totalHeight += result.height;
-      maxWidth = Math.max(maxWidth, result.width);
-    }
-    return result;
-  });
-  var alignmentWidth = Math.max(imp.maxWidth, maxWidth);
-  var startPoint = imp.getActualRenderStartPosition(totalHeight, alignmentWidth);
-  var offsetHeight = 0;
-  imp.data.forEach(function (node, index) {
-    if (!isElement(node)) return;
-    var element = MxCADMText.elementTextManager.get(node.type);
-    if (!element) return;
-    var calcResult = paragraphCalcResults[index];
-    if (!calcResult) return;
-    var position = startPoint.clone().subvec(McGeVector3d.kYAxis.clone().mult(offsetHeight));
-    var info = element.render(_this, draw, node, calcResult, {
-      position: position,
-      index: index,
-      alignmentWidth: alignmentWidth
-    });
-    if (info) {
-      offsetHeight += calcResult.height;
-      imp.__PARAGRAPH_INFOS__[index] = _objectSpread$2(_objectSpread$2({}, calcResult), info);
-    }
-  });
-  imp.actualWidth = Math.max(imp.maxWidth, maxWidth);
-  imp.actualHeight = Math.max(imp.maxHeight, totalHeight);
-  imp.emit("changed");
-}
-
 var MxCADBaseCustomText = /*#__PURE__*/_createClass$1(function MxCADBaseCustomText() {
   _classCallCheck$1(this, MxCADBaseCustomText);
 });
 
+function ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$2(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _createSuper$5(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$6(); return function _createSuperInternal() { var Super = _getPrototypeOf$1(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf$1(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn$1(this, result); }; }
 function _isNativeReflectConstruct$6() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var MxCADMText = /*#__PURE__*/function (_McDbCustomEntity) {
@@ -27069,7 +27030,6 @@ var MxCADMText = /*#__PURE__*/function (_McDbCustomEntity) {
     _classCallCheck$1(this, MxCADMText);
     _this = _super.call(this, imp);
     _defineProperty(_assertThisInitialized$1(_this), "impMText", void 0);
-    _defineProperty(_assertThisInitialized$1(_this), "worldDraw", worldDraw);
     _defineProperty(_assertThisInitialized$1(_this), "convertCadPointToSlatePoint", convertCadPointToSlatePoint);
     _defineProperty(_assertThisInitialized$1(_this), "convertSlatePointToCadPoint", convertSlatePointToCadPoint);
     _defineProperty(_assertThisInitialized$1(_this), "transformBy", transformBy);
@@ -27216,6 +27176,53 @@ var MxCADMText = /*#__PURE__*/function (_McDbCustomEntity) {
     value: function getGripPoints() {
       return this.impMText.getGripPoints();
     }
+  }, {
+    key: "worldDraw",
+    value: function worldDraw(draw) {
+      var _this2 = this;
+      clearCalculateData();
+      clearTextCalculateData();
+      var imp = this.getMTextImp();
+      imp.__PARAGRAPH_INFOS__ = [];
+      var totalHeight = 0;
+      var maxWidth = 0;
+      imp.actualWidth = imp.maxWidth;
+      imp.actualHeight = imp.maxHeight;
+      var paragraphCalcResults = imp.data.map(function (node, index) {
+        if (!isElement(node)) return;
+        var element = MxCADMText.elementTextManager.get(node.type);
+        if (!element) return;
+        var result = element === null || element === void 0 ? void 0 : element.calculate(_this2, node, index);
+        if (result) {
+          totalHeight += result.height;
+          maxWidth = Math.max(maxWidth, result.width);
+        }
+        return result;
+      });
+      var alignmentWidth = Math.max(imp.maxWidth, maxWidth);
+      var startPoint = imp.getActualRenderStartPosition(totalHeight, alignmentWidth);
+      var offsetHeight = 0;
+      imp.data.forEach(function (node, index) {
+        if (!isElement(node)) return;
+        var element = MxCADMText.elementTextManager.get(node.type);
+        if (!element) return;
+        var calcResult = paragraphCalcResults[index];
+        if (!calcResult) return;
+        var position = startPoint.clone().subvec(McGeVector3d.kYAxis.clone().mult(offsetHeight));
+        var info = element.render(_this2, draw, node, calcResult, {
+          position: position,
+          index: index,
+          alignmentWidth: alignmentWidth
+        });
+        if (info) {
+          offsetHeight += calcResult.height;
+          imp.__PARAGRAPH_INFOS__[index] = _objectSpread$2(_objectSpread$2({}, calcResult), info);
+        }
+      });
+      imp.actualWidth = Math.max(imp.maxWidth, maxWidth);
+      imp.actualHeight = Math.max(imp.maxHeight, totalHeight);
+      imp.emit("changed");
+    }
   }]);
   return MxCADMText;
 }(McDbCustomEntity);