mxcad-app 1.0.69 → 1.0.71

package/dist/index.d.ts

@@ -22,6 +22,9 @@ import { ShallowRef } from 'vue';
 import { Store } from 'pinia';
 import { StoreDefinition } from 'pinia';
 import { ThemeInstance } from 'vuetify';
+import { VoerkaI18nScope } from '@voerkai18n/runtime';
+import { VueTransformResultType } from '@voerkai18n/vue';
+import { VueTranslateComponentType } from '@voerkai18n/vue';
 
 declare interface AppConfig {
     uiConfig?: string;
@@ -124,6 +127,8 @@ declare type LineType = typeof defaultLineType & {
 };
 
 declare class MxCADApp extends MxCADEvents {
+    /** i18nScope 国际化模块 */
+    get i18nScope(): VoerkaI18nScope<VueTranslateComponentType, VueTransformResultType>;
     setStaticAssetPath(url: string): void;
     getStaticAssetPath(): string;
     initConfig(config: AppConfig): void;
@@ -2633,28 +2638,17 @@ declare module '@howdyjs/to-drag' {
 }
 
 
-declare module "@tiptap/core" {
-    interface Commands<ReturnType> {
-        selectedText: {
-            setSelectedText: (from: number, to: number) => ReturnType;
-            unsetSelectedText: (from: number, to: number) => ReturnType;
-        };
-    }
-}
-
-
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
-        Strike: {
+        TextDecoration: {
             /**
              * Set the font size attribute
              */
-            setStrike: () => ReturnType;
+            setTextDecoration: (textDecoration: string) => ReturnType;
             /**
              * Unset the font size attribute
              */
-            unsetStrike: () => ReturnType;
-            toggleStrike: () => ReturnType;
+            unsetTextDecoration: () => ReturnType;
         };
     }
 }
@@ -2662,10 +2656,16 @@ declare module '@tiptap/core' {
 
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
-        Underline: {
-            setUnderline: () => ReturnType;
-            unsetUnderline: () => ReturnType;
-            toggleUnderline: () => ReturnType;
+        Overline: {
+            /**
+             * Set the font size attribute
+             */
+            setOverline: () => ReturnType;
+            /**
+             * Unset the font size attribute
+             */
+            unsetOverline: () => ReturnType;
+            toggleOverline: () => ReturnType;
         };
     }
 }
@@ -2673,15 +2673,26 @@ declare module '@tiptap/core' {
 
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
-        fontSize: {
+        Strike: {
             /**
              * Set the font size attribute
              */
-            setFontSize: (size: string) => ReturnType;
+            setStrike: () => ReturnType;
             /**
              * Unset the font size attribute
              */
-            unsetFontSize: () => ReturnType;
+            unsetStrike: () => ReturnType;
+            toggleStrike: () => ReturnType;
+        };
+    }
+}
+
+
+declare module "@tiptap/core" {
+    interface Commands<ReturnType> {
+        selectedText: {
+            setSelectedText: (from: number, to: number) => ReturnType;
+            unsetSelectedText: (from: number, to: number) => ReturnType;
         };
     }
 }
@@ -2689,15 +2700,10 @@ declare module '@tiptap/core' {
 
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
-        TextDecoration: {
-            /**
-             * Set the font size attribute
-             */
-            setTextDecoration: (textDecoration: string) => ReturnType;
-            /**
-             * Unset the font size attribute
-             */
-            unsetTextDecoration: () => ReturnType;
+        Underline: {
+            setUnderline: () => ReturnType;
+            unsetUnderline: () => ReturnType;
+            toggleUnderline: () => ReturnType;
         };
     }
 }
@@ -2705,16 +2711,15 @@ declare module '@tiptap/core' {
 
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
-        Overline: {
+        fontSize: {
             /**
              * Set the font size attribute
              */
-            setOverline: () => ReturnType;
+            setFontSize: (size: string) => ReturnType;
             /**
              * Unset the font size attribute
              */
-            unsetOverline: () => ReturnType;
-            toggleOverline: () => ReturnType;
+            unsetFontSize: () => ReturnType;
         };
     }
 }

package/dist/mxcad.d.ts

@@ -12995,18 +12995,44 @@ declare module "mxcad" {
   	* @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;
@@ -13019,7 +13045,7 @@ declare module "mxcad" {
   	 * @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 图片路径
@@ -13039,7 +13065,7 @@ declare module "mxcad" {
   		});
   	 * ```
   	 */
-  	addImageDefine(imageUrl: string, sName?: string, isConvertBase64?: boolean, sourceFileName?: string): McObjectId;
+  	addImageDefine(imageUrl: string, sName?: string, isConvertBase64?: boolean, sourceFileName?: string, sBase64Data?: string): McObjectId;
   	/**
   	 * 显示线重
   	*/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mxcad-app",
-  "version": "1.0.69",
+  "version": "1.0.71",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",