feat(内存占用): 复用SVG字体资源,减少多页阅读的传输量和内存开销
build.yaml / build (push) Successful in 41s

This commit is contained in:
xiaoqidun committed 2026-09-13 16:13:51 +08:00
1 parent 481b21c7ce
commit 78b34713cc
5 files changed
+165 -2

No files matched your search

+20
View File
@@ -39,6 +39,7 @@ func RunWASM() {
registerCallback("ofdgoDocumentInfo", documentInfo)
registerCallback("ofdgoAttachmentData", attachmentData)
registerCallback("ofdgoRenderPage", renderPage)
registerCallback("ofdgoSVGFontData", svgFontData)
registerCallback("ofdgoSearchPage", searchPage)
registerCallback("ofdgoExportFormats", exportFormats)
registerCallback("ofdgoExportPage", exportPage)
@@ -150,6 +151,20 @@ func attachmentData(args []js.Value) (any, error) {
return successResult(map[string]any{"bytes": bytesToJS(data)}), nil
}
// svgFontData 读取SVG字体资源
// 入参: args 浏览器参数
// 返回: any 字体数据, error 错误信息
func svgFontData(args []js.Value) (any, error) {
if currentSession == nil {
return nil, fmt.Errorf("ofd document is not opened")
}
data, err := currentSession.SVGFontData(args[0].String())
if err != nil {
return nil, err
}
return successResult(map[string]any{"bytes": bytesToJS(data)}), nil
}
// renderPage 渲染OFD页面
// 入参: args 浏览器参数
// 返回: any 页面SVG结果, error 错误信息
@@ -182,6 +197,10 @@ func renderPage(args []js.Value) (any, error) {
"height": link.Box.H,
}
}
fonts := make([]any, len(page.Fonts))
for i, font := range page.Fonts {
fonts[i] = map[string]any{"name": font.Name, "weight": font.Weight, "style": font.Style}
}
return successResult(map[string]any{
"index": page.Index,
"number": page.Number,
@@ -190,6 +209,7 @@ func renderPage(args []js.Value) (any, error) {
"height": page.Height,
"svg": page.SVG,
"links": links,
"fonts": fonts,
"text": js.Global().Get("JSON").Call("parse", string(textData)),
}), nil
}
+22 -2
View File
@@ -108,6 +108,7 @@ type Session struct {
pageCache map[int]*ofdgo.PageContent
boxCache map[int]ofdgo.Box
textCache map[int]*ofdgo.PageText
svgFonts map[string][]byte
signatures []SignatureInfo
signatureError error
signaturesRead bool
@@ -165,6 +166,7 @@ type PageSVG struct {
Height float64 `json:"height"`
SVG string `json:"svg"`
Links []ofdgo.PageLink `json:"-"`
Fonts []ofdgo.SVGFont `json:"-"`
}
// ExportFormat 导出格式
@@ -241,6 +243,7 @@ func Open(data []byte, opts OpenOptions) (*Session, error) {
pageCache: make(map[int]*ofdgo.PageContent),
boxCache: make(map[int]ofdgo.Box),
textCache: make(map[int]*ofdgo.PageText),
svgFonts: make(map[string][]byte),
}, nil
}
@@ -267,6 +270,7 @@ func (s *Session) SetFonts(fonts []FontFile) error {
s.Renderer.SetFontFS()
}
clear(s.textCache)
clear(s.svgFonts)
return nil
}
@@ -415,14 +419,30 @@ func (s *Session) RenderPageSVG(index int) (PageSVG, error) {
return PageSVG{}, err
}
var buf bytes.Buffer
if err := s.Renderer.RenderToSVG(page, &buf); err != nil {
fonts, err := s.Renderer.RenderToSVGWithFonts(page, &buf)
if err != nil {
return PageSVG{}, err
}
links, err := s.Renderer.PageLinks(page)
if err != nil {
return PageSVG{}, err
}
return PageSVG{Index: index, Number: index + 1, ID: pageRef.ID, Width: box.W, Height: box.H, SVG: buf.String(), Links: links}, nil
for i, font := range fonts {
s.svgFonts[font.Name] = font.Data
fonts[i].Data = nil
}
return PageSVG{Index: index, Number: index + 1, ID: pageRef.ID, Width: box.W, Height: box.H, SVG: buf.String(), Links: links, Fonts: fonts}, nil
}
// SVGFontData 获取已渲染页面引用的字体数据
// 入参: name 字体资源标识
// 返回: []byte 字体数据, error 错误信息
func (s *Session) SVGFontData(name string) ([]byte, error) {
data, ok := s.svgFonts[name]
if !ok {
return nil, fmt.Errorf("svg font not found: %s", name)
}
return data, nil
}
// ExportPage 导出单页