xw-devtool-cli 1.0.28 → 1.0.29

package/README.md

@@ -21,8 +21,9 @@
     > 2. 由于涉及跨进程通信，按下空格后可能存在轻微延时，请耐心等待结果。
     > 3. 取色模式下会显示全屏十字辅助线，按 **回车键** 退出模式。
   - **占位图生成**：快速生成指定尺寸、颜色、文字的占位图片 (Placeholder Image)。
-  - **全屏十字辅助线**：显示跟随鼠标的全屏红色十字线，用于屏幕对齐和定位。
+  - **全屏十字辅助线**：显示跟随鼠标的全屏红色十字线，用于屏幕对齐和定位。
   - **屏幕测距**：点击屏幕上任意两点，测量其像素距离。
+  - **屏幕文字标注**：在屏幕上点击并输入文字，进行临时标注。右键撤销，Delete 清空。
 - **Mock 数据生成**：
   - 支持生成：英文段落 (Lorem Ipsum)、中文字符、中国居民身份证号、电子邮箱、URL、订单号、手机号、座机号。
   - 支持批量生成。

package/README_EN.md

@@ -18,6 +18,7 @@ Key features include: Base64 encoding/decoding, image format conversion, image <
   - **Screen Picker**: Pick color directly from the screen at the mouse position; move the cursor and press Enter to sample; supports alpha preview.
   - **Screen Crosshair**: Display a full-screen red crosshair following the mouse for alignment.
   - **Pixel Distance**: Measure pixel distance between two points on the screen.
+  - **Screen Mark**: Click on the screen to add text annotations. Right-click to undo, Delete to clear.
 - **Mock Data**:
   - Generate: Lorem Ipsum, Chinese characters, ID cards, Emails, URLs, Order IDs, Phone numbers.
   - Supports batch generation.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xw-devtool-cli",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "type": "module",
   "description": "基于node的开发者助手cli",
   "main": "index.js",
@@ -49,7 +49,9 @@
     "md5",
     "color-converter",
     "emoji",
-    "markdown"
+    "markdown",
+    "screen-mark",
+    "pixel-distance"
   ],
   "author": "npmxw",
   "license": "ISC",

package/src/commands/screenMark.js

@@ -0,0 +1,169 @@
+import { spawn } from 'child_process';
+import i18next from '../i18n.js';
+
+export async function screenMarkHandler() {
+    if (process.platform !== 'win32') {
+        console.log(i18next.t('screenMark.notSupported'));
+        return;
+    }
+
+    console.log(i18next.t('screenMark.startPrompt'));
+
+    const overlayScript = `
+Add-Type -AssemblyName System.Windows.Forms;
+Add-Type -AssemblyName System.Drawing;
+
+Add-Type -TypeDefinition @'
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Collections.Generic;
+
+public class MarkItem {
+    public Point Location;
+    public string Text;
+    public MarkItem(Point loc, string text) {
+        Location = loc;
+        Text = text;
+    }
+}
+
+public class InputBox : Form {
+    private TextBox textBox;
+    private Button btnOk;
+    private Button btnCancel;
+    public string InputText { get { return textBox.Text; } }
+
+    public InputBox(string title, string prompt, Point location) {
+        this.Text = title;
+        this.Size = new Size(300, 150);
+        this.FormBorderStyle = FormBorderStyle.FixedDialog;
+        this.StartPosition = FormStartPosition.Manual;
+        this.Location = location;
+        this.TopMost = true;
+        this.MinimizeBox = false;
+        this.MaximizeBox = false;
+
+        Label lbl = new Label();
+        lbl.Text = prompt;
+        lbl.Location = new Point(10, 10);
+        lbl.AutoSize = true;
+        this.Controls.Add(lbl);
+
+        textBox = new TextBox();
+        textBox.Location = new Point(10, 35);
+        textBox.Size = new Size(260, 20);
+        this.Controls.Add(textBox);
+
+        btnOk = new Button();
+        btnOk.Text = "OK";
+        btnOk.DialogResult = DialogResult.OK;
+        btnOk.Location = new Point(110, 70);
+        this.Controls.Add(btnOk);
+
+        btnCancel = new Button();
+        btnCancel.Text = "Cancel";
+        btnCancel.DialogResult = DialogResult.Cancel;
+        btnCancel.Location = new Point(190, 70);
+        this.Controls.Add(btnCancel);
+
+        this.AcceptButton = btnOk;
+        this.CancelButton = btnCancel;
+    }
+}
+
+public class MarkForm : Form {
+    private List<MarkItem> marks = new List<MarkItem>();
+    private Bitmap screenCapture;
+
+    public MarkForm() {
+        this.FormBorderStyle = FormBorderStyle.None;
+        this.TopMost = true;
+        this.Cursor = Cursors.IBeam;
+        this.DoubleBuffered = true;
+        
+        // Calculate total bounds
+        Rectangle totalBounds = Rectangle.Empty;
+        foreach(Screen s in Screen.AllScreens) {
+            totalBounds = Rectangle.Union(totalBounds, s.Bounds);
+        }
+        
+        this.StartPosition = FormStartPosition.Manual;
+        this.Bounds = totalBounds;
+        
+        // Capture screen
+        screenCapture = new Bitmap(totalBounds.Width, totalBounds.Height);
+        using (Graphics g = Graphics.FromImage(screenCapture)) {
+            g.CopyFromScreen(totalBounds.Location, Point.Empty, totalBounds.Size);
+        }
+        this.BackgroundImage = screenCapture;
+    }
+
+    protected override void OnMouseDown(MouseEventArgs e) {
+        if (e.Button == MouseButtons.Right) {
+            // Remove last mark
+            if (marks.Count > 0) {
+                marks.RemoveAt(marks.Count - 1);
+                this.Invalidate();
+            }
+            return;
+        }
+
+        if (e.Button == MouseButtons.Left) {
+            // Show input box
+            using (InputBox input = new InputBox("Add Text", "Enter text:", Cursor.Position)) {
+                if (input.ShowDialog() == DialogResult.OK && !string.IsNullOrWhiteSpace(input.InputText)) {
+                    marks.Add(new MarkItem(e.Location, input.InputText));
+                    this.Invalidate();
+                }
+            }
+        }
+    }
+
+    protected override void OnPaint(PaintEventArgs e) {
+        Graphics g = e.Graphics;
+        g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+        g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
+
+        Font font = new Font("Segoe UI", 12, FontStyle.Bold);
+        Brush textBrush = Brushes.White;
+
+        foreach (var mark in marks) {
+            SizeF size = g.MeasureString(mark.Text, font);
+            // Draw text without background frame
+            g.DrawString(mark.Text, font, textBrush, mark.Location.X, mark.Location.Y - size.Height);
+            
+            // Draw anchor point
+            g.FillEllipse(Brushes.Red, mark.Location.X - 3, mark.Location.Y - 3, 6, 6);
+        }
+    }
+
+    protected override void OnKeyDown(KeyEventArgs e) {
+        if (e.KeyCode == Keys.Escape) {
+            Application.Exit();
+        }
+        if (e.KeyCode == Keys.Delete || e.KeyCode == Keys.C) {
+            marks.Clear();
+            this.Invalidate();
+        }
+    }
+}
+
+public static class Entry {
+    public static void Main() {
+        Application.EnableVisualStyles();
+        Application.SetCompatibleTextRenderingDefault(false);
+        Application.Run(new MarkForm());
+    }
+}
+'@ -ReferencedAssemblies System.Windows.Forms,System.Drawing
+
+[Entry]::Main()
+`;
+
+    const proc = spawn('powershell', ['-NoProfile', '-Command', overlayScript], { stdio: 'inherit' });
+
+    proc.on('close', (code) => {
+        // console.log('Exited');
+    });
+}

