mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-17 07:00:12 +01:00
This commit is contained in:
parent
84e2668c0f
commit
1e807b8ffb
2 changed files with 4 additions and 4 deletions
|
|
@ -64,9 +64,9 @@ export const setGroupMethod = async (options: {
|
||||||
setPosition(options.menuElement, tabRect.right - options.menuElement.clientWidth, tabRect.bottom, tabRect.height);
|
setPosition(options.menuElement, tabRect.right - options.menuElement.clientWidth, tabRect.bottom, tabRect.height);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getGroupsMethodHTML = (columns: IAVColumn[], group: IAVGroup) => {
|
export const getGroupsMethodHTML = (columns: IAVColumn[], group: IAVGroup, viewType: TAVView) => {
|
||||||
const selectHTML = '<svg class="b3-menu__checked"><use xlink:href="#iconSelect"></use></svg>';
|
const selectHTML = '<svg class="b3-menu__checked"><use xlink:href="#iconSelect"></use></svg>';
|
||||||
let html = `<button class="b3-menu__item" data-type="setGroupMethod">
|
let html = viewType === "kanban" ? "" : `<button class="b3-menu__item" data-type="setGroupMethod">
|
||||||
<div class="b3-menu__label">${window.siyuan.languages.calcOperatorNone}</div>
|
<div class="b3-menu__label">${window.siyuan.languages.calcOperatorNone}</div>
|
||||||
${(!group || !group.field) ? selectHTML : ""}
|
${(!group || !group.field) ? selectHTML : ""}
|
||||||
</button>`;
|
</button>`;
|
||||||
|
|
|
||||||
|
|
@ -1559,7 +1559,7 @@ export const openMenuPanel = (options: {
|
||||||
data
|
data
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
menuElement.innerHTML = getGroupsMethodHTML(fields, data.view.group);
|
menuElement.innerHTML = getGroupsMethodHTML(fields, data.view.group, data.viewType);
|
||||||
}
|
}
|
||||||
setPosition(menuElement, tabRect.right - menuElement.clientWidth, tabRect.bottom, tabRect.height);
|
setPosition(menuElement, tabRect.right - menuElement.clientWidth, tabRect.bottom, tabRect.height);
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
@ -1567,7 +1567,7 @@ export const openMenuPanel = (options: {
|
||||||
break;
|
break;
|
||||||
} else if (type === "goGroupsMethod") {
|
} else if (type === "goGroupsMethod") {
|
||||||
window.siyuan.menus.menu.remove();
|
window.siyuan.menus.menu.remove();
|
||||||
menuElement.innerHTML = getGroupsMethodHTML(fields, data.view.group);
|
menuElement.innerHTML = getGroupsMethodHTML(fields, data.view.group, data.viewType);
|
||||||
setPosition(menuElement, tabRect.right - menuElement.clientWidth, tabRect.bottom, tabRect.height);
|
setPosition(menuElement, tabRect.right - menuElement.clientWidth, tabRect.bottom, tabRect.height);
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue