xw-devtool-cli 1.0.41 → 1.0.43

package/README.md

@@ -4,7 +4,7 @@
 
 一个基于 Node.js 的开发者命令行工具箱，旨在提供开箱即用的常用开发工具，帮助开发者快速处理日常任务。
 
-主要功能包括：Base64 编解码、图片格式转换、图片与 Base64 互转、Mock 数据生成、时间戳/日期格式化、时间计算、URL 编解码、UUID 生成、汉字转拼音、颜色转换、变量格式转换、哈希计算、二维码生成、特殊符号大全、Markdown 语法工具、VS Code 代码段生成、当前目录树生成等。大部分结果可一键复制到剪贴板，极大提升开发效率。
+主要功能包括：Base64 编解码、图片格式转换、图片与 Base64 互转、Mock 数据生成、时间戳/日期格式化、时间计算、URL 编解码、UUID 生成、汉字转拼音、颜色转换、变量格式转换、哈希计算、二维码生成、二维码识别、特殊符号大全、Markdown 语法工具、VS Code 代码段生成、当前目录树生成等。大部分结果可一键复制到剪贴板，极大提升开发效率。
 
 ## ✨ 功能特性
 
@@ -13,6 +13,7 @@
   - **图片格式转换**：支持 PNG、JPG、WebP、ICO 格式互转，可调整压缩质量。生成 ICO 时支持自定义尺寸（逗号分隔），留空则默认生成 `256` 尺寸。输出文件名默认带时间戳，避免覆盖。
   - **图片 ↔ Base64**：支持图片转 Base64 字符串，以及 Base64 还原为图片文件。
   - **图片分割**：支持网格等分（自定义行/列数）或自定义分割线（像素/百分比），自动生成分割后的图片文件。
+  - **图片拼接**：支持“选择目录”或“选择多张图片”两种输入方式；在对话框中可一次多选多张图片，可选**水平拼接**或**垂直拼接**，输出支持选择指定目录（对话框或手动输入），默认输出文件名带时间戳并自动复制输出路径。
   - **图片主色识别**：提取图片主色调（Hex/RGB/HSL/HSV），默认复制 Hex 到剪贴板，支持保存详细信息到文件。
   - **颜色吸取**：从图片中吸取单像素颜色或区域平均颜色，支持 px/% 坐标输入，结果显示颜色条并自动复制 Hex/Hex8。
   - **屏幕取色**：实时显示鼠标所在位置的颜色值（Hex/RGB）。
@@ -45,6 +46,7 @@
   - **变量格式转换**：支持 CamelCase, PascalCase, SnakeCase, KebabCase, ConstantCase 互转。
   - **哈希计算**：支持 MD5, SHA1, SHA256, SHA512, SM3 算法。
   - **二维码生成**：终端直接显示二维码，支持保存为 PNG 图片（带时间戳文件名）。
+  - **二维码识别**：支持选择二维码图片进行识别，识别结果自动复制到剪贴板。
   - **特殊符号大全**：包含常用符号、箭头、数学符号、货币、希腊字母等 170+ 个符号，支持一键复制。
   - **Emoji 输入**：支持分类查看和选择常用 Emoji，一键复制到剪贴板。
   - **HTML 实体工具**：支持 HTML 实体编码与解码 (如 `&` <-> `&amp;`)。
@@ -207,6 +209,13 @@ x. 设置 / 语言 (Settings)
 - 输入文本或 URL（支持直接回车读取剪贴板）。
 - 终端直接显示二维码预览。
 - 可选保存为 PNG 图片，默认文件名包含时间戳。
+
+### 二维码识别
+- 选择 `qrcodeDecode`（菜单对应数字/字母）进入。
+- 支持两种图片输入方式：
+  - **选择文件（对话框）**
+  - **手动输入文件路径**
+- 自动识别二维码内容并复制到剪贴板。
 
 ### 5. URL 编解码
 - 选择 `5` 进入。
@@ -345,7 +354,7 @@ x. 设置 / 语言 (Settings)
 
 A Node.js-based developer command-line toolbox designed to provide out-of-the-box common development tools to help developers handle daily tasks quickly.
 
