@hprint/plugins 0.0.1-alpha.1 → 0.0.1-alpha.3

package/src/plugins/CopyPlugin.ts

@@ -1,255 +1,255 @@
-import { fabric } from '@hprint/core';
-import { v4 as uuid } from 'uuid';
-import { utils } from '@hprint/shared';
-import type { IEditor, IPluginTempl } from '@hprint/core';
-
-type IPlugin = Pick<CopyPlugin, 'clone'>;
-
-declare module '@hprint/core' {
-    // eslint-disable-next-line @typescript-eslint/no-empty-interface
-    interface IEditor extends IPlugin {}
-}
-
-class CopyPlugin implements IPluginTempl {
-    static pluginName = 'CopyPlugin';
-    static apis = ['clone'];
-    hotkeys: string[] = ['ctrl+v', 'ctrl+c'];
-    private cache: null | fabric.ActiveSelection | fabric.Object = null;
-    constructor(
-        public canvas: fabric.Canvas,
-        public editor: IEditor
-    ) {
-        this.initPaste();
-    }
-
-    // 多选对象复制
-    _copyActiveSelection(activeObject: fabric.Object) {
-        // 间距设置
-        const grid = 10;
-        const canvas = this.canvas;
-        const keys = this.editor.getExtensionKey();
-        activeObject?.clone((cloned: fabric.Object) => {
-            // 再次进行克隆，处理选择多个对象的情况
-            cloned.clone((clonedObj: fabric.ActiveSelection) => {
-                canvas.discardActiveObject();
-                if (clonedObj.left === undefined || clonedObj.top === undefined)
-                    return;
-                // 将克隆的画布重新赋值
-                clonedObj.canvas = canvas;
-                // 设置位置信息
-                clonedObj.set({
-                    left: clonedObj.left + grid,
-                    top: clonedObj.top + grid,
-                    evented: true,
-                    id: uuid(),
-                });
-                clonedObj.forEachObject((obj: fabric.Object) => {
-                    obj.id = uuid();
-                    canvas.add(obj);
-                });
-                // 解决不可选择问题
-                clonedObj.setCoords();
-                canvas.setActiveObject(clonedObj);
-                canvas.requestRenderAll();
-            });
-        }, keys);
-    }
-
-    // 单个对象复制
-    _copyObject(activeObject: fabric.Object) {
-        // 间距设置
-        const grid = 10;
-        const canvas = this.canvas;
-        const keys = this.editor.getExtensionKey();
-        activeObject?.clone((cloned: fabric.Object) => {
-            if (cloned.left === undefined || cloned.top === undefined) return;
-            canvas.discardActiveObject();
-            // 设置位置信息
-            cloned.set({
-                left: cloned.left + grid,
-                top: cloned.top + grid,
-                evented: true,
-                id: uuid(),
-            });
-            canvas.add(cloned);
-            canvas.setActiveObject(cloned);
-            canvas.requestRenderAll();
-        }, keys);
-    }
-
-    // 复制元素
-    clone(paramsActiveObeject?: fabric.ActiveSelection | fabric.Object) {
-        const activeObject =
-            paramsActiveObeject || this.canvas.getActiveObject();
-        if (!activeObject) return;
-        if (activeObject?.type === 'activeSelection') {
-            this._copyActiveSelection(activeObject);
-        } else {
-            this._copyObject(activeObject);
-        }
-    }
-
-    // 快捷键扩展回调
-    hotkeyEvent(eventName: string, e: KeyboardEvent) {
-        if (eventName === 'ctrl+c' && e.type === 'keydown') {
-            const activeObject = this.canvas.getActiveObject();
-            this.cache = activeObject;
-            // 清空剪切板
-            navigator.clipboard.writeText('');
-        }
-        if (eventName === 'ctrl+v' && e.type === 'keydown') {
-            // 确保clone元素操作的执行晚于pasteListener
-            setTimeout(() => {
-                if (this.cache) {
-                    this.clone(this.cache);
-                }
-            }, 0);
-        }
-    }
-
-    contextMenu() {
-        const activeObject = this.canvas.getActiveObject();
-        if (activeObject) {
-            return [
-                {
-                    text: '复制',
-                    hotkey: 'Ctrl+V',
-                    disabled: false,
-                    onclick: () => this.clone(),
-                },
-            ];
-        }
-    }
-
-    destroy() {
-        console.log('pluginDestroy');
-        window.removeEventListener('paste', (e) => this.pasteListener(e));
-    }
-
-    initPaste() {
-        window.addEventListener('paste', (e) => this.pasteListener(e));
-    }
-
-    async pasteListener(event: any) {
-        const canvas = this.canvas;
-        if (document.activeElement === document.body) {
-            event.preventDefault(); // 阻止默认粘贴行为
-        } else {
-            return;
-        }
-
-        const items = (event.clipboardData || event.originalEvent.clipboardData)
-            .items;
-        const fileAccept =
-            '.pdf,.psd,.cdr,.ai,.svg,.jpg,.jpeg,.png,.webp,.json';
-        for (const item of items) {
-            if (item.kind === 'file') {
-                const file = item.getAsFile();
-                const curFileSuffix: string | undefined = file.name
-                    .split('.')
-                    .pop();
-                if (!fileAccept.split(',').includes(`.${curFileSuffix}`))
-                    return;
-                if (curFileSuffix === 'svg') {
-                    const svgFile = await utils.getImgStr(file);
-                    if (!svgFile) throw new Error('file is undefined');
-                    fabric.loadSVGFromURL(
-                        svgFile as string,
-                        (objects, options) => {
-                            const item = fabric.util.groupSVGElements(objects, {
-                                ...options,
-                                name: 'defaultSVG',
-                                id: uuid(),
-                            });
-                            canvas.add(item).centerObject(item).renderAll();
-                        }
-                    );
-                }
-                // if (curFileSuffix === 'json') {
-                //   const dataText = await getImageText(file);
-                //   const template = JSON.parse(dataText);
-                //   addTemplate(template);
-                // }
-                if (item.type.indexOf('image/') === 0) {
-                    // 这是一个图片文件
-                    const imageUrl = URL.createObjectURL(file);
-                    const imgEl = document.createElement('img');
-                    imgEl.src = imageUrl;
-                    // 插入页面
-                    document.body.appendChild(imgEl);
-                    imgEl.onload = () => {
-                        // 创建图片对象
-                        const imgInstance = new fabric.Image(imgEl, {
-                            id: uuid(),
-                            name: '图片1',
-                            left: 100,
-                            top: 100,
-                        });
-                        // 设置缩放
-                        canvas.add(imgInstance);
-                        canvas.setActiveObject(imgInstance);
-                        canvas.renderAll();
-                        // 删除页面中的图片元素
-                        imgEl.remove();
-                    };
-                }
-            } else if (
-                item.kind === 'string' &&
-                item.type.indexOf('text/plain') === 0
-            ) {
-                // 文本数据
-                item.getAsString((text: any) => {
-                    // 插入到文本框
-                    const activeObject =
-                        canvas.getActiveObject() as fabric.Textbox;
-                    // 如果是激活的文字把复制的内容插入到对应光标位置
-                    if (
-                        activeObject &&
-                        (activeObject.type === 'textbox' ||
-                            activeObject.type === 'i-text') &&
-                        activeObject.text
-                    ) {
-                        const cursorPosition = activeObject.selectionStart;
-                        const textBeforeCursorPosition =
-                            activeObject.text.substring(0, cursorPosition);
-                        const textAfterCursorPosition =
-                            activeObject.text.substring(
-                                cursorPosition as number
-                            );
-
-                        // 更新文本对象的文本
-                        activeObject.set(
-                            'text',
-                            textBeforeCursorPosition +
-                                text +
-                                textAfterCursorPosition
-                        );
-
-                        // 重新设置光标的位置
-                        activeObject.selectionStart =
-                            cursorPosition + text.length;
-                        activeObject.selectionEnd =
-                            cursorPosition + text.length;
-
-                        // 重新渲染画布展示更新后的文本
-                        activeObject.dirty = true;
-                        canvas.renderAll();
-                    } else {
-                        const fabricText = new fabric.IText(text, {
-                            left: 100,
-                            top: 100,
-                            fontSize: 80,
-                            id: uuid(),
-                        });
-                        canvas.add(fabricText);
-                        canvas.setActiveObject(fabricText);
-                    }
-                });
-            }
-        }
-        // 复制浏览器外的元素时，清空暂存的画布内粘贴元素
-        if (items.length) this.cache = null;
-    }
-}
-
-export default CopyPlugin;
+import { fabric } from '@hprint/core';
+import { v4 as uuid } from 'uuid';
+import { utils } from '@hprint/shared';
+import type { IEditor, IPluginTempl } from '@hprint/core';
+
+type IPlugin = Pick<CopyPlugin, 'clone'>;
+
+declare module '@hprint/core' {
+    // eslint-disable-next-line @typescript-eslint/no-empty-interface
+    interface IEditor extends IPlugin {}
+}
+
+class CopyPlugin implements IPluginTempl {
+    static pluginName = 'CopyPlugin';
+    static apis = ['clone'];
+    hotkeys: string[] = ['ctrl+v', 'ctrl+c'];
+    private cache: null | fabric.ActiveSelection | fabric.Object = null;
+    constructor(
+        public canvas: fabric.Canvas,
+        public editor: IEditor
+    ) {
+        this.initPaste();
+    }
+
+    // 多选对象复制
+    _copyActiveSelection(activeObject: fabric.Object) {
+        // 间距设置
+        const grid = 10;
+        const canvas = this.canvas;
+        const keys = this.editor.getExtensionKey();
+        activeObject?.clone((cloned: fabric.Object) => {
+            // 再次进行克隆，处理选择多个对象的情况
+            cloned.clone((clonedObj: fabric.ActiveSelection) => {
+                canvas.discardActiveObject();
+                if (clonedObj.left === undefined || clonedObj.top === undefined)
+                    return;
+                // 将克隆的画布重新赋值
+                clonedObj.canvas = canvas;
+                // 设置位置信息
+                clonedObj.set({
+                    left: clonedObj.left + grid,
+                    top: clonedObj.top + grid,
+                    evented: true,
+                    id: uuid(),
+                });
+                clonedObj.forEachObject((obj: fabric.Object) => {
+                    obj.id = uuid();
+                    canvas.add(obj);
+                });
+                // 解决不可选择问题
+                clonedObj.setCoords();
+                canvas.setActiveObject(clonedObj);
+                canvas.requestRenderAll();
+            });
+        }, keys);
+    }
+
+    // 单个对象复制
+    _copyObject(activeObject: fabric.Object) {
+        // 间距设置
+        const grid = 10;
+        const canvas = this.canvas;
+        const keys = this.editor.getExtensionKey();
+        activeObject?.clone((cloned: fabric.Object) => {
+            if (cloned.left === undefined || cloned.top === undefined) return;
+            canvas.discardActiveObject();
+            // 设置位置信息
+            cloned.set({
+                left: cloned.left + grid,
+                top: cloned.top + grid,
+                evented: true,
+                id: uuid(),
+            });
+            canvas.add(cloned);
+            canvas.setActiveObject(cloned);
+            canvas.requestRenderAll();
+        }, keys);
+    }
+
+    // 复制元素
+    clone(paramsActiveObeject?: fabric.ActiveSelection | fabric.Object) {
+        const activeObject =
+            paramsActiveObeject || this.canvas.getActiveObject();
+        if (!activeObject) return;
+        if (activeObject?.type === 'activeSelection') {
+            this._copyActiveSelection(activeObject);
+        } else {
+            this._copyObject(activeObject);
+        }
+    }
+
+    // 快捷键扩展回调
+    hotkeyEvent(eventName: string, e: KeyboardEvent) {
+        if (eventName === 'ctrl+c' && e.type === 'keydown') {
+            const activeObject = this.canvas.getActiveObject();
+            this.cache = activeObject;
+            // 清空剪切板
+            navigator.clipboard.writeText('');
+        }
+        if (eventName === 'ctrl+v' && e.type === 'keydown') {
+            // 确保clone元素操作的执行晚于pasteListener
+            setTimeout(() => {
+                if (this.cache) {
+                    this.clone(this.cache);
+                }
+            }, 0);
+        }
+    }
+
+    contextMenu() {
+        const activeObject = this.canvas.getActiveObject();
+        if (activeObject) {
+            return [
+                {
+                    text: '复制',
+                    hotkey: 'Ctrl+V',
+                    disabled: false,
+                    onclick: () => this.clone(),
+                },
+            ];
+        }
+    }
+
+    destroy() {
+        console.log('pluginDestroy');
+        window.removeEventListener('paste', (e) => this.pasteListener(e));
+    }
+
+    initPaste() {
+        window.addEventListener('paste', (e) => this.pasteListener(e));
+    }
+
+    async pasteListener(event: any) {
+        const canvas = this.canvas;
+        if (document.activeElement === document.body) {
+            event.preventDefault(); // 阻止默认粘贴行为
+        } else {
+            return;
+        }
+
+        const items = (event.clipboardData || event.originalEvent.clipboardData)
+            .items;
+        const fileAccept =
+            '.pdf,.psd,.cdr,.ai,.svg,.jpg,.jpeg,.png,.webp,.json';
+        for (const item of items) {
+            if (item.kind === 'file') {
+                const file = item.getAsFile();
+                const curFileSuffix: string | undefined = file.name
+                    .split('.')
+                    .pop();
+                if (!fileAccept.split(',').includes(`.${curFileSuffix}`))
+                    return;
+                if (curFileSuffix === 'svg') {
+                    const svgFile = await utils.getImgStr(file);
+                    if (!svgFile) throw new Error('file is undefined');
+                    fabric.loadSVGFromURL(
+                        svgFile as string,
+                        (objects, options) => {
+                            const item = fabric.util.groupSVGElements(objects, {
+                                ...options,
+                                name: 'defaultSVG',
+                                id: uuid(),
+                            });
+                            canvas.add(item).centerObject(item).renderAll();
+                        }
+                    );
+                }
+                // if (curFileSuffix === 'json') {
+                //   const dataText = await getImageText(file);
+                //   const template = JSON.parse(dataText);
+                //   addTemplate(template);
+                // }
+                if (item.type.indexOf('image/') === 0) {
+                    // 这是一个图片文件
+                    const imageUrl = URL.createObjectURL(file);
+                    const imgEl = document.createElement('img');
+                    imgEl.src = imageUrl;
+                    // 插入页面
+                    document.body.appendChild(imgEl);
+                    imgEl.onload = () => {
+                        // 创建图片对象
+                        const imgInstance = new fabric.Image(imgEl, {
+                            id: uuid(),
+                            name: '图片1',
+                            left: 100,
+                            top: 100,
+                        });
+                        // 设置缩放
+                        canvas.add(imgInstance);
+                        canvas.setActiveObject(imgInstance);
+                        canvas.renderAll();
+                        // 删除页面中的图片元素
+                        imgEl.remove();
+                    };
+                }
+            } else if (
+                item.kind === 'string' &&
+                item.type.indexOf('text/plain') === 0
+            ) {
+                // 文本数据
+                item.getAsString((text: any) => {
+                    // 插入到文本框
+                    const activeObject =
+                        canvas.getActiveObject() as fabric.Textbox;
+                    // 如果是激活的文字把复制的内容插入到对应光标位置
+                    if (
+                        activeObject &&
+                        (activeObject.type === 'textbox' ||
+                            activeObject.type === 'i-text') &&
+                        activeObject.text
+                    ) {
+                        const cursorPosition = activeObject.selectionStart;
+                        const textBeforeCursorPosition =
+                            activeObject.text.substring(0, cursorPosition);
+                        const textAfterCursorPosition =
+                            activeObject.text.substring(
+                                cursorPosition as number
+                            );
+
+                        // 更新文本对象的文本
+                        activeObject.set(
+                            'text',
+                            textBeforeCursorPosition +
+                                text +
+                                textAfterCursorPosition
+                        );
+
+                        // 重新设置光标的位置
+                        activeObject.selectionStart =
+                            cursorPosition + text.length;
+                        activeObject.selectionEnd =
+                            cursorPosition + text.length;
+
+                        // 重新渲染画布展示更新后的文本
+                        activeObject.dirty = true;
+                        canvas.renderAll();
+                    } else {
+                        const fabricText = new fabric.IText(text, {
+                            left: 100,
+                            top: 100,
+                            fontSize: 80,
+                            id: uuid(),
+                        });
+                        canvas.add(fabricText);
+                        canvas.setActiveObject(fabricText);
+                    }
+                });
+            }
+        }
+        // 复制浏览器外的元素时，清空暂存的画布内粘贴元素
+        if (items.length) this.cache = null;
+    }
+}
+
+export default CopyPlugin;

