coder/image-editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: coder:v1.2.2
Branches Tags
coder:master
coder:v1.2.7 coder:v1.2.6 coder:v1.2.5 coder:v1.2.4 coder:v1.2.3 coder:v1.2.2 coder:v1.2.1 coder:v1.2.0 coder:v1.1.0 coder:v1.0.0
...
compare: coder:v1.2.6
Branches Tags
coder:master
coder:v1.2.7 coder:v1.2.6 coder:v1.2.5 coder:v1.2.4 coder:v1.2.3 coder:v1.2.2 coder:v1.2.1 coder:v1.2.0 coder:v1.1.0 coder:v1.0.0

4 Commits
v1.2.2 ... v1.2.6

Author SHA1 Message Date
hubian
a99cb57a2f v1.2.6: 操作后显示预览效果，保留原始图片 2026-04-21 17:04:15 +08:00
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
4 changed files with 174 additions and 61 deletions
Expand all files Collapse all files

10
app.py
View File

@@ -1,7 +1,7 @@
"""
图片编辑器 - Image Editor v1.2.2
图片编辑器 - Image Editor v1.2.6
前端图片处理工具：合并、分割、挖孔填充、圆形切图、文字图片等
v1.2.2: 右侧面板始终显示，首页显示快捷入口
v1.2.6: 操作后显示预览效果，保留原始图片
端口: 19018
"""
@@ -25,7 +25,7 @@ def index():
@app.route('/api/health')
def health():
return jsonify({'status': 'ok', 'version': '1.2.2', 'time': datetime.now().isoformat()})
return jsonify({'status': 'ok', 'version': '1.2.6', '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.2")
print("图片编辑器 - Image Editor v1.2.6")
print("=" * 50)
print("右侧面板始终显示，首页显示快捷入口")
print("操作后显示预览效果，保留原始图片")
print(f"访问地址: http://localhost:19018")
print("=" * 50)
app.run(host='0.0.0.0', port=19018, debug=True)

BIN
outputs/edited_1776755761871.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 763 KiB

BIN
outputs/edited_1776761087118.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 763 KiB

225
templates/index.html
View File

@@ -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.2</title>
<title>图片编辑器 - Image Editor v1.2.6</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>
@@ -185,18 +183,150 @@
selection: null,
textStyles: { bold: false, italic: false },
mergeImageOrder: [],
mergeImageSizes: {}
mergeImageSizes: {},
previewMode: false, // 预览模式
previewData: null, // 预览图片数据
originalImages: null // 预览前保存的原始图片
};
const canvas = document.getElementById('mainCanvas');
const ctx = canvas.getContext('2d');
const container = document.getElementById('canvasContainer');
// 返回首页面板
function goHome() {
document.querySelectorAll('.tool-btn').forEach(btn => btn.classList.remove('active'));
state.currentTool = null;
showPanel('home');
// 检查是否有图片（画布有内容）
function hasImage() {
return state.images.length > 0 || document.getElementById('emptyHint').classList.contains('hidden');
}
// 显示预览效果（操作后显示结果，但保留原始图片）
function showPreviewResult(dataUrl, name) {
// 进入预览模式
state.previewMode = true;
state.previewData = dataUrl;
// 保存原始图片状态
state.originalImages = state.images.map(img => ({
...img,
// 不复制img对象，只保存数据
}));
// 显示预览效果（追加结果图片，不清除原始）
const img = new Image();
img.onload = () => {
// 调整画布大小以适应结果图片
canvas.width = img.width;
canvas.height = img.height;
// 绘制结果图片
ctx.clearRect(0, 0, canvas.width, canvas.height);
ctx.drawImage(img, 0, 0);
hideEmptyHint();
// 显示预览面板
showPreviewPanel(name);
};
img.src = dataUrl;
}
// 显示预览面板
function showPreviewPanel(operationName) {
document.getElementById('panelTitle').textContent = '预览效果';
document.getElementById('panelContent').innerHTML = `
<div class="space-y-3">
<div class="p-3 bg-green-50 rounded-lg">
<p class="text-sm text-green-700">
<i class="ri-check-line"></i> ${operationName} 完成！
</p>
<p class="text-xs text-green-600 mt-1">预览效果已显示，原图片仍保留</p>
</div>
<p class="text-xs text-gray-500">选择"应用结果"替换原图，或"取消"恢复</p>
</div>
`;
document.getElementById('panelActions').innerHTML = `
<button onclick="applyPreviewResult()" class="px-4 py-2 bg-green-500 text-white rounded-lg w-full mb-2">
<i class="ri-check-double-line mr-1"></i>应用结果
</button>
<button onclick="cancelPreview()" class="px-4 py-2 bg-gray-200 rounded-lg w-full mb-2">
<i class="ri-close-line mr-1"></i>取消预览
</button>
<button onclick="goHome()" class="px-4 py-2 bg-blue-100 text-blue-600 rounded-lg w-full">
<i class="ri-home-line mr-1"></i>返回首页
</button>
`;
}
// 应用预览结果
function applyPreviewResult() {
if (!state.previewData) return;
// 清空原始图片，只保留结果
state.images = [];
const img = new Image();
img.onload = () => {
state.images.push({
img: img,
name: 'result_' + Date.now(),
x: 0,
y: 0,
width: img.width,
height: img.height,
dataUrl: state.previewData
});
drawCanvas();
updateImageList();
saveState('应用结果');
// 清除预览状态
state.previewMode = false;
state.previewData = null;
state.originalImages = null;
// 返回首页
goHome();
};
img.src = state.previewData;
}
// 取消预览
function cancelPreview() {
if (!state.originalImages) {
goHome();
return;
}
// 恢复原始图片
state.images = [];
state.originalImages.forEach((item, idx) => {
if (state.images[idx] && state.images[idx].img) {
state.images.push(state.images[idx]);
}
});
// 如果没有恢复成功，重新从画布历史恢复
if (state.images.length === 0 && state.historyStack.length > 0) {
const lastState = state.historyStack[state.historyStack.length - 1];
restoreState(lastState);
} else {
drawCanvas();
updateImageList();
}
// 清除预览状态
state.previewMode = false;
state.previewData = null;
state.originalImages = null;
// 返回首页
goHome();
}
// 刷新当前工具面板（执行操作后保持当前配置）
function refreshCurrentPanel() {
if (state.currentTool) {
showPanel(state.currentTool);
}
}
// 初始化
@@ -238,11 +368,6 @@
// 更新右侧配置面板内容（不隐藏）
showPanel(tool);
// 上传图片直接触发文件选择
if (tool === 'upload') {
document.getElementById('fileInput').click();
}
}
// 显示右侧面板内容
@@ -259,18 +384,18 @@
// 获取各工具的配置面板内容
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('upload')" class="p-3 bg-blue-50 rounded-lg hover:bg-blue-100 text-center">
<i class="ri-upload-cloud-line text-2xl text-blue-500"></i>
<p class="text-xs mt-1">上传图片</p>
</button>
<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>
@@ -311,20 +436,9 @@
}
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>`,
@@ -401,7 +515,7 @@
};
case 'split':
if (state.images.length === 0) {
if (!hasImage()) {
return {
title: '分割图片',
content: `<p class="text-sm text-red-500">请先上传图片</p>`,
@@ -432,7 +546,7 @@
};
case 'hole':
if (state.images.length === 0) {
if (!hasImage()) {
return {
title: '挖孔填充',
content: `<p class="text-sm text-red-500">请先上传图片</p>`,
@@ -478,7 +592,7 @@
};
case 'circle':
if (state.images.length === 0) {
if (!hasImage()) {
return {
title: '圆形切图',
content: `<p class="text-sm text-red-500">请先上传图片</p>`,
@@ -564,7 +678,7 @@
};
case 'resize':
if (state.images.length === 0) {
if (!hasImage()) {
return {
title: '调整大小',
content: `<p class="text-sm text-red-500">请先上传图片</p>`,
@@ -595,7 +709,7 @@
};
case 'crop':
if (state.images.length === 0) {
if (!hasImage()) {
return {
title: '裁剪',
content: `<p class="text-sm text-red-500">请先上传图片</p>`,
@@ -865,10 +979,17 @@
updateImageList();
hideEmptyHint();
saveState('加载: ' + name);
// 刷新当前面板
refreshCurrentPanel();
};
img.src = dataUrl;
}
// 加载操作结果（不清空原始图片）
function loadOperationResult(dataUrl, name, operationName) {
showPreviewResult(dataUrl, operationName);
}
function drawCanvas() {
ctx.clearRect(0, 0, canvas.width, canvas.height);
ctx.fillStyle = '#ffffff';
@@ -889,7 +1010,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) => {
@@ -909,7 +1030,7 @@
drawCanvas();
updateImageList();
saveState('移除图片');
if (state.images.length === 0) showEmptyHint();
if (!hasImage()) showEmptyHint();
}
function hideEmptyHint() {
@@ -970,6 +1091,7 @@
canvas.width = cols * maxWidth + (cols - 1) * gap;
canvas.height = rows * maxHeight + (rows - 1) * gap;
// 绘制合并结果到画布（预览）
ctx.fillStyle = bgColor;
ctx.fillRect(0, 0, canvas.width, canvas.height);
@@ -989,10 +1111,9 @@
}
});
// 显示预览效果（不清除原始图片）
const mergedData = canvas.toDataURL('image/png');
state.images = [];
loadImage(mergedData, 'merged');
goHome();
showPreviewResult(mergedData, '合并图片');
}
function applySplit() {
@@ -1029,7 +1150,7 @@
}
document.getElementById('splitResults').classList.remove('hidden');
goHome();
refreshCurrentPanel();
saveState(`分割 (${cols}x${rows})`);
}
@@ -1168,9 +1289,7 @@
ctx.drawImage(circleCanvas, 0, 0);
const circleData = canvas.toDataURL('image/png');
state.images = [];
loadImage(circleData, 'circle');
goHome();
showPreviewResult(circleData, '圆形切图');
}
function createTextImage() {
@@ -1219,9 +1338,7 @@
});
const textData = canvas.toDataURL('image/png');
state.images = [];
loadImage(textData, 'text');
goHome();
showPreviewResult(textData, '文字图片');
}
function applyResize() {
@@ -1237,9 +1354,7 @@
ctx.drawImage(img.img, 0, 0, newWidth, newHeight);
const resizedData = canvas.toDataURL('image/png');
state.images = [];
loadImage(resizedData, 'resized');
goHome();
showPreviewResult(resizedData, '调整大小');
}
function applyCrop() {
@@ -1257,9 +1372,7 @@
ctx.drawImage(img.img, x, y, w, h, 0, 0, w, h);
const croppedData = canvas.toDataURL('image/png');
state.images = [];
loadImage(croppedData, 'cropped');
goHome();
showPreviewResult(croppedData, '裁剪');
}
function saveImage() {