diff --git a/app/src/assets/scss/protyle/_wysiwyg.scss b/app/src/assets/scss/protyle/_wysiwyg.scss index cfc5ef768..ac0171106 100644 --- a/app/src/assets/scss/protyle/_wysiwyg.scss +++ b/app/src/assets/scss/protyle/_wysiwyg.scss @@ -643,7 +643,10 @@ .av { .b3-chip[data-type="block-more"], - .av__row--util, + .av__row--util:not(.av__readonly--show), + .av__row--footer:not(.av__readonly--show), + .av__row--util .b3-button[data-type="av-add-bottom"], + .av__row--util svg[data-type="set-page-size"], .av__row--header > .block__icons, .av__views .fn__space, .av__views .block__icon:not([data-type="av-search-icon"]), @@ -651,7 +654,7 @@ display: none; } - .av__row--footer { + .av__row--util:not(.av__readonly--show) + .av__row--footer.av__readonly--show { border-top-color: transparent; } @@ -662,5 +665,10 @@ .av__row--footer:hover .av__calc:not(.av__calc--ashow) { opacity: 0; } + + .av__row--footer .av__calc:hover, + .av__cell--header:hover { + background-color: transparent; + } } } diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts index c102ba047..048b94a92 100644 --- a/app/src/protyle/render/av/render.ts +++ b/app/src/protyle/render/av/render.ts @@ -114,6 +114,7 @@ export const avRender = (element: Element, protyle: IProtyle, cb?: () => void, v tableHTML = '
'; calcHTML = '
'; } + let hasCalc = false; data.columns.forEach((column: IAVColumn, index: number) => { if (column.hidden) { return; @@ -130,13 +131,16 @@ style="width: ${column.width || "200px"};"> tableHTML += "
"; } - // lineNumber type 不参与计算操作 if (column.type === "lineNumber") { - calcHTML += `
 
`; + // lineNumber type 不参与计算操作 + calcHTML += `
 
`; } else { calcHTML += `
${getCalcValue(column) || '' + window.siyuan.languages.calc}
`; } + if (column.calc && column.calc.operator !== "") { + hasCalc = true + } if (pinIndex === index) { calcHTML += "
"; @@ -247,7 +251,7 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value, rowIndex)}
${tableHTML} -
+
- +
${calcHTML}
${Constants.ZWSP}