优化bug
This commit is contained in:
@@ -1098,12 +1098,18 @@ window.openFile = function open(file) {
|
|||||||
fo.forEach((objMeta, idx) => {
|
fo.forEach((objMeta, idx) => {
|
||||||
if ((objMeta.type === 8 || objMeta.type === 9) && j.f.objects[idx + 1] && !j.f.objects[idx + 1].src) {
|
if ((objMeta.type === 8 || objMeta.type === 9) && j.f.objects[idx + 1] && !j.f.objects[idx + 1].src) {
|
||||||
j.f.objects[idx + 1].src = placeholder;
|
j.f.objects[idx + 1].src = placeholder;
|
||||||
|
} else if (objMeta.type === 2 && j.f.objects[idx + 1] && !j.f.objects[idx + 1].src) {
|
||||||
|
// 合成图片类型,恢复默认图片
|
||||||
|
j.f.objects[idx + 1].src = './public/images/outpic_extra.png';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
bo.forEach((objMeta, idx) => {
|
bo.forEach((objMeta, idx) => {
|
||||||
if ((objMeta.type === 8 || objMeta.type === 9) && j.b.objects && j.b.objects[idx + 1] && !j.b.objects[idx + 1].src) {
|
if ((objMeta.type === 8 || objMeta.type === 9) && j.b.objects && j.b.objects[idx + 1] && !j.b.objects[idx + 1].src) {
|
||||||
j.b.objects[idx + 1].src = placeholder;
|
j.b.objects[idx + 1].src = placeholder;
|
||||||
|
} else if (objMeta.type === 2 && j.b.objects && j.b.objects[idx + 1] && !j.b.objects[idx + 1].src) {
|
||||||
|
// 合成图片类型,恢复默认图片
|
||||||
|
j.b.objects[idx + 1].src = './public/images/outpic_extra.png';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+47
-49
File diff suppressed because one or more lines are too long
@@ -1233,17 +1233,23 @@ window.openFile = function open(file) {
|
|||||||
const bo = j.bo || []
|
const bo = j.bo || []
|
||||||
const placeholder = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=='
|
const placeholder = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=='
|
||||||
|
|
||||||
// 为正面二维码和条形码创建临时 src
|
// 为正面二维码、条形码和合成图片创建临时 src
|
||||||
fo.forEach((objMeta, idx) => {
|
fo.forEach((objMeta, idx) => {
|
||||||
if ((objMeta.type === 8 || objMeta.type === 9) && j.f.objects[idx + 1] && !j.f.objects[idx + 1].src) {
|
if ((objMeta.type === 8 || objMeta.type === 9) && j.f.objects[idx + 1] && !j.f.objects[idx + 1].src) {
|
||||||
j.f.objects[idx + 1].src = placeholder
|
j.f.objects[idx + 1].src = placeholder
|
||||||
|
} else if (objMeta.type === 2 && j.f.objects[idx + 1] && !j.f.objects[idx + 1].src) {
|
||||||
|
// 合成图片类型,恢复默认图片
|
||||||
|
j.f.objects[idx + 1].src = './public/images/outpic_extra.png'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// 为背面二维码和条形码创建临时 src
|
// 为背面二维码、条形码和合成图片创建临时 src
|
||||||
bo.forEach((objMeta, idx) => {
|
bo.forEach((objMeta, idx) => {
|
||||||
if ((objMeta.type === 8 || objMeta.type === 9) && j.b.objects && j.b.objects[idx + 1] && !j.b.objects[idx + 1].src) {
|
if ((objMeta.type === 8 || objMeta.type === 9) && j.b.objects && j.b.objects[idx + 1] && !j.b.objects[idx + 1].src) {
|
||||||
j.b.objects[idx + 1].src = placeholder
|
j.b.objects[idx + 1].src = placeholder
|
||||||
|
} else if (objMeta.type === 2 && j.b.objects && j.b.objects[idx + 1] && !j.b.objects[idx + 1].src) {
|
||||||
|
// 合成图片类型,恢复默认图片
|
||||||
|
j.b.objects[idx + 1].src = './public/images/outpic_extra.png'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -39,7 +39,6 @@ $('body').keydown(function (event) {
|
|||||||
if (_keyc && _textEdit) {
|
if (_keyc && _textEdit) {
|
||||||
//同时按下且在编辑状态
|
//同时按下且在编辑状态
|
||||||
setTimeout("clipboard.writeText( (clipboard.readText()+' ') );", 1)
|
setTimeout("clipboard.writeText( (clipboard.readText()+' ') );", 1)
|
||||||
//clipboard.writeText((clipboard.readText()+' '))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (event.keyCode == 67) {
|
if (event.keyCode == 67) {
|
||||||
@@ -47,7 +46,6 @@ $('body').keydown(function (event) {
|
|||||||
if (_keyctrl & _textEdit) {
|
if (_keyctrl & _textEdit) {
|
||||||
//同时按下且在编辑状态
|
//同时按下且在编辑状态
|
||||||
setTimeout("clipboard.writeText( (clipboard.readText()+' ') );", 1)
|
setTimeout("clipboard.writeText( (clipboard.readText()+' ') );", 1)
|
||||||
//clipboard.writeText((clipboard.readText()+' '))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (event.keyCode == 37) {
|
if (event.keyCode == 37) {
|
||||||
|
|||||||
Reference in New Issue
Block a user