mxcad 1.0.354 → 1.0.355

package/dist/mxcad.d.ts

@@ -2723,7 +2723,7 @@ export declare class MxCADUtilityClass {
 	 console.log(objIds);
    * ```
    */
-	getCurrentSelect(filter?: MxCADResbuf | null, returnMxCADObject?: boolean, returnMxDrawObject?: boolean, whenEmptyReturnPrvSelect?: boolean, isFilterLockLayer?: boolean): McObjectId[];
+	getCurrentSelect(filter?: MxCADResbuf | null | Object, returnMxCADObject?: boolean, returnMxDrawObject?: boolean, whenEmptyReturnPrvSelect?: boolean, isFilterLockLayer?: boolean): McObjectId[];
 	/** 用户选择
 	 * @param strPrompt 字符串提示
 	 * @param filter 过滤对象
@@ -2737,7 +2737,7 @@ export declare class MxCADUtilityClass {
 		console.log(aryId);
 	 * ```
 	 *  */
-	userSelect(strPrompt?: string, filter?: MxCADResbuf | null, init?: (ss: MxCADSelectionSet, getPoint: MrxDbgUiPrPoint) => any, isRetCurrentSelect?: boolean, isFilterLockLayer?: boolean): Promise<McObjectId[]>;
+	userSelect(strPrompt?: string | Object, filter?: MxCADResbuf | null, init?: (ss: MxCADSelectionSet, getPoint: MrxDbgUiPrPoint) => any, isRetCurrentSelect?: boolean, isFilterLockLayer?: boolean): Promise<McObjectId[]>;
 	/**
 	 * 初始化
 	 * @example
@@ -3107,7 +3107,7 @@ export declare class MxCADSelectionSet extends McRxObject {
 	   console.log(ids);
 	 * ```
 	 *  */
-	userSelect(strPrompt?: string, filter?: MxCADResbuf | null, init?: (getPoint: MrxDbgUiPrPoint) => any): Promise<boolean>;
+	userSelect(strPrompt?: string | Object, filter?: MxCADResbuf | null, init?: (getPoint: MrxDbgUiPrPoint) => any): Promise<boolean>;
 	fenceSelect(strPrompt?: string, filter?: MxCADResbuf | null, init?: (getPoint: MrxDbgUiPrPoint) => any): Promise<boolean>;
 }
 /** MxCADUiPrBase 作为 MxCADUiPr* 系列的基类，提供了一些基础的功能。 */
