diff --git a/extract_vba.py b/extract_vba.py index 3a94058..33eb04c 100644 --- a/extract_vba.py +++ b/extract_vba.py @@ -76,8 +76,10 @@ class VBAExtractor: elif VBA_OUTPUT_DIR is not None: self.output_dir = Path(VBA_OUTPUT_DIR) else: - # 使用目标文件同目录下的VBA文件夹 - self.output_dir = self.source_path.parent / "VBA" + # 根据文件类型使用不同的默认文件夹 + file_type = get_file_type(self.source_path) + default_dir = "VBA-Access" if file_type == 'access' else "VBA-Excel" + self.output_dir = self.source_path.parent / default_dir # 创建输出目录结构 self.modules_dir = self.output_dir / STANDARD_MODULE_DIR diff --git a/import_vba.py b/import_vba.py index 028a1e7..01b0125 100644 --- a/import_vba.py +++ b/import_vba.py @@ -472,8 +472,9 @@ def main(): if not vba_path.is_absolute(): vba_path = script_dir / vba_path else: - # 使用目标文件同目录下的 VBA 文件夹 - vba_path = target_path.parent / "VBA" + # 根据文件类型使用不同的默认文件夹 + default_dir = "VBA-Access" if file_type == "access" else "VBA-Excel" + vba_path = target_path.parent / default_dir if not vba_path.exists(): print(f"错误: VBA 代码目录不存在: {vba_path}")