qrpa 1.0.25__py3-none-any.whl → 1.0.26__py3-none-any.whl

qrpa/fun_excel.py

@@ -1860,6 +1860,117 @@ 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_v2_safe(sheet, columns=None, data_rows=None):
+    """
+    更安全的文本格式化函数，避免COM异常
+    
+    Args:
+        sheet: Excel工作表对象
+        columns: 要格式化的列名列表
+        data_rows: 数据行数，用于限制格式化范围
+    """
+    if columns is None or len(columns) == 0:
+        return
+    
+    # 确保columns是列表
+    if not isinstance(columns, list):
+        columns = [columns]
+    
+    for col_name in columns:
+        try:
+            if isinstance(col_name, int):
+                col_name = xw.utils.col_name(col_name)
+            
+            log(f'安全设置[{col_name}] 文本格式')
+            
+            # 如果指定了数据行数，只格式化有数据的范围
+            if data_rows and data_rows > 0:
+                # 格式化从第1行到数据行数的范围
+                range_str = f'{col_name}1:{col_name}{data_rows}'
+                sheet.range(range_str).number_format = '@'
+            else:
+                # 检查列是否有数据，如果没有则跳过
+                try:
+                    # 先检查第一个单元格是否存在
+                    test_range = sheet.range(f'{col_name}1')
+                    if test_range.value is not None or sheet.used_range.last_cell.column >= column_name_to_index(col_name) + 1:
+                        sheet.range(f'{col_name}:{col_name}').number_format = '@'
+                    else:
+                        log(f'列 {col_name} 没有数据，跳过格式化')
+                except:
+                    log(f'列 {col_name} 格式化失败，跳过')
+                    
+        except Exception as e:
+            log(f'设置列 {col_name} 文本格式失败: {e}，继续处理其他列')
+
+def pre_format_columns_safe(sheet, columns, data_rows):
+    """
+    预格式化函数：在写入数据前安全地设置列格式
+    
+    Args:
+        sheet: Excel工作表对象
+        columns: 要格式化的列名列表
+        data_rows: 预期数据行数
+    """
+    if not columns or not isinstance(columns, list):
+        return
+    
+    for col_name in columns:
+        try:
+            if isinstance(col_name, int):
+                col_name = xw.utils.col_name(col_name)
+            
+            log(f'预格式化列 [{col_name}] 为文本格式')
+            
+            # 方法1：先创建最小范围，避免整列操作
+            try:
+                # 创建足够大的范围来覆盖预期数据
+                range_str = f'{col_name}1:{col_name}{max(data_rows, 1000)}'
+                sheet.range(range_str).number_format = '@'
+                log(f'预格式化成功: {range_str}')
+            except Exception as e1:
+                log(f'预格式化方法1失败: {e1}')
+                
+                # 方法2：逐行设置格式，更安全但稍慢
+                try:
+                    for row in range(1, data_rows + 1):
+                        cell = sheet.range(f'{col_name}{row}')
+                        cell.number_format = '@'
+                    log(f'逐行预格式化成功: {col_name}')
+                except Exception as e2:
+                    log(f'逐行预格式化也失败: {e2}')
+                    
+        except Exception as e:
+            log(f'预格式化列 {col_name} 失败: {e}，继续处理其他列')
+
+def post_format_columns_safe(sheet, columns, data_rows):
+    """
+    后格式化函数：在写入数据后确认列格式
+    
+    Args:
+        sheet: Excel工作表对象
+        columns: 要格式化的列名列表
+        data_rows: 实际数据行数
+    """
+    if not columns or not isinstance(columns, list):
+        return
+    
+    for col_name in columns:
+        try:
+            if isinstance(col_name, int):
+                col_name = xw.utils.col_name(col_name)
+            
+            log(f'后格式化列 [{col_name}] 为文本格式')
+            
+            # 只对实际有数据的行进行格式化
+            if data_rows > 0:
+                range_str = f'{col_name}1:{col_name}{data_rows}'
+                sheet.range(range_str).number_format = '@'
+                log(f'后格式化成功: {range_str}')
+                
+        except Exception as e:
+            log(f'后格式化列 {col_name} 失败: {e}，继续处理其他列')
+
 def format_to_text(sheet, columns=None):
     if columns is None:
         return
