feat(文档属性): 统一属性读写及前后端字段顺序

assets/webui/index.html

@@ -495,13 +495,13 @@
 				<label class="form-row"><span>摘要</span><textarea id="infoAbstract" rows="2"></textarea></label>
 				<details><summary><span>关键词</span></summary><div id="infoKeywordRows" class="info-rows"></div><button id="infoKeywordAdd" class="icon-button" type="button" title="添加词条">+</button></details>
 				<details><summary><span>文档属性</span></summary>
-					<label class="form-row"><span>文档标识</span><input id="infoDocId" type="text"></label>
-					<label class="form-row"><span>文档用途</span><input id="infoDocUsage" type="text"></label>
-					<label class="form-row"><span>封面路径</span><input id="infoCover" type="text"></label>
 					<label class="form-row"><span>创建日期</span><input id="infoCreationDate" type="text"></label>
 					<label class="form-row"><span>修改日期</span><input id="infoModDate" type="text"></label>
 					<label class="form-row"><span>制作软件</span><input id="infoCreator" type="text"></label>
 					<label class="form-row"><span>软件版本</span><input id="infoCreatorVersion" type="text"></label>
+					<label class="form-row"><span>文档标识</span><input id="infoDocId" type="text"></label>
+					<label class="form-row"><span>文档用途</span><input id="infoDocUsage" type="text"></label>
+					<label class="form-row"><span>封面路径</span><input id="infoCover" type="text"></label>
 				</details>
 				<details><summary><span>扩展属性</span></summary><div id="infoCustomRows" class="info-rows"></div><button id="infoCustomAdd" class="icon-button" type="button" title="添加属性">+</button></details>
 				<div class="form-actions"><div id="infoStatus" class="form-status"></div><button id="infoCancel" class="button" type="button">取消</button><button class="button" type="submit">确定</button></div>
@@ -849,18 +849,6 @@
 							</dl>
 							<details><summary>文档属性</summary>
 								<dl class="meta-list">
-									<div hidden>
-										<dt>文档标识</dt>
-										<dd id="metaDocId"></dd>
-									</div>
-									<div hidden>
-										<dt>文档用途</dt>
-										<dd id="metaDocUsage"></dd>
-									</div>
-									<div hidden>
-										<dt>封面路径</dt>
-										<dd id="metaCover"></dd>
-									</div>
 									<div hidden>
 										<dt>创建日期</dt>
 										<dd id="metaCreationDate"></dd>
@@ -877,6 +865,18 @@
 										<dt>软件版本</dt>
 										<dd id="metaCreatorVersion"></dd>
 									</div>
+									<div hidden>
+										<dt>文档标识</dt>
+										<dd id="metaDocId"></dd>
+									</div>
+									<div hidden>
+										<dt>文档用途</dt>
+										<dd id="metaDocUsage"></dd>
+									</div>
+									<div hidden>
+										<dt>封面路径</dt>
+										<dd id="metaCover"></dd>
+									</div>
 								</dl>
 							</details>
 							<details><summary>扩展属性</summary><dl id="metaCustomData" class="meta-list" hidden></dl></details>

assets/webui/ofdgo.js

@@ -15,7 +15,7 @@ const SCROLL_SEGMENT_SIZE = 1000000;
 const OBJECT_CLIPBOARD_TYPE = "application/x-ofdgo-objects";
 const RESOURCE_KINDS = [["Font", "字体"], ["Image", "图片"], ["Audio", "音频"], ["Video", "视频"], ["Attachment", "附件"], ["ColorSpace", "色彩"], ["DrawParam", "样式"]];
 const SETTINGS_KINDS = [["bookmarks", "书签"], ["actions", "动作"], ["templates", "模板"], ["layers", "图层"], ["extensions", "扩展"]];
