qrpa 1.0.17__py3-none-any.whl → 1.0.19__py3-none-any.whl

qrpa/fun_excel.py

@@ -16,63 +16,62 @@ from playwright.sync_api import sync_playwright
 from .fun_base import log, sanitize_filename, create_file_path, copy_file, add_https, send_exception
 
 excel_color_index = {
-    "无色(自动)": 0,  # 透明/默认
-    "黑色": 1,  # #000000
-    "白色": 2,  # #FFFFFF
-    "红色": 3,  # #FF0000
-    "绿色": 4,  # #00FF00
-    "蓝色": 5,  # #0000FF
-    "黄色": 6,  # #FFFF00
-    "粉红色": 7,  # #FF00FF
-    "青绿色": 8,  # #00FFFF
-    "深红色": 9,  # #800000
-    "深绿色": 10,  # #008000
-    "深蓝色": 11,  # #000080
-    "橄榄色(深黄)": 12,  # #808000
-    "紫色": 13,  # #800080
-    "蓝绿色(水色)": 14,  # #008080
-    "灰色（25%）": 15,  # #808080
+    "无色(自动)"   : 0,  # 透明/默认
+    "黑色"         : 1,  # #000000
+    "白色"         : 2,  # #FFFFFF
+    "红色"         : 3,  # #FF0000
+    "绿色"         : 4,  # #00FF00
+    "蓝色"         : 5,  # #0000FF
+    "黄色"         : 6,  # #FFFF00
+    "粉红色"       : 7,  # #FF00FF
+    "青绿色"       : 8,  # #00FFFF
+    "深红色"       : 9,  # #800000
+    "深绿色"       : 10,  # #008000
+    "深蓝色"       : 11,  # #000080
+    "橄榄色(深黄)" : 12,  # #808000
+    "紫色"         : 13,  # #800080
+    "蓝绿色(水色)" : 14,  # #008080
+    "灰色（25%）"    : 15,  # #808080
     "浅灰色(12.5%)": 16,  # #C0C0C0
     # 17-19：系统保留（通常不可用）
-    "深玫瑰红": 20,  # #FF99CC
-    "深金色": 21,  # #FFCC99
-    "深橙红色": 22,  # #FF6600
-    "深灰色(50%)": 23,  # #666666
-    "深紫色": 24,  # #660066
-    "蓝灰色": 25,  # #3366FF
-    "浅蓝色": 26,  # #99CCFF
-    "浅紫色": 27,  # #CC99FF
-    "浅青绿色": 28,  # #99FFFF
-    "浅绿色": 29,  # #CCFFCC
-    "浅黄色": 30,  # #FFFFCC
-    "浅橙红色": 31,  # #FFCC99
-    "玫瑰红": 32,  # #FF9999
-    "浅天蓝色": 33,  # #99CCFF
-    "浅海绿色": 34,  # #99FFCC
-    "浅草绿色": 35,  # #CCFF99
-    "浅柠檬黄": 36,  # #FFFF99
-    "浅珊瑚色": 37,  # #FFCC99
-    "浅玫瑰红": 38,  # #FF9999
-    "棕褐色": 39,  # #CC9966
-    "浅棕褐色": 40,  # #FFCC99
-    "浅橄榄色": 41,  # #CCCC99
-    "浅蓝灰色": 42,  # #9999FF
-    "浅灰绿色": 43,  # #99CC99
-    "金色": 44,  # #FFCC00
-    "浅橙黄色": 45,  # #FFCC66
-    "橙红色": 46,  # #FF6600
-    "深天蓝色": 47,  # #0066CC
-    "深海绿色": 48,  # #009966
-    "深草绿色": 49,  # #669900
-    "深柠檬黄": 50,  # #CCCC00
-    "深珊瑚色": 51,  # #FF9933
-    "深玫瑰红(暗)": 52,  # #CC6699
-    "深棕褐色": 53,  # #996633
-    "深橄榄色": 54,  # #666600
-    "深蓝灰色": 55,  # #333399
+    "深玫瑰红"     : 20,  # #FF99CC
+    "深金色"       : 21,  # #FFCC99
+    "深橙红色"     : 22,  # #FF6600
+    "深灰色(50%)"  : 23,  # #666666
+    "深紫色"       : 24,  # #660066
+    "蓝灰色"       : 25,  # #3366FF
+    "浅蓝色"       : 26,  # #99CCFF
+    "浅紫色"       : 27,  # #CC99FF
+    "浅青绿色"     : 28,  # #99FFFF
+    "浅绿色"       : 29,  # #CCFFCC
+    "浅黄色"       : 30,  # #FFFFCC
+    "浅橙红色"     : 31,  # #FFCC99
+    "玫瑰红"       : 32,  # #FF9999
+    "浅天蓝色"     : 33,  # #99CCFF
+    "浅海绿色"     : 34,  # #99FFCC
+    "浅草绿色"     : 35,  # #CCFF99
+    "浅柠檬黄"     : 36,  # #FFFF99
+    "浅珊瑚色"     : 37,  # #FFCC99
+    "浅玫瑰红"     : 38,  # #FF9999
+    "棕褐色"       : 39,  # #CC9966
+    "浅棕褐色"     : 40,  # #FFCC99
+    "浅橄榄色"     : 41,  # #CCCC99
+    "浅蓝灰色"     : 42,  # #9999FF
+    "浅灰绿色"     : 43,  # #99CC99
+    "金色"         : 44,  # #FFCC00
+    "浅橙黄色"     : 45,  # #FFCC66
+    "橙红色"       : 46,  # #FF6600
+    "深天蓝色"     : 47,  # #0066CC
+    "深海绿色"     : 48,  # #009966
+    "深草绿色"     : 49,  # #669900
+    "深柠檬黄"     : 50,  # #CCCC00
+    "深珊瑚色"     : 51,  # #FF9933
+    "深玫瑰红(暗)" : 52,  # #CC6699
+    "深棕褐色"     : 53,  # #996633
+    "深橄榄色"     : 54,  # #666600
+    "深蓝灰色"     : 55,  # #333399
 }
 
