Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:sparkles: Support template-calculated dates in calendar views https://github.com/siyuan-note/siyuan/issues/19951

Danielb4e80cafdc23
diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy
index f0bfe5ab1a..3f9205b1f7 100644
--- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy
+++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy
@@ -7,7 +7,7 @@
"id": "20240208172514-9dsv6na",
"title": "Database",
"type": "doc",
- "updated": "20260929105001"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -88,7 +88,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20251224101749-zybcbjk",
- "updated": "20260923103343"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -730,7 +730,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20260920225154-tz8a00o",
- "updated": "20260924110133"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -759,7 +759,7 @@
"ListData": {},
"Properties": {
"id": "20260920225154-qqxdh7e",
- "updated": "20260927113016"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -836,6 +836,34 @@
}
]
},
+ {
+ "ID": "20260929122307-2ixnrxo",
+ "Type": "NodeListItem",
+ "ListData": {
+ "BulletChar": 42,
+ "Marker": "Kg=="
+ },
+ "Properties": {
+ "id": "20260929122307-2ixnrxo",
+ "updated": "20260929123717"
+ },
+ "Children": [
+ {
+ "ID": "20260929122307-ftq006m",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20260929122307-ftq006m",
+ "updated": "20260929123717"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "Template dates: When a date field has a display template, the calendar places entries on the calculated date without changing the stored date. Output a plain text date in YYYY-MM-DD, the field's selected numeric date format, or the current language's local date format (such as October 2, 2026). An optional HH:mm or HH:mm:ss time can follow a space or T. Dates use the current device's local time zone; slash-separated dates follow the field format without guessing the month/day order. Empty results, invalid dates, and other formats appear neither on the calendar nor in the undated list. Calculated dates cannot be dragged, cleared, or assigned when creating an entry on a day; change the source field or template to adjust the date. Use YYYY-MM-DD for templates shared across languages"
+ }
+ ]
+ }
+ ]
+ },
{
"ID": "20260920225154-vblms0p",
"Type": "NodeListItem",
diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy
index bacbc3a28c..73b5f00649 100644
--- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy
+++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy
@@ -7,7 +7,7 @@
"id": "20240208113259-nykkvaq",
"title": "数据库",
"type": "doc",
- "updated": "20260929105001"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -88,7 +88,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20240208115136-9g2b46l",
- "updated": "20260923103343"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -730,7 +730,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20260920225154-xtg5hn3",
- "updated": "20260924110133"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -759,7 +759,7 @@
"ListData": {},
"Properties": {
"id": "20260920225154-09h9ysf",
- "updated": "20260927112821"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -836,6 +836,34 @@
}
]
},
+ {
+ "ID": "20260929122307-mutfp6g",
+ "Type": "NodeListItem",
+ "ListData": {
+ "BulletChar": 42,
+ "Marker": "Kg=="
+ },
+ "Properties": {
+ "id": "20260929122307-mutfp6g",
+ "updated": "20260929123717"
+ },
+ "Children": [
+ {
+ "ID": "20260929122307-3aos75m",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20260929122307-3aos75m",
+ "updated": "20260929123717"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "模板日期:日期字段设置显示模板后,日历按模板计算出的日期显示条目,原始日期保持不变。模板需输出纯文本日期,支持 YYYY-MM-DD、字段所选的数字日期格式,以及当前语言的本地日期格式(如 2026年10月2日);可附加 HH:mm 或 HH:mm:ss,以空格或 T 分隔。日期按当前设备的本地时区解释,斜杠日期按字段格式解释,不猜测日月顺序。空结果、无效日期和其他格式不会显示,也不会进入无日期列表。计算日期不支持拖动、清空或按日期新建,请修改来源字段或模板来调整日期;跨语言使用时建议输出 YYYY-MM-DD"
+ }
+ ]
+ }
+ ]
+ },
{
"ID": "20260920225154-s45tw42",
"Type": "NodeListItem",
diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy
index 426fd36ae6..7acfcb0809 100644
--- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy
+++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy
@@ -7,7 +7,7 @@
"id": "20240208171522-y7dxcno",
"title": "資料庫",
"type": "doc",
- "updated": "20260929105001"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -88,7 +88,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20251224101729-yhz5zrt",
- "updated": "20260923103343"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -730,7 +730,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20260920225154-xknvq29",
- "updated": "20260924110133"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -759,7 +759,7 @@
"ListData": {},
"Properties": {
"id": "20260920225154-mpwyzfe",
- "updated": "20260927112821"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -836,6 +836,34 @@
}
]
},
+ {
+ "ID": "20260929122307-ltcytyu",
+ "Type": "NodeListItem",
+ "ListData": {
+ "BulletChar": 42,
+ "Marker": "Kg=="
+ },
+ "Properties": {
+ "id": "20260929122307-ltcytyu",
+ "updated": "20260929123717"
+ },
+ "Children": [
+ {
+ "ID": "20260929122307-s1kwa3w",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20260929122307-s1kwa3w",
+ "updated": "20260929123717"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "範本日期:日期欄位設定顯示範本後,日曆依範本計算出的日期顯示項目,原始日期保持不變。範本需輸出純文字日期,支援 YYYY-MM-DD、欄位所選的數字日期格式,以及目前語言的本地日期格式(如 2026年10月2日);可附加 HH:mm 或 HH:mm:ss,以空格或 T 分隔。日期依目前裝置的本地時區解讀,斜線日期依欄位格式解讀,不猜測日月順序。空白結果、無效日期及其他格式不會顯示,也不會進入無日期列表。計算日期不支援拖曳、清空或按日期新增,請修改來源欄位或範本來調整日期;跨語言使用時建議輸出 YYYY-MM-DD"
+ }
+ ]
+ }
+ ]
+ },
{
"ID": "20260920225154-aibikc5",
"Type": "NodeListItem",
diff --git a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.sy b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.sy
index db30e2e383..93b8ba09e3 100644
--- a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.sy
+++ b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.sy
@@ -8,7 +8,7 @@
"id": "20240530101000-3eaevtp",
"title": "データベース",
"type": "doc",
- "updated": "20260929105001"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -89,7 +89,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20251224101829-lva3op2",
- "updated": "20260923103343"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -731,7 +731,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20260920225154-vntgfc2",
- "updated": "20260924110133"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -760,7 +760,7 @@
"ListData": {},
"Properties": {
"id": "20260920225154-wh2lupo",
- "updated": "20260927112821"
+ "updated": "20260929123717"
},
"Children": [
{
@@ -837,6 +837,34 @@
}
]
},
+ {
+ "ID": "20260929122307-wsjglj5",
+ "Type": "NodeListItem",
+ "ListData": {
+ "BulletChar": 42,
+ "Marker": "Kg=="
+ },
+ "Properties": {
+ "id": "20260929122307-wsjglj5",
+ "updated": "20260929123717"
+ },
+ "Children": [
+ {
+ "ID": "20260929122307-aw4496z",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20260929122307-aw4496z",
+ "updated": "20260929123717"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "テンプレートによる日付:日付フィールドに表示テンプレートを設定すると、保存された日付は変更せず、計算結果の日付にエントリを表示します。YYYY-MM-DD、フィールドで選択した数字の日付形式、または現在の言語のローカル日付形式(例:2026年10月2日)でプレーンテキストを出力してください。空白または T の後に HH:mm または HH:mm:ss の時刻を付けることもできます。現在の端末のローカルタイムゾーンで解釈され、スラッシュ区切りの日付はフィールドの形式に従い、月と日の順序は推測しません。空の結果、無効な日付、その他の形式はカレンダーにも日付なしリストにも表示されません。計算された日付のドラッグ、クリア、指定日の新規作成はできません。調整には参照元のフィールドまたはテンプレートを変更してください。異なる言語間で共有するテンプレートには YYYY-MM-DD をおすすめします"
+ }
+ ]
+ }
+ ]
+ },
{
"ID": "20260920225154-z254pew",
"Type": "NodeListItem",
diff --git a/app/src/protyle/render/av/calendar/date.test.ts b/app/src/protyle/render/av/calendar/date.test.ts
index be1293b4f4..5e96e5a804 100644
--- a/app/src/protyle/render/av/calendar/date.test.ts
+++ b/app/src/protyle/render/av/calendar/date.test.ts
@@ -1,6 +1,8 @@
import * as assert from "node:assert/strict";
import {test} from "node:test";
-import {addCalendarDays, calendarDayDistance, getCalendarInterval, getCalendarRange, getISOWeek,
+import {readFileSync, readdirSync} from "node:fs";
+import {join} from "node:path";
+import {addCalendarDays, calendarDayDistance, getCalendarDate, getCalendarInterval, getCalendarRange, getISOWeek, isCalendarDateEditable,
getISOWeekForCalendarRow, getISOWeeksInYear, getISOWeekThursday, moveCalendarDate,
packCalendarWeek, resizeCalendarDate} from "./date";
@@ -152,3 +154,60 @@ test("drag preserves wall-clock times and supports either endpoint", () => {
assert.equal(moveCalendarDate(endOnly, 2).content, undefined);
assert.equal(calendarDayDistance(end, moveCalendarDate(endOnly, 2).content2), 2);
});
+
+test("calendar template dates match kernel parsing without changing stored values", () => {
+ const cases = JSON.parse(readFileSync(join(__dirname, "../../../../../..", "kernel/av/testdata/calendar_template_dates.json"), "utf8"));
+ const originalZone = process.env.TZ;
+ const originalWindow = Object.getOwnPropertyDescriptor(globalThis, "window");
+ const languageDir = join(__dirname, "../../../../../appearance/langs");
+ const setLanguage = (lang: string) => Object.defineProperty(globalThis, "window", {configurable: true,
+ value: {siyuan: {languages: JSON.parse(readFileSync(join(languageDir, `${lang}.json`), "utf8"))}}});
+ try {
+ for (const fixture of cases) {
+ process.env.TZ = fixture.zone;
+ setLanguage(fixture.lang || "en");
+ const value = {type: "date" as const, hasRenderTemplate: true, renderedContent: fixture.content,
+ date: {content: 1, isNotEmpty: true, content2: 9999999999999, hasEndDate: true, isNotEmpty2: true}};
+ const before = JSON.stringify(value);
+ const interval = getCalendarInterval(value, fixture.format);
+ if (fixture.start) {
+ assert.equal(interval?.start, Date.parse(fixture.start), fixture.name);
+ assert.equal(interval?.end, Date.parse(fixture.end), fixture.name);
+ assert.equal(getCalendarDate(value, fixture.format)?.isNotTime, fixture.end !== fixture.start, fixture.name);
+ } else {
+ assert.equal(interval, undefined, fixture.name);
+ }
+ assert.equal(JSON.stringify(value), before);
+ assert.equal(isCalendarDateEditable(value), false);
+ }
+ process.env.TZ = "UTC";
+ for (const file of readdirSync(languageDir).filter(name => name.endsWith(".json"))) {
+ setLanguage(file.slice(0, -5));
+ const language = window.siyuan.languages._attrView;
+ language.dateMonths.split("|").forEach((month: string, index: number) => {
+ const content = language.dateFormatFullTemplate.replace("${year}", "2026").replace("${month}", month).replace("${day}", "2");
+ for (const suffix of ["", " 09:30:15"]) {
+ const date = getCalendarDate({type: "date", hasRenderTemplate: true, renderedContent: content + suffix}, "full");
+ assert.equal(date?.content, Date.UTC(2026, index, 2, suffix ? 9 : 0, suffix ? 30 : 0, suffix ? 15 : 0), file + content + suffix);
+ assert.equal(date.isNotTime, suffix === "");
+ }
+ });
+ }
+ assert.equal(isCalendarDateEditable({type: "date", renderTemplate: "2026-09-30"}), false);
+ assert.equal(isCalendarDateEditable({type: "date", renderTemplate: " "}), true);
+ assert.equal(isCalendarDateEditable({type: "created"}), false);
+ assert.equal(getCalendarInterval({type: "created", hasRenderTemplate: true, renderedContent: "2026-09-30",
+ created: {content: 123, isNotEmpty: true}}).start, 123);
+ } finally {
+ if (originalWindow) {
+ Object.defineProperty(globalThis, "window", originalWindow);
+ } else {
+ Reflect.deleteProperty(globalThis, "window");
+ }
+ if (originalZone === undefined) {
+ delete process.env.TZ;
+ } else {
+ process.env.TZ = originalZone;
+ }
+ }
+});
diff --git a/app/src/protyle/render/av/calendar/date.ts b/app/src/protyle/render/av/calendar/date.ts
index e04e377e8f..85d24976c5 100644
--- a/app/src/protyle/render/av/calendar/date.ts
+++ b/app/src/protyle/render/av/calendar/date.ts
@@ -1,3 +1,5 @@
+import {parseDateValue} from "../dateFormat";
+
export const calendarDay = (value: number | Date) => {
const date = new Date(value);
date.setHours(0, 0, 0, 0);
@@ -74,10 +76,40 @@ export interface ICalendarInterval {
invalid: boolean;
}
+export const isCalendarDateEditable = (field: {type?: TAVCol; renderTemplate?: string; hasRenderTemplate?: boolean}) =>
+ field?.type === "date" && !field.renderTemplate?.trim() && !field.hasRenderTemplate;
+
+// 与内核使用相同的纯文本格式,按设备本地时区解析,不改写单元格原值。
+export const getCalendarDate = (value: IAVCellValue, format: TAVDateFormat = ""): IAVCellDateValue | undefined => {
+ if (value?.type !== "date") {
+ return value?.type === "created" ? value.created : value?.type === "updated" ? value.updated : undefined;
+ }
+ if (!value.hasRenderTemplate) {
+ return value.date;
+ }
+ const content = value.renderedContent?.trim() || "";
+ const time = /[ T](\d{2}):(\d{2})(?::(\d{2}))?$/.exec(content);
+ const dateText = time ? content.slice(0, time.index) : content;
+ for (const candidate of new Set<TAVDateFormat>(["", format, "full"])) {
+ const parsed = parseDateValue(dateText, candidate);
+ if (!parsed.isNotEmpty || parsed.hasEndDate || !parsed.isNotTime) {
+ continue;
+ }
+ const date = new Date(parsed.content);
+ const [hour, minute, second] = time ? time.slice(1).map(part => Number(part || 0)) : [0, 0, 0];
+ const day = date.getDate();
+ date.setHours(hour, minute, second, 0);
+ if (date.getFullYear() < 1 || date.getDate() !== day || date.getHours() !== hour ||
+ date.getMinutes() !== minute || date.getSeconds() !== second) {
+ return;
+ }
+ return {content: date.getTime(), isNotEmpty: true, isNotTime: !time, formattedContent: content};
+ }
+};
+
// 全天结束日期包含当天,带时间的结束端点不包含自身;缺失端点不补造时长。
-export const getCalendarInterval = (value: IAVCellValue): ICalendarInterval | undefined => {
- const date = value?.type === "date" ? value.date : value?.type === "created" ? value.created :
- value?.type === "updated" ? value.updated : undefined;
+export const getCalendarInterval = (value: IAVCellValue, format: TAVDateFormat = ""): ICalendarInterval | undefined => {
+ const date = getCalendarDate(value, format);
if (!date) {
return;
}
diff --git a/app/src/protyle/render/av/calendar/jump.test.ts b/app/src/protyle/render/av/calendar/jump.test.ts
index f619b7dba4..accfd353df 100644
--- a/app/src/protyle/render/av/calendar/jump.test.ts
+++ b/app/src/protyle/render/av/calendar/jump.test.ts
@@ -3,6 +3,7 @@ import {readFileSync} from "node:fs";
import {test} from "node:test";
import {runInNewContext} from "node:vm";
import {ModuleKind, ScriptTarget, transpileModule} from "typescript";
+import * as dateFormat from "../dateFormat";
class Control {
value = "";
@@ -33,7 +34,7 @@ const loadJump = () => {
const dateExports = {} as typeof import("./date");
const compilerOptions = {module: ModuleKind.CommonJS, target: ScriptTarget.ES2020};
runInNewContext(transpileModule(readFileSync("src/protyle/render/av/calendar/date.ts", "utf8"),
- {compilerOptions}).outputText, {exports: dateExports, Date, Intl, Math, Number});
+ {compilerOptions}).outputText, {exports: dateExports, Date, Intl, Math, Number, require: () => dateFormat});
const jumpExports = {} as typeof import("./jump");
let current: {
date: Control;
diff --git a/app/src/protyle/render/av/calendar/render.test.ts b/app/src/protyle/render/av/calendar/render.test.ts
index d3a213767c..652e83497f 100644
--- a/app/src/protyle/render/av/calendar/render.test.ts
+++ b/app/src/protyle/render/av/calendar/render.test.ts
@@ -153,13 +153,17 @@ test("calendar refresh keeps selected event segments and blank clicks dismiss th
});
test("calendar checkbox clicks and keyboard activation update only the chosen field and honor readonly modes", async () => {
- for (const mode of ["desktop", "mobile", "disabled", "publish", "history", "snapshot"]) {
+ for (const mode of ["desktop", "mobile", "disabled", "publish", "history", "snapshot", "desktop-template", "mobile-template"]) {
+ const computed = mode.endsWith("-template");
const start = new Date(2026, 8, 1).getTime();
const range = {start, end: dates.addCalendarDays(start, 7), timeZone: "UTC"};
const values = [
{...createEmptyAVValue("date", "date"), date: {content: start, isNotEmpty: true, isNotTime: true}},
createEmptyAVValue("first", "checkbox"), createEmptyAVValue("second", "checkbox"),
];
+ if (computed) {
+ values[0] = {...values[0], date: {isNotEmpty: false}, hasRenderTemplate: true, renderedContent: "2026-09-01"};
+ }
const cells = values.map(value => ({id: value.keyID, value}));
const handlers: Record<string, (event: unknown) => void> = {};
const updates: unknown[] = [];
@@ -167,6 +171,7 @@ test("calendar checkbox clicks and keyboard activation update only the chosen fi
let html = "";
let startDrag: () => void;
let menusClosed = 0;
+ const menuIcons: string[] = [];
const root = {
isConnected: true,
classList: {add() {}},
@@ -190,8 +195,12 @@ test("calendar checkbox clicks and keyboard activation update only the chosen fi
"../conditionalColor": {getConditionalBackground},
"../cell": {renderCell: () => "<span></span>", updateCellsValue: (...args: unknown[]) => updates.push(args)},
"../openDatabaseRow": {openDatabaseRowByData: () => opens++},
+ "../action": {avContextmenu: (_protyle: unknown, _item: unknown, _position: unknown,
+ options: {customize: (menu: unknown) => void}) => options.customize({
+ addSeparator() {}, addItem: (item: {icon: string}) => menuIcons.push(item.icon),
+ })},
"../../../../util/escape": {escapeAttr: String, escapeHtml: String},
- "../../../../util/functions": {isMobile: () => mode === "mobile"},
+ "../../../../util/functions": {isMobile: () => mode.startsWith("mobile")},
"../../../../constants": {Constants: {ZWSP: ""}},
"../container": {replaceAVContainer: (_block: unknown, value: string) => { html = value; }},
"../virtualScroll": {getAVSelectedItemIDs: (): string[] => [], setAVData() {}},
@@ -217,10 +226,11 @@ test("calendar checkbox clicks and keyboard activation update only the chosen fi
}}} as IProtyle;
await exports.renderCalendar(block as unknown as HTMLElement, protyle, {viewID: "calendar", view: {
calendar: {dateKeyID: "date"}, calendarRange: range,
- columns: values.map(value => ({id: value.keyID, type: value.type, name: value.keyID})),
+ columns: values.map(value => ({id: value.keyID, type: value.type, name: value.keyID,
+ renderTemplate: computed && value.type === "date" ? "2026-09-01" : ""})),
rows: [{id: "row", cells}],
}} as unknown as IAV);
- const editable = mode === "desktop" || mode === "mobile";
+ const editable = mode === "desktop" || mode === "mobile" || computed;
assert.match(html, new RegExp(`role="checkbox" tabindex="${editable ? "0" : "-1"}" aria-checked="false" aria-disabled="${!editable}"`));
const item = {dataset: {calendarItem: "row"}};
const field = {dataset: {colId: "second"}, closest: () => item};
@@ -237,6 +247,17 @@ test("calendar checkbox clicks and keyboard activation update only the chosen fi
assert.equal(args[9][0].rowID, "row");
assert.equal(args[9][0].colID, "second");
}
+ if (computed) {
+ assert.match(html, /data-calendar-item="row"/);
+ assert.match(html, /2026-09-01/);
+ assert.doesNotMatch(html, /data-calendar-(move|resize|add|undated-toggle)/);
+ const eventTarget = {closest: (selector: string) => selector === "[data-calendar-item]" ? item : null};
+ handlers.pointerdown({target: eventTarget, button: 0, pointerType: "mouse", stopPropagation() {}});
+ handlers.touchstart({target: eventTarget, touches: [{identifier: 1, clientX: 10, clientY: 20}]});
+ assert.equal(startDrag, undefined);
+ handlers.contextmenu({target: eventTarget, clientX: 10, clientY: 20, preventDefault() {}, stopPropagation() {}});
+ assert.deepEqual(menuIcons, ["iconOpen"]);
+ }
if (mode === "mobile") {
const closedBeforeDrag = menusClosed;
handlers.touchstart({
diff --git a/app/src/protyle/render/av/calendar/render.ts b/app/src/protyle/render/av/calendar/render.ts
index 795b4ace23..07e9f16452 100644
--- a/app/src/protyle/render/av/calendar/render.ts
+++ b/app/src/protyle/render/av/calendar/render.ts
@@ -18,8 +18,8 @@ import {renderAVRichTextElements} from "../richText";
import {avContextmenu} from "../action";
import {bindAvSearch} from "../search";
import {getAVData, getAVSelectedItemIDs, setAVData} from "../virtualScroll";
-import {addCalendarDays, calendarDay, calendarDayDistance, getCalendarInterval, getISOWeekForCalendarRow, ICalendarEvent, ICalendarSegment,
- moveCalendarDate, packCalendarWeek, resizeCalendarDate} from "./date";
+import {addCalendarDays, calendarDay, calendarDayDistance, getCalendarDate, getCalendarInterval, getISOWeekForCalendarRow, ICalendarEvent, ICalendarSegment,
+ isCalendarDateEditable, moveCalendarDate, packCalendarWeek, resizeCalendarDate} from "./date";
import {openCalendarJump} from "./jump";
import {getCalendarDropDay} from "./hitTest";
import {createCalendarPreviewLayout} from "./preview";
@@ -58,7 +58,7 @@ const openCalendarItem = (protyle: IProtyle, blockElement: HTMLElement, row: IAV
const updateCalendarDate = (protyle: IProtyle, blockElement: HTMLElement,
event: Pick<ICalendarEvent, "row" | "date">, date: IAVCellDateValue,
onUpdated?: () => void) => {
- if (event.date.value?.type !== "date" || !canEditCalendar(protyle)) {
+ if (!isCalendarDateEditable(event.date.value) || !canEditCalendar(protyle)) {
return;
}
const operation = {
@@ -82,11 +82,11 @@ const getEventHTML = (segment: ICalendarSegment, view: IAVTable, editable: boole
(option ? getAVBackgroundColor(option) : "");
const dateValue = event.date.value;
const column = view.columns.find(field => field.id === dateValue.keyID);
- const rawDate = dateValue.type === "date" ? dateValue.date : dateValue.type === "created" ? dateValue.created : dateValue.updated;
+ const rawDate = getCalendarDate(dateValue, column?.dateFormat);
const showTime = dateValue.type === "date" ? !rawDate.isNotTime : !!column?.[dateValue.type as "created" | "updated"]?.includeTime;
const formatTime = (value: number) => new Date(value).toLocaleTimeString(window.siyuan.config.lang, {hour: "2-digit", minute: "2-digit"});
const time = showTime ? formatTime(event.start) + (event.end > event.start && calendarDay(event.start) === calendarDay(event.end) ? ` - ${formatTime(event.end)}` : "") : "";
- const drag = editable && dateValue.type === "date" && !event.invalid;
+ const drag = editable && isCalendarDateEditable(dateValue) && !event.invalid;
const title = `${primary?.value?.block?.content || window.siyuan.languages.untitled}\n${rawDate.formattedContent || ""}${event.invalid ? `\n${window.siyuan.languages.calendarInvalidRange}` : ""}`;
const fields = event.row.cells.map((cell, index) => {
const field = view.columns[index];
@@ -226,7 +226,7 @@ const bindCalendarDrag = (root: HTMLElement, protyle: IProtyle, blockElement: HT
const item = target.closest<HTMLElement>("[data-calendar-item]");
const entry = item && events.get(item.dataset.calendarItem);
const endpoint = target.closest<HTMLElement>("[data-calendar-resize]")?.dataset.calendarResize as "start" | "end" | undefined;
- if (target.closest('[role="checkbox"]') || event.button !== 0 || !entry || entry.invalid || entry.date.value.type !== "date" || !canEditCalendar(protyle) ||
+ if (target.closest('[role="checkbox"]') || event.button !== 0 || !entry || entry.invalid || !isCalendarDateEditable(entry.date.value) || !canEditCalendar(protyle) ||
event.pointerType === "touch" && !endpoint && !target.closest("[data-calendar-move]")) {
return;
}
@@ -282,7 +282,7 @@ const bindCalendarDrag = (root: HTMLElement, protyle: IProtyle, blockElement: HT
}
const item = target.closest<HTMLElement>("[data-calendar-item]");
const entry = item && events.get(item.dataset.calendarItem);
- if (!entry || entry.invalid || entry.date.value.type !== "date") {
+ if (!entry || entry.invalid || !isCalendarDateEditable(entry.date.value)) {
return;
}
const touch = event.touches[0];
@@ -359,6 +359,8 @@ export const renderCalendar = async (blockElement: HTMLElement, protyle: IProtyl
const dateColumn = view.columns.find(field => field.id === view.calendar.dateKeyID && isCalendarDateColumn(field));
state.weekStart = view.calendar.weekStart;
state.dateType = dateColumn?.type;
+ state.dateHasTemplate = !!dateColumn?.renderTemplate?.trim();
+ const dateEditable = isCalendarDateEditable(dateColumn);
if (view.calendarTargetDate !== undefined) {
const current = getCalendarRequestRange(blockElement, data.viewID);
if (view.calendarTargetDate < current.start || view.calendarTargetDate >= current.end) {
@@ -380,7 +382,7 @@ export const renderCalendar = async (blockElement: HTMLElement, protyle: IProtyl
const events: ICalendarEvent[] = [];
view.rows.forEach((row, rowIndex) => {
const date = row.cells.find(cell => cell.value?.keyID === dateColumn?.id);
- const interval = getCalendarInterval(date?.value);
+ const interval = getCalendarInterval(date?.value, dateColumn?.dateFormat);
if (interval) {
events.push({...interval, row, date, rowIndex});
}
@@ -412,7 +414,7 @@ export const renderCalendar = async (blockElement: HTMLElement, protyle: IProtyl
const date = new Date(timestamp);
return `<div class="av__calendar-day${date.getMonth() === anchor.getMonth() || state.mode === "week" ? "" : " av__calendar-day--outside"}${calendarDay(Date.now()) === timestamp ? " av__calendar-day--today" : ""}" data-calendar-day="${timestamp}">
<span title="${escapeAttr(date.toLocaleDateString(locale))}">${date.getDate() === 1 ? date.toLocaleDateString(locale, {month: "short", day: "numeric"}) : date.getDate()}</span>
- ${editable && dateColumn.type === "date" && date.getFullYear() >= 1 && date.getFullYear() <= 9999 ? `<button type="button" class="block__icon" data-calendar-add="${timestamp}" aria-label="${window.siyuan.languages.newRow}"><svg><use xlink:href="#iconAdd"></use></svg></button>` : ""}
+ ${editable && dateEditable && date.getFullYear() >= 1 && date.getFullYear() <= 9999 ? `<button type="button" class="block__icon" data-calendar-add="${timestamp}" aria-label="${window.siyuan.languages.newRow}"><svg><use xlink:href="#iconAdd"></use></svg></button>` : ""}
</div>`;
}).join("");
const overflow = Array.from({length: 7}, (_, day) => {
@@ -433,7 +435,7 @@ export const renderCalendar = async (blockElement: HTMLElement, protyle: IProtyl
<div class="av__calendar-toolbar">
<span class="av__calendar-label">${escapeHtml(label)}</span>
<div class="av__calendar-controls">
- ${editable && dateColumn?.type === "date" ? `<button type="button" class="block__icon block__icon--show ariaLabel${hasUndated ? "" : " fn__none"}" data-calendar-undated-toggle data-position="8south" aria-label="${escapeAttr(window.siyuan.languages.calendarUndated)}" aria-expanded="false"><svg><use xlink:href="#iconInbox"></use></svg></button>` : ""}
+ ${editable && dateEditable ? `<button type="button" class="block__icon block__icon--show ariaLabel${hasUndated ? "" : " fn__none"}" data-calendar-undated-toggle data-position="8south" aria-label="${escapeAttr(window.siyuan.languages.calendarUndated)}" aria-expanded="false"><svg><use xlink:href="#iconInbox"></use></svg></button>` : ""}
${iconButton("previous", "iconLeft", window.siyuan.languages.previous)}
<button type="button" class="b3-button b3-button--cancel av__calendar-today ariaLabel" data-calendar-action="today" data-position="8south" aria-label="${escapeAttr(window.siyuan.languages.calendarToday)}">${window.siyuan.languages.calendarToday}</button>
${iconButton("next", "iconRight", window.siyuan.languages.next)}
@@ -441,7 +443,7 @@ export const renderCalendar = async (blockElement: HTMLElement, protyle: IProtyl
<select class="b3-select" data-calendar-mode aria-label="${window.siyuan.languages.calendarView}"><option value="month"${state.mode === "month" ? " selected" : ""}>${window.siyuan.languages.month}</option><option value="week"${state.mode === "week" ? " selected" : ""}>${window.siyuan.languages.week}</option></select>
</div>
</div>
- ${editable && dateColumn?.type === "date" ? getCalendarUndatedHTML(state) : ""}
+ ${editable && dateEditable ? getCalendarUndatedHTML(state) : ""}
${dateColumn && dateColumn.type !== "date" ? `<div class="av__calendar-source ft__on-surface">${window.siyuan.languages.calendarReadOnlyDate}</div>` : ""}
<div class="av__calendar-scroll" data-prevent-swipe="true">
${dateColumn ? `<div class="av__calendar-weekdays"><div class="av__calendar-week-label fn__ellipsis" title="${escapeAttr(window.siyuan.languages.calendarISOWeek)}">${escapeHtml(window.siyuan.languages.calendarWeekLabel)}</div>${days.map(day => `<div>${day}</div>`).join("")}</div>` : ""}
@@ -461,7 +463,7 @@ export const renderCalendar = async (blockElement: HTMLElement, protyle: IProtyl
void avRender(blockElement, protyle);
};
const create = (date: number) => {
- if (!canEditCalendar(protyle)) {
+ if (!dateEditable || !canEditCalendar(protyle)) {
return;
}
state.anchor = date;
@@ -469,7 +471,7 @@ export const renderCalendar = async (blockElement: HTMLElement, protyle: IProtyl
position: {calendarDate: date}});
};
bindCalendarDrag(root, protyle, blockElement, eventsByID, view);
- if (editable && dateColumn?.type === "date") {
+ if (editable && dateEditable) {
bindCalendarUndated({root, blockElement, data, state, query,
onOpen: row => openCalendarItem(protyle, blockElement, row),
onSchedule: (row, cell, day, onUpdated) => updateCalendarDate(protyle, blockElement,
@@ -567,7 +569,7 @@ export const renderCalendar = async (blockElement: HTMLElement, protyle: IProtyl
menu.addSeparator();
menu.addItem({icon: "iconOpen", label: window.siyuan.languages.openBy,
click: () => { void openCalendarItem(protyle, blockElement, entry.row); }});
- if (canEditCalendar(protyle) && dateColumn?.type === "date") {
+ if (canEditCalendar(protyle) && dateEditable) {
const week = item.closest<HTMLElement>("[data-calendar-week]");
const rect = week.getBoundingClientRect();
const day = addCalendarDays(Number(week.dataset.calendarWeek),
diff --git a/app/src/protyle/render/av/calendar/state.test.ts b/app/src/protyle/render/av/calendar/state.test.ts
index 07a4e30789..5528423816 100644
--- a/app/src/protyle/render/av/calendar/state.test.ts
+++ b/app/src/protyle/render/av/calendar/state.test.ts
@@ -63,6 +63,8 @@ test("only a calendar with an ordinary date source supplies the date of a new en
}
state.dateType = "date";
assert.equal(getCalendarCreationDate(calendar), state.anchor);
+ state.dateHasTemplate = true;
+ assert.equal(getCalendarCreationDate(calendar), undefined);
const table = block("view-a", "table");
getCalendarState(table).dateType = "date";
assert.equal(getCalendarCreationDate(table), undefined);
diff --git a/app/src/protyle/render/av/calendar/state.ts b/app/src/protyle/render/av/calendar/state.ts
index 947614dbce..15eb92131a 100644
--- a/app/src/protyle/render/av/calendar/state.ts
+++ b/app/src/protyle/render/av/calendar/state.ts
@@ -6,6 +6,7 @@ export interface ICalendarState {
mode: "month" | "week";
weekStart: number;
dateType?: TAVCol;
+ dateHasTemplate?: boolean;
rowLimit?: number;
expandedWeeks: Set<number>;
undatedOpen: boolean;
@@ -66,7 +67,7 @@ export const getCalendarRequestRange = (blockElement: Element, viewID?: string)
export const getCalendarCreationDate = (blockElement: Element) => {
const state = getCalendarState(blockElement);
- if (blockElement.getAttribute("data-av-type") === "calendar" && state.dateType === "date") {
+ if (blockElement.getAttribute("data-av-type") === "calendar" && state.dateType === "date" && !state.dateHasTemplate) {
return state.anchor;
}
};
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
index 4eaa93fdef..1b7f2f2272 100644
--- a/app/src/types/index.d.ts
+++ b/app/src/types/index.d.ts
@@ -1245,10 +1245,14 @@ interface IAVFieldView {
interface IAVCalendarSettings {
/**
* 绑定一个 date、created 或 updated 字段;系统时间不支持通过日历拖动修改。
+ * date 字段设置显示模板时按模板结果排布,原始日期保持不变。
+ * 支持 YYYY-MM-DD、字段 dateFormat 指定的数字日期格式,以及当前语言的本地日期格式。
+ * 可附加 HH:mm[:ss](以空格或 T 分隔),按日历请求时区解析,忽略首尾空白;斜杠日期不猜测日月顺序。
+ * 空值或无效结果不显示,也不进入待安排列表;计算日期不支持拖动、清空或按日期新建。
* 空字符串表示未绑定;字段缺失或类型变化时保留绑定,日历返回空行,不自动改绑或回填日期。
* createAttributeViewItem 的可选 calendarDate 是毫秒时间戳,仅支持绑定普通 date 字段的日历。
* 指定时按全天日期覆盖模板中该字段的值,与模板其他字段及条目创建共用一个可撤销事务。
- * 系统时间源拒绝指定 calendarDate;省略或传 null 时沿用常规创建流程。
+ * 系统时间源或带显示模板的日期字段拒绝指定 calendarDate;省略或传 null 时沿用常规创建流程。
*/
dateKeyID: string;
/** 可选单选字段,使用已有选项颜色;空字符串表示不使用字段颜色。 */
diff --git a/kernel/api/contract_av_calendar_test.go b/kernel/api/contract_av_calendar_test.go
index 85e6608a70..b56bfc9228 100644
--- a/kernel/api/contract_av_calendar_test.go
+++ b/kernel/api/contract_av_calendar_test.go
@@ -7,6 +7,7 @@ import (
"net/http/httptest"
"os"
"testing"
+ "time"
"github.com/88250/lute/ast"
"github.com/siyuan-note/siyuan/kernel/av"
@@ -14,6 +15,117 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
+func TestAVContractCalendarTemplateDate(t *testing.T) {
+ fixture := setupAttributeViewContextFilterAPITest(t)
+ languageData, err := os.ReadFile("../../app/appearance/langs/zh-CN.json")
+ if err != nil {
+ t.Fatal(err)
+ }
+ var language struct {
+ AttrView map[string]any `json:"_attrView"`
+ }
+ if err = json.Unmarshal(languageData, &language); err != nil {
+ t.Fatal(err)
+ }
+ translations := util.AttrViewLangs[util.Lang]
+ oldMonths, oldDateTemplate := translations["dateMonths"], translations["dateFormatFullTemplate"]
+ translations["dateMonths"], translations["dateFormatFullTemplate"] = language.AttrView["dateMonths"], language.AttrView["dateFormatFullTemplate"]
+ t.Cleanup(func() {
+ translations["dateMonths"], translations["dateFormatFullTemplate"] = oldMonths, oldDateTemplate
+ })
+ database, itemID := fixture.attrView, ast.NewNodeID()
+ view := database.Views[0]
+ study := av.NewKey(ast.NewNodeID(), "Study", "", av.KeyTypeDate)
+ date := av.NewKey(ast.NewNodeID(), "Review", "", av.KeyTypeDate)
+ date.RenderTemplate = `.action{$s := index . "Study"}.action{if $s}.action{$s.AddDate 0 0 3 | date "2006年1月2日"}.action{end}`
+ primary := database.GetBlockKeyValues()
+ primary.Values = append(primary.Values, &av.Value{ID: ast.NewNodeID(), KeyID: primary.Key.ID, BlockID: itemID,
+ Type: av.KeyTypeBlock, IsDetached: true, Block: &av.ValueBlock{Content: "Review"}})
+ database.KeyValues = append(database.KeyValues, &av.KeyValues{Key: study, Values: []*av.Value{{
+ ID: ast.NewNodeID(), KeyID: study.ID, BlockID: itemID, Type: av.KeyTypeDate,
+ Date: &av.ValueDate{Content: time.Date(2026, 9, 29, 0, 0, 0, 0, time.Local).UnixMilli(), IsNotEmpty: true, IsNotTime: true},
+ }}}, &av.KeyValues{Key: date})
+ view.ItemIDs = []string{itemID}
+ view.LayoutType = av.LayoutTypeCalendar
+ view.Calendar = &av.LayoutCalendar{LayoutTable: view.Table, Settings: av.CalendarSettings{DateKeyID: date.ID, WeekStart: 1}}
+ view.Table = nil
+ for _, key := range []*av.Key{study, date} {
+ view.Calendar.Columns = append(view.Calendar.Columns, &av.ViewTableColumn{BaseField: &av.BaseField{ID: key.ID}})
+ }
+ if err := av.SaveAttributeView(database); err != nil {
+ t.Fatal(err)
+ }
+ file := av.GetAttributeViewDataPath(database.ID)
+ before, _ := os.ReadFile(file)
+ for _, zone := range []string{"Asia/Shanghai", "America/New_York"} {
+ location, _ := time.LoadLocation(zone)
+ start := time.Date(2026, 10, 2, 0, 0, 0, 0, location)
+ for _, target := range []string{"", itemID} {
+ rangeStart := start
+ if target != "" {
+ rangeStart = start.AddDate(0, 0, -7)
+ }
+ path := "/api/av/renderAttributeView"
+ response := callAttributeViewContextFilterAPI(t, path, map[string]any{
+ "id": database.ID, "viewID": view.ID, "targetItemID": target,
+ "calendarRange": &av.CalendarRange{Start: rangeStart.UnixMilli(), End: rangeStart.AddDate(0, 0, 1).UnixMilli(), TimeZone: zone},
+ }, renderAttributeView)
+ requireAPIContract(t, http.MethodPost, path, response)
+ var result struct {
+ Code int
+ Data struct{ View *av.Table }
+ }
+ decodeAttributeViewContextFilterAPIResponse(t, response, &result)
+ if result.Code != 0 || result.Data.View.RowCount != 1 || len(result.Data.View.Rows) != 1 {
+ t.Fatalf("computed date was filtered out: %s", response.Body.String())
+ }
+ value := result.Data.View.Rows[0].GetValue(date.ID)
+ if !value.HasRenderTemplate || value.RenderedContent != "2026年10月2日" || value.Date.IsNotEmpty {
+ t.Fatalf("computed result overwrote the empty stored date: %+v", value)
+ }
+ if target != "" && (result.Data.View.CalendarTargetDate == nil || *result.Data.View.CalendarTargetDate != start.UnixMilli()) {
+ t.Fatalf("target did not locate the computed date: %+v", result.Data.View.CalendarTargetDate)
+ }
+ }
+ }
+ after, _ := os.ReadFile(file)
+ if !bytes.Equal(before, after) {
+ t.Fatal("calendar rendering persisted computed dates")
+ }
+ for _, content := range []string{"", "invalid"} {
+ date.RenderTemplate = `.action{print "` + content + `"}`
+ values, _ := database.GetKeyValues(date.ID)
+ values.Values = []*av.Value{{ID: ast.NewNodeID(), KeyID: date.ID, BlockID: itemID, Type: av.KeyTypeDate,
+ Date: &av.ValueDate{Content: 1790726400000, IsNotEmpty: true}}}
+ if err := av.SaveAttributeView(database); err != nil {
+ t.Fatal(err)
+ }
+ for _, path := range []string{"/api/av/renderAttributeView", "/api/av/getAttributeViewCalendarUndated"} {
+ handler := renderAttributeView
+ if path == "/api/av/getAttributeViewCalendarUndated" {
+ handler = getAttributeViewCalendarUndated
+ }
+ response := callAttributeViewContextFilterAPI(t, path, map[string]any{
+ "id": database.ID, "viewID": view.ID,
+ }, handler)
+ requireAPIContract(t, http.MethodPost, path, response)
+ var result struct {
+ Code int
+ Data struct {
+ View *av.Table
+ Rows []*av.TableRow
+ Total int
+ }
+ }
+ decodeAttributeViewContextFilterAPIResponse(t, response, &result)
+ if result.Code != 0 || len(result.Data.Rows) != 0 || result.Data.Total != 0 ||
+ result.Data.View != nil && len(result.Data.View.Rows) != 0 {
+ t.Fatalf("invalid template fell back to stored dates or manual scheduling: %s", response.Body.String())
+ }
+ }
+ }
+}
+
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.go
index 4682e46920..8c5ed45e05 100644
--- a/kernel/apicontract/av_calendar.go
+++ b/kernel/apicontract/av_calendar.go
@@ -5,6 +5,10 @@ package apicontract
// 切换布局保留其他布局及分组设置;日历渲染不应用分组。
type AVCalendarSettings struct {
// 绑定一个 date、created 或 updated 字段;后两者不支持通过日历拖动修改。
+ // date 字段有显示模板时,以模板输出的纯文本日期排布,保留原始 date 值,不允许通过日历改期。
+ // 支持 YYYY-MM-DD、字段 dateFormat 指定的数字日期格式,以及当前语言的本地日期格式。
+ // 可附加 HH:mm[:ss],以空格或 T 分隔;首尾空白忽略,斜杠日期按字段格式解释,不猜测日月顺序。
+ // 按 CalendarRange 的时区解释,省略区间时使用内核本地时区;空值、无效日期和其他格式不显示,也不进入待安排列表。
// 空字符串表示未绑定;字段缺失或类型变化时保留绑定,日历返回空行,不自动改绑或回填日期。
DateKeyID string `json:"dateKeyID"`
// 可选单选字段,使用已有选项颜色;空字符串表示不使用字段颜色。
diff --git a/kernel/apicontract/av_requests.go b/kernel/apicontract/av_requests.go
index 1ef53eacc5..34fd2603af 100644
--- a/kernel/apicontract/av_requests.go
+++ b/kernel/apicontract/av_requests.go
@@ -204,7 +204,7 @@ type GetAttributeViewFieldViewsRequest struct {
type CreateAttributeViewItemRequest struct {
// 日历新条目的全天日期,单位为毫秒;仅支持绑定普通 date 字段的日历视图。
// 覆盖模板中该字段的值,与模板其他字段及条目创建共用一个可撤销事务。
- // 绑定 created 或 updated 时拒绝指定日期;省略或传 null 时沿用常规创建流程。
+ // 绑定 created、updated 或带显示模板的 date 字段时拒绝指定日期;省略或传 null 时沿用常规创建流程。
CalendarDate *int64 `json:"calendarDate" api:"optional,nullable"`
AvID string `json:"avID"`
BlockID string `json:"blockID"`
@@ -293,6 +293,7 @@ type RenderAttributeViewRequest struct {
}
// AVCalendarUndatedRequest 只读取普通日期字段为空的条目,不修改视图或数据库。
+// 绑定带显示模板的日期字段时返回空列表,计算日期需要通过模板或来源字段调整。
// query 沿用当前视图搜索,search 仅匹配待安排条目的标题;页码从 1 开始,页大小默认 50,最大 100。
// 端点仅供可编辑用户使用,并按 blockID 保持加密笔记本读取租约。
type AVCalendarUndatedRequest struct {
diff --git a/kernel/av/layout_calendar.go b/kernel/av/layout_calendar.go
index 3ca2dbcab5..52c18663c7 100644
--- a/kernel/av/layout_calendar.go
+++ b/kernel/av/layout_calendar.go
@@ -6,6 +6,9 @@ package av
import (
"fmt"
+ "regexp"
+ "strconv"
+ "strings"
"time"
_ "time/tzdata"
)
@@ -69,6 +72,78 @@ func IsCalendarDateType(keyType KeyType) bool {
return KeyTypeDate == keyType || KeyTypeCreated == keyType || KeyTypeUpdated == keyType
}
+var calendarTemplateTimePattern = regexp.MustCompile(`[ T](\d{2}):(\d{2})(?::(\d{2}))?$`)
+
+// newCalendarTemplateDateParser 复用字段日期格式和当前语言的月份、日期模板,每次日历渲染只编译一次。
+func newCalendarTemplateDateParser(format DateDisplayFormat) func(string, *time.Location) *ValueDate {
+ layouts := []string{"2006-1-2"}
+ switch format {
+ case DateDisplayFormatMonthDayYear:
+ layouts = append(layouts, "1/2/2006")
+ case DateDisplayFormatDayMonthYear:
+ layouts = append(layouts, "2/1/2006")
+ case DateDisplayFormatYearMonthDay:
+ layouts = append(layouts, "2006/1/2")
+ }
+ months := strings.Split(GetAttributeViewI18n("dateMonths"), "|")
+ monthPatterns := make([]string, len(months))
+ for i, month := range months {
+ monthPatterns[i] = regexp.QuoteMeta(month)
+ }
+ pattern := regexp.QuoteMeta(GetAttributeViewI18n("dateFormatFullTemplate"))
+ for token, replacement := range map[string]string{
+ "${year}": `(?P<year>\d{4})`, "${day}": `(?P<day>\d{1,2})`,
+ "${month}": "(?P<month>" + strings.Join(monthPatterns, "|") + ")",
+ } {
+ pattern = strings.ReplaceAll(pattern, regexp.QuoteMeta(token), replacement)
+ }
+ fullDate := regexp.MustCompile("(?i)^" + pattern + "$")
+ return func(content string, location *time.Location) *ValueDate {
+ content = strings.TrimSpace(content)
+ hour, minute, second := 0, 0, 0
+ timeParts := calendarTemplateTimePattern.FindStringSubmatch(content)
+ if timeParts != nil {
+ hour, _ = strconv.Atoi(timeParts[1])
+ minute, _ = strconv.Atoi(timeParts[2])
+ second, _ = strconv.Atoi(timeParts[3])
+ content = strings.TrimSpace(content[:len(content)-len(timeParts[0])])
+ }
+ var date time.Time
+ found := false
+ for _, layout := range layouts {
+ if parsed, err := time.ParseInLocation(layout, content, location); err == nil {
+ date = parsed
+ found = true
+ break
+ }
+ }
+ if !found {
+ parts := fullDate.FindStringSubmatch(content)
+ if parts == nil || fullDate.SubexpIndex("year") < 0 || fullDate.SubexpIndex("day") < 0 || fullDate.SubexpIndex("month") < 0 {
+ return nil
+ }
+ year, _ := strconv.Atoi(parts[fullDate.SubexpIndex("year")])
+ day, _ := strconv.Atoi(parts[fullDate.SubexpIndex("day")])
+ month := 0
+ for i, name := range months {
+ if strings.EqualFold(name, parts[fullDate.SubexpIndex("month")]) {
+ month = i + 1
+ break
+ }
+ }
+ date = time.Date(year, time.Month(month), day, 0, 0, 0, 0, location)
+ if int(date.Month()) != month || date.Day() != day {
+ return nil
+ }
+ }
+ parsed := time.Date(date.Year(), date.Month(), date.Day(), hour, minute, second, 0, location)
+ if date.Year() < 1 || parsed.Day() != date.Day() || parsed.Hour() != hour || parsed.Minute() != minute || parsed.Second() != second {
+ return nil
+ }
+ return &ValueDate{Content: parsed.UnixMilli(), IsNotEmpty: true, IsNotTime: timeParts == nil}
+ }
+}
+
// CalendarInterval 保留源值,按本地日历日解释全天结束日期;缺失端点作为单点显示。
func CalendarInterval(value *Value, location *time.Location) (start, end int64, ok bool) {
if nil == value {
@@ -121,10 +196,23 @@ func FilterCalendarRows(calendar *Calendar, dateRange *CalendarRange, targetItem
return nil
}
rows := make([]*TableRow, 0, len(calendar.Rows))
+ computed := key.Type == KeyTypeDate && strings.TrimSpace(key.RenderTemplate) != ""
+ var parseDate func(string, *time.Location) *ValueDate
+ if computed {
+ parseDate = newCalendarTemplateDateParser(key.DateFormat)
+ }
for _, row := range calendar.Rows {
- start, end, ok := CalendarInterval(row.GetValue(key.ID), location)
+ value := row.GetValue(key.ID)
+ if computed {
+ var date *ValueDate
+ if value != nil && value.HasRenderTemplate {
+ date = parseDate(value.RenderedContent, location)
+ }
+ value = &Value{Type: KeyTypeDate, Date: date}
+ }
+ start, end, ok := CalendarInterval(value, location)
if !ok {
- if key.Type == KeyTypeDate {
+ if key.Type == KeyTypeDate && !computed {
calendar.UndatedRows = append(calendar.UndatedRows, row)
}
continue
diff --git a/kernel/av/layout_calendar_test.go b/kernel/av/layout_calendar_test.go
index 7493e6803b..9cd9c60a87 100644
--- a/kernel/av/layout_calendar_test.go
+++ b/kernel/av/layout_calendar_test.go
@@ -2,11 +2,106 @@ package av
import (
"encoding/json"
+ "os"
+ "path/filepath"
"reflect"
+ "strings"
"testing"
"time"
+
+ "github.com/siyuan-note/siyuan/kernel/util"
)
+func TestCalendarTemplateDates(t *testing.T) {
+ oldLang, oldLangs := util.Lang, util.AttrViewLangs
+ util.AttrViewLangs = map[string]map[string]any{}
+ t.Cleanup(func() { util.Lang, util.AttrViewLangs = oldLang, oldLangs })
+ data, err := os.ReadFile("testdata/calendar_template_dates.json")
+ if err != nil {
+ t.Fatal(err)
+ }
+ var cases []struct{ Name, Zone, Content, Start, End, Lang, Format string }
+ if err = json.Unmarshal(data, &cases); err != nil {
+ t.Fatal(err)
+ }
+ for _, test := range cases {
+ t.Run(test.Name, func(t *testing.T) {
+ lang := test.Lang
+ if lang == "" {
+ lang = "en"
+ }
+ loadCalendarTestLanguage(t, lang)
+ location, err := time.LoadLocation(test.Zone)
+ if err != nil {
+ t.Fatal(err)
+ }
+ value := &Value{Type: KeyTypeDate, HasRenderTemplate: true, RenderedContent: test.Content,
+ Date: &ValueDate{Content: 1, IsNotEmpty: true, Content2: 9999999999999, HasEndDate: true, IsNotEmpty2: true}}
+ before, _ := json.Marshal(value)
+ date := newCalendarTemplateDateParser(DateDisplayFormat(test.Format))(value.RenderedContent, location)
+ start, end, ok := CalendarInterval(&Value{Type: KeyTypeDate, Date: date}, location)
+ if ok != (test.Start != "") {
+ t.Fatalf("unexpected availability: %v", ok)
+ }
+ if ok {
+ wantStart, _ := time.Parse(time.RFC3339, test.Start)
+ wantEnd, _ := time.Parse(time.RFC3339, test.End)
+ if start != wantStart.UnixMilli() || end != wantEnd.UnixMilli() {
+ t.Fatalf("unexpected interval %d - %d", start, end)
+ }
+ }
+ after, _ := json.Marshal(value)
+ if string(before) != string(after) {
+ t.Fatal("calendar changed the stored date")
+ }
+ })
+ }
+}
+
+func loadCalendarTestLanguage(t *testing.T, lang string) {
+ t.Helper()
+ data, err := os.ReadFile(filepath.Join("../../app/appearance/langs", lang+".json"))
+ if err != nil {
+ t.Fatal(err)
+ }
+ var language struct {
+ AttrView map[string]any `json:"_attrView"`
+ }
+ if err = json.Unmarshal(data, &language); err != nil {
+ t.Fatal(err)
+ }
+ util.Lang = lang
+ util.AttrViewLangs[lang] = language.AttrView
+}
+
+func TestCalendarTemplateAllLanguages(t *testing.T) {
+ oldLang, oldLangs := util.Lang, util.AttrViewLangs
+ util.AttrViewLangs = map[string]map[string]any{}
+ t.Cleanup(func() { util.Lang, util.AttrViewLangs = oldLang, oldLangs })
+ paths, err := filepath.Glob("../../app/appearance/langs/*.json")
+ if err != nil || len(paths) == 0 {
+ t.Fatalf("language files: %v", err)
+ }
+ for _, path := range paths {
+ lang := strings.TrimSuffix(filepath.Base(path), ".json")
+ loadCalendarTestLanguage(t, lang)
+ parse := newCalendarTemplateDateParser(DateDisplayFormatFull)
+ for month, name := range strings.Split(GetAttributeViewI18n("dateMonths"), "|") {
+ content := strings.NewReplacer("${year}", "2026", "${month}", name, "${day}", "2").Replace(GetAttributeViewI18n("dateFormatFullTemplate"))
+ for _, suffix := range []string{"", " 09:30:15"} {
+ date := parse(content+suffix, time.UTC)
+ want := time.Date(2026, time.Month(month+1), 2, 0, 0, 0, 0, time.UTC)
+ if suffix != "" {
+ want = want.Add(9*time.Hour + 30*time.Minute + 15*time.Second)
+ }
+ if date == nil || date.Content != want.UnixMilli() || date.IsNotTime != (suffix == "") {
+ t.Fatalf("%s: %s%s produced %+v", lang, content, suffix, date)
+ }
+ }
+ }
+ }
+}
+
func TestCalendarRowLimitCompatibility(t *testing.T) {
var settings CalendarSettings
if err := json.Unmarshal([]byte(`{"dateKeyID":"date","colorKeyID":"","weekStart":1}`), &settings); err != nil {
diff --git a/kernel/av/testdata/calendar_template_dates.json b/kernel/av/testdata/calendar_template_dates.json
new file mode 100644
index 0000000000..b600f84f64
--- /dev/null
+++ b/kernel/av/testdata/calendar_template_dates.json
@@ -0,0 +1,26 @@
+[
+ {"name":"video date format","lang":"zh-CN","zone":"Asia/Shanghai","content":"2026年10月2日","start":"2026-10-01T16:00:00Z","end":"2026-10-02T16:00:00Z"},
+ {"name":"localized date with time","lang":"zh-CN","zone":"Asia/Shanghai","content":"2026年10月2日 09:30","start":"2026-10-02T01:30:00Z","end":"2026-10-02T01:30:00Z"},
+ {"name":"invalid localized day","lang":"zh-CN","zone":"Asia/Shanghai","content":"2026年2月30日"},
+ {"name":"US field format","format":"month-day-year","zone":"UTC","content":"10/02/2026","start":"2026-10-02T00:00:00Z","end":"2026-10-03T00:00:00Z"},
+ {"name":"European field format","format":"day-month-year","zone":"UTC","content":"10/02/2026","start":"2026-02-10T00:00:00Z","end":"2026-02-11T00:00:00Z"},
+ {"name":"year first field format","format":"year-month-day","zone":"UTC","content":"2026/10/02","start":"2026-10-02T00:00:00Z","end":"2026-10-03T00:00:00Z"},
+ {"name":"date in Shanghai","zone":"Asia/Shanghai","content":"2026-09-30","start":"2026-09-29T16:00:00Z","end":"2026-09-30T16:00:00Z"},
+ {"name":"date in New York","zone":"America/New_York","content":"2026-09-30","start":"2026-09-30T04:00:00Z","end":"2026-10-01T04:00:00Z"},
+ {"name":"day across DST","zone":"America/New_York","content":"2026-03-08","start":"2026-03-08T05:00:00Z","end":"2026-03-09T04:00:00Z"},
+ {"name":"time with minutes","zone":"Asia/Shanghai","content":"2026-09-30 09:30","start":"2026-09-30T01:30:00Z","end":"2026-09-30T01:30:00Z"},
+ {"name":"time with seconds","zone":"America/New_York","content":"2026-09-30T09:30:15","start":"2026-09-30T13:30:15Z","end":"2026-09-30T13:30:15Z"},
+ {"name":"trim whitespace","zone":"UTC","content":" \n2026-09-30\t","start":"2026-09-30T00:00:00Z","end":"2026-10-01T00:00:00Z"},
+ {"name":"leap day","zone":"UTC","content":"2024-02-29","start":"2024-02-29T00:00:00Z","end":"2024-03-01T00:00:00Z"},
+ {"name":"early year","zone":"UTC","content":"0001-01-01","start":"0001-01-01T00:00:00Z","end":"0001-01-02T00:00:00Z"},
+ {"name":"empty","zone":"UTC","content":""},
+ {"name":"invalid leap day","zone":"UTC","content":"2026-02-29"},
+ {"name":"invalid month","zone":"UTC","content":"2026-13-01"},
+ {"name":"invalid time","zone":"UTC","content":"2026-09-30 24:00"},
+ {"name":"DST gap","zone":"America/New_York","content":"2026-03-08 02:30"},
+ {"name":"zero year","zone":"UTC","content":"0000-01-01"},
+ {"name":"HTML","zone":"UTC","content":"<b>2026-09-30</b>"},
+ {"name":"ambiguous date","zone":"UTC","content":"09/10/2026"},
+ {"name":"range","zone":"UTC","content":"2026-09-30 - 2026-10-02"},
+ {"name":"timestamp","zone":"UTC","content":"1790726400000"}
+]
diff --git a/kernel/model/attribute_view_calendar.go b/kernel/model/attribute_view_calendar.go
index 59afd9fb87..b7ad001c77 100644
--- a/kernel/model/attribute_view_calendar.go
+++ b/kernel/model/attribute_view_calendar.go
@@ -7,6 +7,7 @@ package model
import (
"encoding/json"
"fmt"
+ "strings"
"github.com/88250/lute/ast"
"github.com/siyuan-note/siyuan/kernel/av"
@@ -87,7 +88,7 @@ func setNewCalendarItemDate(attrView *av.AttributeView, blockID, viewID string,
return fmt.Errorf("invalid calendar item date")
}
key, err := attrView.GetKey(view.Calendar.Settings.DateKeyID)
- if nil != err || key.Type != av.KeyTypeDate {
+ if nil != err || key.Type != av.KeyTypeDate || strings.TrimSpace(key.RenderTemplate) != "" {
return fmt.Errorf("calendar date field is not editable")
}
values[key.ID] = &av.Value{Type: av.KeyTypeDate, KeyID: key.ID,
diff --git a/kernel/model/attribute_view_calendar_test.go b/kernel/model/attribute_view_calendar_test.go
index 15ef4cc35b..2730e8811d 100644
--- a/kernel/model/attribute_view_calendar_test.go
+++ b/kernel/model/attribute_view_calendar_test.go
@@ -137,6 +137,10 @@ func TestAttributeViewCalendarNewDateAndReadOnlySources(t *testing.T) {
if err != nil || !values[key.ID].Date.IsNotTime || values[key.ID].Date.Content != 1756684800000 || values["other"].Text.Content != "template" {
t.Fatalf("calendar creation did not merge with template: %v", err)
}
+ key.RenderTemplate = "2026-09-30"
+ if err = setNewCalendarItemDate(attrView, "", view.ID, 0, values); err == nil || values[key.ID].Date.Content != 1756684800000 {
+ t.Fatal("computed date source must reject rescheduling and preserve values")
+ }
} else if err == nil || len(values) != 1 {
t.Fatal("system date source must reject rescheduling")
}
diff --git a/kernel/model/attribute_view_render.go b/kernel/model/attribute_view_render.go
index e27b6e5691..8fc4a30417 100644
--- a/kernel/model/attribute_view_render.go
+++ b/kernel/model/attribute_view_render.go
@@ -994,6 +994,11 @@ func shouldDeferAttributeViewTemplateValues(attrView *av.AttributeView, view *av
if 0 == len(templateKeyIDs) && 0 == len(renderTemplateKeyIDs) {
return false
}
+ // 日历日期模板参与区间筛选和定位,必须在筛选条目之前完成计算。
+ if view.LayoutType == av.LayoutTypeCalendar && view.Calendar != nil &&
+ renderTemplateKeyIDs[view.Calendar.Settings.DateKeyID] {
+ return false
+ }
for _, rule := range view.EffectiveConditionalColors() {
if nil != rule && nil != rule.Filter && (templateKeyIDs[rule.Filter.Column] ||