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

🎨 fix https://github.com/siyuan-note/siyuan/issues/9486

Browse source
This commit is contained in:
Vanessa 2023-10-27 23:31:39 +08:00
parent d08a0fc156
commit c757e2912f
5 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/assets/scss/business/_av.scss
View file

@ -377,10 +377,11 @@
} }
img.av__cellassetimg { img.av__cellassetimg {
max-height: 18px; max-height: 20px;
border-radius: var(--b3-border-radius); border-radius: var(--b3-border-radius);
margin: 1px 2px; margin: 1px 2px;
max-width: none; max-width: none;
vertical-align: top;
} }
html[data-theme-mode="dark"] .av__panel .b3-menu__item { html[data-theme-mode="dark"] .av__panel .b3-menu__item {

4
app/src/assets/scss/business/_custom.scss
View file

@ -69,4 +69,8 @@
.b3-chip { .b3-chip {
margin: 1px 2px; margin: 1px 2px;
} }
.av__cellassetimg {
max-height: 24px;
}
} }

7
app/src/boot/globalEvent/keydown.ts
View file

@ -1249,6 +1249,13 @@ export const windowKeyDown = (app: App, event: KeyboardEvent) => {
imgPreviewElement.remove(); imgPreviewElement.remove();
return; return;
} }
const avElement = document.querySelector(".av__panel")
if (avElement) {
avElement.remove();
return
}
if (!window.siyuan.menus.menu.element.classList.contains("fn__none")) { if (!window.siyuan.menus.menu.element.classList.contains("fn__none")) {
if (window.siyuan.dialogs.length > 0 && if (window.siyuan.dialogs.length > 0 &&
window.siyuan.menus.menu.element.style.zIndex < (window.siyuan.dialogs[0].element.querySelector(".b3-dialog") as HTMLElement).style.zIndex) { window.siyuan.menus.menu.element.style.zIndex < (window.siyuan.dialogs[0].element.querySelector(".b3-dialog") as HTMLElement).style.zIndex) {

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

@ -356,6 +356,10 @@ export const cellScrollIntoView = (blockElement: HTMLElement, cellRect: DOMRect,
avScrollElement.scrollLeft = avScrollElement.scrollLeft + cellRect.right - avScrollRect.right; avScrollElement.scrollLeft = avScrollElement.scrollLeft + cellRect.right - avScrollRect.right;
} }
} }
if (!blockElement.querySelector(".av__header")) {
// 属性面板
return;
}
const avHeaderRect = blockElement.querySelector(".av__header").getBoundingClientRect(); const avHeaderRect = blockElement.querySelector(".av__header").getBoundingClientRect();
if (avHeaderRect.bottom > cellRect.top) { if (avHeaderRect.bottom > cellRect.top) {
const contentElement = hasClosestByClassName(blockElement, "protyle-content", true); const contentElement = hasClosestByClassName(blockElement, "protyle-content", true);

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

@ -35,8 +35,8 @@ export const getDateHTML = (data: IAVTable, cellElements: HTMLElement[]) => {
} }
return `<div class="b3-menu__items"> return `<div class="b3-menu__items">
<div> <div>
<input type="${cellValue.value.date.isNotTime ? "date" : "datetime-local"}" value="${value}" data-value="${value}" class="b3-text-field fn__size200"><br> <input type="${cellValue.value.date.isNotTime ? "date" : "datetime-local"}" value="${value}" data-value="${value ? dayjs(cellValue.value.date.content).format("YYYY-MM-DD HH:mm") : ""}" class="b3-text-field fn__size200"><br>
<input type="${cellValue.value.date.isNotTime ? "date" : "datetime-local"}" value="${value2}" data-value="${value2}" style="margin-top: 8px" class="b3-text-field fn__size200${hasEndDate ? "" : " fn__none"}"> <input type="${cellValue.value.date.isNotTime ? "date" : "datetime-local"}" value="${value2}" data-value="${value2 ? dayjs(cellValue.value.date.content2).format("YYYY-MM-DD HH:mm") : ""}" 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>
<label class="b3-menu__item"> <label class="b3-menu__item">
<span>${window.siyuan.languages.endDate}</span> <span>${window.siyuan.languages.endDate}</span>
@ -74,7 +74,7 @@ export const bindDateEvent = (options: {
content: new Date(inputElements[0].value).getTime() content: new Date(inputElements[0].value).getTime()
} }
}); });
inputElements[0].dataset.value = inputElements[0].value; inputElements[0].dataset.value = inputElements[0].value.length > 10 ? inputElements[0].value : inputElements[0].value + " 00:00";
}); });
inputElements[1].addEventListener("change", () => { inputElements[1].addEventListener("change", () => {
setDateValue({ setDateValue({
@ -86,7 +86,7 @@ export const bindDateEvent = (options: {
content2: new Date(inputElements[1].value).getTime() content2: new Date(inputElements[1].value).getTime()
} }
}); });
inputElements[1].dataset.value = inputElements[1].value; inputElements[1].dataset.value = inputElements[1].value.length > 10 ? inputElements[1].value : inputElements[1].value + " 00:00";
}); });
inputElements[2].addEventListener("change", () => { inputElements[2].addEventListener("change", () => {
if (inputElements[2].checked) { if (inputElements[2].checked) {