-
 def set_cell_prefix_red(cell, n, color_name):
     """
     将指定 Excel 单元格内容的前 n 个字符设置为红色。
@@ -90,7 +89,6 @@ def set_cell_prefix_red(cell, n, color_name):
     except Exception as e:
         print(f"设置字体颜色失败: {e}")
 
-
 def sort_by_column(data, col_index, start_row=2, reverse=True):
     if not data or start_row >= len(data):
         return data
@@ -114,7 +112,6 @@ def sort_by_column(data, col_index, start_row=2, reverse=True):
         print(f"Error: Column index {col_index} out of range")
         return data
 
-
 def column_exists(sheet, column_name, header_row=1):
     """
     检查工作表中是否存在指定列名
@@ -128,7 +125,6 @@ def column_exists(sheet, column_name, header_row=1):
 
     return column_name in header_values
 
-
 def merge_by_column_v2(sheet, column_name, other_columns):
     log('正在处理合并单元格')
     # 最好放到 open_excel 后面,不然容易出错
@@ -169,7 +165,6 @@ def merge_by_column_v2(sheet, column_name, other_columns):
         log(f'处理 {col_name}{start}:{col_name}{end} merge')
         sheet.range(f'{col_name}{start}:{col_name}{end}').merge()
 
-
 def merge_by_column(sheet, column_name, other_columns):
     log('正在处理合并单元格')
     # 最好放到 open_excel 后面,不然容易出错
@@ -198,7 +193,6 @@ def merge_by_column(sheet, column_name, other_columns):
             if col_name is not None:
                 sheet.range(f'{col_name}{start_row}:{col_name}{len(data)}').merge()
 
-
 def merge_column_v2(sheet, columns):
     if columns is None:
         return
@@ -229,7 +223,6 @@ def merge_column_v2(sheet, columns):
         log(f'处理 {col_letter}{start}:{col_letter}{end} merge')
         sheet.range(f'{col_letter}{start}:{col_letter}{end}').merge()
 
-
 # 按列相同值合并
 def merge_column(sheet, columns):
     # 最后放到 open_excel 后面,不然容易出错
@@ -252,7 +245,6 @@ def merge_column(sheet, columns):
         if len(data) - start_row > 1:
             sheet.range(f'{col_letter}{start_row}:{col_letter}{len(data)}').merge()
 
-
 def remove_excel_columns(sheet, columns):
     # 获取第一行(标题行)的所有值
     header_row = sheet.range('1:1').value
@@ -276,7 +268,6 @@ def remove_excel_columns(sheet, columns):
     print(f"成功移除列: {columns_to_remove}")
     return True
 
-
 def delete_sheet_if_exists(wb, sheet_name):
     """
     如果工作簿中存在指定名称的工作表，则将其删除。
@@ -294,7 +285,6 @@ def delete_sheet_if_exists(wb, sheet_name):
     else:
         print(f"Sheet 不存在: {sheet_name}")
 
-
 # 水平对齐：
 # -4108：居中
 # -4131：左对齐
@@ -316,7 +306,6 @@ def index_to_column_name(index):
         index = index // 26
     return column_name
 
-
 # # 示例：将列索引转换为列名
 # log(index_to_column_name(1))   # 输出: 'A'
 # log(index_to_column_name(26))  # 输出: 'Z'
@@ -334,7 +323,6 @@ def column_name_to_index(column_name):
         index = index * 26 + (ord(char.upper()) - 64)
     return index - 1
 
-
 # # 示例：将列名转换为列索引
 # log(column_name_to_index('A'))   # 输出: 1
 # log(column_name_to_index('Z'))   # 输出: 26
@@ -361,7 +349,6 @@ def find_row_by_data(sheet, column, target_value):
     # 如果未找到，返回 None
     return None
 
-
 def find_column_by_data(sheet, row, target_value):
     """
     查找指定数据在某一行中第一次出现的列名，包括隐藏的列。
@@ -382,7 +369,6 @@ def find_column_by_data(sheet, row, target_value):
 
     return None  # 未找到返回 None
 
-
 def find_column_by_data_old(sheet, row, target_value):
     """
     查找指定数据在某一行中第一次出现的列名。
@@ -404,7 +390,6 @@ def find_column_by_data_old(sheet, row, target_value):
     # 如果未找到，返回 None
     return None
 
-
 def set_print_area(sheet, print_range, pdf_path=None, fit_to_width=True, landscape=False):
     """
     设置指定sheet的打印区域和打印布局为适合A4宽度打印。
