An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:bug: Align optional calendar row order serialization
Daniel850ffcef621d
diff --git a/app/src/types/api/index.d.ts b/app/src/types/api/index.d.tsindex 6500c83c6a..bd575eb8fa 100644--- a/app/src/types/api/index.d.ts+++ b/app/src/types/api/index.d.ts@@ -368,7 +368,7 @@ export type AVKeyValues = { "key": AVKey | null; "values"?: Array<AVValue | nullexport type AVKeysData = { "keys": Array<AVKey | null> | null; };-export type AVLayoutCalendar = { "columns": Array<AVViewTableColumn | null> | null; "id": string; "rowIds": Array<string> | null; "settings": AVCalendarSettings; "showIcon": boolean; "spec": number; "wrapField": boolean; } | ({ "columns": Array<AVViewTableColumn | null> | null; "rowIds": Array<string> | null; "settings": AVCalendarSettings; } & { "id"?: never; "showIcon"?: never; "spec"?: never; "wrapField"?: never; });+export type AVLayoutCalendar = { "columns": Array<AVViewTableColumn | null> | null; "id": string; "rowIds"?: Array<string>; "settings": AVCalendarSettings; "showIcon": boolean; "spec": number; "wrapField": boolean; } | ({ "columns": Array<AVViewTableColumn | null> | null; "rowIds"?: Array<string>; "settings": AVCalendarSettings; } & { "id"?: never; "showIcon"?: never; "spec"?: never; "wrapField"?: never; });export type AVLayoutGallery = { "cardAspectRatio": number; "cardAspectRatioValue": number; "cardLayout": number; "cardSize": number; "cardWidth": number; "coverFrom": number; "coverFromAssetKeyID"?: string; "displayEmptyFields": boolean; "displayFieldName": boolean; "fields": Array<AVViewGalleryCardField | null> | null; "fitImage": boolean; "id": string; "showIcon": boolean; "spec": number; "wrapField": boolean; } | ({ "cardAspectRatio": number; "cardAspectRatioValue": number; "cardLayout": number; "cardSize": number; "cardWidth": number; "coverFrom": number; "coverFromAssetKeyID"?: string; "displayEmptyFields": boolean; "displayFieldName": boolean; "fields": Array<AVViewGalleryCardField | null> | null; "fitImage": boolean; } & { "id"?: never; "showIcon"?: never; "spec"?: never; "wrapField"?: never; });diff --git a/kernel/api/contract_av_calendar_test.go b/kernel/api/contract_av_calendar_test.goindex 148208c385..e3a4a34de3 100644--- a/kernel/api/contract_av_calendar_test.go+++ b/kernel/api/contract_av_calendar_test.go@@ -126,6 +126,35 @@ func TestAVContractCalendarTemplateDate(t *testing.T) {}}+func TestAVContractCalendarLegacyRowIDs(t *testing.T) {+ for _, test := range []struct {+ name string+ rows []string+ }{+ {name: "nil"},+ {name: "empty", rows: []string{}},+ {name: "legacy order", rows: []string{"second", "first"}},+ } {+ t.Run(test.name, func(t *testing.T) {+ layout := &av.LayoutCalendar{LayoutTable: av.NewLayoutTable(), Settings: av.CalendarSettings{WeekStart: 1}}+ layout.RowIDs = test.rows+ converted := toContractAVLayoutCalendar(layout)+ assertAVContractJSONEqual(t, layout, converted)+ data, err := json.Marshal(converted)+ if err != nil {+ t.Fatal(err)+ }+ var fields map[string]json.RawMessage+ if err = json.Unmarshal(data, &fields); err != nil {+ t.Fatal(err)+ }+ if _, present := fields["rowIds"]; present != (len(test.rows) > 0) {+ t.Fatalf("unexpected legacy row order field: %s", data)+ }+ })+ }+}+func TestAVContractCalendarLayoutAndRange(t *testing.T) {fixture := setupAttributeViewContextFilterAPITest(t)util.AttrViewLangs["en"]["calendar"] = "Calendar"diff --git a/kernel/apicontract/av_calendar.go b/kernel/apicontract/av_calendar.goindex 4f80bdb620..0390ef1752 100644--- a/kernel/apicontract/av_calendar.go+++ b/kernel/apicontract/av_calendar.go@@ -35,9 +35,10 @@ type AVCalendarRange struct {type AVLayoutCalendar struct {*AVBaseLayout- Columns []*AVViewTableColumn `json:"columns" api:"optional,nullable"`- RowIDs []string `json:"rowIds" api:"optional,nullable"`- Settings AVCalendarSettings `json:"settings"`+ Columns []*AVViewTableColumn `json:"columns" api:"optional,nullable"`+ // 兼容旧版行顺序;空列表与底层布局一致省略,非空列表保持原有顺序。+ RowIDs []string `json:"rowIds,omitempty" api:"optional,nullable"`+ Settings AVCalendarSettings `json:"settings"`}// AVCalendarUndatedData 返回当前日历视图中待安排条目的单页数据。diff --git a/kernel/apicontract/schema.json b/kernel/apicontract/schema.jsonindex d76468854d..d4dac980e8 100644--- a/kernel/apicontract/schema.json+++ b/kernel/apicontract/schema.json@@ -9444,17 +9444,10 @@"type": "string"},"rowIds": {- "anyOf": [- {- "type": "array",- "items": {- "type": "string"- }- },- {- "type": "null"- }- ]+ "type": "array",+ "items": {+ "type": "string"+ }},"settings": {"$ref": "#/$defs/AVCalendarSettings"@@ -9471,7 +9464,6 @@},"required": ["columns",- "rowIds","settings","spec","id",@@ -9504,17 +9496,10 @@]},"rowIds": {- "anyOf": [- {- "type": "array",- "items": {- "type": "string"- }- },- {- "type": "null"- }- ]+ "type": "array",+ "items": {+ "type": "string"+ }},"settings": {"$ref": "#/$defs/AVCalendarSettings"@@ -9522,7 +9507,6 @@},"required": ["columns",- "rowIds","settings"],"additionalProperties": false