-Key features include: Base64 encoding/decoding, image format conversion, image <-> Base64, Mock data generation, timestamp/date formatting, time calculation, URL encoding/decoding, UUID generation, Chinese pinyin conversion, color conversion, variable format conversion, hash calculation, QR code generation, special symbols, Markdown snippets, VS Code snippet generation, etc. All results are automatically copied to the clipboard, greatly improving development efficiency.
+Key features include: Base64 encoding/decoding, image format conversion, image <-> Base64, Mock data generation, timestamp/date formatting, time calculation, URL encoding/decoding, UUID generation, Chinese pinyin conversion, color conversion, variable format conversion, hash calculation, QR code generation, QR code recognition, special symbols, Markdown snippets, VS Code snippet generation, current directory tree generation, etc. Most results can be copied to the clipboard in one step, greatly improving development efficiency.
 
 ### ✨ Features
 
@@ -380,6 +389,7 @@ Key features include: Base64 encoding/decoding, image format conversion, image <
   - **Variable Format**: CamelCase, PascalCase, SnakeCase, KebabCase, ConstantCase.
   - **Hash Calculator**: MD5, SHA1, SHA256, SHA512, SM3.
   - **QR Code**: Display QR codes in terminal, save as PNG.
+  - **QR Code Reader**: Select an image with QR code and decode content, then copy the result to clipboard automatically.
   - **Special Symbols**: 170+ symbols, arrows, math symbols, etc.
   - **Emoji Picker**: Browse and copy emojis.
   - **HTML Entity**: Encode/Decode HTML entities.
