diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss index da05a889e18..33d31cca859 100644 --- a/app/src/assets/scss/business/_av.scss +++ b/app/src/assets/scss/business/_av.scss @@ -282,6 +282,10 @@ white-space: nowrap; } + &[data-block-id] > .block__icon[data-type="copy"] { + display: none; + } + &.dragover__right { border-right-color: var(--b3-theme-primary-lighter); } diff --git a/app/src/assets/scss/protyle/_wysiwyg.scss b/app/src/assets/scss/protyle/_wysiwyg.scss index ac0171106e7..2803a98796d 100644 --- a/app/src/assets/scss/protyle/_wysiwyg.scss +++ b/app/src/assets/scss/protyle/_wysiwyg.scss @@ -670,5 +670,9 @@ .av__cell--header:hover { background-color: transparent; } + + .av__cell[data-block-id] > .block__icon[data-type="copy"] { + display: block; + } } } diff --git a/app/src/protyle/render/av/action.ts b/app/src/protyle/render/av/action.ts index 34047664a12..5c72b4b6764 100644 --- a/app/src/protyle/render/av/action.ts +++ b/app/src/protyle/render/av/action.ts @@ -30,6 +30,7 @@ import {addView, openViewMenu} from "./view"; import {isOnlyMeta, writeText} from "../../util/compatibility"; import {openSearchAV} from "./relation"; import {Constants} from "../../../constants"; +import {hideElements} from "../../ui/hideElements"; export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLElement }) => { if (isOnlyMeta(event)) { @@ -164,6 +165,7 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle event.stopPropagation(); return true; } else if (type === "block-more") { + window.siyuan.menus.menu.remove(); protyle.toolbar.range = document.createRange(); protyle.toolbar.range.selectNodeContents(target); focusByRange(protyle.toolbar.range); @@ -231,6 +233,7 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle }; export const avContextmenu = (protyle: IProtyle, rowElement: HTMLElement, position: IPosition) => { + hideElements(["hint"], protyle); if (rowElement.classList.contains("av__row--header")) { return false; } diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts index f4f5b20b55f..714db18ca9c 100644 --- a/app/src/protyle/render/av/cell.ts +++ b/app/src/protyle/render/av/cell.ts @@ -732,8 +732,9 @@ export const renderCell = (cellValue: IAVCellValue, rowIndex = 0) => { } } - if (["text", "template", "url", "email", "phone", "number", "date", "created", "updated", "lineNumber"].includes(cellValue.type) && - (cellValue.type === "lineNumber" || (cellValue && cellValue[cellValue.type as "url"].content))) { + if ((["text", "template", "url", "email", "phone", "number", "date", "created", "updated"].includes(cellValue.type) && cellValue[cellValue.type as "url"]?.content) || + cellValue.type === "lineNumber" || + (cellValue.type === "block" && cellValue.block?.content)) { text += ``; } return text; diff --git a/app/src/protyle/util/onGet.ts b/app/src/protyle/util/onGet.ts index 0225c51ed31..f347cd58c7d 100644 --- a/app/src/protyle/util/onGet.ts +++ b/app/src/protyle/util/onGet.ts @@ -321,13 +321,6 @@ export const disabledProtyle = (protyle: IProtyle) => { protyle.wysiwyg.element.querySelectorAll('.protyle-action[draggable="true"]').forEach(item => { item.setAttribute("draggable", "false"); }); - protyle.wysiwyg.element.querySelectorAll(".av").forEach((item: HTMLElement) => { - const headerElement = item.querySelector(".av__row--header") as HTMLElement; - if (headerElement) { - headerElement.style.transform = ""; - (item.querySelector(".av__row--footer") as HTMLElement).style.transform = ""; - } - }); if (protyle.breadcrumb) { protyle.breadcrumb.element.parentElement.querySelector('[data-type="readonly"] use').setAttribute("xlink:href", "#iconLock"); protyle.breadcrumb.element.parentElement.querySelector('[data-type="readonly"]').setAttribute("aria-label", window.siyuan.config.editor.readOnly ? window.siyuan.languages.tempUnlock : window.siyuan.languages.unlockEdit);