@@ -11948,6 +11948,12 @@ export declare class McObject {
 	* ```
 	*/
 	newFile(): boolean;
+	/**
+	* 当回当前打开的文件的在md5码。
+	* @example
+	* ```
+	*/
+	getCurrentOpenFileMd5(): string;
 	/**
 	 * 插件图块文件
 	 * @param sFileUrl 网络文件路径 该文件为mxweb格式

package/dist/mxcad.es.js

@@ -15080,7 +15080,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312Imp(hexstr);
 };
 
-const version$1 = "1.0.353";
+const version$1 = "1.0.354";
 
 var isSharedArrayBuffer = "SharedArrayBuffer" in window;
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -16130,6 +16130,26 @@ var MxCADUtilityClass = /*#__PURE__*/function () {
       var returnMxDrawObject = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
       var whenEmptyReturnPrvSelect = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
       var isFilterLockLayer = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+      if (filter !== null && !(filter instanceof MxCADResbuf)) {
+        var param = filter;
+        if (param["filter"] !== void 0) {
+          filter = param["filter"];
+        } else {
+          filter = null;
+        }
+        if (param["returnMxCADObject"] !== void 0) {
+          returnMxCADObject = param["returnMxCADObject"];
+        }
+        if (param["returnMxDrawObject"] !== void 0) {
+          returnMxDrawObject = param["returnMxDrawObject"];
+        }
+        if (param["whenEmptyReturnPrvSelect"] !== void 0) {
+          whenEmptyReturnPrvSelect = param["whenEmptyReturnPrvSelect"];
+        }
+        if (param["isFilterLockLayer"] !== void 0) {
+          isFilterLockLayer = param["isFilterLockLayer"];
+        }
+      }
       var aryRetId = [];
       if (returnMxDrawObject) {
         var aryId = MxFun.getCurrentDraw().getMxCurrentSelect(whenEmptyReturnPrvSelect);
@@ -16171,6 +16191,7 @@ var MxCADUtilityClass = /*#__PURE__*/function () {
           init,
           isRetCurrentSelect,
           isFilterLockLayer,
+          param,
           aryRetId,
           ss,
           _args2 = arguments;
@@ -16181,33 +16202,53 @@ var MxCADUtilityClass = /*#__PURE__*/function () {
               init = _args2.length > 2 ? _args2[2] : undefined;
               isRetCurrentSelect = _args2.length > 3 && _args2[3] !== undefined ? _args2[3] : true;
               isFilterLockLayer = _args2.length > 4 && _args2[4] !== undefined ? _args2[4] : false;
+              if (strPrompt && strPrompt instanceof Object) {
+                param = strPrompt;
+                if (param["strPrompt"] !== void 0) {
+                  strPrompt = param["strPrompt"];
+                } else {
+                  strPrompt = void 0;
+                }
+                if (param["filter"] !== void 0) {
+                  filter = param["filter"];
+                }
+                if (param["init"] !== void 0) {
+                  init = param["init"];
+                }
+                if (param["isRetCurrentSelect"] !== void 0) {
+                  isRetCurrentSelect = param["isRetCurrentSelect"];
+                }
+                if (param["isFilterLockLayer"] !== void 0) {
+                  isFilterLockLayer = param["isFilterLockLayer"];
+                }
+              }
               aryRetId = [];
               if (isRetCurrentSelect) {
                 aryRetId = this.getCurrentSelect(filter, true, true, true, isFilterLockLayer);
               }
               if (!(aryRetId.length == 0)) {
-                _context2.next = 13;
+                _context2.next = 14;
                 break;
               }
               ss = new MxCADSelectionSet();
               ss.isFilterLockLayer = isFilterLockLayer;
-              _context2.next = 11;
+              _context2.next = 12;
               return ss.userSelect(strPrompt, filter, function (getPoint) {
                 init && init(ss, getPoint);
               });
-            case 11:
+            case 12:
               if (!_context2.sent) {
-                _context2.next = 13;
+                _context2.next = 14;
                 break;
               }
               ss.forEach(function (val) {
                 aryRetId.push(val);
               });
-            case 13:
+            case 14:
               return _context2.abrupt("return", new Promise(function (resolve) {
                 resolve(aryRetId);
               }));
-            case 14:
+            case 15:
             case "end":
               return _context2.stop();
           }
@@ -16586,6 +16627,7 @@ var MxCADSelectionSet = /*#__PURE__*/function (_McRxObject2) {
       var _userSelect2 = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee4(strPrompt) {
         var filter,
           init,
+          param,
           getPoint,
           retcode,
           filterImp,
@@ -16599,6 +16641,20 @@ var MxCADSelectionSet = /*#__PURE__*/function (_McRxObject2) {
             case 0:
               filter = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : null;
               init = _args4.length > 2 ? _args4[2] : undefined;
+              if (strPrompt && strPrompt instanceof Object) {
+                param = strPrompt;
+                if (param["strPrompt"] !== void 0) {
+                  strPrompt = param["strPrompt"];
+                } else {
+                  strPrompt = void 0;
+                }
+                if (param["filter"] !== void 0) {
+                  filter = param["filter"];
+                }
+                if (param["init"] !== void 0) {
+                  init = param["init"];
+                }
+              }
               this.selectPoints = [];
               getPoint = new MrxDbgUiPrPoint();
               if (strPrompt) {
@@ -16611,73 +16667,73 @@ var MxCADSelectionSet = /*#__PURE__*/function (_McRxObject2) {
               retcode = 0;
               init && init(getPoint);
               filterImp = getFilterImp(filter);
-            case 12:
+            case 13:
               getPoint.setDynamicInputType(DynamicInputType.kDynTip);
               getPoint.setInputToucheType(MxType.InputToucheType.kGetBegan);
-              _context4.next = 17;
+              _context4.next = 18;
               return getPoint.go();
-            case 17:
+            case 18:
               pt1 = _context4.sent;
               getPoint.clearLastInputPoint();
               retcode = getPoint.getDetailedResult();
               if (pt1) {
-                _context4.next = 22;
+                _context4.next = 23;
                 break;
               }
-              return _context4.abrupt("break", 43);
-            case 22:
+              return _context4.abrupt("break", 44);
+            case 23:
               pt1CAD = MxCoordConvert.doc2cad1(pt1);
               if (!(this.imp.userPointSelect(pt1CAD.x, pt1CAD.y, filterImp, this.isSelectHighlight) == 0 /* kSelected */)) {
-                _context4.next = 30;
+                _context4.next = 31;
                 break;
               }
               this.selectPoints.push(pt1CAD.clone());
               if (!this.isWhileSelect) {
-                _context4.next = 29;
+                _context4.next = 30;
                 break;
               }
-              return _context4.abrupt("continue", 12);
-            case 29:
-              return _context4.abrupt("break", 43);
+              return _context4.abrupt("continue", 13);
             case 30:
-              _context4.next = 32;
+              return _context4.abrupt("break", 44);
+            case 31:
+              _context4.next = 33;
               return MrxDbgUtils.getCorner(pt1, strPrompt, true, function (ret) {
                 retcode = ret.detailedResult;
               });
-            case 32:
+            case 33:
               pt2 = _context4.sent;
               if (pt2) {
-                _context4.next = 35;
+                _context4.next = 36;
                 break;
               }
-              return _context4.abrupt("break", 43);
-            case 35:
+              return _context4.abrupt("break", 44);
+            case 36:
               pt2CAD = MxCoordConvert.doc2cad1(pt2);
               this.imp.userSelect(pt1CAD.x, pt1CAD.y, pt2CAD.x, pt2CAD.y, filterImp, this.isSelectHighlight);
               this.selectPoints.push(pt1CAD.clone());
               this.selectPoints.push(pt2CAD.clone());
               if (this.isWhileSelect) {
-                _context4.next = 41;
+                _context4.next = 42;
                 break;
               }
-              return _context4.abrupt("break", 43);
-            case 41:
-              _context4.next = 12;
+              return _context4.abrupt("break", 44);
+            case 42:
+              _context4.next = 13;
               break;
-            case 43:
+            case 44:
               if (this.isSelectHighlight) this.imp.highlightEntity(false);
               if (!(retcode == DetailedResult.kEcsIn || retcode == DetailedResult.kNewCommadIn || retcode == DetailedResult.kUnknown)) {
-                _context4.next = 48;
+                _context4.next = 49;
                 break;
               }
               return _context4.abrupt("return", new Promise(function (resolve) {
                 resolve(false);
               }));
-            case 48:
+            case 49:
               return _context4.abrupt("return", new Promise(function (resolve) {
                 resolve(true);
               }));
-            case 49:
+            case 50:
             case "end":
               return _context4.stop();
           }
@@ -22578,6 +22634,11 @@ var McObject = /*#__PURE__*/function () {
       mxobj.clearMxCurrentSelect();
       return this.imp.newFile();
     }
+  }, {
+    key: "getCurrentOpenFileMd5",
+    value: function getCurrentOpenFileMd5() {
+      return this.imp.getCurrentOpenFileMd5();
+    }
   }, {
     key: "insertBlock",
     value: function insertBlock(sFileUrl, sBlkName) {
@@ -40394,32 +40455,35 @@ function _Mx_Copy() {
     return regenerator.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          aryId = MxCADUtility.getCurrentSelect();
+          aryId = MxCADUtility.getCurrentSelect({
+            isFilterLockLayer: true
+          });
           if (!(aryId.length > 0)) {
             _context3.next = 4;
             break;
           }
-          return _context3.abrupt("break", 15);
+          return _context3.abrupt("break", 16);
         case 4:
           ss = new MxCADSelectionSet();
-          _context3.next = 7;
+          ss.isFilterLockLayer = true;
+          _context3.next = 8;
           return ss.userSelect("\n\u9009\u62E9\u590D\u5236\u5BF9\u8C61");
-        case 7:
+        case 8:
           if (_context3.sent) {
-            _context3.next = 9;
+            _context3.next = 10;
             break;
           }
           return _context3.abrupt("return");
-        case 9:
+        case 10:
           aryId = ss.getIds();
           if (!(aryId.length == 0)) {
-            _context3.next = 12;
+            _context3.next = 13;
             break;
           }
           return _context3.abrupt("return");
-        case 12:
-          return _context3.abrupt("break", 15);
-        case 15:
+        case 13:
+          return _context3.abrupt("break", 16);
+        case 16:
           if (aryId.length >= 10) {
             retBox = MxGetMcDbEntityBoundingBox(aryId);
             if (retBox) {
@@ -40429,16 +40493,16 @@ function _Mx_Copy() {
           }
           getPoint = new MxCADUiPrPoint();
           getPoint.setMessage("\n\u6307\u5B9A\u57FA\u70B9");
-          _context3.next = 20;
+          _context3.next = 21;
           return getPoint.go();
-        case 20:
+        case 21:
           ptBase = _context3.sent;
           if (ptBase) {
-            _context3.next = 23;
+            _context3.next = 24;
             break;
           }
           return _context3.abrupt("return");
-        case 23:
+        case 24:
           getPoint.setMessage("\u6307\u5B9A\u79FB\u52A8\u5230\u70B9");
           getPoint.setBasePt(ptBase);
           getPoint.setUseBasePt(true);
@@ -40468,30 +40532,30 @@ function _Mx_Copy() {
               worldDraw.drawMcDbEntity(tmp);
             }
           });
-        case 27:
-          _context3.next = 30;
+        case 28:
+          _context3.next = 31;
           return getPoint.go();
-        case 30:
+        case 31:
           ptMoveTo = _context3.sent;
           if (ptMoveTo) {
-            _context3.next = 33;
+            _context3.next = 34;
             break;
           }
           return _context3.abrupt("return");
-        case 33:
-          i = 0;
         case 34:
+          i = 0;
+        case 35:
           if (!(i < aryId.length)) {
-            _context3.next = 43;
+            _context3.next = 44;
             break;
           }
           entity = aryId[i].getMcDbEntity();
           if (entity) {
-            _context3.next = 38;
+            _context3.next = 39;
             break;
           }
-          return _context3.abrupt("continue", 40);
-        case 38:
+          return _context3.abrupt("continue", 41);
+        case 39:
           newEnt = MxCpp.getCurrentMxCAD().drawEntity(entity).getMcDbEntity();
           if (newEnt) {
             if (newEnt instanceof McDbDimension) {
@@ -40502,14 +40566,14 @@ function _Mx_Copy() {
             }
             newEnt.move(ptBase, ptMoveTo);
           }
-        case 40:
+        case 41:
           i++;
-          _context3.next = 34;
+          _context3.next = 35;
           break;
-        case 43:
-          _context3.next = 27;
+        case 44:
+          _context3.next = 28;
           break;
-        case 45:
+        case 46:
         case "end":
           return _context3.stop();
       }
@@ -41633,7 +41697,10 @@ function _Mx_Mirror() {
       while (1) switch (_context13.prev = _context13.next) {
         case 0:
           _context13.next = 2;
-          return MxCADUtility.userSelect("\u9009\u62E9\u955C\u50CF\u5BF9\u8C61");
+          return MxCADUtility.userSelect({
+            strPrompt: "\u9009\u62E9\u955C\u50CF\u5BF9\u8C61",
+            isFilterLockLayer: true
+          });
         case 2:
           aryId = _context13.sent;
           if (!(aryId.length == 0)) {
@@ -44473,7 +44540,7 @@ function _Mx_Extend() {
           isByWindow = false;
           isExtend = false;
           filter.AddMcDbEntityTypes("LINE,LWPOLYLINE,ARC");
-          aryId = MxCADUtility.getCurrentSelect(filter);
+          aryId = MxCADUtility.getCurrentSelect(filter, true, true, true, true);
           if (!(aryId.length === 0)) {
             _context26.next = 15;
             break;