Upload 2 files

app.py

@@ -1,9 +1,4 @@
 # -*- coding: utf-8 -*-
-"""
-款式选择器 - Hugging Face Spaces 版本
-支持多Sheet + 嵌入图片提取
-"""
-
 import gradio as gr
 import pandas as pd
 import openpyxl
@@ -16,7 +11,6 @@ import tempfile
 from datetime import datetime
 
 def extract_images_from_excel(file_path):
-    """提取Excel中的嵌入图片"""
     images = {}
     try:
         wb = openpyxl.load_workbook(file_path)
@@ -26,55 +20,46 @@ def extract_images_from_excel(file_path):
                 anchor = img.anchor
                 if hasattr(anchor, '_from'):
                     row = anchor._from.row + 1
-                    col = anchor._from.col + 1
-                else:
-                    continue
-                try:
-                    img_data = img._data()
-                    if img_data:
-                        images[(sheet_name, row)] = img_data
-                except:
-                    pass
+                    try:
+                        img_data = img._data()
+                        if img_data:
+                            images[(sheet_name, row)] = img_data
+                    except:
+                        pass
         wb.close()
     except Exception as e:
-        print(f"提取图片时出错: {e}")
+        print(f"提取图片出错: {e}")
     return images
 
 def find_header_row(df):
-    """查找表头行"""
     keywords = ['款号', '货号', 'SKU', '序号', '编号']
     for idx, row in df.iterrows():
         for val in row.values:
             if pd.notna(val):
-                val_str = str(val).lower()
                 for kw in keywords:
-                    if kw.lower() in val_str:
+                    if kw.lower() in str(val).lower():
                         return idx
     return 0
 
 def find_column(headers, possible_names):
-    """查找列索引"""
     for i, h in enumerate(headers):
         if pd.notna(h):
-            h_str = str(h).lower()
             for name in possible_names:
-                if name.lower() in h_str:
+                if name.lower() in str(h).lower():
                     return i
     return -1
 
 def load_excel(file):
-    """加载Excel文件"""
     if file is None:
-        return "❌ 请先上传Excel文件", [], {}
+        return "请先上传Excel文件", [], {}
     
     all_data = []
     all_images = {}
     
     try:
-        all_images = extract_images_from_excel(file.name)
-        print(f"提取到 {len(all_images)} 张图片")
-        
-        xl = pd.ExcelFile(file.name)
+        file_path = file if isinstance(file, str) else file.name
+        all_images = extract_images_from_excel(file_path)
+        xl = pd.ExcelFile(file_path)
         
         for sheet_name in xl.sheet_names:
             df = pd.read_excel(xl, sheet_name=sheet_name, header=None)
@@ -96,7 +81,7 @@ def load_excel(file):
             
             for idx in range(header_row + 1, len(df)):
                 row = df.iloc[idx]
-                sku = row.iloc[sku_col] if sku_col >= 0 and sku_col < len(row) else None
+                sku = row.iloc[sku_col] if sku_col < len(row) else None
                 
                 if pd.isna(sku) or str(sku).strip() == '':
                     continue
@@ -104,13 +89,18 @@ def load_excel(file):
                 excel_row = idx + 1
                 has_image = (sheet_name, excel_row) in all_images
                 
