v1.2.5: 修复操作后面板判断问题

v1.2.4: 移除上传按钮，改为拖放上传；选中效果优化
v1.2.3: 执行操作后保持当前配置面板
2026-04-21 16:29:33 +08:00 · 2026-04-21 13:11:08 +08:00 · 2026-04-21 13:01:31 +08:00 · 2026-04-21 12:17:57 +08:00 · 2026-04-21 12:06:00 +08:00
3 changed files with 113 additions and 69 deletions
--- a/app.py
+++ b/app.py
@@ -1,7 +1,7 @@
 """
-图片编辑器 - Image Editor v1.2.0
+图片编辑器 - Image Editor v1.2.5
 前端图片处理工具：合并、分割、挖孔填充、圆形切图、文字图片等
-v1.2.0: 右侧面板实时配置，无需弹框
+v1.2.5: 修复操作后面板判断问题

 端口: 19018
 """
@@ -25,7 +25,7 @@ def index():

@app.route('/api/health')
 def health():
-    return jsonify({'status': 'ok', 'version': '1.2.0', 'time': datetime.now().isoformat()})
+    return jsonify({'status': 'ok', 'version': '1.2.5', 'time': datetime.now().isoformat()})

@app.route('/api/save', methods=['POST'])
 def save_image():
@@ -64,9 +64,9 @@ def list_images():

 if __name__ == '__main__':
    print("=" * 50)
-    print("图片编辑器 - Image Editor v1.2.1")
+    print("图片编辑器 - Image Editor v1.2.5")
    print("=" * 50)
-    print("右侧面板实时配置，操作更流畅")
+    print("修复操作后面板判断问题")
    print(f"访问地址: http://localhost:19018")
    print("=" * 50)
-    app.run(host='0.0.0.0', port=19018, debug=True)=True)
+    app.run(host='0.0.0.0', port=19018, debug=True)
--- a/outputs/edited_1776755761871.png
+++ b/outputs/edited_1776755761871.png
--- a/templates/index.html
+++ b/templates/index.html
@@ -3,7 +3,7 @@
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>图片编辑器 - Image Editor v1.2.0</title>
+    <title>图片编辑器 - Image Editor v1.2.5</title>
    <script src="https://cdn.tailwindcss.com"></script>
    <link href="https://cdn.jsdelivr.net/npm/remixicon@3.5.0/fonts/remixicon.css" rel="stylesheet">
    <style>
@@ -90,9 +90,6 @@
            
            <!-- 功能按钮 -->
            <div class="mt-3 flex gap-2 flex-wrap">
-                <button onclick="setTool('upload')" id="tool-upload" class="tool-btn px-3 py-2 bg-gray-200 rounded-lg">
-                    <i class="ri-upload-cloud-line mr-1"></i>上传图片
-                </button>
                <button onclick="setTool('merge')" id="tool-merge" class="tool-btn px-3 py-2 bg-gray-200 rounded-lg">
                    <i class="ri-stack-line mr-1"></i>合并图片
                </button>
@@ -127,7 +124,8 @@
                    <canvas id="mainCanvas"></canvas>
                    <div id="emptyHint" class="text-gray-400 text-center">
                        <i class="ri-image-add-line text-6xl"></i>
-                        <p class="mt-2">点击"上传图片"或拖放图片开始编辑</p>
+                        <p class="mt-2">拖动图片到此处上传</p>
+                        <p class="text-sm mt-1">支持多张图片同时上传</p>
                    </div>
                </div>
                
@@ -145,14 +143,11 @@
            </div>
        </div>

-        <!-- 右侧配置面板 -->
-        <div id="rightPanel" class="right-panel hidden-panel w-80 bg-white shadow-lg border-l">
+        <!-- 右侧配置面板 - 始终显示 -->
+        <div id="rightPanel" class="right-panel w-80 bg-white shadow-lg border-l">
            <div class="p-4">
                <div class="flex items-center justify-between mb-4">
-                    <h2 id="panelTitle" class="font-bold text-gray-800">配置</h2>
-                    <button onclick="closePanel()" class="text-gray-500 hover:text-gray-700">
-                        <i class="ri-close-line text-xl"></i>
-                    </button>
+                    <h2 id="panelTitle" class="font-bold text-gray-800">操作面板</h2>
                </div>
                
                <!-- 配置内容区域 -->
