Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 16:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

✨ https://github.com/siyuan-note/siyuan/issues/8868 date

Browse source
This commit is contained in:
Vanessa 2023-08-01 14:42:33 +08:00
parent 0fcd53187d
commit 7a3c8da349
3 changed files with 15 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/menus/Menu.ts
View file

@ -179,7 +179,7 @@ export class MenuItem {
if (this.element.getAttribute("disabled")) { if (this.element.getAttribute("disabled")) {
return; return;
} }
let keepOpen = options.click(this.element); let keepOpen = options.click(this.element, event);
if (keepOpen instanceof Promise) { if (keepOpen instanceof Promise) {
keepOpen = false; keepOpen = false;
} }

40
app/src/protyle/render/av/render.ts
View file

@ -93,10 +93,7 @@ style="width: ${column.width || "200px"}">${getCalcValue(column) || '<svg><use x
text += dayjs(cell.value.date.content).format("YYYY-MM-DD HH:mm"); text += dayjs(cell.value.date.content).format("YYYY-MM-DD HH:mm");
} }
if (cell.value?.date.hasEndDate && cell.value?.date.content && cell.value?.date.content2) { if (cell.value?.date.hasEndDate && cell.value?.date.content && cell.value?.date.content2) {
text += `<svg style="margin-left: 5px"><use xlink:href="#iconForward"></use></svg>`; text += `<svg style="margin-left: 5px"><use xlink:href="#iconForward"></use></svg>${dayjs(cell.value.date.content2).format("YYYY-MM-DD HH:mm")}`;
}
if (cell.value?.date.content2) {
text += dayjs(cell.value.date.content2).format("YYYY-MM-DD HH:mm");
} }
text += "</span>"; text += "</span>";
} }
@ -227,10 +224,7 @@ const genAVValueHTML = (value: IAVCellValue) => {
html = `<span data-content="${value.date.content}">${dayjs(value.date.content).format("YYYY-MM-DD HH:mm")}</span>`; html = `<span data-content="${value.date.content}">${dayjs(value.date.content).format("YYYY-MM-DD HH:mm")}</span>`;
} }
if (value.date.hasEndDate && value.date.content && value.date.content2) { if (value.date.hasEndDate && value.date.content && value.date.content2) {
html += `<svg class="custom-attr__avarrow"><use xlink:href="#iconForward"></use></svg>`; html += `<svg class="custom-attr__avarrow"><use xlink:href="#iconForward"></use></svg><span data-content="${value.date.content2}">${dayjs(value.date.content2).format("YYYY-MM-DD HH:mm")}</span>`;
}
if (value.date.content2) {
html += `<span data-content="${value.date.content2}">${dayjs(value.date.content2).format("YYYY-MM-DD HH:mm")}</span>`;
} }
break; break;
case "url": case "url":
@ -297,10 +291,7 @@ export const renderAVAttribute = (element: HTMLElement, id: string) => {
dataHTML = `<span data-content="${new Date(textElements[0].value).getTime()}">${dayjs(textElements[0].value).format("YYYY-MM-DD HH:mm")}</span>` dataHTML = `<span data-content="${new Date(textElements[0].value).getTime()}">${dayjs(textElements[0].value).format("YYYY-MM-DD HH:mm")}</span>`
} }
if (hasEndDate && textElements[0].value && textElements[1].value) { if (hasEndDate && textElements[0].value && textElements[1].value) {
dataHTML += `<svg class="custom-attr__avarrow"><use xlink:href="#iconForward"></use></svg>` dataHTML += `<svg class="custom-attr__avarrow"><use xlink:href="#iconForward"></use></svg><span data-content="${new Date(textElements[1].value).getTime()}">${dayjs(textElements[1].value).format("YYYY-MM-DD HH:mm")}</span>`
}
if (textElements[1].value) {
dataHTML += `<span data-content="${new Date(textElements[1].value).getTime()}">${dayjs(textElements[1].value).format("YYYY-MM-DD HH:mm")}</span>`
} }
dateElement.innerHTML = dataHTML; dateElement.innerHTML = dataHTML;
}); });
@ -325,10 +316,13 @@ export const renderAVAttribute = (element: HTMLElement, id: string) => {
<span class="fn__space fn__flex-1"></span> <span class="fn__space fn__flex-1"></span>
<input type="checkbox" class="b3-switch fn__flex-center"${hasEndDate ? " checked" : ""}> <input type="checkbox" class="b3-switch fn__flex-center"${hasEndDate ? " checked" : ""}>
</label>`, </label>`,
click(element) { click(element, event) {
const switchElement = element.querySelector(".b3-switch") as HTMLInputElement const switchElement = element.querySelector(".b3-switch") as HTMLInputElement
// TODO if ((event.target as HTMLElement).tagName !== "INPUT") {
switchElement.checked = !switchElement.checked switchElement.checked = !switchElement.checked;
} else {
switchElement.outerHTML = `<input type="checkbox" class="b3-switch fn__flex-center"${switchElement.checked ? " checked" : ""}>`;
}
window.siyuan.menus.menu.element.querySelectorAll('[type="datetime-local"]')[1].classList.toggle("fn__none"); window.siyuan.menus.menu.element.querySelectorAll('[type="datetime-local"]')[1].classList.toggle("fn__none");
return true; return true;
} }
@ -338,18 +332,10 @@ export const renderAVAttribute = (element: HTMLElement, id: string) => {
icon: "iconTrashcan", icon: "iconTrashcan",
label: window.siyuan.languages.clear, label: window.siyuan.languages.clear,
click() { click() {
fetchPost("/api/av/setAttributeViewBlockAttr", { const textElements = window.siyuan.menus.menu.element.querySelectorAll(".b3-text-field") as NodeListOf<HTMLInputElement>
avID: dateElement.dataset.avId, textElements[0].value = "";
keyID: dateElement.dataset.keyId, textElements[1].value = "";
rowID: dateElement.dataset.blockId, (window.siyuan.menus.menu.element.querySelector(".b3-switch") as HTMLInputElement).checked = false
cellID: dateElement.dataset.id,
value: {
date: {
content: null, content2: null, hasEndDate: false
}
}
});
dateElement.innerHTML = ""
} }
}) })
const targetRect = target.getBoundingClientRect() const targetRect = target.getBoundingClientRect()

2
app/src/types/index.d.ts vendored
View file

@ -812,7 +812,7 @@ interface IModels {
interface IMenu { interface IMenu {
label?: string, label?: string,
click?: (element: HTMLElement) => boolean | void | Promise<boolean | void> click?: (element: HTMLElement, event: MouseEvent) => boolean | void | Promise<boolean | void>
type?: "separator" | "submenu" | "readonly", type?: "separator" | "submenu" | "readonly",
accelerator?: string, accelerator?: string,
action?: string, action?: string,