github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-17 09:30:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2024-12-15 11:25:33 +08:00
parent 85ba2414fa
commit 9cb025f5e7
3 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/assets/scss/business/_av.scss
View File

@ -194,13 +194,13 @@
.av__calc { .av__calc {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 5px; padding: 5px 6px 5px 5px;
border-right: 1px; border-right: 1px;
flex-direction: row-reverse; flex-direction: row-reverse;
box-sizing: border-box; box-sizing: border-box;
opacity: 0; opacity: 0;
overflow: hidden; overflow: hidden;
font-size: 75%; font-size: 87.5%;
white-space: nowrap; white-space: nowrap;
line-height: 1.625em; line-height: 1.625em;
cursor: pointer; cursor: pointer;
@ -210,7 +210,7 @@
} }
&:first-child { &:first-child {
padding-left: 1.625em; padding-left: calc(1.625em - 6px);
box-sizing: initial; box-sizing: initial;
} }
@ -221,11 +221,10 @@
svg { svg {
margin-left: 5px; margin-left: 5px;
height: 1.625em; height: 1.625em;
width: calc(1.625em - 10px); width: calc(1.625em - 14px);
} }
span { span {
font-size: 116%;
color: var(--b3-theme-on-background); color: var(--b3-theme-on-background);
margin-left: 5px; margin-left: 5px;
} }

40
app/src/protyle/render/av/calc.ts
View File

@ -418,64 +418,64 @@ export const getCalcValue = (column: IAVColumn) => {
let value = ""; let value = "";
switch (column.calc.operator) { switch (column.calc.operator) {
case "Count all": case "Count all":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultCountAll}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcResultCountAll}</small>`;
break; break;
case "Count values": case "Count values":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultCountValues}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcResultCountValues}</small>`;
break; break;
case "Count unique values": case "Count unique values":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultCountUniqueValues}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcResultCountUniqueValues}</small>`;
break; break;
case "Count empty": case "Count empty":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultCountEmpty}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcResultCountEmpty}</small>`;
break; break;
case "Count not empty": case "Count not empty":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultCountNotEmpty}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcResultCountNotEmpty}</small>`;
break; break;
case "Percent empty": case "Percent empty":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultPercentEmpty}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcResultPercentEmpty}</small>`;
break; break;
case "Percent not empty": case "Percent not empty":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultPercentNotEmpty}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcResultPercentNotEmpty}</small>`;
break; break;
case "Percent unique values": case "Percent unique values":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultPercentUniqueValues}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcResultPercentUniqueValues}</small>`;
break; break;
case "Sum": case "Sum":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultSum}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcResultSum}</small>`;
break; break;
case "Average": case "Average":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultAverage}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcResultAverage}</small>`;
break; break;
case "Median": case "Median":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultMedian}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcResultMedian}</small>`;
break; break;
case "Min": case "Min":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultMin}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcResultMin}</small>`;
break; break;
case "Max": case "Max":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultMax}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcResultMax}</small>`;
break; break;
case "Range": case "Range":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcResultRange}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcResultRange}</small>`;
break; break;
case "Earliest": case "Earliest":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcOperatorEarliest}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcOperatorEarliest}</small>`;
break; break;
case "Latest": case "Latest":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.calcOperatorLatest}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.calcOperatorLatest}</small>`;
break; break;
case "Checked": case "Checked":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.checked}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.checked}</small>`;
break; break;
case "Unchecked": case "Unchecked":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.unchecked}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.unchecked}</small>`;
break; break;
case "Percent checked": case "Percent checked":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.percentChecked}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.percentChecked}</small>`;
break; break;
case "Percent unchecked": case "Percent unchecked":
value = `<span>${resultCalc.formattedContent}</span>${window.siyuan.languages.percentUnchecked}`; value = `<span>${resultCalc.formattedContent}</span><small>${window.siyuan.languages.percentUnchecked}</small>`;
break; break;
} }
return value; return value;

2
app/src/protyle/render/av/render.ts
View File

@ -149,7 +149,7 @@ style="width: ${column.width || "200px"};">
calcHTML += `<div data-col-id="${column.id}" data-dtype="${column.type}" class="av__calc" style="width: ${column.width || "200px"}">&nbsp;</div>`; calcHTML += `<div data-col-id="${column.id}" data-dtype="${column.type}" class="av__calc" style="width: ${column.width || "200px"}">&nbsp;</div>`;
} else { } else {
calcHTML += `<div class="av__calc${column.calc && column.calc.operator !== "" ? " av__calc--ashow" : ""}" data-col-id="${column.id}" data-dtype="${column.type}" data-operator="${column.calc?.operator || ""}" calcHTML += `<div class="av__calc${column.calc && column.calc.operator !== "" ? " av__calc--ashow" : ""}" data-col-id="${column.id}" data-dtype="${column.type}" data-operator="${column.calc?.operator || ""}"
style="width: ${column.width || "200px"}">${getCalcValue(column) || '<svg><use xlink:href="#iconDown"></use></svg>' + window.siyuan.languages.calc}</div>`; style="width: ${column.width || "200px"}">${getCalcValue(column) || `<svg><use xlink:href="#iconDown"></use></svg><small>${window.siyuan.languages.calc}</small>`}</div>`;
} }
if (column.calc && column.calc.operator !== "") { if (column.calc && column.calc.operator !== "") {
hasCalc = true; hasCalc = true;