Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-03 19:30:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 https://github.com/siyuan-note/siyuan/issues/10964

Browse source
This commit is contained in:
Vanessa 2025-07-23 21:46:57 +08:00
parent 81b511042c
commit abcd7b3157
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/src/protyle/render/av/groups.ts
View file

@ -76,11 +76,26 @@ ${html}
export const getGroupsHTML = (columns: IAVColumn[], group: IAVGroup) => { export const getGroupsHTML = (columns: IAVColumn[], group: IAVGroup) => {
let html = ""; let html = "";
if (group) { if (group && group.field) {
html = `<button class="b3-menu__separator"></button> html = `<button class="b3-menu__item" data-type="goGroupsMethod">
<span class="b3-menu__label">${window.siyuan.languages.date}</span>
<span class="b3-menu__accelerator">${group.method}</span>
<svg class="b3-menu__icon b3-menu__icon--small"><use xlink:href="#iconRight"></use></svg>
</button>
<button class="b3-menu__item" data-type="goGroupsSort">
<span class="b3-menu__label">${window.siyuan.languages.sort}</span>
<span class="b3-menu__accelerator">${group.order}</span>
<svg class="b3-menu__icon b3-menu__icon--small"><use xlink:href="#iconRight"></use></svg>
</button>
<button class="b3-menu__item">
<span class="fn__flex-center">${window.siyuan.languages.hideEmptyGroup}</span>
<span class="fn__space fn__flex-1"></span>
<input type="checkbox" class="b3-switch b3-switch--menu">
</button>
<button class="b3-menu__separator"></button>
<button class="b3-menu__item" data-type="removeGroups"> <button class="b3-menu__item" data-type="removeGroups">
<svg class="b3-menu__icon"><use xlink:href="#iconTrashcan"></use></svg> <svg class="b3-menu__icon"><use xlink:href="#iconTrashcan"></use></svg>
<span class="b3-menu__label">${window.siyuan.languages.delete}</span> <span class="b3-menu__label">${window.siyuan.languages.removeGroup}</span>
</button>`; </button>`;
} }
return `<div class="b3-menu__items"> return `<div class="b3-menu__items">
@ -93,7 +108,7 @@ export const getGroupsHTML = (columns: IAVColumn[], group: IAVGroup) => {
<button class="b3-menu__separator"></button> <button class="b3-menu__separator"></button>
<button class="b3-menu__item" data-type="goGroupsMethod"> <button class="b3-menu__item" data-type="goGroupsMethod">
<span class="b3-menu__label">${window.siyuan.languages.groupMethod}</span> <span class="b3-menu__label">${window.siyuan.languages.groupMethod}</span>
<span class="b3-menu__accelerator">${group ? columns.filter(item => item.id === group.field)[0].name : ""}</span> <span class="b3-menu__accelerator">${(group && group.field) ? columns.filter(item => item.id === group.field)[0].name : ""}</span>
<svg class="b3-menu__icon b3-menu__icon--small"><use xlink:href="#iconRight"></use></svg> <svg class="b3-menu__icon b3-menu__icon--small"><use xlink:href="#iconRight"></use></svg>
</button> </button>
${html} ${html}

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

@ -213,10 +213,10 @@ export const getViewHTML = (data: IAV) => {
<span class="b3-menu__accelerator">${view.sorts.length}</span> <span class="b3-menu__accelerator">${view.sorts.length}</span>
<svg class="b3-menu__icon b3-menu__icon--small"><use xlink:href="#iconRight"></use></svg> <svg class="b3-menu__icon b3-menu__icon--small"><use xlink:href="#iconRight"></use></svg>
</button> </button>
<button class="b3-menu__item fn__none" data-type="goGroups"> <button class="b3-menu__item" data-type="goGroups">
<svg class="b3-menu__icon"><use xlink:href="#iconGroups"></use></svg> <svg class="b3-menu__icon"><use xlink:href="#iconGroups"></use></svg>
<span class="b3-menu__label">${window.siyuan.languages.group}</span> <span class="b3-menu__label">${window.siyuan.languages.group}</span>
<span class="b3-menu__accelerator">${data.view.group ? fields.filter((item: IAVColumn) => item.id === data.view.group.field)[0].name : ""}</span> <span class="b3-menu__accelerator">${(data.view.group && data.view.group.field) ? fields.filter((item: IAVColumn) => item.id === data.view.group.field)[0].name : ""}</span>
<svg class="b3-menu__icon b3-menu__icon--small"><use xlink:href="#iconRight"></use></svg> <svg class="b3-menu__icon b3-menu__icon--small"><use xlink:href="#iconRight"></use></svg>
</button> </button>
<button class="b3-menu__separator"></button> <button class="b3-menu__separator"></button>