Skip to content

fix: issues-parseOfdDocument 解析到的 ofd:Template 是个数组，造成 renderPage 方法报错 TypeError: Cannot read properties of undefined (reading 'json') #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DLTech21 merged 3 commits into from
Jun 5, 2024
Merged

fix: issues-parseOfdDocument 解析到的 ofd:Template 是个数组，造成 renderPage 方法报错 TypeError: Cannot read properties of undefined (reading 'json') #113

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59b893f
fix: 修复有多个 Template 的 OFD 报错的 bug
Jun 3, 2024
a0916f4
feat: 增加注释和修改判断逻辑
Jun 3, 2024
055b8ab
feat: 把单行注释改成 js doc、增加异常情况处理
Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions src/utils/ofd/ofd_render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,22 +125,38 @@ export const calPageBoxScale = function (document, page) {
return box;
}


// 根据模板来渲染层节点
const renderLayerFromTemplate = function (tpls, template, pageDiv, fontResObj, drawParamResObj, multiMediaResObj) {
let array = [];
const layers = tpls[template['@_TemplateID']]['json']['ofd:Content']['ofd:Layer'];
array = array.concat(layers);
for (let layer of array) {
if (layer) {
renderLayer(pageDiv, fontResObj, drawParamResObj, multiMediaResObj, layer, false);
}
}
}

export const renderPage = function (pageDiv, page, tpls, fontResObj, drawParamResObj, multiMediaResObj) {
const pageId = Object.keys(page)[0];
const template = page[pageId]['json']['ofd:Template'];
if (template) {
let array = [];
const layers = tpls[template['@_TemplateID']]['json']['ofd:Content']['ofd:Layer'];
array = array.concat(layers);
for (let layer of array) {
if (layer) {
renderLayer(pageDiv, fontResObj, drawParamResObj, multiMediaResObj, layer, false);
if (Array.isArray(template)) { // 当使用多个模板时
template.forEach(item => {
/**
* 此处只满足 ZOrder 相同的情况
* 若 ZOrder 不同，可能需要根据 ZOrder 排序来渲染
* 参考 http://www.dajs.gov.cn/attach/0/88a7620d9d3f4e13b2baa52ab3487854.pdf 第 18 页 ZOrder 的属性说明
*/
if (item) {
renderLayerFromTemplate(tpls, item, pageDiv, fontResObj, drawParamResObj, multiMediaResObj);
}
}
});
} else if (template) { // 当使用单个模板时
renderLayerFromTemplate(tpls, template, pageDiv, fontResObj, drawParamResObj, multiMediaResObj);
} else {
console.error('ofd:Template not found!');
}

const contentLayers = page[pageId]?.json?.['ofd:Content']?.['ofd:Layer'];
let array = [];
array = array.concat(contentLayers);
Expand Down