@@ -493,6 +503,13 @@ You can enter a feature key directly, or type a keyword (e.g. `json`, `image`, `
 - Input text or URL.
 - Preview in terminal.
 - Option to save as PNG.
+
+#### QR Code Reader
+- Select `qrcodeDecode` (menu key).
+- Image input methods:
+  - **Select file (dialog)**
+  - **Enter file path manually**
+- Decode content and copy it to clipboard automatically.
 
 #### 5. URL Encode/Decode
 - Select `5`.

package/README_EN.md

@@ -4,7 +4,7 @@
 
 A Node.js-based developer command-line toolbox designed to provide out-of-the-box common development tools to help developers handle daily tasks quickly.
 
-Key features include: Base64 encoding/decoding, image format conversion, image <-> Base64, Mock data generation, timestamp/date formatting, time calculation, URL encoding/decoding, UUID generation, Chinese pinyin conversion, color conversion, variable format conversion, hash calculation, QR code generation, special symbols, Markdown snippets, VS Code snippet generation, current directory tree generation, etc. Most results can be copied to the clipboard in one step, greatly improving development efficiency.
+Key features include: Base64 encoding/decoding, image format conversion, image <-> Base64, Mock data generation, timestamp/date formatting, time calculation, URL encoding/decoding, UUID generation, Chinese pinyin conversion, color conversion, variable format conversion, hash calculation, QR code generation, QR code recognition, special symbols, Markdown snippets, VS Code snippet generation, current directory tree generation, etc. Most results can be copied to the clipboard in one step, greatly improving development efficiency.
 
 ## ✨ Features
 
@@ -13,6 +13,7 @@ Key features include: Base64 encoding/decoding, image format conversion, image <
   - **Format Conversion**: Convert between PNG, JPG, WebP, with adjustable compression quality.
   - **Image ↔ Base64**: Convert images to Base64 strings and vice versa.
   - **Image Splitter**: Split images into grid (rows/cols) or custom split lines (pixels/percentage).
+  - **Image Merger**: Supports two input modes (folder or multiple images); the dialog mode supports selecting multiple images at once. You can choose **horizontal** or **vertical** merge, and choose a specific output directory (dialog or manual input). Default output filename includes timestamp, and output path is copied to clipboard.
   - **Placeholder Image**: Quickly generate placeholder images with custom size, color, and text.
   - **Color Picker**: Pick a single pixel color or area average from an image; supports px/% coordinates; shows preview bar and auto-copies Hex/Hex8.
   - **Screen Picker**: Pick color directly from the screen at the mouse position; move the cursor and press Enter to sample; supports alpha preview.
@@ -39,6 +40,7 @@ Key features include: Base64 encoding/decoding, image format conversion, image <
   - **Variable Format**: CamelCase, PascalCase, SnakeCase, KebabCase, ConstantCase.
   - **Hash Calculator**: MD5, SHA1, SHA256, SHA512, SM3.
   - **QR Code**: Display QR codes in terminal, save as PNG.
+  - **QR Code Reader**: Select a QR code image and recognize the content, then copy the result to clipboard.
   - **Special Symbols**: 170+ symbols, arrows, math symbols, etc.
   - **Emoji Picker**: Browse and copy emojis.
   - **HTML Entity**: Encode/Decode HTML entities.
@@ -159,6 +161,13 @@ s. Settings (Language)
 - Preview in terminal.
 - Option to save as PNG.
 
+### QR Code Reader
+- Select `qrcodeDecode` (menu key).
+- Supports two input methods:
+  - **Select file (dialog)**
+  - **Enter file path manually**
+- Recognized content is copied to clipboard automatically.
+
 ### 5. URL Encode/Decode
 - Select `5`.
 - Select `Encode` or `Decode`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xw-devtool-cli",
-  "version": "1.0.41",
+  "version": "1.0.43",
   "type": "module",
   "description": "基于node的开发者助手cli",
   "main": "index.js",
@@ -42,6 +42,8 @@
     "png",
     "placeholder-image",
     "qrcode",
+    "qr-code-reader",
+    "qr-decoder",
     "json-format",
     "json-formatter",
     "variable-case",
@@ -54,6 +56,9 @@
     "screen-mark",
     "pixel-distance",
     "image-compress",
+    "image-merge",
+    "merge-images",
+    "image-stitch",
     "png-compress",
     "jpg-compress",
     "webp-compress",
@@ -84,6 +89,7 @@
     "he": "^1.2.0",
     "i18next": "^25.7.3",
     "inquirer": "^13.1.0",
+    "jsqr": "^1.4.0",
     "lorem-ipsum": "^2.0.8",
     "pinyin": "^4.0.0",
     "qrcode": "^1.5.4",

package/src/commands/imgMerge.js

@@ -0,0 +1,285 @@
+import fs from 'fs';
+import path from 'path';
+import inquirer from 'inquirer';
+import sharp from 'sharp';
+import i18next from '../i18n.js';
+import { selectFromMenu } from '../utils/menu.js';
+import { selectFiles, selectFolder } from '../utils/fileDialog.js';
+import { copy } from '../utils/clipboard.js';
+import { defaultFileName } from '../utils/output.js';
+
+const SUPPORTED_EXT = new Set(['.png', '.jpg', '.jpeg', '.webp', '.bmp', '.tif', '.tiff', '.gif']);
+
+function isImageFile(filePath) {
+    const ext = path.extname(filePath).toLowerCase();
+    return SUPPORTED_EXT.has(ext);
+}
+
+function listImagesInDir(dir) {
+    const entries = fs.readdirSync(dir, { withFileTypes: true });
+    return entries
+        .filter((entry) => entry.isFile() && isImageFile(entry.name))
+        .map((entry) => path.join(dir, entry.name))
+        .sort((a, b) => path.basename(a).localeCompare(path.basename(b), undefined, { numeric: true, sensitivity: 'base' }));
+}
+
+function parseManualImagePaths(input) {
+    return Array.from(new Set(
+        input
+            .split(/[\r\n,]+/)
+            .map((p) => p.trim())
+            .filter(Boolean)
+    ));
+}
+
+async function pickFolderPath() {
+    const method = await selectFromMenu(
+        i18next.t('imgMerge.inputMethod'),
+        [
+            { name: i18next.t('imgMerge.folderDialog'), value: 'dialog' },
+            { name: i18next.t('imgMerge.folderManual'), value: 'manual' }
+        ],
+        true,
+        i18next.t('common.back')
+    );
+    if (method === '__BACK__') return null;
+
+    if (method === 'dialog') {
+        const selected = selectFolder();
+        if (!selected) {
+            console.log(i18next.t('imgMerge.dialogFail'));
+            return await pickFolderPath();
+        }
+        return selected;
+    }
+
+    const { folderPath } = await inquirer.prompt([
+        {
+            type: 'input',
+            name: 'folderPath',
+            message: i18next.t('imgMerge.enterFolderPath'),
+            validate: (input) => {
+                if (!fs.existsSync(input)) return i18next.t('imgMerge.notExist');
+                if (!fs.statSync(input).isDirectory()) return i18next.t('imgMerge.notDirectory');
+                return true;
+            }
+        }
+    ]);
+    return folderPath;
+}
+
+async function pickMultiImageFiles() {
+    const method = await selectFromMenu(
+        i18next.t('imgMerge.inputMethod'),
+        [
+            { name: i18next.t('imgMerge.multiDialog'), value: 'dialog' },
+            { name: i18next.t('imgMerge.multiManual'), value: 'manual' }
+        ],
+        true,
+        i18next.t('common.back')
+    );
+    if (method === '__BACK__') return null;
+
+    if (method === 'dialog') {
+        const files = selectFiles('Image Files|*.png;*.jpg;*.jpeg;*.webp;*.bmp;*.tif;*.tiff;*.gif|All Files|*.*');
+        if (!files || files.length === 0) {
+            console.log(i18next.t('imgMerge.dialogFail'));
+            return await pickMultiImageFiles();
+        }
+        return Array.from(new Set(files));
+    }
+
+    const { filesInput } = await inquirer.prompt([
+        {
+            type: 'input',
+            name: 'filesInput',
+            message: i18next.t('imgMerge.enterImagePaths')
+        }
+    ]);
+    return parseManualImagePaths(filesInput);
+}
+
+async function pickOutputPath(baseDir) {
+    const outputMethod = await selectFromMenu(
+        i18next.t('imgMerge.selectOutput'),
+        [
+            { name: i18next.t('imgMerge.outputDefault'), value: 'default' },
+            { name: i18next.t('imgMerge.outputFolderDialog'), value: 'folderDialog' },
+            { name: i18next.t('imgMerge.outputFolderManual'), value: 'folderManual' },
+            { name: i18next.t('imgMerge.outputFileManual'), value: 'fileManual' }
+        ],
+        true,
+        i18next.t('common.back')
+    );
+    if (outputMethod === '__BACK__') return null;
+
+    if (outputMethod === 'default') {
+        return path.join(baseDir, defaultFileName('img-merge', 'png'));
+    }
+
+    if (outputMethod === 'folderDialog') {
+        const selected = selectFolder();
+        if (!selected) {
+            console.log(i18next.t('imgMerge.dialogFail'));
+            return await pickOutputPath(baseDir);
+        }
+        return path.join(selected, defaultFileName('img-merge', 'png'));
+    }
+
+    if (outputMethod === 'folderManual') {
+        const { outputDir } = await inquirer.prompt([
+            {
+                type: 'input',
+                name: 'outputDir',
+                message: i18next.t('imgMerge.enterOutputDir'),
+                default: baseDir,
+                validate: (input) => {
+                    const dir = input.trim();
+                    if (!dir) return i18next.t('imgMerge.outputPathRequired');
+                    if (fs.existsSync(dir) && !fs.statSync(dir).isDirectory()) {
+                        return i18next.t('imgMerge.notDirectory');
+                    }
+                    return true;
+                }
+            }
+        ]);
+        return path.join(outputDir.trim(), defaultFileName('img-merge', 'png'));
+    }
+
+    const defaultPath = path.join(baseDir, defaultFileName('img-merge', 'png'));
+    const { outputPath } = await inquirer.prompt([
+        {
+            type: 'input',
+            name: 'outputPath',
+            message: i18next.t('imgMerge.outputPathPrompt'),
+            default: defaultPath,
+            validate: (input) => input.trim() ? true : i18next.t('imgMerge.outputPathRequired')
+        }
+    ]);
+    return outputPath.trim();
+}
+
+function validateImageFiles(files) {
+    if (!files || files.length < 2) {
+        return i18next.t('imgMerge.needAtLeastTwo');
+    }
+    for (const filePath of files) {
+        if (!fs.existsSync(filePath)) {
+            return `${i18next.t('imgMerge.notExist')}: ${filePath}`;
+        }
+        if (!fs.statSync(filePath).isFile()) {
+            return `${i18next.t('imgMerge.notFile')}: ${filePath}`;
+        }
+        if (!isImageFile(filePath)) {
+            return `${i18next.t('imgMerge.notImage')}: ${filePath}`;
+        }
+    }
+    return true;
+}
+
+async function mergeImages(files, direction, outputPath) {
+    const metas = await Promise.all(files.map(async (filePath) => {
+        const image = sharp(filePath).rotate();
+        const metadata = await image.metadata();
+        const buffer = await image.toBuffer();
+        return { filePath, metadata, buffer };
+    }));
+
+    const widths = metas.map((m) => m.metadata.width || 0);
+    const heights = metas.map((m) => m.metadata.height || 0);
+    if (widths.some((w) => w <= 0) || heights.some((h) => h <= 0)) {
+        throw new Error(i18next.t('imgMerge.invalidImageSize'));
+    }
+
+    const isHorizontal = direction === 'horizontal';
+    const canvasWidth = isHorizontal ? widths.reduce((sum, w) => sum + w, 0) : Math.max(...widths);
+    const canvasHeight = isHorizontal ? Math.max(...heights) : heights.reduce((sum, h) => sum + h, 0);
+
+    let offsetX = 0;
+    let offsetY = 0;
+    const composite = metas.map((meta, index) => {
+        const item = {
+            input: meta.buffer,
+            left: offsetX,
+            top: offsetY
+        };
+        if (isHorizontal) {
+            offsetX += widths[index];
+        } else {
+            offsetY += heights[index];
+        }
+        return item;
+    });
+
+    fs.mkdirSync(path.dirname(outputPath), { recursive: true });
+
+    await sharp({
+        create: {
+            width: canvasWidth,
+            height: canvasHeight,
+            channels: 4,
+            background: { r: 255, g: 255, b: 255, alpha: 1 }
+        }
+    })
+        .composite(composite)
+        .png()
+        .toFile(outputPath);
+}
+
+export async function imgMergeHandler() {
+    const sourceType = await selectFromMenu(
+        i18next.t('imgMerge.selectSource'),
+        [
+            { name: i18next.t('imgMerge.sourceFolder'), value: 'folder' },
+            { name: i18next.t('imgMerge.sourceMulti'), value: 'multi' }
+        ],
+        true,
+        i18next.t('common.back')
+    );
+    if (sourceType === '__BACK__') return;
+
+    let files = [];
+    let baseDir = process.cwd();
+    if (sourceType === 'folder') {
+        const folderPath = await pickFolderPath();
+        if (!folderPath) return;
+        baseDir = folderPath;
+        files = listImagesInDir(folderPath);
+    } else {
+        const selectedFiles = await pickMultiImageFiles();
+        if (!selectedFiles) return;
+        files = selectedFiles;
+        if (files.length > 0) {
+            baseDir = path.dirname(files[0]);
+        }
+    }
+
+    const validationResult = validateImageFiles(files);
+    if (validationResult !== true) {
+        console.log(validationResult);
+        return;
+    }
+
+    const direction = await selectFromMenu(
+        i18next.t('imgMerge.selectDirection'),
+        [
+            { name: i18next.t('imgMerge.horizontal'), value: 'horizontal' },
+            { name: i18next.t('imgMerge.vertical'), value: 'vertical' }
+        ],
+        true,
+        i18next.t('common.back')
+    );
+    if (direction === '__BACK__') return;
+
+    const outputPath = await pickOutputPath(baseDir);
+    if (!outputPath) return;
+
+    try {
+        await mergeImages(files, direction, outputPath);
+        console.log(i18next.t('imgMerge.success', { outputPath }));
+        await copy(outputPath);
+        console.log(i18next.t('imgMerge.copied', { outputPath }));
+    } catch (error) {
+        console.error(i18next.t('imgMerge.error', { message: error.message }));
+    }
+}

package/src/commands/qrcodeDecode.js

@@ -0,0 +1,76 @@
+import fs from 'fs';
+import inquirer from 'inquirer';
+import jsQR from 'jsqr';
+import sharp from 'sharp';
+import i18next from '../i18n.js';
+import { selectFile } from '../utils/fileDialog.js';
+import { selectFromMenu } from '../utils/menu.js';
+import { outputText } from '../utils/output.js';
+
+async function getImagePath() {
+    const method = await selectFromMenu(
+        i18next.t('qrcodeDecode.selectInputMethod'),
+        [
+            { name: i18next.t('qrcodeDecode.inputDialog'), value: 'dialog' },
+            { name: i18next.t('qrcodeDecode.inputManual'), value: 'manual' }
+        ],
+        true,
+        i18next.t('common.back')
+    );
+    if (method === '__BACK__') {
+        return null;
+    }
+
+    let imagePath = '';
+    if (method === 'dialog') {
+        imagePath = selectFile('Image Files|*.png;*.jpg;*.jpeg;*.gif;*.bmp;*.webp|All Files|*.*') || '';
+        if (!imagePath) {
+            console.log(i18next.t('qrcodeDecode.dialogUnavailable'));
+        }
+    }
+
+    if (!imagePath) {
+        const answer = await inquirer.prompt([
+            {
+                type: 'input',
+                name: 'path',
+                message: i18next.t('qrcodeDecode.enterPath'),
+                validate: (value) => (fs.existsSync(value) ? true : i18next.t('qrcodeDecode.notExist'))
+            }
+        ]);
+        imagePath = answer.path;
+    }
+
+    return imagePath;
+}
+
+async function decodeQRCodeFromImage(imagePath) {
+    const { data, info } = await sharp(imagePath)
+        .rotate()
+        .ensureAlpha()
+        .raw()
+        .toBuffer({ resolveWithObject: true });
+    const pixelData = new Uint8ClampedArray(data);
+    const result = jsQR(pixelData, info.width, info.height, { inversionAttempts: 'attemptBoth' });
+    return result ? result.data : '';
+}
+
+export async function qrcodeDecodeHandler() {
+    const imagePath = await getImagePath();
+    if (!imagePath) {
+        return;
+    }
+
+    try {
+        const decoded = await decodeQRCodeFromImage(imagePath);
+        if (!decoded) {
+            console.log(i18next.t('qrcodeDecode.notFound'));
+            return;
+        }
+        await outputText(decoded, { showPreview: false, copyToClipboard: true });
+        console.log(i18next.t('qrcodeDecode.success'));
+        console.log(`${i18next.t('qrcodeDecode.result')}\n${decoded}\n`);
+    } catch (error) {
+        console.error(i18next.t('qrcodeDecode.decodeFail', { message: error.message }));
+    }
+}

package/src/index.js

@@ -11,6 +11,7 @@ import { unicodeHandler } from './commands/unicode.js';
 import { imgBase64Handler } from './commands/imgBase64.js';
 import { imgConvertHandler } from './commands/imgConvert.js';
 import { imgSplitHandler } from './commands/imgSplit.js';
+import { imgMergeHandler } from './commands/imgMerge.js';
 import { timeFormatHandler } from './commands/timeFormat.js';
 import { timeCalcHandler } from './commands/timeCalc.js';
 import { mockHandler } from './commands/mock.js';
@@ -22,6 +23,7 @@ import { variableFormatHandler } from './commands/variableFormat.js';
 import { jsonFormatHandler } from './commands/jsonFormat.js';
 import { hashingHandler } from './commands/hashing.js';
 import { qrcodeHandler } from './commands/qrcode.js';
+import { qrcodeDecodeHandler } from './commands/qrcodeDecode.js';
 import { specialCharsHandler } from './commands/specialChars.js';
 import { emojiHandler } from './commands/emoji.js';
 import { htmlEntitiesHandler } from './commands/htmlEntities.js';
@@ -58,6 +60,7 @@ function getFeatures() {
         { name: i18next.t('menu.features.imgBase64'), value: 'imgBase64' },
         { name: i18next.t('menu.features.imgConvert'), value: 'imgConvert' },
         { name: i18next.t('menu.features.imgSplit'), value: 'imgSplit' },
+        { name: i18next.t('menu.features.imgMerge'), value: 'imgMerge' },
         { name: i18next.t('menu.features.dominantColor'), value: 'dominantColor' },
         { name: i18next.t('menu.features.colorPick'), value: 'colorPick' },
         { name: i18next.t('menu.features.crosshair'), value: 'crosshair' },
@@ -66,6 +69,7 @@ function getFeatures() {
         { name: i18next.t('menu.features.imgCompress'), value: 'imgCompress' },
         { name: i18next.t('menu.features.placeholderImg'), value: 'placeholderImg' },
         { name: i18next.t('menu.features.qrcode'), value: 'qrcode' },
+        { name: i18next.t('menu.features.qrcodeDecode'), value: 'qrcodeDecode' },
         
         // Encode/Decode & Formatting
         { name: i18next.t('menu.features.url'), value: 'url' },
@@ -282,6 +286,9 @@ async function handleAction(action) {
         case 'imgSplit':
             await imgSplitHandler();
             break;
+        case 'imgMerge':
+            await imgMergeHandler();
+            break;
         case 'dominantColor':
             await dominantColorHandler();
             break;
@@ -331,6 +338,9 @@ async function handleAction(action) {
         case 'qrcode':
             await qrcodeHandler();
             break;
+        case 'qrcodeDecode':
+            await qrcodeDecodeHandler();
+            break;
         case 'specialChars':
             await specialCharsHandler();
             break;

package/src/locales/en.js

@@ -41,6 +41,7 @@ export default {
             imgBase64: 'Image <-> Base64',
             imgConvert: 'Image Format Convert',
             imgSplit: 'Image Splitter',
+            imgMerge: 'Image Merger',
             dominantColor: 'Image Dominant Color',
             colorPick: 'Color Picker',
             crosshair: 'Screen Crosshair',
@@ -49,6 +50,7 @@ export default {
             imgCompress: 'Image Compression',
             placeholderImg: 'Placeholder Image Generator',
             qrcode: 'QR Code Generator',
+            qrcodeDecode: 'QR Code Reader',
             url: 'URL Encode/Decode',
             baseConvert: 'Number Base Converter',
             base64: 'String Encode/Decode (Base64)',
@@ -109,6 +111,18 @@ export default {
         y2Prompt: 'Enter Y2 (px or %):',
         result: 'Picked Color'
     },
+    qrcodeDecode: {
+        selectInputMethod: 'Select QR image input method',
+        inputDialog: 'Select file (dialog)',
+        inputManual: 'Enter file path manually',
+        dialogUnavailable: 'File dialog is unavailable or canceled. Please enter the file path manually.',
+        enterPath: 'Enter QR code image path:',
+        notExist: 'File does not exist.',
+        notFound: 'No QR code detected. Please make sure the image is clear and contains a QR code.',
+        success: 'Recognition completed. Content copied to clipboard.',
+        result: 'Recognized content:',
+        decodeFail: 'Failed to decode QR code: {{message}}'
+    },
     url: {
         title: 'URL Encode/Decode',
         encode: 'Encode',
@@ -156,6 +170,42 @@ export default {
         vLines: 'Vertical split lines (e.g. 10 20 30 or 10% 20%):',
         success: 'Successfully split image into {{count}} parts. Saved to {{path}}'
     },
+    imgMerge: {
+        selectSource: 'Select image source',
+        sourceFolder: 'Use images from a folder',
+        sourceMulti: 'Select multiple images',
+        inputMethod: 'Select input method',
+        folderDialog: 'Select folder (dialog)',
+        folderManual: 'Enter folder path manually',
+        multiDialog: 'Select multiple images (dialog)',
+        multiManual: 'Enter multiple image paths manually',
+        continueAdd: 'Continue adding images?',
+        yes: 'Yes',
+        no: 'No',
+        enterFolderPath: 'Enter image folder path:',
+        enterImagePaths: 'Enter image paths (comma or newline separated):',
+        notExist: 'Path does not exist',
+        notDirectory: 'The path is not a folder',
+        notFile: 'The path is not a file',
+        notImage: 'The file is not a supported image format',
+        needAtLeastTwo: 'At least 2 images are required for merging.',
+        dialogFail: 'Dialog is unavailable or canceled. Please retry or use manual input.',
+        selectDirection: 'Select merge direction',
+        horizontal: 'Horizontal merge (left to right)',
+        vertical: 'Vertical merge (top to bottom)',
+        selectOutput: 'Select output mode',
+        outputDefault: 'Default output to input directory',
+        outputFolderDialog: 'Select output directory (dialog)',
+        outputFolderManual: 'Enter output directory manually',
+        outputFileManual: 'Enter full output file path manually',
+        enterOutputDir: 'Enter output directory path:',
+        outputPathPrompt: 'Enter output file path:',
+        outputPathRequired: 'Output file path cannot be empty.',
+        invalidImageSize: 'One or more images have invalid dimensions.',
+        success: 'Merge completed. Output saved to: {{outputPath}}',
+        copied: 'Output path copied to clipboard: {{outputPath}}',
+        error: 'Merge failed: {{message}}'
+    },
     imgCompress: {
         selectSource: 'Select input method',
         sourceFileDialog: 'Select file (dialog)',

package/src/locales/zh.js

@@ -41,6 +41,7 @@ export default {
             imgBase64: '图片 <-> Base64',
             imgConvert: '图片格式转换',
             imgSplit: '图片分割工具',
+            imgMerge: '图片拼接工具',
             dominantColor: '图片主色识别',
             colorPick: '颜色吸取',
             crosshair: '全屏十字辅助线',
@@ -49,6 +50,7 @@ export default {
             imgCompress: '图片压缩',
             placeholderImg: '占位图生成器',
             qrcode: '二维码生成器',
+            qrcodeDecode: '二维码识别',
             url: 'URL 编码/解码',
             baseConvert: '进制转换工具',
             base64: '字符串 编码/解码 (Base64)',
@@ -109,6 +111,18 @@ export default {
         y2Prompt: '输入 Y2（px 或 %）:',
         result: '吸取结果'
     },
+    qrcodeDecode: {
+        selectInputMethod: '选择二维码图片输入方式',
+        inputDialog: '选择文件（对话框）',
+        inputManual: '手动输入文件路径',
+        dialogUnavailable: '文件对话框不可用或已取消，请手动输入文件路径。',
+        enterPath: '请输入二维码图片路径:',
+        notExist: '文件不存在。',
+        notFound: '未识别到二维码，请确认图片清晰且包含二维码。',
+        success: '识别完成，内容已复制到剪贴板。',
+        result: '识别结果:',
+        decodeFail: '二维码识别失败: {{message}}'
+    },
     url: {
         title: 'URL 编码/解码',
         encode: '编码',
@@ -156,6 +170,42 @@ export default {
         vLines: '垂直分割线 (例如 10 20 30 或 10% 20%):',
         success: '成功将图片分割为 {{count}} 份。保存至 {{path}}'
     },
+    imgMerge: {
+        selectSource: '选择图片来源',
+        sourceFolder: '选择目录中的图片',
+        sourceMulti: '选择多张图片',
+        inputMethod: '选择输入方式',
+        folderDialog: '选择文件夹（对话框）',
+        folderManual: '手动输入文件夹路径',
+        multiDialog: '多选图片（对话框）',
+        multiManual: '手动输入多张图片路径',
+        continueAdd: '是否继续添加图片',
+        yes: '是',
+        no: '否',
+        enterFolderPath: '请输入图片目录路径:',
+        enterImagePaths: '请输入图片路径（可用逗号或换行分隔）:',
+        notExist: '路径不存在',
+        notDirectory: '输入路径不是文件夹',
+        notFile: '输入路径不是文件',
+        notImage: '文件不是支持的图片格式',
+        needAtLeastTwo: '至少需要 2 张图片才能拼接。',
+        dialogFail: '对话框不可用或已取消，请重试或改用手动输入。',
+        selectDirection: '选择拼接方向',
+        horizontal: '水平拼接（从左到右）',
+        vertical: '垂直拼接（从上到下）',
+        selectOutput: '选择输出方式',
+        outputDefault: '默认输出到输入目录',
+        outputFolderDialog: '选择输出目录（对话框）',
+        outputFolderManual: '手动输入输出目录',
+        outputFileManual: '手动输入完整输出文件路径',
+        enterOutputDir: '请输入输出目录路径:',
+        outputPathPrompt: '请输入输出文件路径:',
+        outputPathRequired: '输出文件路径不能为空。',
+        invalidImageSize: '存在无法读取尺寸的图片文件。',
+        success: '拼接完成，已输出到：{{outputPath}}',
+        copied: '输出路径已复制到剪贴板：{{outputPath}}',
+        error: '拼接失败：{{message}}'
+    },
     imgCompress: {
         selectSource: '选择输入方式',
         sourceFileDialog: '选择文件（对话框）',

package/src/utils/fileDialog.js

@@ -16,6 +16,21 @@ export function selectFile(filter = 'All Files|*.*') {
     }
 }
 
+export function selectFiles(filter = 'All Files|*.*') {
+    if (!isWindows()) return null;
+    try {
+        const cmd = `powershell -NoProfile -Command "Add-Type -AssemblyName System.Windows.Forms; $fd = New-Object System.Windows.Forms.OpenFileDialog; $fd.Filter='${filter.replace(/"/g, '\\"')}'; $fd.Multiselect=$true; if($fd.ShowDialog() -eq [System.Windows.Forms.DialogResult]::OK){ $json = ConvertTo-Json @($fd.FileNames) -Compress; $bytes = [System.Text.Encoding]::UTF8.GetBytes($json); Write-Output ([Convert]::ToBase64String($bytes)) }"`;
+        const buf = execSync(cmd, { stdio: ['pipe', 'pipe', 'ignore'] });
+        const output = Buffer.isBuffer(buf) ? buf.toString('utf8').trim() : String(buf).trim();
+        if (!output) return null;
+        const parsed = JSON.parse(Buffer.from(output, 'base64').toString('utf8'));
+        if (!Array.isArray(parsed)) return null;
+        return parsed;
+    } catch {
+        return null;
+    }
+}
+
 export function saveFile(defaultName = 'output.txt', filter = 'All Files|*.*') {
     if (!isWindows()) return null;
     try {