mxcad 1.0.384 → 1.0.385

package/dist/mxcad.es.js

@@ -14596,7 +14596,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312Imp(hexstr);
 };
 
-const version$1 = "1.0.383";
+const version$1 = "1.0.384";
 
 var isSharedArrayBuffer = "SharedArrayBuffer" in window;
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -16487,7 +16487,18 @@ var MxCADUiPrBase = /*#__PURE__*/function () {
   }, {
     key: "setLastInputPoint",
     value: function setLastInputPoint(pt) {
-      this.imp.setLastInputPoint(this.cad2doc1(pt));
+      if (pt == void 0) {
+        this.imp.clearLastInputPoint();
+      } else {
+        this.imp.setLastInputPoint(this.cad2doc1(pt));
+      }
+    }
+  }, {
+    key: "getLastInputPoint",
+    value: function getLastInputPoint() {
+      var pt = this.imp.getLastInputPoint();
+      if (pt == void 0) return pt;
+      return this.doc2cad1(pt);
     }
   }, {
     key: "message",
@@ -22502,6 +22513,9 @@ var McObject = /*#__PURE__*/function () {
       }
       this.currentFileName = sFileUrl.split("/").pop();
       this.currentOriginalFileName = this.currentFileName;
+      if (mxObject) {
+        mxObject.clearMxCurrentSelect(true);
+      }
       var sParam = "";
       if (obj_param) {
         sParam = JSON.stringify(obj_param);
@@ -38482,12 +38496,12 @@ function _drawPolyLine() {
           window.addEventListener("keydown", onKeydown);
           window.addEventListener("keyup", onkeyup);
           _loop = /*#__PURE__*/regenerator.mark(function _loop() {
-            var sPrompt, sKeyWord, getNextPoint, drawData, ptNext, nextData, pPolyline, getWidth, dWVal, _getWidth, _dWVal, _vecData, vet, pt, _pt, endPoint, length, nextPoint, _nextData, _pPolyline, _sPrompt, _sKeyWord, _getNextPoint, vecArcTangent, iSzie, pt1, dBluge, pt2, tmpPl, tmpVec, userDrawFristData, _ptNext, _nextData2, iSize, _pPolyline2, getAngle, angle, startPoint, getBulge, _pt2, center, radius, _endPoint, nextData2, iSize2, _pPolyline3, getDist, _radius, oppositeSide, _pt3, _endPoint2, _nextData3, _iSize, _pPolyline4, _nextData4, _iSize2, _pPolyline5, _center, _startPoint, _radius2, _pt4, _getAngle, angle2, angleA, mVet, eVet, midPoint2, endPoint2, dBulge2, _nextData5, _iSize3, _pPolyline6, _getDist, dist, includedAngle, vet2, _midPoint, _endPoint3, _dBulge, _nextData6, _iSize4, _pPolyline7, _endPoint4, _angle, midPt, _vet, midPoint, dBulge, _nextData7, _iSize5, _pPolyline8, getRadius, dRVal, _startPoint2, _pt5, _getAngle2, _angle2, chordLength, _pt6, _vet2, entPoint, center2, _midPoint2, _dBulge2, _nextData8, _iSize6, _pPolyline9, _dist, _angle3, _center2, _midPoint3, _dBulge3, _nextData9, _iSize7, _pPolyline0, _getWidth2, _dWVal2, val, vecArcTangent2, _pt7, _nextData0, _iSize8, _pPolyline1, _pt8, getSecondPoint, _pt9, getThirdPoint, _nextPoint, _midPoint4, arc, retBulge, _nextData1, _iSize9, _pPolyline10, _getWidth3, _dWVal3;
+            var sPrompt, sKeyWord, getNextPoint, drawData, ptNext, nextData, pPolyline, lastPointBak, getWidth, dWVal, _getWidth, _dWVal, _vecData, vet, pt, _pt, endPoint, length, nextPoint, _nextData, _pPolyline, _sPrompt, _sKeyWord, _getNextPoint, vecArcTangent, iSzie, pt1, dBluge, pt2, tmpPl, tmpVec, userDrawFristData, _ptNext, _nextData2, iSize, _pPolyline2, getAngle, angle, startPoint, getBulge, _pt2, center, radius, _endPoint, nextData2, iSize2, _pPolyline3, getDist, _radius, oppositeSide, _pt3, _endPoint2, _nextData3, _iSize, _pPolyline4, _nextData4, _iSize2, _pPolyline5, _center, _startPoint, _radius2, _pt4, _getAngle, angle2, angleA, mVet, eVet, midPoint2, endPoint2, dBulge2, _nextData5, _iSize3, _pPolyline6, _getDist, dist, includedAngle, vet2, _midPoint, _endPoint3, _dBulge, _nextData6, _iSize4, _pPolyline7, _endPoint4, _angle, midPt, _vet, midPoint, dBulge, _nextData7, _iSize5, _pPolyline8, getRadius, dRVal, _startPoint2, _pt5, _getAngle2, _angle2, chordLength, _pt6, _vet2, entPoint, center2, _midPoint2, _dBulge2, _nextData8, _iSize6, _pPolyline9, _dist, _angle3, _center2, _midPoint3, _dBulge3, _nextData9, _iSize7, _pPolyline0, _getWidth2, _dWVal2, val, vecArcTangent2, _pt7, _nextData0, _iSize8, _pPolyline1, _pt8, getSecondPoint, _pt9, getThirdPoint, _nextPoint, _midPoint4, arc, retBulge, _nextData1, _iSize9, _pPolyline10, _lastPointBak, _getWidth3, _dWVal3;
             return regenerator.wrap(function _loop$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
                   if (!isDrawLine) {
-                    _context.next = 107;
+                    _context.next = 109;
                     break;
                   }
                   sPrompt = _ML_String("ID_ARX_PL2", "\u6307\u5B9A\u4E0B\u4E00\u4E2A\u70B9:");
@@ -38531,11 +38545,11 @@ function _drawPolyLine() {
                     pPolyline.addVertexAt(vecData[vecData.length - 1].pt);
                     vecTmpObjectId.push(mxcad.drawEntity(pPolyline));
                   }
-                  _context.next = 105;
+                  _context.next = 107;
                   break;
                 case 22:
                   if (!(getNextPoint.getStatus() == MrxDbgUiPrBaseReturn.kKeyWord)) {
-                    _context.next = 104;
+                    _context.next = 106;
                     break;
                   }
                   if (!getNextPoint.isKeyWordPicked("A")) {
@@ -38543,90 +38557,92 @@ function _drawPolyLine() {
                     break;
                   }
                   isDrawLine = false;
-                  _context.next = 102;
+                  _context.next = 104;
                   break;
                 case 27:
                   if (!getNextPoint.isKeyWordPicked("W")) {
-                    _context.next = 49;
+                    _context.next = 51;
                     break;
                   }
+                  lastPointBak = getNextPoint.getLastInputPoint();
                   getWidth = new MxCADUiPrDist();
                   getWidth.setMessage(_ML_String("ID_ARX_PLGETSTARTWIDTH", "\u6307\u5B9A\u8D77\u70B9\u5BBD\u5EA6"));
-                  _context.next = 32;
+                  _context.next = 33;
                   return getWidth.go();
-                case 32:
+                case 33:
                   dWVal = _context.sent;
                   if (!(dWVal === null)) {
-                    _context.next = 35;
+                    _context.next = 36;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 35:
+                case 36:
                   dStartWidth = getWidth.value();
                   getWidth.setMessage(_ML_String("ID_ARX_PLGETVERITXWIDTH", "\u6307\u5B9A\u7AEF\u70B9\u5BBD\u5EA6"));
-                  _context.next = 39;
+                  _context.next = 40;
                   return getWidth.go();
-                case 39:
+                case 40:
                   dWVal = _context.sent;
                   if (!(dWVal === null)) {
-                    _context.next = 42;
+                    _context.next = 43;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 42:
+                case 43:
                   dEndWidth = getWidth.value();
                   s_dWidth = dEndWidth;
                   vecData[vecData.length - 1].dStartWidth = dStartWidth;
                   vecData[vecData.length - 1].dEndWidth = dEndWidth;
                   dStartWidth = dEndWidth;
-                  _context.next = 102;
+                  getNextPoint.setLastInputPoint(lastPointBak);
+                  _context.next = 104;
                   break;
-                case 49:
+                case 51:
                   if (!getNextPoint.isKeyWordPicked("H")) {
-                    _context.next = 71;
+                    _context.next = 73;
                     break;
                   }
                   _getWidth = new MxCADUiPrDist();
                   _getWidth.setMessage(_ML_String("ID_ARX_PLGETSTARTWIDTH", "\u6307\u5B9A\u8D77\u70B9\u534A\u5BBD"));
-                  _context.next = 54;
+                  _context.next = 56;
                   return _getWidth.go();
-                case 54:
+                case 56:
                   _dWVal = _context.sent;
                   if (!(_dWVal === null)) {
-                    _context.next = 57;
+                    _context.next = 59;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 57:
+                case 59:
                   dStartWidth = _getWidth.value() * 2;
                   _getWidth.setMessage(_ML_String("ID_ARX_PLGETVERITXWIDTH", "\u6307\u5B9A\u7AEF\u70B9\u534A\u5BBD"));
-                  _context.next = 61;
+                  _context.next = 63;
                   return _getWidth.go();
-                case 61:
+                case 63:
                   _dWVal = _context.sent;
                   if (!(_dWVal === null)) {
-                    _context.next = 64;
+                    _context.next = 66;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 64:
+                case 66:
                   dEndWidth = _getWidth.value() * 2;
                   s_dWidth = dEndWidth;
                   vecData[vecData.length - 1].dStartWidth = dStartWidth;
                   vecData[vecData.length - 1].dEndWidth = dEndWidth;
                   dStartWidth = dEndWidth;
-                  _context.next = 102;
+                  _context.next = 104;
                   break;
-                case 71:
+                case 73:
                   if (!getNextPoint.isKeyWordPicked("C")) {
-                    _context.next = 76;
+                    _context.next = 78;
                     break;
                   }
                   isClose = true;
                   return _context.abrupt("return", 0);
-                case 76:
+                case 78:
                   if (!getNextPoint.isKeyWordPicked("U")) {
-                    _context.next = 80;
+                    _context.next = 82;
                     break;
                   }
                   if (vecData.length > 1) {
@@ -38637,28 +38653,28 @@ function _drawPolyLine() {
                       getNextPoint.setLastInputPoint(vecData[vecData.length - 1].pt);
                     }
                   }
-                  _context.next = 102;
+                  _context.next = 104;
                   break;
-                case 80:
+                case 82:
                   if (!getNextPoint.isKeyWordPicked("L")) {
-                    _context.next = 102;
+                    _context.next = 104;
                     break;
                   }
                   vet = McGeVector3d.kXAxis;
                   getNextPoint.setMessage("\u6307\u5B9A\u76F4\u7EBF\u957F\u5EA6");
                   getNextPoint.setKeyWords("");
-                  _context.next = 86;
+                  _context.next = 88;
                   return getNextPoint.go();
-                case 86:
+                case 88:
                   _pt = _context.sent;
                   if (_pt) {
-                    _context.next = 89;
+                    _context.next = 91;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 89:
+                case 91:
                   endPoint = vecData[vecData.length - 1].pt;
                   length = _pt.distanceTo(endPoint);
                   nextPoint = (_vecData = vecData[vecData.length - 2]) === null || _vecData === void 0 ? void 0 : _vecData.pt;
@@ -38679,15 +38695,15 @@ function _drawPolyLine() {
                     _pPolyline.addVertexAt(vecData[vecData.length - 1].pt);
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline));
                   }
-                case 102:
-                  _context.next = 105;
-                  break;
                 case 104:
-                  return _context.abrupt("return", 0);
-                case 105:
-                  _context.next = 495;
+                  _context.next = 107;
                   break;
+                case 106:
+                  return _context.abrupt("return", 0);
                 case 107:
+                  _context.next = 499;
+                  break;
+                case 109:
                   _sPrompt = _ML_String("NO1_ID_ARX_PL5", "\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9(\u6309\u4F4F Ctrl \u952E\u4EE5\u5207\u6362\u65B9\u5411)");
                   _sKeyWord = "[\u89D2\u5EA6(A)/\u7B2C\u4E8C\u4E2A\u70B9(S)/\u5706\u5FC3(CE)/\u65B9\u5411(D)/\u76F4\u7EBF(L)/\u534A\u5F84(R)/\u5BBD\u5EA6(W)/\u534A\u5BBD(H)]";
                   if (vecData.length >= 3) {
@@ -38732,12 +38748,12 @@ function _drawPolyLine() {
                     pl.addVertexAt(currendPoint);
                     pWorldDraw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 119;
+                  _context.next = 121;
                   return _getNextPoint.go();
-                case 119:
+                case 121:
                   _ptNext = _context.sent;
                   if (!(_ptNext !== null)) {
-                    _context.next = 132;
+                    _context.next = 134;
                     break;
                   }
                   _nextData2 = {};
@@ -38754,30 +38770,30 @@ function _drawPolyLine() {
                     _pPolyline2.addVertexAt(vecData[iSize - 1].pt);
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline2));
                   }
-                  _context.next = 495;
+                  _context.next = 499;
                   break;
-                case 132:
+                case 134:
                   if (!(_getNextPoint.getStatus() == MrxDbgUiPrBaseReturn.kKeyWord)) {
-                    _context.next = 494;
+                    _context.next = 498;
                     break;
                   }
                   if (!_getNextPoint.isKeyWordPicked("A")) {
-                    _context.next = 215;
+                    _context.next = 217;
                     break;
                   }
                   getAngle = new MxCADUiPrAngle();
                   getAngle.setBasePt(userDrawFristData.pt);
                   getAngle.setMessage(_ML_String("ID_ARX_PLGET_I_ANGLE", "\u6307\u5B9A\u5939\u89D2"));
-                  _context.next = 139;
+                  _context.next = 141;
                   return getAngle.go();
-                case 139:
+                case 141:
                   angle = _context.sent;
                   if (!(angle === null)) {
-                    _context.next = 142;
+                    _context.next = 144;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 142:
+                case 144:
                   _getNextPoint.setMessage("\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9(\u6309\u4F4F Ctrl \u952E\u4EE5\u5207\u6362\u65B9\u5411)");
                   _getNextPoint.setKeyWords("[\u5706\u5FC3(CE)/\u534A\u5F84(R)]");
                   _getNextPoint.setLastInputPoint(userDrawFristData.pt);
@@ -38799,12 +38815,12 @@ function _drawPolyLine() {
                     pl.addVertexAt(currendPoint);
                     pWorldDraw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 150;
+                  _context.next = 152;
                   return _getNextPoint.go();
-                case 150:
+                case 152:
                   _pt2 = _context.sent;
                   if (!_getNextPoint.isKeyWordPicked("CE")) {
-                    _context.next = 174;
+                    _context.next = 176;
                     break;
                   }
                   _getNextPoint.setMessage("\u6307\u5B9A\u5706\u5F27\u7684\u5706\u5FC3");
@@ -38819,16 +38835,16 @@ function _drawPolyLine() {
                     pl.addVertexAt(endPoint2);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 158;
+                  _context.next = 160;
                   return _getNextPoint.go();
-                case 158:
+                case 160:
                   center = _context.sent;
                   if (center) {
-                    _context.next = 161;
+                    _context.next = 163;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 161:
+                case 163:
                   radius = center.distanceTo(startPoint);
                   _endPoint = center.addvec(center.sub(startPoint).rotateBy(angle).normalize().mult(radius));
                   nextData2 = {};
@@ -38847,24 +38863,24 @@ function _drawPolyLine() {
                   }
                   _getNextPoint.setLastInputPoint(_endPoint);
                   return _context.abrupt("return", 1);
-                case 174:
+                case 176:
                   if (!_getNextPoint.isKeyWordPicked("R")) {
-                    _context.next = 204;
+                    _context.next = 206;
                     break;
                   }
                   getDist = new MxCADUiPrDist();
                   getDist.setMessage("\u6307\u5B9A\u5706\u5F27\u534A\u5F84");
                   getDist.setKeyWords("");
-                  _context.next = 180;
+                  _context.next = 182;
                   return getDist.go();
-                case 180:
+                case 182:
                   _radius = _context.sent;
                   if (!(typeof _radius !== "number")) {
-                    _context.next = 183;
+                    _context.next = 185;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 183:
+                case 185:
                   oppositeSide = _radius * Math.sin(angle / 2);
                   _getNextPoint.setBasePt(startPoint);
                   _getNextPoint.setMessage("\u6307\u5B9A\u5706\u5F27\u7684\u5F26\u65B9\u5411(\u6309\u4F4FCtrl\u952E\u5207\u6362\u65B9\u5411)");
@@ -38877,16 +38893,16 @@ function _drawPolyLine() {
                     pl.addVertexAt(endPoint2);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 190;
+                  _context.next = 192;
                   return _getNextPoint.go();
-                case 190:
+                case 192:
                   _pt3 = _context.sent;
                   if (_pt3) {
-                    _context.next = 193;
+                    _context.next = 195;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 193:
+                case 195:
                   _endPoint2 = startPoint.clone().addvec(_pt3.sub(startPoint).normalize().mult(oppositeSide * 2));
                   _nextData3 = {};
                   _nextData3.dStartWidth = dStartWidth;
@@ -38903,13 +38919,13 @@ function _drawPolyLine() {
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline4));
                   }
                   return _context.abrupt("return", 1);
-                case 204:
+                case 206:
                   if (_pt2) {
-                    _context.next = 206;
+                    _context.next = 208;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 206:
+                case 208:
                   _nextData4 = {};
                   _nextData4.dStartWidth = dStartWidth;
                   _nextData4.dEndWidth = dEndWidth;
@@ -38924,26 +38940,26 @@ function _drawPolyLine() {
                     _pPolyline5.addVertexAt(vecData[_iSize2 - 1].pt);
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline5));
                   }
-                case 215:
+                case 217:
                   if (!_getNextPoint.isKeyWordPicked("CE")) {
-                    _context.next = 311;
+                    _context.next = 313;
                     break;
                   }
                   _getNextPoint.setMessage("\u6307\u5B9A\u5706\u5F27\u7684\u5706\u5FC3");
                   _getNextPoint.setKeyWords("");
                   _getNextPoint.setUserDraw(function () {});
-                  _context.next = 221;
+                  _context.next = 223;
                   return _getNextPoint.go();
-                case 221:
+                case 223:
                   _center = _context.sent;
                   if (_center) {
-                    _context.next = 224;
+                    _context.next = 226;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 224:
+                case 226:
                   _startPoint = userDrawFristData.pt;
                   _radius2 = _center.distanceTo(_startPoint);
                   _getNextPoint.setLastInputPoint(_startPoint);
@@ -38963,12 +38979,12 @@ function _drawPolyLine() {
                     pl.addVertexAt(endPoint2);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 233;
+                  _context.next = 235;
                   return _getNextPoint.go();
-                case 233:
+                case 235:
                   _pt4 = _context.sent;
                   if (!_getNextPoint.isKeyWordPicked("A")) {
-                    _context.next = 261;
+                    _context.next = 263;
                     break;
                   }
                   _getAngle = new MxCADUiPrAngle();
@@ -38988,16 +39004,16 @@ function _drawPolyLine() {
                     pl.addVertexAt(endPoint3);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 242;
+                  _context.next = 244;
                   return _getAngle.go();
-                case 242:
+                case 244:
                   angle2 = _context.sent;
                   if (!(angle2 === null)) {
-                    _context.next = 245;
+                    _context.next = 247;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 245:
+                case 247:
                   angleA = isCtrl ? Math.PI * 2 - angle2 / 2 : angle2 / 2;
                   mVet = _startPoint.sub(_center).rotateBy(angleA).normalize().mult(_radius2);
                   eVet = _startPoint.sub(_center).rotateBy(angle2).normalize().mult(_radius2);
@@ -39019,9 +39035,9 @@ function _drawPolyLine() {
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline6));
                   }
                   return _context.abrupt("return", 1);
-                case 261:
+                case 263:
                   if (!_getNextPoint.isKeyWordPicked("L")) {
-                    _context.next = 292;
+                    _context.next = 294;
                     break;
                   }
                   _getDist = new MxCADUiPrDist();
@@ -39041,24 +39057,24 @@ function _drawPolyLine() {
                     pl.addVertexAt(endPoint3);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 269;
+                  _context.next = 271;
                   return _getDist.go();
-                case 269:
+                case 271:
                   dist = _context.sent;
                   if (!(typeof dist !== "number")) {
-                    _context.next = 272;
+                    _context.next = 274;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 272:
+                case 274:
                   if (!(dist > _radius2 * 2)) {
-                    _context.next = 276;
+                    _context.next = 278;
                     break;
                   }
                   MxFun.acutPrintf("*\u5F26\u957F\u4E0D\u80FD\u5927\u4E8E\u76F4\u5F84 \u65E0\u6548*");
                   _getNextPoint.setLastInputPoint(_startPoint);
                   return _context.abrupt("return", 1);
-                case 276:
+                case 278:
                   includedAngle = Math.asin(dist / 2 / _radius2) * 2;
                   vet2 = _startPoint.sub(_center).normalize().mult(_radius2);
                   _midPoint = _center.clone().addvec(vet2.clone().rotateBy(isCtrl ? Math.PI - includedAngle / 2 : includedAngle / 2));
@@ -39080,15 +39096,15 @@ function _drawPolyLine() {
                   }
                   _getNextPoint.setLastInputPoint(_endPoint3);
                   return _context.abrupt("return", 1);
-                case 292:
+                case 294:
                   if (_pt4) {
-                    _context.next = 294;
+                    _context.next = 296;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 294:
+                case 296:
                   _endPoint4 = _center.clone().addvec(_pt4.sub(_center).normalize().mult(_radius2));
                   _angle = _center.sub(_startPoint).angleTo2(_center.sub(_endPoint4), McGeVector3d.kZAxis);
                   midPt = new McGePoint3d((_startPoint.x + _endPoint4.x) / 2, (_startPoint.y + _endPoint4.y) / 2);
@@ -39111,24 +39127,24 @@ function _drawPolyLine() {
                   }
                   _getNextPoint.setLastInputPoint(_endPoint4);
                   return _context.abrupt("return", 1);
-                case 311:
+                case 313:
                   if (!_getNextPoint.isKeyWordPicked("R")) {
-                    _context.next = 383;
+                    _context.next = 385;
                     break;
                   }
                   getRadius = new MxCADUiPrDist();
                   getRadius.setMessage(_ML_String("ID_ARX_PLGETSTARTRADIUS", "\u6307\u5B9A\u5706\u5F27\u7684\u534A\u5F84"));
                   getRadius.setKeyWords("");
-                  _context.next = 317;
+                  _context.next = 319;
                   return getRadius.go();
-                case 317:
+                case 319:
                   dRVal = _context.sent;
                   if (!(dRVal === null)) {
-                    _context.next = 320;
+                    _context.next = 322;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 320:
+                case 322:
                   _startPoint2 = userDrawFristData.pt;
                   _getNextPoint.setLastInputPoint(_startPoint2);
                   _getNextPoint.setMessage("\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9(\u6309\u4F4F Ctrl \u952E\u4EE5\u5207\u6362\u65B9\u5411)");
@@ -39146,28 +39162,28 @@ function _drawPolyLine() {
                     pl.addVertexAt(pt2);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 327;
+                  _context.next = 329;
                   return _getNextPoint.go();
-                case 327:
+                case 329:
                   _pt5 = _context.sent;
                   if (!_getNextPoint.isKeyWordPicked("A")) {
-                    _context.next = 363;
+                    _context.next = 365;
                     break;
                   }
                   _getAngle2 = new MxCADUiPrAngle();
                   _getAngle2.setMessage(_ML_String("ID_ARX_PLGET_I_ANGLE", "\u6307\u5B9A\u5939\u89D2"));
                   _getAngle2.setKeyWords("");
                   _getAngle2.setBasePt(_startPoint2);
-                  _context.next = 335;
+                  _context.next = 337;
                   return _getAngle2.go();
-                case 335:
+                case 337:
                   _angle2 = _context.sent;
                   if (!(typeof _angle2 !== "number")) {
-                    _context.next = 338;
+                    _context.next = 340;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 338:
+                case 340:
                   chordLength = Math.sin(_angle2 / 2) * dRVal * 2;
                   _getNextPoint.setMessage("\u6307\u5B9A\u5706\u5F27\u7684\u5F26\u65B9\u5411(\u6309\u4F4F Ctrl \u952E\u4EE5\u5207\u6362\u65B9\u5411)");
                   _getNextPoint.setKeyWords("");
@@ -39184,16 +39200,16 @@ function _drawPolyLine() {
                     pl.addVertexAt(entPoint2);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 345;
+                  _context.next = 347;
                   return _getNextPoint.go();
-                case 345:
+                case 347:
                   _pt6 = _context.sent;
                   if (_pt6) {
-                    _context.next = 348;
+                    _context.next = 350;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 348:
+                case 350:
                   _vet2 = _pt6.sub(_startPoint2).normalize();
                   entPoint = _startPoint2.clone().addvec(_vet2.clone().mult(chordLength));
                   center2 = entPoint.clone().addvec(_vet2.clone().negate().rotateBy(-(Math.PI / 2 - _angle2 / 2)).mult(dRVal));
@@ -39214,21 +39230,21 @@ function _drawPolyLine() {
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline9));
                   }
                   return _context.abrupt("return", 1);
-                case 363:
+                case 365:
                   if (_pt5) {
-                    _context.next = 365;
+                    _context.next = 367;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 365:
+                case 367:
                   _dist = _pt5.distanceTo(_startPoint2);
                   if (!(_dist > dRVal * 2)) {
-                    _context.next = 369;
+                    _context.next = 371;
                     break;
                   }
                   MxFun.acutPrintf("\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9 *\u65E0\u6548*");
                   return _context.abrupt("return", 1);
-                case 369:
+                case 371:
                   _angle3 = Math.acos(_dist / 2 / dRVal);
                   _center2 = _startPoint2.clone().addvec(_pt5.sub(_startPoint2).rotateBy(_angle3).normalize().mult(dRVal));
                   _midPoint3 = _center2.clone().addvec(new McGePoint3d((_startPoint2.x + _pt5.x) / 2, (_startPoint2.y + _pt5.y) / 2).sub(_center2).normalize().mult(isCtrl ? -dRVal : dRVal));
@@ -39248,44 +39264,44 @@ function _drawPolyLine() {
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline0));
                   }
                   return _context.abrupt("return", 1);
-                case 383:
+                case 385:
                   if (!_getNextPoint.isKeyWordPicked("H")) {
-                    _context.next = 404;
+                    _context.next = 406;
                     break;
                   }
                   _getWidth2 = new MxCADUiPrDist();
                   _getWidth2.setMessage(_ML_String("ID_ARX_PLGETSTARTWIDTH", "\u6307\u5B9A\u8D77\u70B9\u534A\u5BBD"));
-                  _context.next = 388;
+                  _context.next = 390;
                   return _getWidth2.go();
-                case 388:
+                case 390:
                   _dWVal2 = _context.sent;
                   if (!(_dWVal2 === null)) {
-                    _context.next = 391;
+                    _context.next = 393;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 391:
+                case 393:
                   dStartWidth = _getWidth2.value() * 2;
                   _getWidth2.setMessage(_ML_String("ID_ARX_PLGETVERITXWIDTH", "\u6307\u5B9A\u7AEF\u70B9\u534A\u5BBD"));
-                  _context.next = 395;
+                  _context.next = 397;
                   return _getWidth2.go();
-                case 395:
+                case 397:
                   _dWVal2 = _context.sent;
                   if (!(_dWVal2 === null)) {
-                    _context.next = 398;
+                    _context.next = 400;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 398:
+                case 400:
                   dEndWidth = _getWidth2.value() * 2;
                   s_dWidth = dEndWidth;
                   vecData[vecData.length - 1].dStartWidth = dStartWidth;
                   vecData[vecData.length - 1].dEndWidth = dEndWidth;
                   dStartWidth = dEndWidth;
                   return _context.abrupt("return", 1);
-                case 404:
+                case 406:
                   if (!_getNextPoint.isKeyWordPicked("D")) {
-                    _context.next = 433;
+                    _context.next = 435;
                     break;
                   }
                   _getNextPoint.setMessage("\u6307\u5B9A\u5706\u5F27\u8D77\u70B9\u5207\u5411");
@@ -39294,16 +39310,16 @@ function _drawPolyLine() {
                   _getNextPoint.setUserDraw(function (pt2, pw) {
                     pw.drawLine(pt2.toVector3(), userDrawFristData.pt.toVector3());
                   });
-                  _context.next = 411;
+                  _context.next = 413;
                   return _getNextPoint.go();
-                case 411:
+                case 413:
                   val = _context.sent;
                   if (val) {
-                    _context.next = 414;
+                    _context.next = 416;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 414:
+                case 416:
                   vecArcTangent2 = val.sub(userDrawFristData.pt);
                   _getNextPoint.setLastInputPoint(userDrawFristData.pt);
                   _getNextPoint.setBasePt(userDrawFristData.pt);
@@ -39316,9 +39332,9 @@ function _drawPolyLine() {
                     pl.addVertexAt(pt2);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 422;
+                  _context.next = 424;
                   return _getNextPoint.go();
-                case 422:
+                case 424:
                   _pt7 = _context.sent;
                   _nextData0 = {};
                   _nextData0.dStartWidth = dStartWidth;
@@ -39335,33 +39351,33 @@ function _drawPolyLine() {
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline1));
                   }
                   return _context.abrupt("return", 1);
-                case 433:
+                case 435:
                   if (!_getNextPoint.isKeyWordPicked("L")) {
-                    _context.next = 437;
+                    _context.next = 439;
                     break;
                   }
                   isDrawLine = true;
-                  _context.next = 492;
+                  _context.next = 496;
                   break;
-                case 437:
+                case 439:
                   if (!_getNextPoint.isKeyWordPicked("S")) {
-                    _context.next = 463;
+                    _context.next = 465;
                     break;
                   }
                   _pt8 = new McGePoint3d(vecData[vecData.length - 1].pt.x, vecData[vecData.length - 1].pt.y, 0);
                   getSecondPoint = new MxCADUiPrPoint();
                   getSecondPoint.setMessage(_ML_String("NO1_ID_SPECIFY_ARC2", "\u6307\u5B9A\u5706\u5F27\u7684\u7B2C\u4E8C\u4E2A\u70B9"));
                   getSecondPoint.setBasePt(_pt8);
-                  _context.next = 444;
+                  _context.next = 446;
                   return getSecondPoint.go();
-                case 444:
+                case 446:
                   _pt9 = _context.sent;
                   if (!(_pt9 === null)) {
-                    _context.next = 447;
+                    _context.next = 449;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 447:
+                case 449:
                   getThirdPoint = new MxCADUiPrPoint();
                   getThirdPoint.setMessage(_ML_String("ID_CIRCULAR_ENDPOINT", "\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9(\u6309\u4F4F Ctrl \u952E\u4EE5\u5207\u6362\u65B9\u5411)"));
                   getThirdPoint.setUserDraw(function (currendPoint, pWorldDraw) {
@@ -39374,12 +39390,12 @@ function _drawPolyLine() {
                     }
                     pWorldDraw.drawMcDbEntity(arc, true);
                   });
-                  _context.next = 452;
+                  _context.next = 454;
                   return getThirdPoint.go();
-                case 452:
+                case 454:
                   _nextPoint = _context.sent;
                   if (!(_nextPoint !== null)) {
-                    _context.next = 460;
+                    _context.next = 462;
                     break;
                   }
                   _midPoint4 = _pt9;
@@ -39407,58 +39423,60 @@ function _drawPolyLine() {
                   } else {
                     MxFun.acutPrintf(_ML_String("ID_ENDPOINT_INVALID1", "\n \u7AEF\u70B9 *\u65E0\u6548*"));
                   }
-                  _context.next = 461;
+                  _context.next = 463;
                   break;
-                case 460:
+                case 462:
                   return _context.abrupt("return", 0);
-                case 461:
-                  _context.next = 492;
-                  break;
                 case 463:
+                  _context.next = 496;
+                  break;
+                case 465:
                   if (!_getNextPoint.isKeyWordPicked("W")) {
-                    _context.next = 485;
+                    _context.next = 489;
                     break;
                   }
+                  _lastPointBak = _getNextPoint.getLastInputPoint();
                   _getWidth3 = new MxCADUiPrDist();
                   _getWidth3.setMessage(_ML_String("ID_ARX_PLGETSTARTWIDTH", "\u6307\u5B9A\u8D77\u70B9\u5BBD\u5EA6"));
-                  _context.next = 468;
+                  _context.next = 471;
                   return _getWidth3.go();
-                case 468:
+                case 471:
                   _dWVal3 = _context.sent;
                   if (!(_dWVal3 === null)) {
-                    _context.next = 471;
+                    _context.next = 474;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 471:
+                case 474:
                   dStartWidth = _getWidth3.value();
                   _getWidth3.setMessage(_ML_String("ID_ARX_PLGETVERITXWIDTH", "\u6307\u5B9A\u7AEF\u70B9\u5BBD\u5EA6"));
-                  _context.next = 475;
+                  _context.next = 478;
                   return _getWidth3.go();
-                case 475:
+                case 478:
                   _dWVal3 = _context.sent;
                   if (!(_dWVal3 === null)) {
-                    _context.next = 478;
+                    _context.next = 481;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 478:
+                case 481:
                   dEndWidth = _getWidth3.value();
                   s_dWidth = dEndWidth;
                   vecData[vecData.length - 1].dStartWidth = dStartWidth;
                   vecData[vecData.length - 1].dEndWidth = dEndWidth;
                   dStartWidth = dEndWidth;
-                  _context.next = 492;
+                  _getNextPoint.setLastInputPoint(_lastPointBak);
+                  _context.next = 496;
                   break;
-                case 485:
+                case 489:
                   if (!_getNextPoint.isKeyWordPicked("C")) {
-                    _context.next = 491;
+                    _context.next = 495;
                     break;
                   }
                   vecData[vecData.length - 1].dBulge = CMxDrawPolylineDragArcDraw_CalcArcBulge(userDrawFristData.pt, firstPoint, isCtrl ? vecArcTangent.clone().negate() : vecArcTangent);
                   isClose = true;
                   return _context.abrupt("return", 0);
-                case 491:
+                case 495:
                   if (_getNextPoint.isKeyWordPicked("U")) {
                     if (vecData.length > 1) {
                       vecData.pop();
@@ -39469,12 +39487,12 @@ function _drawPolyLine() {
                       }
                     }
                   }
-                case 492:
-                  _context.next = 495;
+                case 496:
+                  _context.next = 499;
                   break;
-                case 494:
+                case 498:
                   return _context.abrupt("return", 0);
-                case 495:
+                case 499:
                 case "end":
                   return _context.stop();
               }
@@ -46457,6 +46475,8 @@ var drawRectang = /*#__PURE__*/function () {
                     pWorldDraw.drawMcDbEntity(pl, true);
                   };
                   getPoint.setUserDraw(userDrawPoint1Rect);
+                  getPoint.setDisableOrthoTrace(true);
+                  getPoint.setDynamicInputType(DynamicInputType.kXYCoordInput);
                   run = /*#__PURE__*/function () {
                     var _ref3 = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee2() {
                       var pt2CAD, userDrawPoint2Rect, getInt, _area, getKey, key, is2, rotationPoint, pt1, pt2, _is;
@@ -46667,16 +46687,16 @@ var drawRectang = /*#__PURE__*/function () {
                       return _ref3.apply(this, arguments);
                     };
                   }();
-                  _context3.next = 53;
+                  _context3.next = 55;
                   return run();
-                case 53:
+                case 55:
                   is = _context3.sent;
                   if (!(typeof is === "undefined")) {
-                    _context3.next = 56;
+                    _context3.next = 58;
                     break;
                   }
                   return _context3.abrupt("return", 1);
-                case 56:
+                case 58:
                 case "end":
                   return _context3.stop();
               }