@@ -195,10 +190,29 @@
        const ctx = canvas.getContext('2d');
        const container = document.getElementById('canvasContainer');

+        // 检查是否有图片（画布有内容）
+        function hasImage() {
+            return state.images.length > 0 || document.getElementById('emptyHint').classList.contains('hidden');
+        }
+        function goHome() {
+            document.querySelectorAll('.tool-btn').forEach(btn => btn.classList.remove('active'));
+            state.currentTool = null;
+            showPanel('home');
+        }
+
+        // 刷新当前工具面板（执行操作后保持当前配置）
+        function refreshCurrentPanel() {
+            if (state.currentTool) {
+                showPanel(state.currentTool);
+            }
+        }
+
        // 初始化
        function init() {
            setupDragDrop();
            setupCanvas();
+            // 显示默认首页面板
+            showPanel('home');
        }

        function setupCanvas() {
@@ -230,18 +244,14 @@
            
            state.currentTool = tool;
            
-            // 显示右侧配置面板
+            // 更新右侧配置面板内容（不隐藏）
            showPanel(tool);
-            
-            // 上传图片直接触发文件选择
-            if (tool === 'upload') {
-                document.getElementById('fileInput').click();
-            }
        }

-        // 显示右侧面板
+        // 显示右侧面板内容
        function showPanel(tool) {
            const panel = document.getElementById('rightPanel');
+            // 确保面板始终显示
            panel.classList.remove('hidden-panel');
            
            const configs = getPanelConfig(tool);
@@ -250,35 +260,67 @@
            document.getElementById('panelActions').innerHTML = configs.actions;
        }