package/src/index.js

@@ -31,6 +31,7 @@ import { dominantColorHandler } from './commands/dominantColor.js';
 import { colorPickHandler } from './commands/colorPick.js';
 import { crosshairHandler } from './commands/crosshair.js';
 import { pixelDistanceHandler } from './commands/pixelDistance.js';
+import { screenMarkHandler } from './commands/screenMark.js';
 
 process.on('SIGINT', () => {
     console.log(`\n${i18next.t('menu.bye')}`);
@@ -57,6 +58,7 @@ function getFeatures() {
         { name: i18next.t('menu.features.colorPick'), value: 'colorPick' },
         { name: i18next.t('menu.features.crosshair'), value: 'crosshair' },
         { name: i18next.t('menu.features.pixelDistance'), value: 'pixelDistance' },
+        { name: i18next.t('menu.features.screenMark'), value: 'screenMark' },
         { name: i18next.t('menu.features.placeholderImg'), value: 'placeholderImg' },
         { name: i18next.t('menu.features.qrcode'), value: 'qrcode' },
         
@@ -204,6 +206,9 @@ async function handleAction(action) {
         case 'pixelDistance':
             await pixelDistanceHandler();
             break;
+        case 'screenMark':
+            await screenMarkHandler();
+            break;
         case 'timeFormat':
             await timeFormatHandler();
             break;

package/src/locales/en.js

@@ -6,6 +6,10 @@ export default {
         notSupported: 'Pixel distance tool not supported on this OS.',
         startPrompt: 'Pixel distance tool started. Click 2 points to measure. Right-click to reset. ESC to exit.'
     },
+    screenMark: {
+        notSupported: 'Screen mark tool not supported on this OS.',
+        startPrompt: 'Screen mark tool started. Click to add text. Right-click to undo. ESC to exit.'
+    },
     menu: {
         title: 'xw-devtool-cli Menu',
         exit: 'Exit',
@@ -20,6 +24,7 @@ export default {
             colorPick: 'Color Picker',
             crosshair: 'Screen Crosshair',
             pixelDistance: 'Pixel Distance Tool',
+            screenMark: 'Screen Mark Tool',
             placeholderImg: 'Placeholder Image Generator',
             qrcode: 'QR Code Generator',
             url: 'URL Encode/Decode',

package/src/locales/zh.js

@@ -24,6 +24,7 @@ export default {
             colorPick: '颜色吸取',
             crosshair: '全屏十字辅助线',
             pixelDistance: '屏幕测距 (像素)',
+            screenMark: '屏幕文字标注',
             placeholderImg: '占位图生成器',
             qrcode: '二维码生成器',
             url: 'URL 编码/解码',