package/src/plugins/CreateElementPlugin.ts

@@ -147,11 +147,21 @@ class CreateElementPlugin implements IPluginTempl {
             const dpiVal = hasFieldsArray ? (dpi ?? 96) : (fieldsOrDpi ?? 96);
             const ratio = convertSingle(1, unit, dpiVal) || 1;
             const origin: Record<string, any> = {};
+            const isImageObject = (this as any).type === 'image';
             const targetFields: string[] =
                 hasFieldsArray && (fieldsOrDpi as string[])?.length ? (fieldsOrDpi as string[]) : singleFields;
             targetFields.forEach((field) => {
                 if (field === 'points') return;
-                const currentVal = (this as any).get ? (this as any).get(field) : (this as any)[field];
+                let currentVal: number | undefined;
+                if (isImageObject && (field === 'width' || field === 'height')) {
+                    if (field === 'width') {
+                        currentVal = (this as any).getScaledWidth?.();
+                    } else {
+                        currentVal = (this as any).getScaledHeight?.();
+                    }
+                } else {
+                    currentVal = (this as any).get ? (this as any).get(field) : (this as any)[field];
+                }
                 if (typeof currentVal === 'number' && !isNaN(currentVal)) {
                     origin[field] = editorRef.getSizeByUnit(currentVal);
                 }
@@ -492,15 +502,9 @@ class CreateElementPlugin implements IPluginTempl {
             top?: number;
             width?: number;
             height?: number;
-            margin?: number;
-            errorCorrectionLevel?: 'L' | 'M' | 'Q' | 'H';
-            dotsColor?: string;
-            dotsType?: string;
-            cornersSquareColor?: string;
-            cornersSquareType?: string;
-            cornersDotColor?: string;
-            cornersDotType?: string;
-            background?: string;
+            ecLevel?: 'L' | 'M' | 'Q' | 'H';
+            color?: string;
+            bgColor?: string;
         },
         dpi?: number
     ): Promise<fabric.Image> {

package/src/plugins/DeleteHotKeyPlugin.ts

@@ -1,57 +1,57 @@
-import { fabric } from '@hprint/core';
-import type { IEditor, IPluginTempl } from '@hprint/core';
-
-type IPlugin = Pick<DeleteHotKeyPlugin, 'del'>;
-
-declare module '@hprint/core' {
-    // eslint-disable-next-line @typescript-eslint/no-empty-interface
-    interface IEditor extends IPlugin {}
-}
-
-class DeleteHotKeyPlugin implements IPluginTempl {
-    static pluginName = 'DeleteHotKeyPlugin';
-    static apis = ['del'];
-    hotkeys: string[] = ['backspace'];
-    constructor(
-        public canvas: fabric.Canvas,
-        public editor: IEditor
-    ) {}
-
-    // 快捷键扩展回调
-    hotkeyEvent(eventName: string, e: KeyboardEvent) {
-        if (e.type === 'keydown' && eventName === 'backspace') {
-            this.del();
-        }
-    }
-
-    del() {
-        const { canvas } = this;
-        const activeObject = canvas.getActiveObjects();
-        if (activeObject) {
-            activeObject.map((item) => canvas.remove(item));
-            canvas.requestRenderAll();
-            canvas.discardActiveObject();
-        }
-    }
-
-    contextMenu() {
-        const activeObject = this.canvas.getActiveObject();
-        if (activeObject) {
-            return [
-                null,
-                {
-                    text: '删除',
-                    hotkey: 'Backspace',
-                    disabled: false,
-                    onclick: () => this.del(),
-                },
-            ];
-        }
-    }
-
-    destroy() {
-        console.log('pluginDestroy');
-    }
-}
-
-export default DeleteHotKeyPlugin;
+import { fabric } from '@hprint/core';
+import type { IEditor, IPluginTempl } from '@hprint/core';
+
+type IPlugin = Pick<DeleteHotKeyPlugin, 'del'>;
+
+declare module '@hprint/core' {
+    // eslint-disable-next-line @typescript-eslint/no-empty-interface
+    interface IEditor extends IPlugin {}
+}
+
+class DeleteHotKeyPlugin implements IPluginTempl {
+    static pluginName = 'DeleteHotKeyPlugin';
+    static apis = ['del'];
+    hotkeys: string[] = ['backspace'];
+    constructor(
+        public canvas: fabric.Canvas,
+        public editor: IEditor
+    ) {}
+
+    // 快捷键扩展回调
+    hotkeyEvent(eventName: string, e: KeyboardEvent) {
+        if (e.type === 'keydown' && eventName === 'backspace') {
+            this.del();
+        }
+    }
+
+    del() {
+        const { canvas } = this;
+        const activeObject = canvas.getActiveObjects();
+        if (activeObject) {
+            activeObject.map((item) => canvas.remove(item));
+            canvas.requestRenderAll();
+            canvas.discardActiveObject();
+        }
+    }
+
+    contextMenu() {
+        const activeObject = this.canvas.getActiveObject();
+        if (activeObject) {
+            return [
+                null,
+                {
+                    text: '删除',
+                    hotkey: 'Backspace',
+                    disabled: false,
+                    onclick: () => this.del(),
+                },
+            ];
+        }
+    }
+
+    destroy() {
+        console.log('pluginDestroy');
+    }
+}
+
+export default DeleteHotKeyPlugin;