提交所有内容

app/blueprints/brand.py

@@ -57,6 +57,17 @@ def _push_task_event(task_id, event):
 
 
 def _expand_folder_xlsx(folder_path):
+    """返回文件夹下第一层 .xlsx 文件的绝对路径列表（保留旧逻辑，不再用于品牌工具文件夹上传）"""
+    if not folder_path or not os.path.isdir(folder_path):
+        return []
+    paths = []
+    for name in os.listdir(folder_path):
+        if name.endswith('.xlsx') or name.endswith('.XLSX'):
+            paths.append(os.path.normpath(os.path.join(folder_path, name)))
+    return paths
+
+
+def _expand_folder_xlsx_recursive_items(folder_path):
     """返回文件夹下所有 .xlsx 文件的绝对路径和相对路径列表（递归）"""
     if not folder_path or not os.path.isdir(folder_path):
         return []
@@ -487,7 +498,22 @@ def api_brand_expand_folder():
         folder = (data.get('folder') or '').strip()
         if not folder:
             return jsonify({'success': False, 'error': '请提供 folder 路径'}), 400
-        items = _expand_folder_xlsx(folder)
+        paths = _expand_folder_xlsx(folder)
+        return jsonify({'success': True, 'paths': paths})
+    except Exception as e:
+        return jsonify({'success': False, 'error': str(e)}), 500
+
+
+@brand_bp.route('/api/brand/expand-folder-recursive', methods=['POST'])
+@login_required
+def api_brand_expand_folder_recursive():
+    """递归展开文件夹，返回 .xlsx 文件绝对路径及相对路径列表"""
+    try:
+        data = request.get_json() or {}
+        folder = (data.get('folder') or '').strip()
+        if not folder:
+            return jsonify({'success': False, 'error': '请提供 folder 路径'}), 400
+        items = _expand_folder_xlsx_recursive_items(folder)
         return jsonify({'success': True, 'items': items})
     except Exception as e:
         return jsonify({'success': False, 'error': str(e)}), 500

app/main.py

@@ -211,7 +211,7 @@ class WindowAPI:
         except Exception as e:
             return {'success': False, 'error': str(e)}
 
-    def upload_file_to_java(self, file_path):
+    def upload_file_to_java(self, file_path, relative_path=None):
         """按本地路径读取文件并上传到 Java 后端临时目录。"""
         if not file_path or not str(file_path).strip():
             return {'success': False, 'error': '文件路径为空'}
@@ -223,6 +223,7 @@ class WindowAPI:
                 response = requests.post(
                     f"{JAVA_API_BASE}/api/files/upload",
                     files={'file': (os.path.basename(normalized_path), file_obj)},
+                    data={'relativePath': str(relative_path).strip()} if relative_path else None,
                     timeout=120,
                 )
             response.raise_for_status()