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

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

Browse source
This commit is contained in:
Vanessa 2023-08-01 12:27:47 +08:00
parent ae576633c1
commit 0fcd53187d
2 changed files with 110 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/protyle/render/av/date.ts
View file

@ -36,11 +36,11 @@ export const getDateHTML = (data: IAVTable, cellElements: HTMLElement[]) => {
<input type="datetime-local" value="${value}" class="b3-text-field fn__size200"><br> <input type="datetime-local" value="${value}" class="b3-text-field fn__size200"><br>
<input type="datetime-local" value="${value2}" style="margin-top: 8px" class="b3-text-field fn__size200${hasEndDate ? "" : " fn__none"}"> <input type="datetime-local" value="${value2}" style="margin-top: 8px" class="b3-text-field fn__size200${hasEndDate ? "" : " fn__none"}">
<button class="b3-menu__separator"></button> <button class="b3-menu__separator"></button>
<button class="b3-menu__item"> <label class="b3-menu__item">
<span>${window.siyuan.languages.endDate}</span> <span>${window.siyuan.languages.endDate}</span>
<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" : ""}>
</button> </label>
<button class="b3-menu__separator"></button> <button class="b3-menu__separator"></button>
<button class="b3-menu__item" data-type="clearDate"> <button class="b3-menu__item" data-type="clearDate">
<svg class="b3-menu__icon"><use xlink:href="#iconTrashcan"></use></svg> <svg class="b3-menu__icon"><use xlink:href="#iconTrashcan"></use></svg>

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

@ -92,8 +92,11 @@ style="width: ${column.width || "200px"}">${getCalcValue(column) || '<svg><use x
if (cell.value?.date.content) { if (cell.value?.date.content) {
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) { 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>${dayjs(cell.value.date.content2).format("YYYY-MM-DD HH:mm")}</span>`; text += `<svg style="margin-left: 5px"><use xlink:href="#iconForward"></use></svg>`;
}
if (cell.value?.date.content2) {
text += dayjs(cell.value.date.content2).format("YYYY-MM-DD HH:mm");
} }
text += "</span>"; text += "</span>";
} }
@ -220,9 +223,14 @@ const genAVValueHTML = (value: IAVCellValue) => {
}); });
break; break;
case "date": case "date":
html = `${dayjs(value.date.content).format("YYYY-MM-DD HH:mm")}`; if (value.date.content) {
if (value.date.hasEndDate) { html = `<span data-content="${value.date.content}">${dayjs(value.date.content).format("YYYY-MM-DD HH:mm")}</span>`;
html += `<svg class="custom-attr__avarrow"><use xlink:href="#iconForward"></use></svg>${dayjs(value.date.content2).format("YYYY-MM-DD HH:mm")}`; }
if (value.date.hasEndDate && value.date.content && value.date.content2) {
html += `<svg class="custom-attr__avarrow"><use xlink:href="#iconForward"></use></svg>`;
}
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":
@ -264,28 +272,101 @@ export const renderAVAttribute = (element: HTMLElement, id: string) => {
}); });
}); });
element.innerHTML = html; element.innerHTML = html;
element.addEventListener("click", (event) => {
const target = event.target as HTMLElement
const dateElement = hasClosestByAttribute(target, "data-type", "date")
if (dateElement) {
const dateMenu = new Menu("custom-attr-av-date", () => {
const textElements = window.siyuan.menus.menu.element.querySelectorAll(".b3-text-field") as NodeListOf<HTMLInputElement>
const hasEndDate = (window.siyuan.menus.menu.element.querySelector(".b3-switch") as HTMLInputElement).checked
fetchPost("/api/av/setAttributeViewBlockAttr", {
avID: dateElement.dataset.avId,
keyID: dateElement.dataset.keyId,
rowID: dateElement.dataset.blockId,
cellID: dateElement.dataset.id,
value: {
date: {
content: new Date(textElements[0].value).getTime(),
content2: new Date(textElements[1].value).getTime(),
hasEndDate
}
}
});
let dataHTML = ""
if (textElements[0].value) {
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) {
dataHTML += `<svg class="custom-attr__avarrow"><use xlink:href="#iconForward"></use></svg>`
}
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;
});
if (dateMenu.isOpen) {
return;
}
const hasEndDate = dateElement.querySelector("svg")
const timeElements = dateElement.querySelectorAll("span")
dateMenu.addItem({
iconHTML: "",
label: `<input value="${timeElements[0] ? dayjs(parseInt(timeElements[0].dataset.content)).format("YYYY-MM-DDTHH:mm") : ""}" type="datetime-local" class="b3-text-field fn__size200" style="margin: 4px 0">`
})
dateMenu.addItem({
iconHTML: "",
label: `<input value="${timeElements[1] ? dayjs(parseInt(timeElements[1].dataset.content)).format("YYYY-MM-DDTHH:mm") : ""}" type="datetime-local" class="b3-text-field fn__size200${hasEndDate ? "" : " fn__none"}" style="margin: 4px 0">`
})
dateMenu.addSeparator()
dateMenu.addItem({
iconHTML: "",
label: `<label class="fn__flex">
<span>${window.siyuan.languages.endDate}</span>
<span class="fn__space fn__flex-1"></span>
<input type="checkbox" class="b3-switch fn__flex-center"${hasEndDate ? " checked" : ""}>
</label>`,
click(element) {
const switchElement = element.querySelector(".b3-switch") as HTMLInputElement
// TODO // TODO
// element.addEventListener("click", (event) => { switchElement.checked = !switchElement.checked
// const target = event.target as HTMLElement window.siyuan.menus.menu.element.querySelectorAll('[type="datetime-local"]')[1].classList.toggle("fn__none");
// const dateElement = hasClosestByAttribute(target, "data-type", "date") return true;
// if (dateElement) { }
// const dateMenu = new Menu("custom-attr-av-date", () => { })
// dateMenu.addSeparator()
// }) dateMenu.addItem({
// if (dateMenu.isOpen) { icon: "iconTrashcan",
// return; label: window.siyuan.languages.clear,
// } click() {
// dateMenu.addItem({ fetchPost("/api/av/setAttributeViewBlockAttr", {
// iconHTML:"", avID: dateElement.dataset.avId,
// label:`<input>` keyID: dateElement.dataset.keyId,
// }) rowID: dateElement.dataset.blockId,
// return; cellID: dateElement.dataset.id,
// } value: {
// const mSelectElement = hasClosestByAttribute(target, "data-type", "select")||hasClosestByAttribute(target, "data-type", "mSelect") date: {
// if (mSelectElement) { content: null, content2: null, hasEndDate: false
// return }
// } }
// }) });
dateElement.innerHTML = ""
}
})
const targetRect = target.getBoundingClientRect()
dateMenu.open({
x: targetRect.left,
y: targetRect.bottom
})
window.siyuan.menus.menu.element.style.zIndex = "400";
event.stopPropagation()
event.preventDefault();
return;
}
const mSelectElement = hasClosestByAttribute(target, "data-type", "select") || hasClosestByAttribute(target, "data-type", "mSelect")
if (mSelectElement) {
return
}
})
element.querySelectorAll(".b3-text-field--text").forEach((item: HTMLInputElement) => { element.querySelectorAll(".b3-text-field--text").forEach((item: HTMLInputElement) => {
item.addEventListener("change", () => { item.addEventListener("change", () => {
let value; let value;