mxcad 1.0.331 → 1.0.332

package/dist/mxcad.d.ts

@@ -2882,28 +2882,6 @@ export declare class MxCADSelectionSet extends McRxObject {
 	 * ```
 	 * */
 	isSelectHighlight: boolean;
-	/**
-	 * 选择角点1
-	 * @example
-	 * ```ts
-	   import { MxCADSelectionSet } from "mxcad";
-
-	   let ss = new MxCADSelectionSet();
-	   ss.selectPt1 = new McGePoint3d(20,10,0);
-	 * ```
-	 * */
-	private selectPt1;
-	/**
-	 * 选择角点2
-	 * @example
-	 * ```ts
-	   import { MxCADSelectionSet } from "mxcad";
-
-	   let ss = new MxCADSelectionSet();
-	   ss.selectPt1 = new McGePoint3d(0,0,0);
-	 * ```
-	 *  */
-	private selectPt2;
 	private selectPoints;
 	/**
 	 * 构造函数
@@ -3047,6 +3025,12 @@ export declare class MxCADSelectionSet extends McRxObject {
 	 * ```
 	 * */
 	item(lItem: number): McObjectId;
+	/** 清空选择集
+	 * @example
+	 * ```ts
+	 * ```
+	 * */
+	clear(): void;
 	/** 遍历已选中的实体
 	 * @example
 	 * ```ts

package/dist/mxcad.es.js

@@ -15079,7 +15079,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312Imp(hexstr);
 };
 
-const version$1 = "1.0.330";
+const version$1 = "1.0.331";
 
 var isSharedArrayBuffer = ("SharedArrayBuffer" in window);
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -16417,8 +16417,6 @@ var MxCADSelectionSet = /*#__PURE__*/function (_McRxObject2) {
     _this3 = _super2.call(this);
     _defineProperty(_assertThisInitialized$1(_this3), "isWhileSelect", true);
     _defineProperty(_assertThisInitialized$1(_this3), "isSelectHighlight", true);
-    _defineProperty(_assertThisInitialized$1(_this3), "selectPt1", new McGePoint3d());
-    _defineProperty(_assertThisInitialized$1(_this3), "selectPt2", new McGePoint3d());
     _defineProperty(_assertThisInitialized$1(_this3), "selectPoints", []);
     _this3.initTempObject(new MxCpp.mxcadassemblyimp.McDrawSelSet());
     _this3.isWhileSelect = MxFun.isPC();
@@ -16427,10 +16425,22 @@ var MxCADSelectionSet = /*#__PURE__*/function (_McRxObject2) {
   _createClass$1(MxCADSelectionSet, [{
     key: "getSelectPoint",
     value: function getSelectPoint() {
-      return {
-        pt1: this.selectPt1,
-        pt2: this.selectPt2
-      };
+      if (this.selectPoints.length == 1) {
+        return {
+          pt1: this.selectPoints[0],
+          pt2: this.selectPoints[0]
+        };
+      } else if (this.selectPoints.length > 1) {
+        return {
+          pt1: this.selectPoints[0],
+          pt2: this.selectPoints[1]
+        };
+      } else {
+        return {
+          pt1: new McGePoint3d(),
+          pt2: new McGePoint3d()
+        };
+      }
     }
   }, {
     key: "getSelectPoints",
@@ -16471,6 +16481,11 @@ var MxCADSelectionSet = /*#__PURE__*/function (_McRxObject2) {
     value: function item(lItem) {
       return new McObjectId(this.imp.item(lItem), McObjectIdType.kMxCAD);
     }
+  }, {
+    key: "clear",
+    value: function clear() {
+      this.imp.clear();
+    }
   }, {
     key: "forEach",
     value: function forEach(call) {
@@ -16509,8 +16524,6 @@ var MxCADSelectionSet = /*#__PURE__*/function (_McRxObject2) {
               filter = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : null;
               init = _args4.length > 2 ? _args4[2] : undefined;
               this.selectPoints = [];
-              this.selectPt1 = new McGePoint3d();
-              this.selectPt2 = new McGePoint3d();
               getPoint = new MrxDbgUiPrPoint();
               if (strPrompt) {
                 getPoint.setMessage(strPrompt);
@@ -16522,77 +16535,73 @@ var MxCADSelectionSet = /*#__PURE__*/function (_McRxObject2) {
               retcode = 0;
               init && init(getPoint);
               filterImp = getFilterImp(filter);
-            case 14:
+            case 12:
               getPoint.setDynamicInputType(DynamicInputType.kDynTip);
               getPoint.setInputToucheType(MxType.InputToucheType.kGetBegan);
-              _context4.next = 19;
+              _context4.next = 17;
               return getPoint.go();
-            case 19:
+            case 17:
               pt1 = _context4.sent;
               getPoint.clearLastInputPoint();
               retcode = getPoint.getDetailedResult();
               if (pt1) {
-                _context4.next = 24;
+                _context4.next = 22;
                 break;
               }
-              return _context4.abrupt("break", 49);
-            case 24:
+              return _context4.abrupt("break", 43);
+            case 22:
               pt1CAD = MxCoordConvert.doc2cad1(pt1);
               if (!(this.imp.userPointSelect(pt1CAD.x, pt1CAD.y, filterImp, this.isSelectHighlight) == 0 /* kSelected */)) {
-                _context4.next = 34;
+                _context4.next = 30;
                 break;
               }
-              this.selectPt1.copy(pt1CAD);
-              this.selectPt2.copy(pt1CAD);
-              this.selectPoints.push(pt1CAD);
+              this.selectPoints.push(pt1CAD.clone());
               if (!this.isWhileSelect) {
-                _context4.next = 33;
+                _context4.next = 29;
                 break;
               }
-              return _context4.abrupt("continue", 14);
-            case 33:
-              return _context4.abrupt("break", 49);
-            case 34:
-              _context4.next = 36;
+              return _context4.abrupt("continue", 12);
+            case 29:
+              return _context4.abrupt("break", 43);
+            case 30:
+              _context4.next = 32;
               return MrxDbgUtils.getCorner(pt1, strPrompt, true, function (ret) {
                 retcode = ret.detailedResult;
               });
-            case 36:
+            case 32:
               pt2 = _context4.sent;
               if (pt2) {
-                _context4.next = 39;
+                _context4.next = 35;
                 break;
               }
-              return _context4.abrupt("break", 49);
-            case 39:
+              return _context4.abrupt("break", 43);
+            case 35:
               pt2CAD = MxCoordConvert.doc2cad1(pt2);
               this.imp.userSelect(pt1CAD.x, pt1CAD.y, pt2CAD.x, pt2CAD.y, filterImp, this.isSelectHighlight);
-              this.selectPt1.copy(pt1CAD);
-              this.selectPt2.copy(pt2CAD);
-              this.selectPoints.push(pt1CAD);
-              this.selectPoints.push(pt2CAD);
+              this.selectPoints.push(pt1CAD.clone());
+              this.selectPoints.push(pt2CAD.clone());
               if (this.isWhileSelect) {
-                _context4.next = 47;
+                _context4.next = 41;
                 break;
               }
-              return _context4.abrupt("break", 49);
-            case 47:
-              _context4.next = 14;
+              return _context4.abrupt("break", 43);
+            case 41:
+              _context4.next = 12;
               break;
-            case 49:
+            case 43:
               if (this.isSelectHighlight) this.imp.highlightEntity(false);
               if (!(retcode == DetailedResult.kEcsIn || retcode == DetailedResult.kNewCommadIn || retcode == DetailedResult.kUnknown)) {
-                _context4.next = 54;
+                _context4.next = 48;
                 break;
               }
               return _context4.abrupt("return", new Promise(function (resolve) {
                 resolve(false);
               }));
-            case 54:
+            case 48:
               return _context4.abrupt("return", new Promise(function (resolve) {
                 resolve(true);
               }));
-            case 55:
+            case 49:
             case "end":
               return _context4.stop();
           }
@@ -16622,6 +16631,8 @@ var MxCADSelectionSet = /*#__PURE__*/function (_McRxObject2) {
             case 0:
               filter = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : null;
               init = _args5.length > 2 ? _args5[2] : undefined;
+              this.imp.clear();
+              this.selectPoints = [];
               getPoint = new MrxDbgUiPrPoint();
               if (strPrompt) {
                 getPoint.setMessage(strPrompt);
@@ -16633,66 +16644,68 @@ var MxCADSelectionSet = /*#__PURE__*/function (_McRxObject2) {
               retcode = 0;
               init && init(getPoint);
               filterImp = getFilterImp(filter);
-            case 11:
+            case 13:
               if (pt1CAD) {
-                _context5.next = 24;
+                _context5.next = 26;
                 break;
               }
               getPoint.setDynamicInputType(DynamicInputType.kDynTip);
               getPoint.setInputToucheType(MxType.InputToucheType.kGetBegan);
-              _context5.next = 17;
+              _context5.next = 19;
               return getPoint.go();
-            case 17:
+            case 19:
               pt1 = _context5.sent;
               retcode = getPoint.getDetailedResult();
               getPoint.clearLastInputPoint();
               if (pt1) {
-                _context5.next = 22;
+                _context5.next = 24;
                 break;
               }
-              return _context5.abrupt("break", 39);
-            case 22:
+              return _context5.abrupt("break", 43);
+            case 24:
               pt1CAD = MxCoordConvert.doc2cad1(pt1);
               this.selectPoints.push(pt1CAD);
-            case 24:
-              _context5.next = 26;
-              return getPoint.go();
             case 26:
+              getPoint.setBasePt(pt1CAD.toVector3());
+              getPoint.setUseBasePt(true);
+              _context5.next = 30;
+              return getPoint.go();
+            case 30:
               pt2 = _context5.sent;
               getPoint.clearLastInputPoint();
               retcode = getPoint.getDetailedResult();
               if (pt2) {
-                _context5.next = 31;
+                _context5.next = 35;
                 break;
               }
-              return _context5.abrupt("break", 39);
-            case 31:
+              return _context5.abrupt("break", 43);
+            case 35:
               pt2CAD = MxCoordConvert.doc2cad1(pt2);
               this.imp.fenceSelect(pt1CAD.x, pt1CAD.y, pt2CAD.x, pt2CAD.y, filterImp, this.isSelectHighlight);
               this.selectPoints.push(pt2CAD);
               pt2CAD = pt1CAD;
               if (this.isWhileSelect) {
-                _context5.next = 37;
+                _context5.next = 41;
                 break;
               }
-              return _context5.abrupt("break", 39);
-            case 37:
-              _context5.next = 11;
+              return _context5.abrupt("break", 43);
+            case 41:
+              _context5.next = 13;
               break;
-            case 39:
+            case 43:
               if (this.isSelectHighlight) this.imp.highlightEntity(false);
               if (!(retcode == DetailedResult.kEcsIn || retcode == DetailedResult.kNewCommadIn || retcode == DetailedResult.kUnknown)) {
-                _context5.next = 44;
+                _context5.next = 48;
                 break;
               }
               return _context5.abrupt("return", new Promise(function (resolve) {
                 resolve(false);
               }));
-            case 44:
+            case 48:
               return _context5.abrupt("return", new Promise(function (resolve) {
                 resolve(true);
               }));
-            case 45:
+            case 49:
             case "end":
               return _context5.stop();
           }
@@ -43050,7 +43063,7 @@ function Mx_Trim() {
 }
 function _Mx_Trim() {
   _Mx_Trim = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee18() {
-    var filter, getPoint, ss, aryId, aryIdLong, mxcadTrimAssert, _loop7, _ret7;
+    var filter, getPoint, ss, aryId, aryIdLong, mxcadTrimAssert, isWindowSelect, _loop7, _ret7;
     return regenerator.wrap(function _callee18$(_context25) {
       while (1) switch (_context25.prev = _context25.next) {
         case 0:
@@ -43097,63 +43110,98 @@ function _Mx_Trim() {
           }
           return _context25.abrupt("return");
         case 17:
+          isWindowSelect = true;
           _loop7 = /*#__PURE__*/regenerator.mark(function _loop7() {
             var ss2, getPoint2, ids, selPoint;
             return regenerator.wrap(function _loop7$(_context24) {
               while (1) switch (_context24.prev = _context24.next) {
                 case 0:
                   ss2 = new MxCADSelectionSet();
-                  ss2.isWhileSelect = false;
                   ss2.isSelectHighlight = false;
-                  _context24.next = 5;
-                  return ss2.userSelect("\u9009\u62E9\u8981\u4FEE\u526A\u7684\u5BF9\u8C61", filter, function (_getPoint) {
+                  if (!isWindowSelect) {
+                    _context24.next = 10;
+                    break;
+                  }
+                  ss2.isWhileSelect = false;
+                  _context24.next = 6;
+                  return ss2.userSelect("\u6846\u9009\u8981\u4FEE\u526A\u7684\u5BF9\u8C61", filter, function (_getPoint) {
                     getPoint2 = _getPoint;
                     getPoint2.setKeyWords("[\u680F\u9009(F)/\u7A97\u4EA4(C)]");
                   });
-                case 5:
+                case 6:
                   if (_context24.sent) {
-                    _context24.next = 7;
+                    _context24.next = 8;
                     break;
                   }
                   return _context24.abrupt("return", 0);
-                case 7:
+                case 8:
+                  _context24.next = 15;
+                  break;
+                case 10:
+                  ss2.isWhileSelect = false;
+                  _context24.next = 13;
+                  return ss2.fenceSelect("\u680F\u9009\u8981\u4FEE\u526A\u7684\u5BF9\u8C61", filter, function (_getPoint) {
+                    getPoint2 = _getPoint;
+                    getPoint2.setKeyWords("[\u680F\u9009(F)/\u7A97\u4EA4(C)]");
+                  });
+                case 13:
+                  if (_context24.sent) {
+                    _context24.next = 15;
+                    break;
+                  }
+                  return _context24.abrupt("return", 0);
+                case 15:
+                  if (!getPoint2.isKeyWordPicked("F")) {
+                    _context24.next = 20;
+                    break;
+                  }
+                  isWindowSelect = false;
+                  return _context24.abrupt("return", 1);
+                case 20:
+                  if (!getPoint2.isKeyWordPicked("C")) {
+                    _context24.next = 23;
+                    break;
+                  }
+                  isWindowSelect = true;
+                  return _context24.abrupt("return", 1);
+                case 23:
                   ids = ss2.getIds();
                   if (!(ids.length == 0)) {
-                    _context24.next = 10;
+                    _context24.next = 26;
                     break;
                   }
                   return _context24.abrupt("return", 1);
-                case 10:
+                case 26:
                   selPoint = ss2.getSelectPoint();
                   aryIdLong.copyFormAryId(ids);
                   mxcadTrimAssert.DoTrim(aryIdLong.imp, selPoint.pt1.x, selPoint.pt1.y, selPoint.pt2.x, selPoint.pt2.y);
-                case 13:
+                case 29:
                 case "end":
                   return _context24.stop();
               }
             }, _loop7);
           });
-        case 18:
-          return _context25.delegateYield(_loop7(), "t0", 20);
-        case 20:
+        case 19:
+          return _context25.delegateYield(_loop7(), "t0", 21);
+        case 21:
           _ret7 = _context25.t0;
           if (!(_ret7 === 0)) {
-            _context25.next = 23;
+            _context25.next = 24;
             break;
           }
-          return _context25.abrupt("break", 27);
-        case 23:
+          return _context25.abrupt("break", 28);
+        case 24:
           if (!(_ret7 === 1)) {
-            _context25.next = 25;
+            _context25.next = 26;
             break;
           }
-          return _context25.abrupt("continue", 18);
-        case 25:
-          _context25.next = 18;
+          return _context25.abrupt("continue", 19);
+        case 26:
+          _context25.next = 19;
           break;
-        case 27:
-          mxcadTrimAssert.UnInit();
         case 28:
+          mxcadTrimAssert.UnInit();
+        case 29:
         case "end":
           return _context25.stop();
       }