From c460337c43ba0954ff0f500b589e8bbf628f6e2f Mon Sep 17 00:00:00 2001 From: fujie Date: Sat, 3 Jan 2026 14:12:53 +0800 Subject: [PATCH] feat: support markdown italic formatting and refine bold parsing --- .../export_to_excel/export_to_excel.py | 65 ++++++++++++------- .../actions/export_to_excel/导出为Excel.py | 65 ++++++++++++------- 2 files changed, 80 insertions(+), 50 deletions(-) diff --git a/plugins/actions/export_to_excel/export_to_excel.py b/plugins/actions/export_to_excel/export_to_excel.py index 109b61e..02c656e 100644 --- a/plugins/actions/export_to_excel/export_to_excel.py +++ b/plugins/actions/export_to_excel/export_to_excel.py @@ -749,8 +749,9 @@ class Action: } ) - # Bold font format (for rich text) + # Bold and Italic font formats (for rich text) bold_font_format = workbook.add_format({"bold": True}) + italic_font_format = workbook.add_format({"italic": True}) for i, table in enumerate(tables): try: @@ -824,6 +825,7 @@ class Action: date_format, sequence_format, bold_font_format, + italic_font_format, ) except Exception as e: @@ -848,6 +850,7 @@ class Action: date_format, sequence_format, bold_font_format=None, + italic_font_format=None, ): """ Apply enhanced formatting @@ -856,7 +859,7 @@ class Action: - Text: Left aligned - Date: Center aligned - Sequence: Center aligned - - Supports Markdown bold (**text**) + - Supports Markdown bold (**text**) and italic (*text*) """ try: # 1. Write headers (Center aligned) @@ -921,9 +924,9 @@ class Action: if ( content_type == "text" and isinstance(value, str) - and "**" in value + and ("**" in value or "*" in value) ): - # Try to parse Markdown bold + # Try to parse Markdown bold/italic self.write_rich_string_cell( worksheet, row_idx + 1, @@ -931,6 +934,7 @@ class Action: value, current_format, bold_font_format, + italic_font_format, ) else: worksheet.write(row_idx + 1, col_idx, value, current_format) @@ -1025,41 +1029,52 @@ class Action: print(f"Error in basic formatting: {str(e)}") def write_rich_string_cell( - self, worksheet, row, col, text, cell_format, bold_format + self, + worksheet, + row, + col, + text, + cell_format, + bold_format, + italic_format, ): """ - Parse Markdown bold and write to rich string cell + Parse Markdown bold (**) and italic (*) and write to rich string cell + Note: Does not support nested formatting or mixed overlapping tags for simplicity. """ try: parts = [] current_text = text - has_bold = False + has_formatting = False - # Simple parsing logic: split by ** - while "**" in current_text: - start = current_text.find("**") - end = current_text.find("**", start + 2) + # Regex to match **bold** OR *italic* + # Priority to bold (**) because it's longer + pattern = re.compile(r"(\*\*(.*?)\*\*)|(\*(.*?)\*)") - if end != -1: - has_bold = True - # Add preceding normal text - if start > 0: - parts.append(current_text[:start]) + last_end = 0 + for match in pattern.finditer(text): + has_formatting = True + start, end = match.span() - # Add bold text - bold_text = current_text[start + 2 : end] + # Add preceding normal text + if start > last_end: + parts.append(text[last_end:start]) + + # Add formatted text + if match.group(1): # Bold match (**...**) parts.append(bold_format) - parts.append(bold_text) + parts.append(match.group(2)) + elif match.group(3): # Italic match (*...*) + parts.append(italic_format) + parts.append(match.group(4)) - current_text = current_text[end + 2 :] - else: - break + last_end = end # Add remaining text - if current_text: - parts.append(current_text) + if last_end < len(text): + parts.append(text[last_end:]) - if has_bold and len(parts) > 1: + if has_formatting and len(parts) > 1: # Must end with cell_format parts.append(cell_format) worksheet.write_rich_string(row, col, *parts) diff --git a/plugins/actions/export_to_excel/导出为Excel.py b/plugins/actions/export_to_excel/导出为Excel.py index f2b0a97..9dfdf5b 100644 --- a/plugins/actions/export_to_excel/导出为Excel.py +++ b/plugins/actions/export_to_excel/导出为Excel.py @@ -754,8 +754,9 @@ class Action: } ) - # 粗体字体格式 (用于富文本) + # 粗体和斜体字体格式 (用于富文本) bold_font_format = workbook.add_format({"bold": True}) + italic_font_format = workbook.add_format({"italic": True}) for i, table in enumerate(tables): try: @@ -829,6 +830,7 @@ class Action: date_format, sequence_format, bold_font_format, + italic_font_format, ) except Exception as e: @@ -853,6 +855,7 @@ class Action: date_format, sequence_format, bold_font_format=None, + italic_font_format=None, ): """ 应用符合中国官方表格规范的格式化 @@ -861,7 +864,7 @@ class Action: - 文本: 左对齐 - 日期: 居中对齐 - 序号: 居中对齐 - - 支持 Markdown 粗体 (**text**) + - 支持 Markdown 粗体 (**text**) 和斜体 (*text*) """ try: # 1. 写入表头（居中对齐） @@ -926,9 +929,9 @@ class Action: if ( content_type == "text" and isinstance(value, str) - and "**" in value + and ("**" in value or "*" in value) ): - # 尝试解析 Markdown 粗体 + # 尝试解析 Markdown 粗体/斜体 self.write_rich_string_cell( worksheet, row_idx + 1, @@ -936,6 +939,7 @@ class Action: value, current_format, bold_font_format, + italic_font_format, ) else: worksheet.write(row_idx + 1, col_idx, value, current_format) @@ -1040,41 +1044,52 @@ class Action: print(f"Warning: Even basic formatting failed: {str(e)}") def write_rich_string_cell( - self, worksheet, row, col, text, cell_format, bold_format + self, + worksheet, + row, + col, + text, + cell_format, + bold_format, + italic_format, ): """ - 解析 Markdown 粗体并写入富文本单元格 + 解析 Markdown 粗体 (**) 和斜体 (*) 并写入富文本单元格 + 注意: 为简化实现，不支持嵌套格式或混合重叠标签 """ try: parts = [] current_text = text - has_bold = False + has_formatting = False - # 简单的解析逻辑：分割 ** - while "**" in current_text: - start = current_text.find("**") - end = current_text.find("**", start + 2) + # 正则匹配 **bold** 或 *italic* + # 优先匹配粗体 (**)，因为它更长 + pattern = re.compile(r"(\*\*(.*?)\*\*)|(\*(.*?)\*)") - if end != -1: - has_bold = True - # 添加前面的普通文本 - if start > 0: - parts.append(current_text[:start]) + last_end = 0 + for match in pattern.finditer(text): + has_formatting = True + start, end = match.span() - # 添加粗体文本 - bold_text = current_text[start + 2 : end] + # 添加前面的普通文本 + if start > last_end: + parts.append(text[last_end:start]) + + # 添加格式化文本 + if match.group(1): # 粗体匹配 (**...**) parts.append(bold_format) - parts.append(bold_text) + parts.append(match.group(2)) + elif match.group(3): # 斜体匹配 (*...*) + parts.append(italic_format) + parts.append(match.group(4)) - current_text = current_text[end + 2 :] - else: - break + last_end = end # 添加剩余文本 - if current_text: - parts.append(current_text) + if last_end < len(text): + parts.append(text[last_end:]) - if has_bold and len(parts) > 1: + if has_formatting and len(parts) > 1: # 必须以 cell_format 结尾 parts.append(cell_format) worksheet.write_rich_string(row, col, *parts)