Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-26 17:04:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-11-15 00:38:58 +08:00
commit 6437ec9793
20 changed files with 134 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -270,7 +270,7 @@ export const avContextmenu = (protyle: IProtyle, rowElement: HTMLElement, positi
/// #if !MOBILE
const blockId = ids[0];
const openSubmenus = openEditorTab(protyle.app, [blockId], undefined, undefined, true);
openSubmenus.push({type: "separator"});
openSubmenus.push({id: "separator_3", type: "separator"});
openSubmenus.push({
icon: "iconAttr",
label: window.siyuan.languages.attr,
@ -581,7 +581,7 @@ ${window.siyuan.languages.insertRowAfter.replace("${x}", '<span class="fn__space
});
menu.addItem({
icon: "iconAttr",
label: window.siyuan.languages.attr,
label: window.siyuan.languages.fields,
type: "submenu",
submenu: editAttrSubmenu
});

44
app/src/protyle/render/av/calc.ts
View file

@ -142,28 +142,6 @@ export const openCalcMenu = async (protyle: IProtyle, calcElement: HTMLElement,
target: calcElement
});
if (type !== "checkbox") {
calcItem({
menu,
protyle,
colId,
avId,
oldOperator,
operator: "Count values",
data: panelData?.data,
blockID,
target: calcElement
});
calcItem({
menu,
protyle,
colId,
avId,
oldOperator,
operator: "Count unique values",
data: panelData?.data,
blockID,
target: calcElement
});
calcItem({
menu,
protyle,
@ -186,6 +164,28 @@ export const openCalcMenu = async (protyle: IProtyle, calcElement: HTMLElement,
blockID,
target: calcElement
});
calcItem({
menu,
protyle,
colId,
avId,
oldOperator,
operator: "Count values",
data: panelData?.data,
blockID,
target: calcElement
});
calcItem({
menu,
protyle,
colId,
avId,
oldOperator,
operator: "Count unique values",
data: panelData?.data,
blockID,
target: calcElement
});
calcItem({
menu,
protyle,

2
app/src/protyle/render/av/openMenuPanel.ts
View file

@ -1372,7 +1372,7 @@ ${hideHTML}`;
<span class="block__icon" style="padding: 8px;margin-left: -4px;" data-type="go-config">
<svg><use xlink:href="#iconLeft"></use></svg>
</span>
<span class="b3-menu__label ft__center">${window.siyuan.languages.attr}</span>
<span class="b3-menu__label ft__center">${window.siyuan.languages.fields}</span>
</button>
<button class="b3-menu__separator"></button>
<button class="b3-menu__item" data-type="nobg">

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

@ -169,7 +169,7 @@ export const getViewHTML = (data: IAV) => {
<button class="b3-menu__separator"></button>
<button class="b3-menu__item" data-type="go-properties">
<svg class="b3-menu__icon"></svg>
<span class="b3-menu__label">${window.siyuan.languages.attr}</span>
<span class="b3-menu__label">${window.siyuan.languages.fields}</span>
<span class="b3-menu__accelerator">${view.columns.filter((item: IAVColumn) => !item.hidden).length}/${view.columns.length}</span>
<svg class="b3-menu__icon b3-menu__icon--small"><use xlink:href="#iconRight"></use></svg>
</button>