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

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

Browse source
This commit is contained in:
Vanessa 2024-11-20 23:39:06 +08:00
commit 028e3118c4
16 changed files with 439 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -208,6 +208,17 @@ export const openCalcMenu = async (protyle: IProtyle, calcElement: HTMLElement,
blockID,
target: calcElement
});
calcItem({
menu,
protyle,
colId,
avId,
oldOperator,
operator: "Percent unique values",
data: panelData?.data,
blockID,
target: calcElement
});
} else {
calcItem({
menu,
@ -427,6 +438,9 @@ export const getCalcValue = (column: IAVColumn) => {
case "Percent not empty":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultPercentNotEmpty}`;
break;
case "Percent unique values":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultPercentUniqueValues}`;
break;
case "Sum":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultSum}`;
break;
@ -486,6 +500,8 @@ export const getNameByOperator = (operator: string, isRollup: boolean) => {
return window.siyuan.languages.calcOperatorPercentEmpty;
case "Percent not empty":
return window.siyuan.languages.calcOperatorPercentNotEmpty;
case "Percent unique values":
return window.siyuan.languages.calcOperatorPercentUniqueValues;
case "Checked":
return window.siyuan.languages.checked;
case "Unchecked":