From 78cd949f43bccf9a5920bab9c742059b10407998 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Fri, 29 Nov 2024 16:09:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0xlsx?= =?UTF-8?q?=E9=87=8C=E7=9A=84=E5=9B=BE=E7=89=87=E6=B2=A1=E5=9C=A8=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=8F=90=E5=8F=96=E4=B8=AD=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/table/xlsx_parse_table_handle.py | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/apps/common/handle/impl/table/xlsx_parse_table_handle.py b/apps/common/handle/impl/table/xlsx_parse_table_handle.py index 2ae22d019..a98c6ae75 100644 --- a/apps/common/handle/impl/table/xlsx_parse_table_handle.py +++ b/apps/common/handle/impl/table/xlsx_parse_table_handle.py @@ -78,28 +78,34 @@ class XlsxSplitHandle(BaseParseTableHandle): try: # 加载 Excel 文件 workbook = load_workbook(file) + try: + image_dict: dict = xlsx_embed_cells_images(file) + if len(image_dict) > 0: + save_image(image_dict.values()) + except Exception as e: + print(f'{e}') + image_dict = {} md_tables = '' # 如果未指定 sheet_name，则使用第一个工作表 for sheetname in workbook.sheetnames: sheet = workbook[sheetname] if sheetname else workbook.active - - # 获取工作表的所有行 - rows = list(sheet.iter_rows(values_only=True)) - if not rows: - continue + rows = self.fill_merged_cells(sheet, image_dict) # 提取表头和内容 - headers = rows[0] - data = rows[1:] + + headers = [f"{key}" for key, value in rows[0].items()] # 构建 Markdown 表格 md_table = '| ' + ' | '.join(headers) + ' |\n' md_table += '| ' + ' | '.join(['---'] * len(headers)) + ' |\n' - for row in data: + for row in rows: + r = [f'{value}' for key, value in row.items()] md_table += '| ' + ' | '.join( - [str(cell).replace('\n', '
') if cell is not None else '' for cell in row]) + ' |\n' + [str(cell).replace('\n', '
') if cell is not None else '' for cell in r]) + ' |\n' md_tables += md_table + '\n\n' + + md_tables = md_tables.replace('/api/image/', '/api/file/') return md_tables except Exception as e: max_kb.error(f'excel split handle error: {e}')