fix(编辑能力): 修复输入状态下标签快捷键

Dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM alpine:3.24.2
+FROM alpine:3.24.3
 
 # 作者信息
 LABEL authors="肖其顿 (XIAO QI DUN)"

assets/webui/ofdgo.js

@@ -110,6 +110,7 @@ function createDocumentState() {
 		styleOriginal: null,
 		objectClipboardToken: null,
 		styleClipboard: null,
+		objectDistribution: null,
 		outlineExpanded: new Map(),
 		textFonts: [],
 		textFontID: null,
@@ -1260,7 +1261,7 @@ el.objectAlign.addEventListener("change", () => {
 el.objectDistribute.addEventListener("change", () => {
 	const axis = el.objectDistribute.value;
 	el.objectDistribute.value = "";
-	if (axis && canvasEditor.items().length >= 3) {
+	if (axis && !el.objectDistribute.disabled && state.objectDistribution?.axes?.includes(axis)) {
 		return changeDocument("ofdgoDistributeObjects", canvasEditor.selected, axis);
 	}
 });
@@ -1307,7 +1308,10 @@ for (const [button, tool] of [[el.drawLineButton, "line"], [el.drawRectangleButt
 }
 editorClick(el.eraseButton, () => toggleDrawingTool(el.eraseMode.value));
 el.eraseMode.addEventListener("change", () => {
-	if (canvasEditor.tool.startsWith("erase-")) canvasEditor.setTool(el.eraseMode.value);
+	if (canvasEditor.tool.startsWith("erase-")) {
+		canvasEditor.setTool(el.eraseMode.value);
+		canvasEditor.focus();
+	}
 });
 for (const input of [el.shapeFill, el.shapeStroke]) {
 	input.addEventListener("change", changeShapeStyle);
@@ -1407,9 +1411,11 @@ for (const [button, ungroup] of [[el.groupObjectsButton, false], [el.ungroupObje
 	});
 }
 el.arrowTool.addEventListener("change", async () => {
+	const tab = documentTab(), content = documentContentKey(state);
+	const current = () => isForegroundDocument(tab) && state.editing && content === documentContentKey(state);
 	const tool = el.arrowTool.value;
 	el.arrowTool.value = "";
-	if (await canvasEditor.commitText() && await canvasEditor.commitCrop()) {
+	if (await canvasEditor.commitText() && current() && await canvasEditor.commitCrop() && current()) {
 		const item = canvasEditor.selected;
 		if (lineShape(item?.shape)) {
 			const box = item.geometry;
@@ -1420,6 +1426,7 @@ el.arrowTool.addEventListener("change", async () => {
 		state.selectObjects = true;
 		canvasEditor.setTool(tool);
 		updateControls();
+		canvasEditor.focus();
 	}
 });
 el.copyStyleButton.addEventListener("click", async () => {
@@ -1807,6 +1814,7 @@ el.annotationButton.addEventListener("click", toggleAnnotations);
 document.addEventListener("copy", copySelection);
 document.addEventListener("cut", copySelection);
 el.viewerPanel.addEventListener("paste", pasteEditorContent);
+el.editorTools.addEventListener("paste", pasteEditorContent);
 document.addEventListener("selectionchange", syncSelection);
 el.exportFormat.addEventListener("change", () => updateDPIControl());
 el.outputCompression.addEventListener("change", () => {
@@ -1933,6 +1941,11 @@ el.documentNewTab.addEventListener("click", openEmptyDocumentTab);
 updateSidebarState();
 boot();
 
+function editorShortcutTarget(target) {
+	const field = target.closest?.("input, textarea, select, [contenteditable]");
+	return !field || el.editorTools.contains(field) && field.matches('select, input[type="checkbox"], input[type="radio"], input[type="color"], input[type="range"]');
+}
+
 function handleKeyDown(event) {
 	if (sealPreview) {
 		if (event.key === "Escape") { event.preventDefault(); finishSealPosition(); }
@@ -1994,7 +2007,7 @@ function handleKeyDown(event) {
 		}
 	}
 	if (event.ctrlKey || event.metaKey) {
-		if (state.editing && !target.closest("input, textarea, select, [contenteditable]")
+		if (state.editing && editorShortcutTarget(target)
 			&& (key.toLowerCase() === "z" || (!event.shiftKey && key.toLowerCase() === "y"))) {
 			event.preventDefault();
 			(key.toLowerCase() === "y" || event.shiftKey ? el.redoButton : el.undoButton).click();
@@ -2010,6 +2023,11 @@ function handleKeyDown(event) {
 	if (!state.doc) {
 		return;
 	}
+	if (state.editing && !event.shiftKey && el.editorTools.contains(target) && editorShortcutTarget(target)
+		&& (key === "Delete" || key === "F2")) {
+		canvasEditor.keyDown(event, true);
+		return;
+	}
 	if (key === "Escape" && !event.shiftKey && state.documentSelection && el.viewerPanel.contains(target)
 		&& !target.closest("input, textarea, select, [contenteditable]")) {
 		event.preventDefault();
@@ -10851,8 +10869,9 @@ async function selectDocumentText() {
 
 function copyEditorSelection(event) {
 	const tab = documentTab(), state = tab.state;
-	if (!state.editing || !canvasEditor.enabled || !canvasEditor.selected || !el.viewerPanel.contains(event.target)
+	if (!state.editing || !canvasEditor.enabled || !canvasEditor.selected || !editorShortcutTarget(event.target)
-		|| canvasEditor.input || canvasEditor.crop || canvasEditor.drag || document.body.hasAttribute("data-busy")) return false;
+		|| !el.viewerPanel.contains(event.target) && !el.editorTools.contains(event.target)
+		|| canvasEditor.input || canvasEditor.crop || canvasEditor.drag || document.body.hasAttribute("data-busy") || formDialogOpen()) return false;
 	const items = canvasEditor.items().slice().sort((a, b) => a.order - b.order);
 	const cut = event.type === "cut";
 	if (!canEditObject(canvasEditor.selected, "copy") || cut && !canEditObject(canvasEditor.selected, "delete")) {
@@ -10928,7 +10947,7 @@ function visiblePageBounds(index) {
 
 async function pasteEditorContent(event) {
 	const tab = documentTab(), state = tab.state;
-	if (!state.editing || event.target.closest?.("input, textarea, select, [contenteditable]") || formDialogOpen()) return;
+	if (!state.editing || !editorShortcutTarget(event.target) || formDialogOpen()) return;
 	event.preventDefault();
 	const token = event.clipboardData.getData(OBJECT_CLIPBOARD_TYPE);
 	const files = Array.from(event.clipboardData.files);
@@ -10997,7 +11016,7 @@ async function pasteEditorContent(event) {
 
 function copySelection(event) {
 	if (sealPreview) return;
-	if (event.target.closest?.("input, textarea, [contenteditable]")) {
+	if (!editorShortcutTarget(event.target)) {
 		return;
 	}
 	const selection = document.getSelection();
@@ -12746,6 +12765,30 @@ function updateEditorTools() {
 	updateObjectControls(canvasEditor.selected);
 }
 
+function updateObjectDistribution(item, disabled) {
+	const tab = documentTab(), state = tab.state;
+	const ids = item?.items?.slice().sort((a, b) => a.order - b.order).map(member => member.id) || [];
+	if (disabled || ids.length < 3) state.objectDistribution = null;
+	else {
+		const { openSeq, wasmSeq } = state, revision = state.editorInfo?.revision;
+		const key = JSON.stringify([openSeq, wasmSeq, revision, item.index, ids]);
+		if (state.objectDistribution?.key !== key) {
+			const request = state.objectDistribution = { key, axes: [] };
+			const current = () => !tab.closed && state.objectDistribution === request && state.openSeq === openSeq && state.wasmSeq === wasmSeq && state.editorInfo?.revision === revision;
+			callTabWASM(tab, "ofdgoDistributionAxes", item.index, ids).then(axes => {
+				if (!current()) return;
+				request.axes = axes;
+				if (isForegroundDocument(tab)) updateObjectControls(canvasEditor.selected);
+			}).catch(error => {
+				if (current() && isForegroundDocument(tab)) showError(error, false);
+			});
+		}
+	}
+	const axes = state.objectDistribution?.axes || [];
+	el.objectDistribute.disabled = disabled || !axes.length;
+	for (const option of el.objectDistribute.options) if (option.value) option.disabled = !axes.includes(option.value);
+}
+
 function updateObjectControls(item, reset = false) {
 	const members = item?.items || (item ? [item] : []);
 	const disabled = !item || Boolean(item.draft) || !state.ready || state.exporting;
@@ -12763,7 +12806,7 @@ function updateObjectControls(item, reset = false) {
 	el.cropImageButton.setAttribute("data-pressed", String(cropping));
 	el.resetCropButton.textContent = cropping ? "取消" : "还原";
 	el.resetCropButton.disabled = canEditObject(item, "resetCrop") ? disabled : el.cropImageButton.disabled || !cropping && (item.scoped ? !item.cropped : !item.imageBounds || ["x", "y", "width", "height"].every(key => Math.abs(item[key] - item.imageBounds[key]) < 1e-9));
-	el.objectDistribute.disabled = el.objectAlign.disabled || !item.items || item.items.length < 3;
+	updateObjectDistribution(item, el.objectAlign.disabled);
 	el.editObjectButton.disabled = disabled || (item.items ? !item.items.every(member => member.type === "TextObject" && !member.richText)
 		: !canEditObject(item, "children") && (item.type === "PathObject"
 		|| !(item.type === "TextObject" && canEditObject(item, "rewriteText")) && !canEditObject(item, item.type === "TextObject" ? "textContent" : item.type === "ImageObject" ? "replaceImage" : "update")));

assets/webui/ofdgo_edit.js

@@ -1741,8 +1741,8 @@ export class CanvasEditor {
 		return this.nudgeCommit;
 	}
 
-	keyDown(event) {
+	keyDown(event, toolbar = false) {
-		if (event.defaultPrevented || event.target?.closest("input, textarea, select, [contenteditable]")) return;
+		if (event.defaultPrevented || !toolbar && event.target?.closest("input, textarea, select, [contenteditable]")) return;
 		if (this.crop && !this.options.busy()) {
 			if (event.key === "Escape" || event.key === "Enter") {
 				event.preventDefault();
@@ -1952,7 +1952,7 @@ export class CanvasEditor {
 			}
 		});
 		input.addEventListener("keydown", (event) => {
-			if ((event.ctrlKey || event.metaKey) && !event.altKey && !event.shiftKey && event.key.toLowerCase() === "s") return;
+			if ((event.ctrlKey || event.metaKey) && !event.altKey && ["s", "w", "tab"].includes(event.key.toLowerCase())) return;
 			event.stopPropagation();
 			if (event.isComposing || editing.composing || editing.saving) {
 				return;

assets/webui/ofdgo_font.js

@@ -183,7 +183,7 @@ export class FontPicker {
 	}
 
 	keyDown(event) {
-		if (event.isComposing) return;
+		if (event.isComposing || event.key === "Tab" && (event.ctrlKey || event.metaKey || event.altKey)) return;
 		if (!["Escape", "Enter", "ArrowDown", "ArrowUp", "Tab"].includes(event.key)) return;
 		event.stopPropagation();
 		if (event.key === "Escape") {

internal/webui/webui.go

@@ -5703,6 +5703,20 @@ func (e *businessEngine) orderObjects(args []platformValue) (any, error) {
 	})
 }
 
+// distributionAxes 获取画布选区可用的等间距分布方向
+// 入参: args 页面索引和画布对象标识数组
+// 返回: any 可用方向, error 路径或度量错误
+func (e *businessEngine) distributionAxes(args []platformValue) (any, error) {
+	if e.currentEditor == nil {
+		return nil, fmt.Errorf("no document is being edited")
+	}
+	paths, err := e.editorTargetPaths(e.stringsFromJS(args[1]))
+	if err != nil {
+		return nil, err
+	}
+	return e.currentEditor.DistributionAxes(args[0].Int(), paths)
+}
+
 // distributeObjects 按指定轴等距分布选区
 // 入参: args 页面索引、对象标识数组和分布轴
 // 返回: any 文档信息, error 错误信息
@@ -8159,6 +8173,7 @@ func (e *businessEngine) businessCommands() map[string]func([]platformValue) (an
 		"ofdgoImportObjects":          e.importObjects,
 		"ofdgoOrderObjects":           e.orderObjects,
 		"ofdgoDistributeObjects":      e.distributeObjects,
+		"ofdgoDistributionAxes":       e.distributionAxes,
 		"ofdgoRotateObjects":          e.rotateObjects,
 		"ofdgoFlipObjects":            e.flipObjects,
 		"ofdgoCropImage":              e.cropImage,

ofdgo_editor_selection.go

@@ -808,6 +808,40 @@ func (e *Editor) ResizeTargets(page int, paths []ObjectPath, box Box) error {
 	return e.TransformTargets(page, paths, Matrix{a: sx, d: sy, e: box.X - bounds.X*sx, f: box.Y - bounds.Y*sy})
 }
 
+// DistributionAxes 获取选区可保持位置顺序的等间距分布方向，不修改文档或历史
+// 入参: page 页面索引, paths 按绘制顺序排列的完整路径
+// 返回: []string 可用的horizontal和vertical方向, error 路径或度量错误
+func (e *Editor) DistributionAxes(page int, paths []ObjectPath) ([]string, error) {
+	objects, annotations, groups, err := editorTargetGroups(paths)
+	if err != nil {
+		return nil, err
+	}
+	var boxes []Box
+	var positions []editorObjectPosition
+	if len(groups) == 0 {
+		boxes, positions, _, err = e.selectionGeometry(page, objects, annotations)
+	} else {
+		boxes, _, _, err = e.targetGeometry(page, paths)
+		positions = make([]editorObjectPosition, len(paths))
+		for i := range positions {
+			positions[i].index = i
+		}
+	}
+	if err != nil {
+		return nil, err
+	}
+	axes := []string{}
+	if len(boxes) < 3 {
+		return axes, nil
+	}
+	for _, axis := range []string{"horizontal", "vertical"} {
+		if _, err := editorDistribution(boxes, positions, axis); err == nil {
+			axes = append(axes, axis)
+		}
+	}
+	return axes, nil
+}
+
 // ArrangeTargets 对齐或等距分布跨容器选区，单选对齐页面
 // 入参: page 页面索引, paths 按绘制顺序排列的完整路径, distribute 是否分布, direction 对齐方向或分布轴
 // 返回: error 路径、方向或编辑错误