Skip to content

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

:lipstick: Display calendar week numbers in a separate column https://github.com/siyuan-note/siyuan/issues/19754

Daniel34acda4bbca0
diff --git a/app/src/assets/scss/business/_av-calendar.scss b/app/src/assets/scss/business/_av-calendar.scss
index 532c316b1d..a492b61afd 100644
--- a/app/src/assets/scss/business/_av-calendar.scss
+++ b/app/src/assets/scss/business/_av-calendar.scss
@@ -135,11 +135,12 @@
}
.av__calendar-scroll {
+ --av-calendar-week-width: 36px;
overflow-x: auto;
}
.av__calendar-grid {
- min-width: 560px;
+ min-width: calc(560px + var(--av-calendar-week-width));
box-sizing: border-box;
border: 1px solid var(--b3-border-color);
border-radius: var(--b3-border-radius);
@@ -150,7 +151,6 @@
}
}
- .av__calendar-weekdays,
.av__calendar-days,
.av__calendar-overflow {
display: grid;
@@ -158,29 +158,48 @@
}
.av__calendar-weekdays {
- min-width: 560px;
+ display: grid;
+ grid-template-columns: var(--av-calendar-week-width) repeat(7, minmax(0, 1fr));
+ min-width: calc(560px + var(--av-calendar-week-width));
+ box-sizing: border-box;
direction: ltr;
- padding: 8px 0;
+ padding: 8px 1px;
text-align: center;
color: var(--b3-theme-on-surface);
font-size: 12px;
}
- .av__calendar-week {
- position: relative;
+ .av__calendar-week-row {
+ display: grid;
+ grid-template-columns: var(--av-calendar-week-width) minmax(0, 1fr);
+ border-top: 1px solid var(--b3-border-color);
+
&:first-child {
border-top: 0;
- border-top-left-radius: max(0px, calc(var(--b3-border-radius) - 1px));
- border-top-right-radius: max(0px, calc(var(--b3-border-radius) - 1px));
+
+ .av__calendar-week {
+ border-top-right-radius: max(0px, calc(var(--b3-border-radius) - 1px));
+ }
}
- &:last-child {
- border-bottom-left-radius: max(0px, calc(var(--b3-border-radius) - 1px));
+ &:last-child .av__calendar-week {
border-bottom-right-radius: max(0px, calc(var(--b3-border-radius) - 1px));
}
+ }
+
+ .av__calendar-week-number {
+ padding: 3px 2px;
+ border-right: 1px solid var(--b3-border-color);
+ color: var(--b3-theme-on-surface);
+ font-size: 11px;
+ line-height: 24px;
+ text-align: center;
+ }
+ .av__calendar-week {
+ position: relative;
+ min-width: 0;
min-height: 130px;
- border-top: 1px solid var(--b3-border-color);
padding-bottom: 6px;
background-image:
linear-gradient(to right,
@@ -219,24 +238,11 @@
white-space: nowrap;
}
- &--first > span:nth-child(2) {
- min-width: 0;
- margin-left: auto;
- }
-
- .av__calendar-week-number {
- flex-shrink: 0;
- min-width: 0;
- padding: 0 1px;
- color: var(--b3-theme-on-surface);
- font-size: 11px;
- }
-
&--outside {
color: var(--b3-theme-on-surface-light);
}
- &--today > span:not(.av__calendar-week-number) {
+ &--today > span {
background: var(--b3-theme-primary);
color: var(--b3-theme-on-primary);
}
diff --git a/app/src/protyle/render/av/calendar/render.ts b/app/src/protyle/render/av/calendar/render.ts
index 09db6457fc..f98190abd6 100644
--- a/app/src/protyle/render/av/calendar/render.ts
+++ b/app/src/protyle/render/av/calendar/render.ts
@@ -393,8 +393,7 @@ export const renderCalendar = async (blockElement: HTMLElement, protyle: IProtyl
const dayHeaders = Array.from({length: 7}, (_, day) => {
const timestamp = addCalendarDays(start, day);
const date = new Date(timestamp);
- return `<div class="av__calendar-day${day === 0 ? " av__calendar-day--first" : ""}${date.getMonth() === anchor.getMonth() || state.mode === "week" ? "" : " av__calendar-day--outside"}${calendarDay(Date.now()) === timestamp ? " av__calendar-day--today" : ""}" data-calendar-day="${timestamp}">
- ${day === 0 ? `<span class="av__calendar-week-number" title="${escapeAttr(weekLabel)}">W${String(isoWeek.week).padStart(2, "0")}</span>` : ""}
+ 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>` : ""}
</div>`;
@@ -403,9 +402,10 @@ export const renderCalendar = async (blockElement: HTMLElement, protyle: IProtyl
const hidden = segments.filter(segment => segment.lane >= rowLimit && segment.column <= day && segment.column + segment.span > day).length;
return hidden && !expanded ? `<button class="b3-button b3-button--cancel b3-button--small av__calendar-more" data-calendar-expand="${start}" style="grid-column:${day + 1}">${escapeHtml(window.siyuan.languages.calendarMore.replace("${x}", hidden.toString()))}</button>` : "";
}).join("");
- body += `<div class="av__calendar-week" data-calendar-week="${start}"><div class="av__calendar-days">${dayHeaders}</div>
+ body += `<div class="av__calendar-week-row"><span class="av__calendar-week-number" title="${escapeAttr(weekLabel)}">W${String(isoWeek.week).padStart(2, "0")}</span>
+ <div class="av__calendar-week" data-calendar-week="${start}"><div class="av__calendar-days">${dayHeaders}</div>
<div class="av__calendar-events" style="grid-template-rows:repeat(${Math.max(1, maxLane)},auto)">${visible.map(segment => getEventHTML(segment, view, editable)).join("")}</div>
- ${overflow ? `<div class="av__calendar-overflow">${overflow}</div>` : ""}</div>`;
+ ${overflow ? `<div class="av__calendar-overflow">${overflow}</div>` : ""}</div></div>`;
}
}
blockElement.removeAttribute(Constants.ATTRIBUTE_V_SCROLL);
@@ -427,7 +427,7 @@ export const renderCalendar = async (blockElement: HTMLElement, protyle: IProtyl
${editable && dateColumn?.type === "date" ? 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">${days.map(day => `<div>${day}</div>`).join("")}</div>` : ""}
+ ${dateColumn ? `<div class="av__calendar-weekdays"><span aria-hidden="true"></span>${days.map(day => `<div>${day}</div>`).join("")}</div>` : ""}
<div class="av__body av__calendar-grid${dateColumn ? "" : " av__calendar-grid--empty"}" data-group-id="" style="--av-calendar-saturday:${(6 - weekStartDay + 7) % 7};--av-calendar-sunday:${(7 - weekStartDay) % 7};">${body}</div>
</div>
</div>