mirror of
https://github.com/xiaoqidun/ofdgo.git
synced 2026-10-30 09:37:26 +08:00
1 parent
6d9f1fbe41
commit
28b524ae84
2 files changed
+13
-4
No files matched your search
@@ -671,6 +671,7 @@ function addCustomDataRow(field = {Name: "", Value: ""}, sourceIndex) {
|
|||||||
}
|
}
|
||||||
el.annotationClose.addEventListener("click", () => el.annotationNote.close());
|
el.annotationClose.addEventListener("click", () => el.annotationNote.close());
|
||||||
el.annotationNote.addEventListener("close", () => { state.annotationEdit = null; });
|
el.annotationNote.addEventListener("close", () => { state.annotationEdit = null; });
|
||||||
|
el.objectPicker.addEventListener("close", () => { if (!el.objectPicker.open) el.objectPickerList.replaceChildren(); });
|
||||||
el.penTool.addEventListener("change", () => {
|
el.penTool.addEventListener("change", () => {
|
||||||
const tool = el.penTool.value;
|
const tool = el.penTool.value;
|
||||||
el.penTool.value = "";
|
el.penTool.value = "";
|
||||||
@@ -2027,6 +2028,7 @@ async function createDocument(event) {
|
|||||||
setPan(false);
|
setPan(false);
|
||||||
state.ofdBytes = null;
|
state.ofdBytes = null;
|
||||||
state.fileName = `${title.replace(/[\\/:*?"<>|]+/g, "_").replace(/\.ofd$/i, "")}.ofd`;
|
state.fileName = `${title.replace(/[\\/:*?"<>|]+/g, "_").replace(/\.ofd$/i, "")}.ofd`;
|
||||||
|
state.conversionWarnings = [];
|
||||||
state.savedRevision = null;
|
state.savedRevision = null;
|
||||||
setEditorInfo(doc);
|
setEditorInfo(doc);
|
||||||
el.createPanel.close();
|
el.createPanel.close();
|
||||||
@@ -3478,7 +3480,9 @@ async function openOFD(file, remote = null) {
|
|||||||
bytes = converted.bytes;
|
bytes = converted.bytes;
|
||||||
warnings = JSON.parse(converted.warnings || "null") || [];
|
warnings = JSON.parse(converted.warnings || "null") || [];
|
||||||
}
|
}
|
||||||
const remoteDoc = remote ? await openWithCredentials(await fontManager.files(fontManager.records()), openSeq, bytes) : null;
|
await ensureWASM();
|
||||||
|
if (openSeq !== state.openSeq) return;
|
||||||
|
const doc = await openWithCredentials(await fontManager.files(fontManager.userFonts), openSeq, bytes);
|
||||||
if (openSeq !== state.openSeq) return;
|
if (openSeq !== state.openSeq) return;
|
||||||
state.ofdBytes = bytes;
|
state.ofdBytes = bytes;
|
||||||
state.conversionWarnings = warnings;
|
state.conversionWarnings = warnings;
|
||||||
@@ -3513,7 +3517,7 @@ async function openOFD(file, remote = null) {
|
|||||||
el.objectBoundsPanel.close();
|
el.objectBoundsPanel.close();
|
||||||
el.outlinePanel.close();
|
el.outlinePanel.close();
|
||||||
updateControls();
|
updateControls();
|
||||||
await openDocument({ ...(remoteDoc ? { doc: remoteDoc } : {}), pageIndex: remote?.pageIndex || 0, resetScroll: true, openSeq });
|
await openDocument({ doc, pageIndex: remote?.pageIndex || 0, resetScroll: true, openSeq });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (openSeq === state.openSeq) {
|
if (openSeq === state.openSeq) {
|
||||||
if (err.name === "AbortError") setStatus("转换已取消");
|
if (err.name === "AbortError") setStatus("转换已取消");
|
||||||
|
|||||||
@@ -301,10 +301,15 @@ func newSession(reader *ofdgo.Reader, opts OpenOptions) (*Session, error) {
|
|||||||
// Close 关闭文档会话
|
// Close 关闭文档会话
|
||||||
// 返回: error 错误信息
|
// 返回: error 错误信息
|
||||||
func (s *Session) Close() error {
|
func (s *Session) Close() error {
|
||||||
if s == nil || s.Reader == nil {
|
if s == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return s.Reader.Close()
|
reader := s.Reader
|
||||||
|
*s = Session{}
|
||||||
|
if reader != nil {
|
||||||
|
return reader.Close()
|
||||||
|
}
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetFonts 更新字体配置并保留文档、页面和验签结果
|
// SetFonts 更新字体配置并保留文档、页面和验签结果
|
||||||
|
|||||||
Reference in new issue
Block a user