@@ -2469,12 +2580,25 @@ def batch_excel_operations(excel_path, operations):
                 data, format_to_text_colunm = args[0], args[1:] if len(args) > 1 else None
                 # 清空工作表
                 sheet.clear()
-                # 格式化文本列
-                if format_to_text_colunm:
-                    format_to_text_v2(sheet, format_to_text_colunm)
+                
+                # 先设置文本格式，再写入数据（确保格式生效）
+                if format_to_text_colunm and format_to_text_colunm[0]:
+                    try:
+                        # 使用安全的预格式化方式
+                        pre_format_columns_safe(sheet, format_to_text_colunm[0], len(data))
+                    except Exception as e:
+                        log(f"预格式化失败: {e}，继续执行")
+                
                 # 写入数据
                 sheet.range('A1').value = data
                 log(f"批量操作：写入数据到 {sheet_name}")
+                
+                # 写入后再次确认格式（双重保险）
+                if format_to_text_colunm and format_to_text_colunm[0]:
+                    try:
+                        post_format_columns_safe(sheet, format_to_text_colunm[0], len(data))
+                    except Exception as e:
+                        log(f"后格式化失败: {e}")
 
             elif operation_type == 'format':
                 format_func, format_args = args[0], args[1:] if len(args) > 1 else ()

{qrpa-1.0.25.dist-info → qrpa-1.0.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.0.25
+Version: 1.0.26
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>

{qrpa-1.0.25.dist-info → qrpa-1.0.26.dist-info}/RECORD

@@ -2,7 +2,7 @@ qrpa/RateLimitedSender.py,sha256=hqvb1qspDFaW4RsLuVufylOrefkMgixANKeBaGEqYb4,142
 qrpa/__init__.py,sha256=OMQjTO0rE2XDyxsM6wVeWfI1rKFyXRGO5oPU6iLqfoA,980
 qrpa/db_migrator.py,sha256=2VmhzcMsU0MKpl-mNCwKyV8tLTqyEysSpP27-S_rQZ8,21862
 qrpa/fun_base.py,sha256=qg6SvR-GEj2TclB1OL9eLu711jV-bysXJ5Eh2gW9pE8,10600
-qrpa/fun_excel.py,sha256=rMfNsokeAwftIENOYTGaN3-bRj1v9-TpArFUtnkK1kU,106477
+qrpa/fun_excel.py,sha256=qGiTupcGJdZyVZL-LMxkZDTpOPhobzxZesU2Tr8iOl0,111619
 qrpa/fun_file.py,sha256=yzjDV16WL5vRys7J4uQcNzIFkX4D5MAlSCwxcD-mwQo,11966
 qrpa/fun_web.py,sha256=5QLQorAhRzMOGMRh4eCJ2UH8ZhVHvxkHwobWhmgU5qM,6286
 qrpa/fun_win.py,sha256=-LnTeocdTt72NVH6VgLdpAT9_C5oV9okeudXG6CftMA,8034
@@ -17,7 +17,7 @@ qrpa/temu_lib.py,sha256=hYB59zsLS3m3NTic_duTwPMOTSxlHyQVa8OhHnHm-1g,7199
 qrpa/time_utils.py,sha256=ef0hhbN_6b-gcnz5ETIVOoxemIMvcxGVGGIRnHnGaBo,29564
 qrpa/time_utils_example.py,sha256=shHOXKKF3QSzb0SHsNc34M61wEkkLuM30U9X1THKNS8,8053
 qrpa/wxwork.py,sha256=Vy8PGEtlTWt4-1laVhuqpJUGCFH2JymgbjvH00aaBog,10946
-qrpa-1.0.25.dist-info/METADATA,sha256=EQUAQAlLv1qCtr78NOCVbwHkyqNKUbYnQkOWZaXFpc8,231
-qrpa-1.0.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qrpa-1.0.25.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
-qrpa-1.0.25.dist-info/RECORD,,
+qrpa-1.0.26.dist-info/METADATA,sha256=tsIRZvpoWWACWKLq_fvsrrwY84lken14sYSQeCtzCrQ,231
+qrpa-1.0.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qrpa-1.0.26.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
+qrpa-1.0.26.dist-info/RECORD,,