feat(文档属性): 统一全属性编辑与后端字段顺序

assets/webui/index.html

@@ -489,19 +489,19 @@
 		<dialog id="infoPanel" class="form-dialog">
 			<form id="infoForm">
 				<h2 id="infoPanelTitle" class="form-title">文档信息</h2>
+				<label class="form-row"><span>文档标识</span><input id="infoDocId" type="text"></label>
 				<label class="form-row"><span>标题</span><textarea id="infoTitle" rows="1" autofocus></textarea></label>
 				<label class="form-row"><span>作者</span><textarea id="infoAuthor" rows="1"></textarea></label>
 				<label class="form-row"><span>主题</span><textarea id="infoSubject" rows="1"></textarea></label>
 				<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="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><summary><span>关键词</span></summary><div id="infoKeywordRows" class="info-rows"></div><button id="infoKeywordAdd" class="icon-button" type="button" title="添加词条">+</button></details>
+					<label class="form-row"><span>制作软件</span><input id="infoCreator" type="text"></label>
+					<label class="form-row"><span>软件版本</span><input id="infoCreatorVersion" 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>

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", "creationDate", "modDate", "creator", "creatorVersion", "docId", "docUsage", "cover"];
+const INFO_FIELDS = ["docId", "title", "author", "subject", "abstract", "creationDate", "modDate", "docUsage", "cover", "creator", "creatorVersion"];
 const STATUS = {
 	ready: "选择 OFD、PDF 文件",
 	opening: "正在打开文档",
@@ -342,19 +342,19 @@ const el = {
 	versionClose: document.querySelector("#versionClose"),
 	infoPanel: document.querySelector("#infoPanel"),
 	infoForm: document.querySelector("#infoForm"),
+	infoDocId: document.querySelector("#infoDocId"),
 	infoTitle: document.querySelector("#infoTitle"),
 	infoAuthor: document.querySelector("#infoAuthor"),
 	infoSubject: document.querySelector("#infoSubject"),
 	infoAbstract: document.querySelector("#infoAbstract"),
-	infoKeywordRows: document.querySelector("#infoKeywordRows"),
-	infoKeywordAdd: document.querySelector("#infoKeywordAdd"),
 	infoCreationDate: document.querySelector("#infoCreationDate"),
 	infoModDate: document.querySelector("#infoModDate"),
-	infoCreator: document.querySelector("#infoCreator"),
-	infoCreatorVersion: document.querySelector("#infoCreatorVersion"),
-	infoDocId: document.querySelector("#infoDocId"),
 	infoDocUsage: document.querySelector("#infoDocUsage"),
 	infoCover: document.querySelector("#infoCover"),
+	infoKeywordRows: document.querySelector("#infoKeywordRows"),
+	infoKeywordAdd: document.querySelector("#infoKeywordAdd"),
+	infoCreator: document.querySelector("#infoCreator"),
+	infoCreatorVersion: document.querySelector("#infoCreatorVersion"),
 	infoCustomRows: document.querySelector("#infoCustomRows"),
 	infoCustomAdd: document.querySelector("#infoCustomAdd"),
 	infoCancel: document.querySelector("#infoCancel"),

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"`
-	Creator        string             `json:"creator"`
-	CreatorVersion string             `json:"creatorVersion"`
-	DocID          string             `json:"docId"`
 	DocUsage       string             `json:"docUsage"`
 	Cover          string             `json:"cover"`
+	Keywords       []string           `json:"keywords,omitempty"`
+	Creator        string             `json:"creator"`
+	CreatorVersion string             `json:"creatorVersion"`
 	CustomData     []ofdgo.CustomData `json:"customData,omitempty"`
 }
 
@@ -104,9 +104,9 @@ type DocumentMetadata struct {
 // 返回: DocumentMetadata 界面元数据
 func documentMetadata(info ofdgo.DocInfo) DocumentMetadata {
 	metadata := DocumentMetadata{
-		Title: info.Title, Author: info.Author, Subject: info.Subject, Abstract: info.Abstract, Keywords: slices.Clone(info.Keywords),
+		DocID: info.DocID, Title: info.Title, Author: info.Author, Subject: info.Subject, Abstract: info.Abstract,
-		CreationDate: info.CreationDate, ModDate: info.ModDate, Creator: info.Creator, CreatorVersion: info.CreatorVersion,
+		CreationDate: info.CreationDate, ModDate: info.ModDate, DocUsage: info.DocUsage, Cover: info.Cover,
-		DocID: info.DocID, DocUsage: info.DocUsage, Cover: info.Cover,
+		Keywords: slices.Clone(info.Keywords), Creator: info.Creator, CreatorVersion: info.CreatorVersion,
 	}
 	if info.CustomDatas != nil {
 		metadata.CustomData = slices.Clone(info.CustomDatas.CustomData)