1
0

refactor: 重构外部模板系统,改为单文件模板库模式

主要变更:
- 将 templates_dir 参数改为 template_file,支持单个模板库 YAML 文件
- 添加模板库 YAML 验证功能
- 为模板添加 base_dir 支持,正确解析相对路径资源
- 内联模板与外部模板同名时改为警告(内联优先)
- 移除模板缓存机制,直接使用模板库字典
- 更新所有相关测试以适配新的模板加载方式

此重构简化了模板管理,使模板资源的路径解析更加清晰明确。
This commit is contained in:
2026-03-05 13:26:29 +08:00
parent bd12fce14b
commit f1aae96a04
27 changed files with 2141 additions and 1988 deletions

View File

@@ -63,44 +63,6 @@ slides:
# 默认应该启用
assert slides_data[0].get('enabled', True) is True
def test_slide_enabled_with_template(self, temp_dir):
"""测试 enabled 与模板共存"""
# 创建模板
template_dir = temp_dir / "templates"
template_dir.mkdir()
template_file = template_dir / "title-slide.yaml"
template_content = """
vars:
- name: title
required: true
elements:
- type: text
box: [1, 2, 8, 1]
content: "{title}"
font:
size: 44
"""
template_file.write_text(template_content)
yaml_content = """
slides:
- template: title-slide
enabled: false
vars:
title: "Disabled Title"
- template: title-slide
vars:
title: "Enabled Title"
"""
yaml_path = temp_dir / "test.yaml"
yaml_path.write_text(yaml_content)
pres = Presentation(str(yaml_path), str(template_dir))
slides_data = pres.data.get('slides', [])
# 第一个禁用,第二个启用
assert slides_data[0].get('enabled', True) is False
assert slides_data[1].get('enabled', True) is True
def test_slide_enabled_with_custom_slide(self, temp_dir):
"""测试 enabled 与自定义幻灯片共存"""
@@ -127,55 +89,6 @@ slides:
assert slides_data[0].get('enabled', True) is False
assert slides_data[1].get('enabled', True) is True
def test_slide_enabled_with_element_visible(self, temp_dir):
"""测试 enabled 和 visible 共存"""
# 创建模板
template_dir = temp_dir / "templates"
template_dir.mkdir()
template_file = template_dir / "title-slide.yaml"
template_content = """
vars:
- name: title
required: true
- name: subtitle
required: false
default: ""
elements:
- type: text
box: [1, 2, 8, 1]
content: "{title}"
font:
size: 44
- type: text
box: [1, 3.5, 8, 0.5]
content: "{subtitle}"
visible: "{subtitle != ''}"
font:
size: 24
"""
template_file.write_text(template_content)
yaml_content = """
slides:
- template: title-slide
enabled: true
vars:
title: "Title"
subtitle: ""
"""
yaml_path = temp_dir / "test.yaml"
yaml_path.write_text(yaml_content)
pres = Presentation(str(yaml_path), str(template_dir))
slide_data = pres.data['slides'][0]
# 页面启用
assert slide_data.get('enabled', True) is True
# 渲染幻灯片,元素级 visible 会隐藏空副标题
rendered = pres.render_slide(slide_data)
# 只有标题元素,副标题被 visible 隐藏
assert len(rendered['elements']) == 1
def test_slide_enabled_count(self, temp_dir):
"""测试渲染统计准确"""