-const INFO_FIELDS = ["title", "author", "subject", "abstract", "docId", "docUsage", "cover", "creationDate", "modDate", "creator", "creatorVersion"];
+const INFO_FIELDS = ["title", "author", "subject", "abstract", "creationDate", "modDate", "creator", "creatorVersion", "docId", "docUsage", "cover"];
 const STATUS = {
 	ready: "选择 OFD、PDF 文件",
 	opening: "正在打开文档",
@@ -345,20 +345,20 @@ const el = {
 	infoPanel: document.querySelector("#infoPanel"),
 	infoForm: document.querySelector("#infoForm"),
 	infoTitle: document.querySelector("#infoTitle"),
-	infoCustomRows: document.querySelector("#infoCustomRows"),
-	infoCustomAdd: document.querySelector("#infoCustomAdd"),
 	infoAuthor: document.querySelector("#infoAuthor"),
 	infoSubject: document.querySelector("#infoSubject"),
 	infoAbstract: document.querySelector("#infoAbstract"),
-	infoDocId: document.querySelector("#infoDocId"),
+	infoKeywordRows: document.querySelector("#infoKeywordRows"),
-	infoDocUsage: document.querySelector("#infoDocUsage"),
+	infoKeywordAdd: document.querySelector("#infoKeywordAdd"),
-	infoCover: document.querySelector("#infoCover"),
 	infoCreationDate: document.querySelector("#infoCreationDate"),
 	infoModDate: document.querySelector("#infoModDate"),
 	infoCreator: document.querySelector("#infoCreator"),
 	infoCreatorVersion: document.querySelector("#infoCreatorVersion"),
-	infoKeywordRows: document.querySelector("#infoKeywordRows"),
+	infoDocId: document.querySelector("#infoDocId"),
-	infoKeywordAdd: document.querySelector("#infoKeywordAdd"),
+	infoDocUsage: document.querySelector("#infoDocUsage"),
+	infoCover: document.querySelector("#infoCover"),
+	infoCustomRows: document.querySelector("#infoCustomRows"),
+	infoCustomAdd: document.querySelector("#infoCustomAdd"),
 	infoCancel: document.querySelector("#infoCancel"),
 	infoStatus: document.querySelector("#infoStatus"),
 	paragraphPanel: document.querySelector("#paragraphPanel"),
@@ -607,20 +607,20 @@ const el = {
 	refreshAppButton: document.querySelector("#refreshAppButton"),
 	metaFile: document.querySelector("#metaFile"),
 	metaTitle: document.querySelector("#metaTitle"),
-	conversionNotice: document.querySelector("#conversionNotice"),
+	metaAuthor: document.querySelector("#metaAuthor"),
-	conversionWarnings: document.querySelector("#conversionWarnings"),
 	metaSubject: document.querySelector("#metaSubject"),
 	metaAbstract: document.querySelector("#metaAbstract"),
-	metaDocId: document.querySelector("#metaDocId"),
-	metaDocUsage: document.querySelector("#metaDocUsage"),
-	metaCover: document.querySelector("#metaCover"),
 	metaKeywords: document.querySelector("#metaKeywords"),
-	metaCustomData: document.querySelector("#metaCustomData"),
-	metaAuthor: document.querySelector("#metaAuthor"),
 	metaCreationDate: document.querySelector("#metaCreationDate"),
 	metaModDate: document.querySelector("#metaModDate"),
 	metaCreator: document.querySelector("#metaCreator"),
 	metaCreatorVersion: document.querySelector("#metaCreatorVersion"),
+	metaDocId: document.querySelector("#metaDocId"),
+	metaDocUsage: document.querySelector("#metaDocUsage"),
+	metaCover: document.querySelector("#metaCover"),
+	metaCustomData: document.querySelector("#metaCustomData"),
+	conversionNotice: document.querySelector("#conversionNotice"),
+	conversionWarnings: document.querySelector("#conversionWarnings"),
 	metaType: document.querySelector("#metaType"),
 	metaVersion: document.querySelector("#metaVersion"),
 	metaSignatures: document.querySelector("#metaSignatures"),
@@ -12677,13 +12677,13 @@ function renderMeta(keepDetails = false) {
 	for (const [field, value] of [
 		[el.metaSubject, doc.subject || ""],
 		[el.metaAbstract, doc.abstract || ""],
-		[el.metaDocId, doc.docId || ""],
-		[el.metaDocUsage, doc.docUsage || ""],
-		[el.metaCover, doc.cover || ""],
 		[el.metaCreationDate, formatDocumentTime(doc.creationDate)],
 		[el.metaModDate, formatDocumentTime(doc.modDate)],
 		[el.metaCreator, doc.creator || ""],
 		[el.metaCreatorVersion, doc.creatorVersion || ""],
+		[el.metaDocId, doc.docId || ""],
+		[el.metaDocUsage, doc.docUsage || ""],
+		[el.metaCover, doc.cover || ""],
 	]) {
 		field.textContent = value;
 		field.parentElement.hidden = !value;

internal/webui/webui.go

@@ -84,18 +84,18 @@ type pageBoxInfo struct {
 
 // DocumentMetadata 文档描述，供信息展示与包内文档管理共用
 type DocumentMetadata struct {
-	DocID          string             `json:"docId"`
 	Title          string             `json:"title"`
 	Author         string             `json:"author"`
 	Subject        string             `json:"subject"`
 	Abstract       string             `json:"abstract"`
+	Keywords       []string           `json:"keywords,omitempty"`
 	CreationDate   string             `json:"creationDate"`
 	ModDate        string             `json:"modDate"`
-	DocUsage       string             `json:"docUsage"`
-	Cover          string             `json:"cover"`
-	Keywords       []string           `json:"keywords,omitempty"`
 	Creator        string             `json:"creator"`
 	CreatorVersion string             `json:"creatorVersion"`
+	DocID          string             `json:"docId"`
+	DocUsage       string             `json:"docUsage"`
+	Cover          string             `json:"cover"`
 	CustomData     []ofdgo.CustomData `json:"customData,omitempty"`
 }
 
@@ -104,9 +104,9 @@ type DocumentMetadata struct {
 // 返回: DocumentMetadata 界面元数据
 func documentMetadata(info ofdgo.DocInfo) DocumentMetadata {
 	metadata := DocumentMetadata{
-		DocID: info.DocID, Title: info.Title, Author: info.Author, Subject: info.Subject, Abstract: info.Abstract,
+		Title: info.Title, Author: info.Author, Subject: info.Subject, Abstract: info.Abstract, Keywords: slices.Clone(info.Keywords),
-		CreationDate: info.CreationDate, ModDate: info.ModDate, DocUsage: info.DocUsage, Cover: info.Cover,
+		CreationDate: info.CreationDate, ModDate: info.ModDate, Creator: info.Creator, CreatorVersion: info.CreatorVersion,
-		Keywords: slices.Clone(info.Keywords), Creator: info.Creator, CreatorVersion: info.CreatorVersion,
+		DocID: info.DocID, DocUsage: info.DocUsage, Cover: info.Cover,
 	}
 	if info.CustomDatas != nil {
 		metadata.CustomData = slices.Clone(info.CustomDatas.CustomData)