mxcad 1.0.385 → 1.0.387

package/dist/mxcad.d.ts

@@ -12994,18 +12994,44 @@ export declare class McObject {
 	* @param call 回调函数
 	* @example
 	* ```ts
-	 import { MxCpp, McObject } from "mxcad"
-	 const mxcad: McObject = MxCpp.getCurrentMxCAD()
-	 mxcad.loadImage(imagUrl, (image) => {
-	   if (!image) {
-		   console.log("loadImage failed");
-		   return;
-	   }
-	   let width = mxcad.mxdraw.viewCoordLong2Cad(100);
-	   let height = (image.height / image.width) * width;
-	   idImage = mxcad.drawImage((pt as any).x, (pt as any).y, width, height, 0, imagUrl,true);
-	   mxcad.updateDisplay();
-	});
+		import { MxCpp } from "mxcad";
+		function selectLocalFile() {
+			return new Promise((resolve) => {
+				const input = document.createElement("input");
+				input.type = "file";
+				input.accept = "image/*";
+				input.onchange = (e) => resolve(e.target.files[0]);
+				input.click();
+			});
+		}
+		function fileToBase64(file) {
+			return new Promise((resolve, reject) => {
+				const reader = new FileReader();
+				reader.onload = () => resolve(reader.result);
+				reader.onerror = reject;
+				reader.readAsDataURL(file);
+			});
+		}
+
+		const file = await selectLocalFile();
+		if (!file) return;
+		const imagData = await fileToBase64(file);
+		let mxcad = MxCpp.getCurrentMxCAD();
+
+		mxcad.loadImageBase64(imagData, "test.jpg", (image) => {
+			if (!image) {
+				console.log("loadImage failed");
+				return;
+			}
+			let width = mxcad.mxdraw.viewCoordLong2Cad(100);
+			let height = (image.height / image.width) * width;
+
+			let viewAngle = 0.0;
+			let id = mxcad.drawImage(100, 100, width, height, viewAngle, "test.jpg", true, image.width, image.height,"",imagData);
+
+
+			mxcad.updateDisplay();
+		})
 	* ```
 	*/
 	loadImageBase64(sImageBase64: string, imageFileName: string, call: (image: any) => void): void;
@@ -13018,7 +13044,7 @@ export declare class McObject {
 	 * @param dAng 图片角度,单位是度
 	 * @param imageUrl 图片路径
 	 */
-	drawImage(dPosX: number, dPosY: number, dWidth: number, dHeight: number, dAng: number, imageName: string, isConvertBase64?: boolean, dwgImageSizeWidth?: number, dwgImageSizeHeight?: number, imageUrl?: string): McObjectId;
+	drawImage(dPosX: number, dPosY: number, dWidth: number, dHeight: number, dAng: number, imageName: string, isConvertBase64?: boolean, dwgImageSizeWidth?: number, dwgImageSizeHeight?: number, imageUrl?: string, sImageBase64?: string): McObjectId;
 	/**
 	 * 添加一个图片定义到cad数据库中 。
 	 * @param imageUrl 图片路径
@@ -13038,7 +13064,7 @@ export declare class McObject {
 		});
 	 * ```
 	 */
-	addImageDefine(imageUrl: string, sName?: string, isConvertBase64?: boolean, sourceFileName?: string): McObjectId;
+	addImageDefine(imageUrl: string, sName?: string, isConvertBase64?: boolean, sourceFileName?: string, sBase64Data?: string): McObjectId;
 	/**
 	 * 显示线重
 	*/

package/dist/mxcad.es.js

@@ -14596,7 +14596,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312Imp(hexstr);
 };
 
-const version$1 = "1.0.384";
+const version$1 = "1.0.386";
 
 var isSharedArrayBuffer = "SharedArrayBuffer" in window;
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -23019,7 +23019,8 @@ var McObject = /*#__PURE__*/function () {
       var dwgImageSizeWidth = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
       var dwgImageSizeHeight = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
       var imageUrl = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : "";
-      return new McObjectId(this.imp.DrawImage(dPosX, dPosY, dWidth, dHeight, dAng, MxG2312Obj.encodeToGb2312(imageName), isConvertBase64, dwgImageSizeWidth, dwgImageSizeHeight, MxG2312Obj.encodeToGb2312(imageUrl)));
+      var sImageBase64 = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : "";
+      return new McObjectId(this.imp.DrawImage(dPosX, dPosY, dWidth, dHeight, dAng, MxG2312Obj.encodeToGb2312(imageName), isConvertBase64, dwgImageSizeWidth, dwgImageSizeHeight, MxG2312Obj.encodeToGb2312(imageUrl), sImageBase64));
     }
   }, {
     key: "addImageDefine",
@@ -23027,7 +23028,8 @@ var McObject = /*#__PURE__*/function () {
       var sName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
       var isConvertBase64 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var sourceFileName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "";
-      return new McObjectId(this.imp.addImageDefine(MxG2312Obj.encodeToGb2312(imageUrl), MxG2312Obj.encodeToGb2312(sName), isConvertBase64, MxG2312Obj.encodeToGb2312(sourceFileName)));
+      var sBase64Data = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "";
+      return new McObjectId(this.imp.addImageDefine(MxG2312Obj.encodeToGb2312(imageUrl), MxG2312Obj.encodeToGb2312(sName), isConvertBase64, MxG2312Obj.encodeToGb2312(sourceFileName), sBase64Data));
     }
   }, {
     key: "showLineWeight",