diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss index f6c493516..0d372e73f 100644 --- a/app/src/assets/scss/business/_av.scss +++ b/app/src/assets/scss/business/_av.scss @@ -194,13 +194,13 @@ .av__calc { display: flex; align-items: center; - padding: 5px; + padding: 5px 6px 5px 5px; border-right: 1px; flex-direction: row-reverse; box-sizing: border-box; opacity: 0; overflow: hidden; - font-size: 75%; + font-size: 87.5%; white-space: nowrap; line-height: 1.625em; cursor: pointer; @@ -210,7 +210,7 @@ } &:first-child { - padding-left: 1.625em; + padding-left: calc(1.625em - 6px); box-sizing: initial; } @@ -221,11 +221,10 @@ svg { margin-left: 5px; height: 1.625em; - width: calc(1.625em - 10px); + width: calc(1.625em - 14px); } span { - font-size: 116%; color: var(--b3-theme-on-background); margin-left: 5px; } diff --git a/app/src/protyle/render/av/calc.ts b/app/src/protyle/render/av/calc.ts index d5a365953..38ae15e80 100644 --- a/app/src/protyle/render/av/calc.ts +++ b/app/src/protyle/render/av/calc.ts @@ -418,64 +418,64 @@ export const getCalcValue = (column: IAVColumn) => { let value = ""; switch (column.calc.operator) { case "Count all": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultCountAll}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultCountAll}`; break; case "Count values": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultCountValues}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultCountValues}`; break; case "Count unique values": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultCountUniqueValues}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultCountUniqueValues}`; break; case "Count empty": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultCountEmpty}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultCountEmpty}`; break; case "Count not empty": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultCountNotEmpty}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultCountNotEmpty}`; break; case "Percent empty": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultPercentEmpty}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultPercentEmpty}`; break; case "Percent not empty": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultPercentNotEmpty}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultPercentNotEmpty}`; break; case "Percent unique values": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultPercentUniqueValues}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultPercentUniqueValues}`; break; case "Sum": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultSum}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultSum}`; break; case "Average": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultAverage}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultAverage}`; break; case "Median": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultMedian}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultMedian}`; break; case "Min": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultMin}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultMin}`; break; case "Max": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultMax}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultMax}`; break; case "Range": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultRange}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcResultRange}`; break; case "Earliest": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcOperatorEarliest}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcOperatorEarliest}`; break; case "Latest": - value = `${resultCalc.formattedContent}${window.siyuan.languages.calcOperatorLatest}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.calcOperatorLatest}`; break; case "Checked": - value = `${resultCalc.formattedContent}${window.siyuan.languages.checked}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.checked}`; break; case "Unchecked": - value = `${resultCalc.formattedContent}${window.siyuan.languages.unchecked}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.unchecked}`; break; case "Percent checked": - value = `${resultCalc.formattedContent}${window.siyuan.languages.percentChecked}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.percentChecked}`; break; case "Percent unchecked": - value = `${resultCalc.formattedContent}${window.siyuan.languages.percentUnchecked}`; + value = `${resultCalc.formattedContent}${window.siyuan.languages.percentUnchecked}`; break; } return value; diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts index a08129ee8..7748311c5 100644 --- a/app/src/protyle/render/av/render.ts +++ b/app/src/protyle/render/av/render.ts @@ -149,7 +149,7 @@ style="width: ${column.width || "200px"};"> calcHTML += `
 
`; } else { calcHTML += `
${getCalcValue(column) || '' + window.siyuan.languages.calc}
`; +style="width: ${column.width || "200px"}">${getCalcValue(column) || `${window.siyuan.languages.calc}`}`; } if (column.calc && column.calc.operator !== "") { hasCalc = true;