+                def safe_get(col_idx):
+                    if col_idx >= 0 and col_idx < len(row) and pd.notna(row.iloc[col_idx]):
+                        return str(row.iloc[col_idx]).strip()
+                    return ''
+                
                 item = {
                     'sku': str(sku).strip(),
-                    'name': str(row.iloc[name_col]).strip() if name_col >= 0 and name_col < len(row) and pd.notna(row.iloc[name_col]) else '',
-                    'material': str(row.iloc[material_col]).strip() if material_col >= 0 and material_col < len(row) and pd.notna(row.iloc[material_col]) else '',
-                    'color': str(row.iloc[color_col]).strip() if color_col >= 0 and color_col < len(row) and pd.notna(row.iloc[color_col]) else '',
-                    'size': str(row.iloc[size_col]).strip() if size_col >= 0 and size_col < len(row) and pd.notna(row.iloc[size_col]) else '',
-                    'price': str(row.iloc[price_col]).strip() if price_col >= 0 and price_col < len(row) and pd.notna(row.iloc[price_col]) else '',
+                    'name': safe_get(name_col),
+                    'material': safe_get(material_col),
+                    'color': safe_get(color_col),
+                    'size': safe_get(size_col),
+                    'price': safe_get(price_col),
                     'sheet': sheet_name,
                     'excel_row': excel_row,
                     'has_image': has_image,
@@ -119,43 +109,35 @@ def load_excel(file):
                 all_data.append(item)
         
         xl.close()
-        
-        sheets_with_data = len(set(item['sheet'] for item in all_data))
+        sheets_count = len(set(item['sheet'] for item in all_data))
         images_count = sum(1 for item in all_data if item['has_image'])
-        
-        status = f"✅ 加载成功！共 {len(all_data)} 条款式，来自 {sheets_with_data} 个Sheet，{images_count} 张图片"
+        status = f"加载成功! {len(all_data)}条款式, {sheets_count}个Sheet, {images_count}张图片"
         return status, all_data, all_images
         
     except Exception as e:
-        return f"❌ 加载失败: {str(e)}", [], {}
+        return f"加载失败: {str(e)}", [], {}
 
 def search_sku(keyword, all_data):
-    """搜索款号"""
     if not keyword or not all_data:
         return []
-    
     keyword = keyword.lower().strip()
     matches = []
-    
     for item in all_data:
         if keyword in item['sku'].lower():
             label = f"{item['sku']} [{item['sheet']}]"
             if item['has_image']:
-                label += " 📷"
+                label += " (有图)"
             matches.append((label, item['unique_id']))
-    
     return matches[:50]
 
-def get_image_base64(all_images, sheet_name, excel_row, max_size=80):
-    """获取图片的base64"""
+def get_image_base64(all_images, sheet_name, excel_row):
     key = (sheet_name, excel_row)
     if key not in all_images:
         return None
-    
     try:
         img_data = all_images[key]
         img = Image.open(io.BytesIO(img_data))
-        img.thumbnail((max_size, max_size), Image.Resampling.LANCZOS)
+        img.thumbnail((80, 80), Image.Resampling.LANCZOS)
         buffer = io.BytesIO()
         img.save(buffer, format='PNG')
         return base64.b64encode(buffer.getvalue()).decode()
@@ -163,75 +145,57 @@ def get_image_base64(all_images, sheet_name, excel_row, max_size=80):
         return None
 
 def update_selected_table(selected_ids, all_data, all_images):
-    """更新已选表格"""
     if not selected_ids or not all_data:
-        return "<p style='text-align:center;color:#999;padding:40px;'>还没有选择任何款式<br>在左边搜索并添加</p>", 0
-    
-    selected_items = []
-    for uid in selected_ids:
-        for item in all_data:
-            if item['unique_id'] == uid:
-                selected_items.append(item)
-                break
+        return "<p style='text-align:center;color:#888;padding:30px;'>还没有选择款式，在左边搜索添加</p>", 0
     
+    selected_items = [item for item in all_data if item['unique_id'] in selected_ids]
     if not selected_items:
-        return "<p style='text-align:center;color:#999;padding:40px;'>还没有选择任何款式</p>", 0
-    
-    html = '''
-    <style>
-        .sel-table { width:100%; border-collapse:collapse; font-size:13px; }
-        .sel-table th { background:#f0f4ff; padding:12px 8px; text-align:left; border-bottom:2px solid #ddd; font-weight:600; }
-        .sel-table td { padding:12px 8px; border-bottom:1px solid #eee; vertical-align:middle; }
-        .sel-table tr:hover { background:#f9f9ff; }
-        .sku-cell { font-weight:600; color:#6366f1; }
-        .price-cell { color:#f59e0b; font-weight:600; }
-        .sheet-cell { background:#ede9fe; color:#7c3aed; padding:2px 8px; border-radius:4px; font-size:11px; display:inline-block; }
-        .img-thumb { width:60px; height:60px; object-fit:cover; border-radius:6px; border:1px solid #e0e0e0; }
-        .no-img { width:60px; height:60px; background:#f5f5f5; border-radius:6px; display:flex; align-items:center; justify-content:center; color:#bbb; font-size:11px; }
-    </style>
-    <table class="sel-table">
-        <thead><tr>
-            <th>序号</th><th>图片</th><th>款号</th><th>材质</th><th>颜色</th><th>尺码</th><th>价格</th><th>来源</th>
-        </tr></thead>
-        <tbody>
-    '''
+        return "<p style='text-align:center;color:#888;padding:30px;'>还没有选择款式</p>", 0
     
+    rows_html = ""
     for i, item in enumerate(selected_items, 1):
         b64 = get_image_base64(all_images, item['sheet'], item['excel_row'])
-        img_html = f'<img class="img-thumb" src="data:image/png;base64,{b64}">' if b64 else '<div class="no-img">无图</div>'
+        if b64:
+            img_html = f'<img src="data:image/png;base64,{b64}" style="width:60px;height:60px;object-fit:cover;border-radius:4px;">'
+        else:
+            img_html = '<div style="width:60px;height:60px;background:#f0f0f0;border-radius:4px;display:flex;align-items:center;justify-content:center;color:#aaa;font-size:11px;">无图</div>'
         
-        def truncate(s, n):
+        def trunc(s, n=12):
             s = str(s) if s else '-'
-            return s[:n] + '...' if len(s) > n else s
+            return s[:n] + '..' if len(s) > n else s
         
-        html += f'''
-        <tr>
-            <td>{i}</td>
-            <td>{img_html}</td>
-            <td class="sku-cell">{item['sku']}</td>
-            <td>{truncate(item['material'], 12)}</td>
-            <td>{truncate(item['color'], 12)}</td>
-            <td>{truncate(item['size'], 8)}</td>
-            <td class="price-cell">{item['price'] or '-'}</td>
-            <td><span class="sheet-cell">{item['sheet']}</span></td>
-        </tr>
-        '''
+        rows_html += f'''<tr>
+            <td style="padding:8px;border-bottom:1px solid #eee;">{i}</td>
+            <td style="padding:8px;border-bottom:1px solid #eee;">{img_html}</td>
+            <td style="padding:8px;border-bottom:1px solid #eee;font-weight:600;color:#4f46e5;">{item['sku']}</td>
+            <td style="padding:8px;border-bottom:1px solid #eee;">{trunc(item['material'])}</td>
+            <td style="padding:8px;border-bottom:1px solid #eee;">{trunc(item['color'])}</td>
+            <td style="padding:8px;border-bottom:1px solid #eee;">{trunc(item['size'], 8)}</td>
+            <td style="padding:8px;border-bottom:1px solid #eee;color:#f59e0b;font-weight:600;">{item['price'] or '-'}</td>
+            <td style="padding:8px;border-bottom:1px solid #eee;"><span style="background:#e0e7ff;color:#4338ca;padding:2px 6px;border-radius:3px;font-size:11px;">{item['sheet']}</span></td>
+        </tr>'''
+    
+    html = f'''<table style="width:100%;border-collapse:collapse;font-size:13px;">
+        <thead><tr style="background:#f5f3ff;">
+            <th style="padding:10px 8px;text-align:left;border-bottom:2px solid #c7d2fe;">序号</th>
+            <th style="padding:10px 8px;text-align:left;border-bottom:2px solid #c7d2fe;">图片</th>
+            <th style="padding:10px 8px;text-align:left;border-bottom:2px solid #c7d2fe;">款号</th>
+            <th style="padding:10px 8px;text-align:left;border-bottom:2px solid #c7d2fe;">材质</th>
+            <th style="padding:10px 8px;text-align:left;border-bottom:2px solid #c7d2fe;">颜色</th>
+            <th style="padding:10px 8px;text-align:left;border-bottom:2px solid #c7d2fe;">尺码</th>
+            <th style="padding:10px 8px;text-align:left;border-bottom:2px solid #c7d2fe;">价格</th>
+            <th style="padding:10px 8px;text-align:left;border-bottom:2px solid #c7d2fe;">来源</th>
+        </tr></thead>
+        <tbody>{rows_html}</tbody>
+    </table>'''
     
-    html += '</tbody></table>'
     return html, len(selected_items)
 
 def export_excel_with_images(selected_ids, customer_name, all_data, all_images):
-    """导出带图片的Excel"""
     if not selected_ids or not all_data:
         return None
     
-    selected_items = []
-    for uid in selected_ids:
-        for item in all_data:
-            if item['unique_id'] == uid:
-                selected_items.append(item)
-                break
-    
+    selected_items = [item for item in all_data if item['unique_id'] in selected_ids]
     if not selected_items:
         return None
     
@@ -244,9 +208,7 @@ def export_excel_with_images(selected_ids, customer_name, all_data, all_images):
         cell = ws.cell(row=1, column=col, value=header)
         cell.font = openpyxl.styles.Font(bold=True)
         cell.fill = openpyxl.styles.PatternFill(start_color="E0E7FF", end_color="E0E7FF", fill_type="solid")
-        cell.alignment = openpyxl.styles.Alignment(horizontal='center', vertical='center')
     
-    ws.row_dimensions[1].height = 25
     ws.column_dimensions['A'].width = 6
     ws.column_dimensions['B'].width = 15
     ws.column_dimensions['C'].width = 14
@@ -258,7 +220,6 @@ def export_excel_with_images(selected_ids, customer_name, all_data, all_images):
     
     for row_num, item in enumerate(selected_items, 2):
         ws.row_dimensions[row_num].height = 80
-        
         ws.cell(row=row_num, column=1, value=row_num - 1)
         ws.cell(row=row_num, column=3, value=item['sku'])
         ws.cell(row=row_num, column=4, value=item['material'])
@@ -267,170 +228,100 @@ def export_excel_with_images(selected_ids, customer_name, all_data, all_images):
         ws.cell(row=row_num, column=7, value=item['price'])
         ws.cell(row=row_num, column=8, value=item['sheet'])
         
-        for col in range(1, 9):
-            ws.cell(row=row_num, column=col).alignment = openpyxl.styles.Alignment(vertical='center', wrap_text=True)
-        
         img_key = (item['sheet'], item['excel_row'])
         if img_key in all_images:
             try:
                 img_data = all_images[img_key]
                 img = Image.open(io.BytesIO(img_data))
                 img.thumbnail((100, 100), Image.Resampling.LANCZOS)
-                
                 with tempfile.NamedTemporaryFile(suffix='.png', delete=False) as tmp:
                     img.save(tmp.name, 'PNG')
                     tmp_path = tmp.name
-                
                 xl_img = XLImage(tmp_path)
                 xl_img.width = 75
                 xl_img.height = 75
                 ws.add_image(xl_img, f'B{row_num}')
-                
                 os.unlink(tmp_path)
-            except Exception as e:
-                print(f"插入图片失败: {e}")
+            except:
+                pass
     
     today = datetime.now().strftime('%Y-%m-%d')
     customer = customer_name.strip() if customer_name else '客户'
     filename = f"{customer}的选款_{today}.xlsx"
-    
     output_path = os.path.join(tempfile.gettempdir(), filename)
     wb.save(output_path)
     wb.close()
-    
     return output_path
 
-# ============ Gradio 界面 ============
+# ========== Gradio 界面 ==========
 
-with gr.Blocks(
-    title="款式选择器",
-    theme=gr.themes.Soft(primary_hue="indigo"),
-    css="""
-    .main-title { text-align: center; margin-bottom: 20px; }
-    .main-title h1 { font-size: 2em; margin-bottom: 5px; }
-    .main-title p { color: #666; }
-    """
-) as app:
-    
-    # 状态存储
+with gr.Blocks(title="款式选择器") as app:
     all_data_state = gr.State([])
     all_images_state = gr.State({})
     selected_ids_state = gr.State([])
     
-    gr.HTML("""
-    <div class="main-title">
-        <h1>📦 款式选择器</h1>
-        <p>支持多Sheet + 自动提取嵌入图片 | 上传 → 搜索 → 选款 → 导出</p>
-    </div>
-    """)
+    gr.Markdown("# 📦 款式选择器\n支持多Sheet + 自动提取嵌入图片")
     
     with gr.Row():
-        # 左侧面板
         with gr.Column(scale=1):
-            gr.Markdown("### 📤 第一步：上传款式表")
-            file_input = gr.File(
-                label="选择Excel文件（支持.xlsx）",
-                file_types=[".xlsx", ".xls"],
-                type="filepath"
-            )
-            load_status = gr.Textbox(label="状态", interactive=False, value="等待上传...")
+            gr.Markdown("### 📤 上传款式表")
+            file_input = gr.File(label="选择Excel文件", file_types=[".xlsx", ".xls"])
+            load_status = gr.Textbox(label="状态", value="等待上传...", interactive=False)
             
-            gr.Markdown("### 🔍 第二步：搜索款号")
-            search_input = gr.Textbox(
-                label="输入款号关键字",
-                placeholder="如：PZ、PM200、HSZ...",
-                interactive=True
-            )
-            search_results = gr.CheckboxGroup(
-                label="搜索结果（勾选后点击添加）",
-                choices=[],
-                interactive=True
-            )
-            add_btn = gr.Button("➕ 添加选中项到右侧", variant="primary", size="lg")
+            gr.Markdown("### 🔍 搜索款号")
+            search_input = gr.Textbox(label="输入款号关键字", placeholder="如：PZ、PM200...")
+            search_results = gr.CheckboxGroup(label="搜索结果（勾选后点添加）", choices=[])
+            add_btn = gr.Button("➕ 添加选中项", variant="primary")
         
-        # 右侧面板
         with gr.Column(scale=2):
-            gr.Markdown("### ✅ 第三步：确认已选款式")
+            gr.Markdown("### ✅ 已选款式")
             selected_count = gr.Number(label="已选数量", value=0, interactive=False)
-            selected_table = gr.HTML(
-                "<p style='text-align:center;color:#999;padding:40px;'>还没有选择任何款式<br>在左边搜索并添加</p>"
-            )
+            selected_table = gr.HTML("<p style='text-align:center;color:#888;padding:30px;'>还没有选择款式</p>")
             
-            gr.Markdown("### 📥 第四步：导出")
+            gr.Markdown("### 📥 导出")
             with gr.Row():
-                customer_input = gr.Textbox(
-                    label="客户名",
-                    placeholder="输入客户名，如：张三",
-                    scale=2
-                )
-                clear_btn = gr.Button("🗑️ 清空已选", variant="secondary", scale=1)
-            
-            export_btn = gr.Button("📥 生成Excel（带图片）", variant="primary", size="lg")
-            export_file = gr.File(label="⬇️ 点击下载", visible=True)
-    
-    # ============ 事件绑定 ============
+                customer_input = gr.Textbox(label="客户名", placeholder="如：张三", scale=2)
+                clear_btn = gr.Button("🗑️ 清空", scale=1)
+            export_btn = gr.Button("📥 生成Excel（带图片）", variant="primary")
+            export_file = gr.File(label="点击下载")
     
     def on_file_upload(file):
         status, data, images = load_excel(file)
         return status, data, images, [], gr.update(choices=[])
     
-    file_input.change(
-        on_file_upload,
-        inputs=[file_input],
-        outputs=[load_status, all_data_state, all_images_state, selected_ids_state, search_results]
-    )
+    file_input.change(on_file_upload, [file_input], [load_status, all_data_state, all_images_state, selected_ids_state, search_results])
     
     def on_search(keyword, all_data):
         if not keyword or not all_data:
             return gr.update(choices=[], value=[])
-        matches = search_sku(keyword, all_data)
-        return gr.update(choices=matches, value=[])
+        return gr.update(choices=search_sku(keyword, all_data), value=[])
     
-    search_input.change(
-        on_search,
-        inputs=[search_input, all_data_state],
-        outputs=[search_results]
-    )
+    search_input.change(on_search, [search_input, all_data_state], [search_results])
     
     def on_add(search_result, current_selected, all_data, all_images):
         if not search_result:
             html, count = update_selected_table(current_selected, all_data, all_images)
             return current_selected, html, count, gr.update(value=[])
-        
         new_selected = list(current_selected) if current_selected else []
         for uid in search_result:
             if uid not in new_selected:
                 new_selected.append(uid)
-        
         html, count = update_selected_table(new_selected, all_data, all_images)
         return new_selected, html, count, gr.update(value=[])
     
-    add_btn.click(
-        on_add,
-        inputs=[search_results, selected_ids_state, all_data_state, all_images_state],
-        outputs=[selected_ids_state, selected_table, selected_count, search_results]
-    )
+    add_btn.click(on_add, [search_results, selected_ids_state, all_data_state, all_images_state], [selected_ids_state, selected_table, selected_count, search_results])
     
     def on_clear(all_data, all_images):
         html, count = update_selected_table([], all_data, all_images)
         return [], html, count
     
-    clear_btn.click(
-        on_clear,
-        inputs=[all_data_state, all_images_state],
-        outputs=[selected_ids_state, selected_table, selected_count]
-    )
+    clear_btn.click(on_clear, [all_data_state, all_images_state], [selected_ids_state, selected_table, selected_count])
     
     def on_export(selected_ids, customer_name, all_data, all_images):
         if not selected_ids:
             return None
         return export_excel_with_images(selected_ids, customer_name, all_data, all_images)
     
-    export_btn.click(
-        on_export,
-        inputs=[selected_ids_state, customer_input, all_data_state, all_images_state],
-        outputs=[export_file]
-    )
+    export_btn.click(on_export, [selected_ids_state, customer_input, all_data_state, all_images_state], [export_file])
 
-# 启动
-app.launch()
+app.launch()

requirements.txt

@@ -1,4 +1,4 @@
-gradio>=4.0.0
+gradio
 pandas
 openpyxl
-pillow
+pillow