diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss index 385f01909..215cbd278 100644 --- a/app/src/assets/scss/business/_av.scss +++ b/app/src/assets/scss/business/_av.scss @@ -115,7 +115,6 @@ } &:hover { - [data-type="block-ref"], [data-type="block-more"] { display: block; } @@ -250,7 +249,6 @@ cursor: pointer; // display: flex; 不需要使用,否则 av__celltext 会占满单元格,导致链接列点击空白无法进行编辑 - [data-type="block-ref"], [data-type="block-more"] { display: none; position: absolute; diff --git a/app/src/assets/scss/protyle/_wysiwyg.scss b/app/src/assets/scss/protyle/_wysiwyg.scss index 0f0ca47db..0ccd6d6c9 100644 --- a/app/src/assets/scss/protyle/_wysiwyg.scss +++ b/app/src/assets/scss/protyle/_wysiwyg.scss @@ -229,7 +229,7 @@ background-color: var(--b3-theme-secondary); } - span[data-type~="block-ref"], + span[data-type~="block-ref"]:not(.av__celltext), span[data-type~="file-annotation-ref"] { color: var(--b3-protyle-inline-blockref-color); opacity: .86; diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts index 4550870e2..a4ab74121 100644 --- a/app/src/protyle/render/av/cell.ts +++ b/app/src/protyle/render/av/cell.ts @@ -153,6 +153,9 @@ export const genCellValue = (colType: TAVCol, value: string | any) => { }; } } + if (colType === "block") { + cellValue.isDetached = true; + } return cellValue; }; diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts index 846ec2138..786eef4d0 100644 --- a/app/src/protyle/render/av/render.ts +++ b/app/src/protyle/render/av/render.ts @@ -148,11 +148,12 @@ style="width: ${column.width || "200px"}">${getCalcValue(column) || '${urlContent}`; } else if (cell.valueType === "block") { - text = `${cell.value.block.content || ""}`; if (cell.value?.isDetached) { - text += `${window.siyuan.languages.more}`; + text = `${cell.value.block.content || ""} +${window.siyuan.languages.more}`; } else { - text += `${window.siyuan.languages.openBy}`; + text = `${cell.value.block.content || ""} +${window.siyuan.languages.update}`; } } else if (cell.valueType === "number") { text = `${cell.value?.number.formattedContent || ""}`;