-        // 关闭面板
-        function closePanel() {
-            const panel = document.getElementById('rightPanel');
-            panel.classList.add('hidden-panel');
-            document.querySelectorAll('.tool-btn').forEach(btn => btn.classList.remove('active'));
-            state.currentTool = null;
-        }
-
        // 获取各工具的配置面板内容
        function getPanelConfig(tool) {
+            <!-- 默认首页面板 -->
+            if (!tool || tool === 'home') {
+                return {
+                    title: '欢迎使用',
+                    content: `
+                        <div class="space-y-4">
+                            <p class="text-sm text-gray-600">点击顶部功能按钮开始编辑图片</p>
+                            <div class="p-3 bg-blue-50 rounded-lg border-2 border-dashed border-blue-300 text-center">
+                                <i class="ri-upload-cloud-2-line text-3xl text-blue-500"></i>
+                                <p class="text-sm text-blue-600 mt-2">拖动图片到左侧画布区域上传</p>
+                            </div>
+                            <div class="grid grid-cols-2 gap-2">
+                                <button onclick="setTool('merge')" class="p-3 bg-green-50 rounded-lg hover:bg-green-100 text-center">
+                                    <i class="ri-stack-line text-2xl text-green-500"></i>
+                                    <p class="text-xs mt-1">合并图片</p>
+                                </button>
+                                <button onclick="setTool('split')" class="p-3 bg-purple-50 rounded-lg hover:bg-purple-100 text-center">
+                                    <i class="ri-layout-grid-line text-2xl text-purple-500"></i>
+                                    <p class="text-xs mt-1">分割图片</p>
+                                </button>
+                                <button onclick="setTool('circle')" class="p-3 bg-orange-50 rounded-lg hover:bg-orange-100 text-center">
+                                    <i class="ri-checkbox-blank-circle-line text-2xl text-orange-500"></i>
+                                    <p class="text-xs mt-1">圆形切图</p>
+                                </button>
+                                <button onclick="setTool('text')" class="p-3 bg-pink-50 rounded-lg hover:bg-pink-100 text-center">
+                                    <i class="ri-font-size text-2xl text-pink-500"></i>
+                                    <p class="text-xs mt-1">文字图片</p>
+                                </button>
+                                <button onclick="setTool('resize')" class="p-3 bg-cyan-50 rounded-lg hover:bg-cyan-100 text-center">
+                                    <i class="ri-expand-diagonal-line text-2xl text-cyan-500"></i>
+                                    <p class="text-xs mt-1">调整大小</p>
+                                </button>
+                                <button onclick="setTool('crop')" class="p-3 bg-yellow-50 rounded-lg hover:bg-yellow-100 text-center">
+                                    <i class="ri-crop-line text-2xl text-yellow-500"></i>
+                                    <p class="text-xs mt-1">裁剪</p>
+                                </button>
+                                <button onclick="setTool('hole')" class="p-3 bg-red-50 rounded-lg hover:bg-red-100 text-center">
+                                    <i class="ri-contrast-drop-line text-2xl text-red-500"></i>
+                                    <p class="text-xs mt-1">挖孔填充</p>
+                                </button>
+                            </div>
+                            <div class="border-t pt-3">
+                                <p class="text-xs text-gray-500">提示：所有操作都支持撤销恢复</p>
+                                <p class="text-xs text-gray-500 mt-1">快捷键：Ctrl+Z 撤销，Ctrl+Y 恢复</p>
+                            </div>
+                        </div>
+                    `,
+                    actions: ''
+                };
+            }
+            
            switch(tool) {
-                case 'upload':
-                    return {
-                        title: '上传图片',
-                        content: `
-                            <p class="text-sm text-gray-600 mb-4">点击按钮选择图片，或直接拖放图片到画布区域</p>
-                            <button onclick="document.getElementById('fileInput').click()" class="w-full px-4 py-3 bg-blue-500 text-white rounded-lg">
-                                <i class="ri-upload-cloud-line mr-2"></i>选择图片
-                            </button>
-                        `,
-                        actions: ''
-                    };
                
                case 'merge':
-                    if (state.images.length < 2) {
+                    if (!hasImage() || state.images.length < 2) {
                        return {
                            title: '合并图片',
                            content: `<p class="text-sm text-red-500">请先上传至少2张图片</p>`,
-                            actions: `<button onclick="closePanel()" class="px-4 py-2 bg-gray-200 rounded-lg">关闭</button>`
+                            actions: `<button onclick="goHome()" class="px-4 py-2 bg-gray-200 rounded-lg">关闭</button>`
                        };
                    }
                    
@@ -351,11 +393,11 @@
                    };
                
                case 'split':
-                    if (state.images.length === 0) {
+                    if (!hasImage()) {
                        return {
                            title: '分割图片',
                            content: `<p class="text-sm text-red-500">请先上传图片</p>`,
-                            actions: `<button onclick="closePanel()" class="px-4 py-2 bg-gray-200 rounded-lg">关闭</button>`
+                            actions: `<button onclick="goHome()" class="px-4 py-2 bg-gray-200 rounded-lg">关闭</button>`
                        };
                    }
                    return {
@@ -382,11 +424,11 @@
                    };
                
                case 'hole':
-                    if (state.images.length === 0) {
+                    if (!hasImage()) {
                        return {
                            title: '挖孔填充',
                            content: `<p class="text-sm text-red-500">请先上传图片</p>`,
-                            actions: `<button onclick="closePanel()" class="px-4 py-2 bg-gray-200 rounded-lg">关闭</button>`
+                            actions: `<button onclick="goHome()" class="px-4 py-2 bg-gray-200 rounded-lg">关闭</button>`
                        };
                    }
                    return {
@@ -423,16 +465,16 @@
                        `,
                        actions: `
                            <button onclick="startHoleSelection()" class="px-4 py-2 bg-blue-500 text-white rounded-lg w-full mb-2">开始选择</button>
-                            <button onclick="closePanel()" class="px-4 py-2 bg-gray-200 rounded-lg w-full">关闭面板</button>
+                            <button onclick="goHome()" class="px-4 py-2 bg-gray-200 rounded-lg w-full">关闭面板</button>
                        `
                    };
                
                case 'circle':
-                    if (state.images.length === 0) {
+                    if (!hasImage()) {
                        return {
                            title: '圆形切图',
                            content: `<p class="text-sm text-red-500">请先上传图片</p>`,
-                            actions: `<button onclick="closePanel()" class="px-4 py-2 bg-gray-200 rounded-lg">关闭</button>`
+                            actions: `<button onclick="goHome()" class="px-4 py-2 bg-gray-200 rounded-lg">关闭</button>`
                        };
                    }
                    return {
@@ -514,11 +556,11 @@
                    };
                
                case 'resize':
-                    if (state.images.length === 0) {
+                    if (!hasImage()) {
                        return {
                            title: '调整大小',
                            content: `<p class="text-sm text-red-500">请先上传图片</p>`,
-                            actions: `<button onclick="closePanel()" class="px-4 py-2 bg-gray-200 rounded-lg">关闭</button>`
+                            actions: `<button onclick="goHome()" class="px-4 py-2 bg-gray-200 rounded-lg">关闭</button>`
                        };
                    }
                    const img = state.images[0];
@@ -545,11 +587,11 @@
                    };
                
                case 'crop':
-                    if (state.images.length === 0) {
+                    if (!hasImage()) {
                        return {
                            title: '裁剪',
                            content: `<p class="text-sm text-red-500">请先上传图片</p>`,
-                            actions: `<button onclick="closePanel()" class="px-4 py-2 bg-gray-200 rounded-lg">关闭</button>`
+                            actions: `<button onclick="goHome()" class="px-4 py-2 bg-gray-200 rounded-lg">关闭</button>`
                        };
                    }
                    return {
@@ -815,6 +857,8 @@
                updateImageList();
                hideEmptyHint();
                saveState('加载: ' + name);
+                // 刷新当前面板
+                refreshCurrentPanel();
            };
            img.src = dataUrl;
        }
@@ -839,7 +883,7 @@
            const list = document.getElementById('imageList');
            const items = document.getElementById('imageItems');
            document.getElementById('imageCount').textContent = `(${state.images.length}张)`;
-            if (state.images.length === 0) { list.classList.add('hidden'); return; }
+            if (!hasImage()) { list.classList.add('hidden'); return; }
            list.classList.remove('hidden');
            items.innerHTML = '';
            state.images.forEach((item, index) => {
@@ -859,7 +903,7 @@
            drawCanvas();
            updateImageList();
            saveState('移除图片');
-            if (state.images.length === 0) showEmptyHint();
+            if (!hasImage()) showEmptyHint();
        }

        function hideEmptyHint() {
@@ -940,9 +984,9 @@
            });
            
            const mergedData = canvas.toDataURL('image/png');
-            state.images = [];
+            hideEmptyHint(); state.images = [];
            loadImage(mergedData, 'merged');
-            closePanel();
+            refreshCurrentPanel();
        }

        function applySplit() {
@@ -979,7 +1023,7 @@
            }
            
            document.getElementById('splitResults').classList.remove('hidden');
-            closePanel();
+            refreshCurrentPanel();
            saveState(`分割 (${cols}x${rows})`);
        }

@@ -1118,9 +1162,9 @@
            ctx.drawImage(circleCanvas, 0, 0);
            
            const circleData = canvas.toDataURL('image/png');
-            state.images = [];
+            hideEmptyHint(); state.images = [];
            loadImage(circleData, 'circle');
-            closePanel();
+            refreshCurrentPanel();
        }

        function createTextImage() {
@@ -1169,9 +1213,9 @@
            });
            
            const textData = canvas.toDataURL('image/png');
-            state.images = [];
+            hideEmptyHint(); state.images = [];
            loadImage(textData, 'text');
-            closePanel();
+            refreshCurrentPanel();
        }

        function applyResize() {
@@ -1187,9 +1231,9 @@
            ctx.drawImage(img.img, 0, 0, newWidth, newHeight);
            
            const resizedData = canvas.toDataURL('image/png');
-            state.images = [];
+            hideEmptyHint(); state.images = [];
            loadImage(resizedData, 'resized');
-            closePanel();
+            refreshCurrentPanel();
        }

        function applyCrop() {
@@ -1207,9 +1251,9 @@
            ctx.drawImage(img.img, x, y, w, h, 0, 0, w, h);
            
            const croppedData = canvas.toDataURL('image/png');
-            state.images = [];
+            hideEmptyHint(); state.images = [];
            loadImage(croppedData, 'cropped');
-            closePanel();
+            refreshCurrentPanel();
        }

        function saveImage() {
Author	SHA1	Message	Date
hubian	6db10c0c83	v1.2.5: 修复操作后面板判断问题	2026-04-21 16:29:33 +08:00
hubian	8bdd18bdcf	v1.2.4: 移除上传按钮，改为拖放上传；选中效果优化	2026-04-21 13:11:08 +08:00
hubian	1bf6d6448c	v1.2.3: 执行操作后保持当前配置面板	2026-04-21 13:01:31 +08:00
hubian	7bde3ce551	v1.2.2: 右侧面板始终显示，首页显示快捷入口	2026-04-21 12:17:57 +08:00
hubian	7ad0538039	fix: 修复语法错误	2026-04-21 12:06:00 +08:00