@@ -453,12 +438,10 @@ def set_print_area(sheet, print_range, pdf_path=None, fit_to_width=True, landsca
         sheet.to_pdf(path=pdf_path)
         log(f"PDF已成功生成：{pdf_path}")
 
-
 def minimize(app):
     # 让 Excel 窗口最小化
     app.api.WindowState = -4140  # -4140 对应 Excel 中的 xlMinimized 常量
 
-
 def insert_fixed_scale_image_v2(sheet, cell, image_path):
     """
     将图片插入到指定单元格中，自动缩放以适应单元格尺寸，但保持宽高比例不变。
@@ -521,7 +504,6 @@ def insert_fixed_scale_image_v2(sheet, cell, image_path):
 
     return None
 
-
 def insert_fixed_scale_image(sheet, cell, image_path, scale=1.0):
     """
     按固定比例放大图片并插入到单元格
@@ -559,8 +541,7 @@ def insert_fixed_scale_image(sheet, cell, image_path, scale=1.0):
 
     return None
 
-
-def InsertImageV2(app, wb, sheet, columns=None, platform='shein', img_width=150, img_save_key=None, dir_name=None):
+def InsertImageV2(app, wb, sheet, columns=None, platform='shein', img_width=150, img_save_key=None, dir_name=None, cell_height_with_img=False):
     if not columns:
         return
 
@@ -619,14 +600,17 @@ def InsertImageV2(app, wb, sheet, columns=None, platform='shein', img_width=150,
                 if cell_height < img_width:
                     cell_range.row_height = max(150 / 8, img_width / cell_range.rows.count)
 
+                if cell_height_with_img:
+                    cell_range.row_height = img_width
+
                 # 计算居中位置
                 top = cell_range.top + (cell_range.height - img_width) / 2
                 left = cell_range.left + (cell_range.width - img_width) / 2
 
                 area_map[cell_address] = {
-                    'top': top,
-                    'left': left,
-                    'width': img_width,
+                    'top'      : top,
+                    'left'     : left,
+                    'width'    : img_width,
                     'cell_list': [c.address for c in cell_range]
                 }
 
@@ -684,7 +668,6 @@ def InsertImageV2(app, wb, sheet, columns=None, platform='shein', img_width=150,
             else:
                 log(f'图片地址不存在 [{img_col_name}] : 第{row}行')
 
-
 def download_images_concurrently(image_urls, platform='shein', img_save_dir=None):
     # 使用线程池执行并发下载
     with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
@@ -692,7 +675,6 @@ def download_images_concurrently(image_urls, platform='shein', img_save_dir=None
         results = list(executor.map(lambda url: download_img_v2(url, platform, img_save_path=img_save_dir), image_urls))
     return results
 
-
 def download_img_by_chrome(image_url, save_name):
     with sync_playwright() as p:
         browser = p.chromium.launch(headless=True)  # 运行时可以看到浏览器
@@ -707,7 +689,6 @@ def download_img_by_chrome(image_url, save_name):
         browser.close()
     return save_name
 
-
 def download_img_v2(image_url, platform='shein', img_save_path=None):
     image_url = add_https(image_url)
     if image_url is None or 'http' not in image_url:
@@ -745,8 +726,8 @@ def download_img_v2(image_url, platform='shein', img_save_path=None):
     #     return False
 
     headers = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36",
-        "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
+        "User-Agent"     : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36",
+        "Accept"         : "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
         "Accept-Encoding": "gzip, deflate",
         "Accept-Language": "zh-CN,zh;q=0.9"
     }
@@ -779,7 +760,6 @@ def download_img_v2(image_url, platform='shein', img_save_path=None):
 
     return file_path
 
-
 # 插入图片函数 注意windows中这个路径反斜杠要是这样的才能插入成功
 # C:\Users\Administrator/Desktop/auto/sku_img\K-CPYZB005-1_1734316546.png
 def insert_cell_image(sheet, cell, file_path, img_width=120):
@@ -825,7 +805,6 @@ def insert_cell_image(sheet, cell, file_path, img_width=120):
         log(f'插入图片失败: {e}, {file_path}')
         send_exception()
 
-
 # 插入图片函数 注意windows中这个路径反斜杠要是这样的才能插入成功
 # C:\Users\Administrator/Desktop/auto/sku_img\K-CPYZB005-1_1734316546.png
 def insert_image_from_local(sheet, cell, file_path, cell_width=90, cell_height=90):
@@ -864,7 +843,6 @@ def insert_image_from_local(sheet, cell, file_path, cell_width=90, cell_height=9
     except Exception as e:
         log(f'插入图片失败: {e}, {file_path}')
 
-
 # 插入图片函数 注意windows中这个路径反斜杠要是这样的才能插入成功
 # C:\Users\Administrator/Desktop/auto/sku_img\K-CPYZB005-1_1734316546.png
 def insert_skc_image_from_local(sheet, cell, file_path):
@@ -897,7 +875,6 @@ def insert_skc_image_from_local(sheet, cell, file_path):
     except Exception as e:
         log(f'插入图片失败: {e}')
 
-
 # # 设置 A 列和第 1 行为接近 100x100 的正方形
 # set_square_cells(sheet, 'A', 1, 100)
 
@@ -916,35 +893,34 @@ def clear_all_pictures(sheet):
         send_exception()
         log(f"清空图片失败: {e}")
 
-
 def get_excel_format(sheet, cell_range):
     rng = sheet.range(cell_range)
 
     format_settings = {
         "numberFormat": rng.number_format,
-        "font": {
-            "name": rng.api.Font.Name,
-            "size": rng.api.Font.Size,
-            "bold": rng.api.Font.Bold,
+        "font"        : {
+            "name"  : rng.api.Font.Name,
+            "size"  : rng.api.Font.Size,
+            "bold"  : rng.api.Font.Bold,
             "italic": rng.api.Font.Italic,
-            "color": rng.api.Font.Color
+            "color" : rng.api.Font.Color
         },
-        "alignment": {
+        "alignment"   : {
             "horizontalAlignment": rng.api.HorizontalAlignment,
-            "verticalAlignment": rng.api.VerticalAlignment,
-            "wrapText": rng.api.WrapText
+            "verticalAlignment"  : rng.api.VerticalAlignment,
+            "wrapText"           : rng.api.WrapText
         },
-        "borders": []
+        "borders"     : []
     }
 
     # 获取所有边框设置（Excel 有 8 种边框）
     for index in range(5, 13):
         border = rng.api.Borders(index)
         format_settings["borders"].append({
-            "index": index,
+            "index"    : index,
             "lineStyle": border.LineStyle,
-            "color": border.Color,
-            "weight": border.Weight
+            "color"    : border.Color,
+            "weight"   : border.Weight
         })
 
     # 获取背景色
@@ -958,7 +934,6 @@ def get_excel_format(sheet, cell_range):
 
     return json.dumps(format_settings, indent=2)
 
-
 def set_excel_format(sheet, cell_range, json_setting):
     settings = json.loads(json_setting)
 
@@ -1017,7 +992,6 @@ def set_excel_format(sheet, cell_range, json_setting):
     if "formulaHidden" in settings:
         rng.api.FormulaHidden = settings["formulaHidden"]
 
-
 # # 获取 A1 单元格格式
 # json_format = get_excel_format(sheet, "A1")
 # log("Original Format:", json_format)
@@ -1056,7 +1030,6 @@ def get_unique_values(sheet, column, start_row, end_row=None):
     # unique_values = get_unique_values(sheet, 'A', 2)
     # log(unique_values)
 
-
 def get_unique_values_by_row(sheet, row, start_col, end_col=None):
     """
     获取指定行从指定列开始的不重复值列表，确保读取的值与 Excel 中显示的内容完全一致。
@@ -1088,7 +1061,6 @@ def get_unique_values_by_row(sheet, row, start_col, end_col=None):
     # 获取第 2 行从 A 列开始的不重复值
     # unique_values = get_unique_values_by_row(sheet, 2, 'A')
 
-
 def find_rows_by_criteria(sheet, col, search_text, match_type='equals'):
     """
     在指定列中查找符合条件的数据所在行。
@@ -1140,7 +1112,6 @@ def find_rows_by_criteria(sheet, col, search_text, match_type='equals'):
     # result_negative_col = find_rows_by_criteria(sheet, -1, 'xyz', match_type='equals')
     # log("倒数第一列匹配结果:", result_negative_col)
 
-
 def find_columns_by_criteria(sheet, row, search_text, match_type='equals'):
     """
     在指定行中查找符合条件的数据所在列。
@@ -1186,12 +1157,10 @@ def find_columns_by_criteria(sheet, row, search_text, match_type='equals'):
     # result_negative_row = find_columns_by_criteria(sheet, -1, 'xyz', match_type='equals')
     # log("倒数第一行匹配结果:", result_negative_row)
 
-
 def check_data(data):
     for row in data:
         log(len(row), row)
 
-
 def write_data(excel_path, sheet_name, data, format_to_text_colunm=None):
     app, wb, sheet = open_excel(excel_path, sheet_name)
     # 清空工作表中的所有数据
@@ -1205,7 +1174,6 @@ def write_data(excel_path, sheet_name, data, format_to_text_colunm=None):
     wb.save()
     close_excel(app, wb)
 
-
 def colorize_by_field(app, wb, sheet, field):
     minimize(app)
     # 读取数据
@@ -1228,7 +1196,6 @@ def colorize_by_field(app, wb, sheet, field):
         row_range.color = bg_color  # 应用背景色
         sheet.range(f"A{row}").api.Font.Bold = True  # 让店铺名称加粗
 
-
 def add_borders(sheet, lineStyle=1):
     log('添加边框')
     # 获取工作表的整个范围（假设表格的数据是从A1开始）
@@ -1248,7 +1215,6 @@ def add_borders(sheet, lineStyle=1):
     range_to_border.api.Borders(3).LineStyle = lineStyle  # 内部左边框
     range_to_border.api.Borders(4).LineStyle = lineStyle  # 内部右边框
 
-
 def add_range_border(sheet, coor_A=(1, 1), coor_B=(1, 1), lineStyle=1):
     range_to_border = sheet.range(coor_A, coor_B)  # 定义范围
 
@@ -1264,7 +1230,6 @@ def add_range_border(sheet, coor_A=(1, 1), coor_B=(1, 1), lineStyle=1):
     range_to_border.api.Borders(3).LineStyle = lineStyle  # 内部左边框
     range_to_border.api.Borders(4).LineStyle = lineStyle  # 内部右边框
 
-
 def open_excel(excel_path, sheet_name='Sheet1'):
     try:
         # 创建新实例
@@ -1321,7 +1286,6 @@ def open_excel(excel_path, sheet_name='Sheet1'):
         # wxwork.notify_error_msg(f'打开 Excel 失败: {traceback.format_exc()}')
         return None, None, None
 
-
 def close_excel(app, wb):
     if wb is not None:
         wb.save()
@@ -1329,7 +1293,6 @@ def close_excel(app, wb):
     if app is not None:
         app.quit()
 
-
 # 获取某列最后非空行
 def get_last_row(sheet, column):
     last_row = sheet.range(column + str(sheet.cells.last_cell.row)).end('up').row
@@ -1340,38 +1303,32 @@ def get_last_row(sheet, column):
         last_row = cell.merge_area.last_cell.row
     return last_row
 
-
 # 获取最后一列字母
 def get_last_col(sheet):
     # # 获取最后一行的索引
     last_col = index_to_column_name(sheet.range('A1').end('right').column)  # 里面是索引 返回最后一列 如 C
     return last_col
 
-
 # 获取最大列名字母
 def get_max_column_letter(sheet):
     """获取当前 sheet 中最大有数据的列的列名（如 'A', 'B', ..., 'Z', 'AA', 'AB'）"""
     last_col = sheet.used_range.last_cell.column  # 获取最大列索引
     return xw.utils.col_name(last_col)  # 将索引转换为列名
 
-
 # 随机生成颜色
 def random_color():
     return (random.randint(180, 255), random.randint(180, 255), random.randint(180, 255))  # 亮色背景
 
-
 def get_contrast_text_color(rgb):
     """根据背景色亮度返回适合的字体颜色（黑色或白色）"""
     r, g, b = rgb
     brightness = r * 0.299 + g * 0.587 + b * 0.114  # 亮度计算公式
     return (0, 0, 0) if brightness > 186 else (255, 255, 255)  # 186 是经验值
 
-
 def rgb_to_long(r, g, b):
     """将 RGB 颜色转换为 Excel Long 类型"""
     return r + (g * 256) + (b * 256 * 256)
 
-
 def read_excel_to_json(file_path, sheet_name="Sheet1"):
     app, wb, sheet = open_excel(file_path, sheet_name)
 
@@ -1409,20 +1366,20 @@ def read_excel_to_json(file_path, sheet_name="Sheet1"):
                 diagonal_down_info = {"style": diagonal_down.LineStyle, "color": diagonal_down.Color}
 
             cell_info = {
-                "value": cell.value,
-                "color": cell.color,
-                "font_name": cell.api.Font.Name,
-                "font_size": cell.api.Font.Size,
-                "bold": cell.api.Font.Bold,
-                "italic": cell.api.Font.Italic,
-                "font_color": cell.api.Font.Color,
+                "value"           : cell.value,
+                "color"           : cell.color,
+                "font_name"       : cell.api.Font.Name,
+                "font_size"       : cell.api.Font.Size,
+                "bold"            : cell.api.Font.Bold,
+                "italic"          : cell.api.Font.Italic,
+                "font_color"      : cell.api.Font.Color,
                 "horizontal_align": cell.api.HorizontalAlignment,
-                "vertical_align": cell.api.VerticalAlignment,
-                "number_format": cell.api.NumberFormat,
-                "border": {
-                    "left": {"style": cell.api.Borders(1).LineStyle, "color": cell.api.Borders(1).Color},
-                    "right": {"style": cell.api.Borders(2).LineStyle, "color": cell.api.Borders(2).Color},
-                    "top": {"style": cell.api.Borders(3).LineStyle, "color": cell.api.Borders(3).Color},
+                "vertical_align"  : cell.api.VerticalAlignment,
+                "number_format"   : cell.api.NumberFormat,
+                "border"          : {
+                    "left"  : {"style": cell.api.Borders(1).LineStyle, "color": cell.api.Borders(1).Color},
+                    "right" : {"style": cell.api.Borders(2).LineStyle, "color": cell.api.Borders(2).Color},
+                    "top"   : {"style": cell.api.Borders(3).LineStyle, "color": cell.api.Borders(3).Color},
                     "bottom": {"style": cell.api.Borders(4).LineStyle, "color": cell.api.Borders(4).Color},
                 }
             }
@@ -1445,10 +1402,10 @@ def read_excel_to_json(file_path, sheet_name="Sheet1"):
     app.quit()
 
     final_data = {
-        "cells": data,
-        "merged_cells": merged_cells,
+        "cells"        : data,
+        "merged_cells" : merged_cells,
         "column_widths": column_widths,
-        "row_heights": row_heights
+        "row_heights"  : row_heights
     }
 
     with open("excel_data.json", "w", encoding="utf-8") as f:
@@ -1456,7 +1413,6 @@ def read_excel_to_json(file_path, sheet_name="Sheet1"):
 
     print("✅ Excel 数据已存储为 JSON")
 
-
 def write_json_to_excel(json_file, new_excel="new_test.xlsx", sheet_name="Sheet1"):
     with open(json_file, "r", encoding="utf-8") as f:
         final_data = json.load(f)
@@ -1519,7 +1475,6 @@ def write_json_to_excel(json_file, new_excel="new_test.xlsx", sheet_name="Sheet1
     print(f"✅ 数据已成功写入 {new_excel}")
     time.sleep(2)  # 这里需要一个延时
 
-
 def safe_expand_down(sheet, start_cell='A2'):
     rng = sheet.range(start_cell)
     if not rng.value:
@@ -1530,7 +1485,6 @@ def safe_expand_down(sheet, start_cell='A2'):
         log(f'safe_expand_down failed: {e}')
         return [rng]  # 返回单元格本身
 
-
 # 初始化一个表格
 # data 需要是一个二维列表
 def init_progress_ex(key_id, excel_path, sheet_name='Sheet1'):
@@ -1565,7 +1519,6 @@ def init_progress_ex(key_id, excel_path, sheet_name='Sheet1'):
 
     wb.save()
 
-
 def init_data_ex(key_id, excel_path, header, sheet_name='Sheet1'):
     app, wb, sheet = open_excel(excel_path, sheet_name)
 
@@ -1594,7 +1547,6 @@ def init_data_ex(key_id, excel_path, header, sheet_name='Sheet1'):
 
     wb.save()
 
-
 def format_header_row(sheet, column_count):
     """
     设置标题行样式和列对齐
@@ -1616,7 +1568,6 @@ def format_header_row(sheet, column_count):
         # 自动调整列宽
         sheet.range(f'{col_letter}:{col_letter}').autofit()
 
-
 # 初始化一个表格
 # data 需要是一个二维列表
 def init_progress(excel_path, keyID, sheet_name='Sheet1'):
@@ -1668,7 +1619,6 @@ def init_progress(excel_path, keyID, sheet_name='Sheet1'):
 
     wb.save()
 
-
 def get_progress(excel_path, keyID, sheet_name="Sheet1"):
     app, wb, sheet = open_excel(excel_path, sheet_name)
     # 遍历可用行
@@ -1685,7 +1635,6 @@ def get_progress(excel_path, keyID, sheet_name="Sheet1"):
             else:
                 return False
 
-
 def get_progress_ex(keyID, excel_path, sheet_name="Sheet1"):
     app, wb, sheet = open_excel(excel_path, sheet_name)
     # 遍历可用行
@@ -1703,7 +1652,6 @@ def get_progress_ex(keyID, excel_path, sheet_name="Sheet1"):
                 return False
     close_excel(app, wb)
 
-
 def get_progress_data(excel_path, keyID, sheet_name="Sheet1"):
     app, wb, sheet = open_excel(excel_path, sheet_name)
     # 遍历可用行
@@ -1718,7 +1666,6 @@ def get_progress_data(excel_path, keyID, sheet_name="Sheet1"):
             return result
     return None
 
-
 def get_progress_data_ex(keyID, excel_path, sheet_name="Sheet1"):
     app, wb, sheet = open_excel(excel_path, sheet_name)
     # 遍历可用行
@@ -1733,7 +1680,6 @@ def get_progress_data_ex(keyID, excel_path, sheet_name="Sheet1"):
             return result
     return None
 
-
 def set_progress(excel_path, keyID, status='已完成', sheet_name="Sheet1"):
     app, wb, sheet = open_excel(excel_path, sheet_name)
     # 遍历可用行
@@ -1748,7 +1694,6 @@ def set_progress(excel_path, keyID, status='已完成', sheet_name="Sheet1"):
             wb.save()
             return
 
-
 def set_progress_ex(keyID, excel_path, status='已完成', sheet_name="Sheet1"):
     app, wb, sheet = open_excel(excel_path, sheet_name)
     # 遍历可用行
@@ -1765,7 +1710,6 @@ def set_progress_ex(keyID, excel_path, status='已完成', sheet_name="Sheet1"):
             return
     close_excel(app, wb)
 
-
 def set_data_ex(keyID, data, excel_path, sheet_name="Sheet1"):
     app, wb, sheet = open_excel(excel_path, sheet_name)
     # 遍历可用行
@@ -1780,7 +1724,6 @@ def set_data_ex(keyID, data, excel_path, sheet_name="Sheet1"):
             wb.save()
             return
 
-
 def set_progress_data(excel_path, keyID, data, sheet_name="Sheet1"):
     app, wb, sheet = open_excel(excel_path, sheet_name)
     # 遍历可用行
@@ -1796,7 +1739,6 @@ def set_progress_data(excel_path, keyID, data, sheet_name="Sheet1"):
             wb.save()
             return
 
-
 def set_progress_data_ex(keyID, data, excel_path, sheet_name="Sheet1"):
     app, wb, sheet = open_excel(excel_path, sheet_name)
     # 遍历可用行
@@ -1812,7 +1754,6 @@ def set_progress_data_ex(keyID, data, excel_path, sheet_name="Sheet1"):
             wb.save()
             return
 
-
 def check_progress(excel_path, listKeyID, sheet_name="Sheet1"):
     app, wb, sheet = open_excel(excel_path, sheet_name)
     # 读取整个任务表数据
@@ -1827,7 +1768,6 @@ def check_progress(excel_path, listKeyID, sheet_name="Sheet1"):
     incomplete_tasks = [task_id for task_id in listKeyID if task_status_dict.get(task_id) != "已完成"]
     return len(incomplete_tasks) == 0, incomplete_tasks
 
-
 def check_progress_ex(listKeyID, excel_path, sheet_name="Sheet1"):
     app, wb, sheet = open_excel(excel_path, sheet_name)
     # 读取整个任务表数据
@@ -1842,7 +1782,6 @@ def check_progress_ex(listKeyID, excel_path, sheet_name="Sheet1"):
     incomplete_tasks = [task_id for task_id in listKeyID if task_status_dict.get(task_id) != "已完成"]
     return len(incomplete_tasks) == 0, incomplete_tasks
 
-
 def read_excel_sheet_to_list(file_path, sheet_name=None):
     """
     使用 xlwings 读取 Excel 文件中指定工作表的数据，并返回为二维列表。
@@ -1864,7 +1803,6 @@ def read_excel_sheet_to_list(file_path, sheet_name=None):
     else:
         return [data]
 
-
 def excel_to_dict(excel_path, column_key, column_value, sheet_name=None):
     """
     从 Excel 文件中读取指定两列，生成字典返回（不受中间空行影响）
@@ -1912,7 +1850,6 @@ def excel_to_dict(excel_path, column_key, column_value, sheet_name=None):
             wb.close()
         app.quit()
 
-
 def format_to_text_v2(sheet, columns=None):
     if columns is None or len(columns) == 0:
         return
@@ -1922,7 +1859,6 @@ def format_to_text_v2(sheet, columns=None):
             log(f'设置[{col_name}] 文本格式')
         sheet.range(f'{col_name}:{col_name}').number_format = '@'
 
-
 def format_to_text(sheet, columns=None):
     if columns is None:
         return
@@ -1936,7 +1872,6 @@ def format_to_text(sheet, columns=None):
                 log(f'设置[{c}] 文本格式')
                 sheet.range(f'{col_name}:{col_name}').number_format = '@'
 
-
 def format_to_date(sheet, columns=None):
     if columns is None:
         return
@@ -1952,7 +1887,6 @@ def format_to_date(sheet, columns=None):
                 log(f'设置[{c}] 时间格式')
                 sheet.range(f'{col_name}:{col_name}').number_format = 'yyyy-mm-dd'
 
-
 def format_to_datetime(sheet, columns=None):
     if columns is None:
         return
@@ -1968,7 +1902,6 @@ def format_to_datetime(sheet, columns=None):
                 log(f'设置[{c}] 时间格式')
                 sheet.range(f'{col_name}:{col_name}').number_format = 'yyyy-mm-dd hh:mm:ss'
 
-
 def format_to_month(sheet, columns=None):
     if columns is None:
         return
@@ -1982,7 +1915,6 @@ def format_to_month(sheet, columns=None):
                 log(f'设置[{c}] 年月格式')
                 sheet.range(f'{col_name}:{col_name}').number_format = 'yyyy-mm'
 
-
 def add_sum_for_cell(sheet, col_list, row=2):
     last_row = sheet.range('A' + str(sheet.cells.last_cell.row)).end('up').row
     for col_name in col_list:
@@ -1991,14 +1923,12 @@ def add_sum_for_cell(sheet, col_list, row=2):
         sheet.range(f'{col_letter}{row}').api.Font.Color = 255
         sheet.range(f'{col_letter}:{col_letter}').autofit()
 
-
 def clear_for_cell(sheet, col_list, row=2):
     last_row = sheet.range('A' + str(sheet.cells.last_cell.row)).end('up').row
     for col_name in col_list:
         col_letter = find_column_by_data(sheet, 1, col_name)
         sheet.range(f'{col_letter}{row}').value = ''
 
-
 def color_for_column(sheet, col_list, color_name, start_row=2):
     last_row = sheet.range('A' + str(sheet.cells.last_cell.row)).end('up').row
     for col_name in col_list:
@@ -2007,7 +1937,6 @@ def color_for_column(sheet, col_list, color_name, start_row=2):
             sheet.range(f'{col_letter}{start_row}:{col_letter}{last_row}').api.Font.ColorIndex = excel_color_index[
                 color_name]
 
-
 def add_formula_for_column(sheet, col_name, formula, start_row=2):
     last_row = sheet.range('A' + str(sheet.cells.last_cell.row)).end('up').row
     col_letter = find_column_by_data(sheet, 1, col_name)
@@ -2021,7 +1950,6 @@ def add_formula_for_column(sheet, col_name, formula, start_row=2):
             sheet.range(f'{col_letter}{start_row}').api.AutoFill(
                 sheet.range(f'{col_letter}{start_row}:{col_letter}{last_row}').api)
 
-
 def autofit_column(sheet, columns=None):
     if columns is None:
         return
@@ -2040,7 +1968,6 @@ def autofit_column(sheet, columns=None):
                 sheet.range(f'{col_name}:{col_name}').api.WrapText = True
                 sheet.range(f'{col_name}:{col_name}').autofit()
 
-
 def specify_column_width(sheet, columns=None, width=150):
     if columns is None:
         return
@@ -2056,7 +1983,6 @@ def specify_column_width(sheet, columns=None, width=150):
                 log(f'设置[{c}]宽度: {width}')
                 sheet.range(f'{col_name}:{col_name}').column_width = width
 
-
 def format_to_money(sheet, columns=None):
     if columns is None:
         return
@@ -2072,7 +1998,6 @@ def format_to_money(sheet, columns=None):
                 log(f'设置[{c}] 金额格式')
                 sheet.range(f'{col_name}:{col_name}').number_format = '¥#,##0.00'
 
-
 def format_to_percent(sheet, columns=None, decimal_places=2):
     if columns is None:
         return
@@ -2092,7 +2017,6 @@ def format_to_percent(sheet, columns=None, decimal_places=2):
                 else:
                     sheet.range(f'{col_name}:{col_name}').number_format = f'0.{"0" * decimal_places}%'
 
-
 def format_to_number(sheet, columns=None, decimal_places=2):
     if not columns or not isinstance(columns, (list, tuple, set)):
         log(f'未提供有效列名列表（{columns}），跳过格式转换')
@@ -2117,7 +2041,6 @@ def format_to_number(sheet, columns=None, decimal_places=2):
                 sheet.range(f'{col_name}:{col_name}').number_format = number_format
                 break  # 如果一列只匹配一个关键词可提前退出
 
-
 # def format_to_number(sheet, columns=None, decimal_places=2):
 #     if columns is None or not isinstance(columns, list):
 #         log('跳过格式化成数字', columns)
@@ -2157,7 +2080,6 @@ def column_to_right(sheet, columns=None):
                 sheet.range(f'{col_name}:{col_name}').api.HorizontalAlignment = -4152
                 sheet.range(f'{col_name}:{col_name}').api.VerticalAlignment = -4108
 
-
 def column_to_left(sheet, columns=None):
     if columns is None:
         return
@@ -2177,7 +2099,6 @@ def column_to_left(sheet, columns=None):
                 sheet.range(f'{col_name}:{col_name}').api.HorizontalAlignment = -4131
                 sheet.range(f'{col_name}:{col_name}').api.VerticalAlignment = -4108
 
-
 def beautify_title(sheet):
     log('美化标题')
     used_range_col = sheet.range('A1').expand('right')
@@ -2196,7 +2117,6 @@ def beautify_title(sheet):
         sheet.range(f'{col_name}:{col_name}').api.VerticalAlignment = -4108
     sheet.autofit()
 
-
 def set_title_style(sheet, rows=2):
     col = get_max_column_letter(sheet)
     range = sheet.range(f'A1:{col}{rows}')
@@ -2219,7 +2139,6 @@ def set_title_style(sheet, rows=2):
 
     sheet.autofit()
 
-
 def move_sheet_to_position(wb, sheet_name, position):
     # 获取要移动的工作表
     sheet = wb.sheets[sheet_name]
@@ -2233,13 +2152,11 @@ def move_sheet_to_position(wb, sheet_name, position):
     # 保存工作簿
     wb.save()
 
-
 # Excel 文件锁管理器
 import threading
 import time
 from collections import defaultdict
 
-
 class ExcelFileLockManager:
     """Excel 文件锁管理器，用于管理不同 Excel 文件的并发访问"""
 
@@ -2272,7 +2189,7 @@ class ExcelFileLockManager:
         # 记录等待请求
         with self._lock:
             self._waiting_queue[excel_path].append({
-                'priority': priority,
+                'priority' : priority,
                 'timestamp': time.time(),
                 'thread_id': threading.get_ident()
             })
@@ -2345,11 +2262,9 @@ class ExcelFileLockManager:
                 # 比如检查文件最后访问时间等
                 pass
 
-
 # 全局 Excel 文件锁管理器实例
 excel_lock_manager = ExcelFileLockManager()
 
-
 def open_excel_with_lock(excel_path, sheet_name='Sheet1', timeout=30):
     """
     带锁的 Excel 打开函数，支持复用已打开的实例
@@ -2409,7 +2324,6 @@ def open_excel_with_lock(excel_path, sheet_name='Sheet1', timeout=30):
         excel_lock_manager.release_excel_lock(excel_path)
         return None, None, None
 
-
 def close_excel_with_lock(excel_path, app, wb, force_close=False):
     """
     带锁的 Excel 关闭函数
@@ -2435,7 +2349,6 @@ def close_excel_with_lock(excel_path, app, wb, force_close=False):
     finally:
         excel_lock_manager.release_excel_lock(excel_path)
 
-
 def write_data_with_lock(excel_path, sheet_name, data, format_to_text_colunm=None):
     """
     带锁的数据写入函数，复用 Excel 实例
@@ -2466,7 +2379,6 @@ def write_data_with_lock(excel_path, sheet_name, data, format_to_text_colunm=Non
         log(f"写入数据失败: {e}")
         return False
 
-
 def format_excel_with_lock(excel_path, sheet_name, format_func, *args, **kwargs):
     """
     带锁的 Excel 格式化函数
@@ -2493,7 +2405,6 @@ def format_excel_with_lock(excel_path, sheet_name, format_func, *args, **kwargs)
         log(f"格式化失败: {e}")
         return False
 
-
 def batch_excel_operations(excel_path, operations):
     """
     批量 Excel 操作函数，一次性打开 Excel 执行多个操作
@@ -2555,7 +2466,6 @@ def batch_excel_operations(excel_path, operations):
         # 释放锁但不关闭 Excel（保持复用）
         excel_lock_manager.release_excel_lock(excel_path)
 
-
 def force_close_excel_file(excel_path):
     """
     强制关闭指定的 Excel 文件
@@ -2572,7 +2482,6 @@ def force_close_excel_file(excel_path):
     except Exception as e:
         log(f"强制关闭 Excel 文件失败: {e}")
 
-
 def wait_for_excel_available(excel_path, timeout=60, check_interval=1):
     """
     等待 Excel 文件可用
@@ -2594,7 +2503,6 @@ def wait_for_excel_available(excel_path, timeout=60, check_interval=1):
     log(f"等待 Excel 文件可用超时: {excel_path}")
     return False
 
-
 def smart_excel_operation(excel_path, operation_func, priority=0, timeout=60, max_retries=3):
     """
     智能 Excel 操作函数，支持优先级、重试和更好的错误处理
@@ -2661,7 +2569,6 @@ def smart_excel_operation(excel_path, operation_func, priority=0, timeout=60, ma
 
     return False
 
-
 def batch_excel_operations_with_priority(excel_path, operations, priority=0, timeout=60):
     """
     带优先级的批量 Excel 操作函数
@@ -2715,7 +2622,6 @@ def batch_excel_operations_with_priority(excel_path, operations, priority=0, tim
 
     return smart_excel_operation(excel_path, batch_operation, priority, timeout)
 
-
 def wait_for_excel_available_with_priority(excel_path, timeout=60, check_interval=1, priority=0):
     """
     等待 Excel 文件可用（带优先级）
@@ -2738,7 +2644,6 @@ def wait_for_excel_available_with_priority(excel_path, timeout=60, check_interva
     log(f"等待 Excel 文件可用超时: {excel_path}")
     return False
 
-
 def get_excel_status(excel_path):
     """
     获取 Excel 文件状态信息
@@ -2750,8 +2655,8 @@ def get_excel_status(excel_path):
         dict: 状态信息
     """
     return {
-        'is_open': excel_lock_manager.is_excel_open(excel_path),
-        'waiting_count': excel_lock_manager.get_waiting_count(excel_path),
+        'is_open'        : excel_lock_manager.is_excel_open(excel_path),
+        'waiting_count'  : excel_lock_manager.get_waiting_count(excel_path),
         'operation_count': excel_lock_manager.get_operation_count(excel_path),
-        'has_lock': excel_lock_manager.get_file_lock(excel_path).locked()
+        'has_lock'       : excel_lock_manager.get_file_lock(excel_path).locked()
     }