diff --git a/app/appearance/themes/daylight/theme.css b/app/appearance/themes/daylight/theme.css index 4904eca6a..e5015a0e0 100644 --- a/app/appearance/themes/daylight/theme.css +++ b/app/appearance/themes/daylight/theme.css @@ -60,10 +60,6 @@ --b3-tooltips-second-color: #7d7c7a; --b3-tooltips-shadow: 0 2px 8px rgba(0, 0, 0, .1); - /* av */ - --b3-av-hover: #e8e8e9; - --b3-av-background-hl: #e8eefc; - /* 为空提示 */ --b3-empty-color: var(--b3-theme-on-surface-light); diff --git a/app/appearance/themes/midnight/theme.css b/app/appearance/themes/midnight/theme.css index 399335a0d..fe914d20e 100644 --- a/app/appearance/themes/midnight/theme.css +++ b/app/appearance/themes/midnight/theme.css @@ -59,10 +59,6 @@ --b3-tooltips-second-color: #7d7c7a; --b3-tooltips-shadow: 0 2px 8px rgba(0, 0, 0, .3); - /* av */ - --b3-av-hover: #2a2a2a; - --b3-av-background-hl: #28324e; - /* 为空提示 */ --b3-empty-color: var(--b3-theme-on-surface); diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss index 96a146396..45c7dd188 100644 --- a/app/src/assets/scss/business/_av.scss +++ b/app/src/assets/scss/business/_av.scss @@ -143,7 +143,7 @@ &--hl { &:not(.av__row--header) .av__cell, &:not(.av__row--header) .av__firstcol { - background-color: var(--b3-av-background-hl) !important; + background-color: var(--b3-theme-primary-lightest); } .av__firstcol svg { @@ -177,10 +177,6 @@ opacity: 1; } - .av__colsticky { - background-color: var(--b3-parent-background); // 保证盯住时无计算结果的列不被覆盖 - } - .av__calc { display: flex; align-items: center; @@ -220,7 +216,7 @@ } &:hover { - background-color: var(--b3-av-hover); + background-color: var(--b3-list-hover); } } } @@ -236,7 +232,7 @@ &:hover, &:focus { - background-color: var(--b3-av-hover); + background-color: var(--b3-list-hover); box-shadow: none; } } @@ -302,13 +298,13 @@ } &--select { - background-color: var(--b3-menu-background); + background-color: var(--b3-theme-primary-lightest); box-shadow: 2px 2px 0 var(--b3-theme-primary-lighter) inset, -2px -2px 0 var(--b3-theme-primary-lighter) inset; border-radius: var(--b3-border-radius); } &--active { - background-color: var(--b3-menu-background); + background-color: var(--b3-theme-primary-lightest); } &--header { @@ -319,7 +315,7 @@ border-right-color: transparent; &:hover { - background-color: var(--b3-av-hover); + background-color: var(--b3-list-hover); } .av__celltext { @@ -434,11 +430,7 @@ left: 0; z-index: 2; // 需大于 av__widthdrag,否则横行滚动后,拖拽会悬浮于 stick 列上 display: flex; - - &.av__firstcol, - & > div:not(.av__cell--select):not(.av__cell--active):not(.av__calc--ashow) { - background-color: var(--b3-parent-background); - } + background-color: var(--b3-parent-background); } &__widthdrag { @@ -531,45 +523,6 @@ } } -.protyle-wysiwyg--select { - .av__row--header, - .av__row--footer, - .av__row--footer .av__colsticky, - .av__row--select .av__cell, - .av__colsticky.av__firstcol, - .av__colsticky > div, - .av__cell--select, - .av__cell--active, - .av__counter { - background-color: var(--b3-av-background-hl) !important; - } -} - -.protyle-wysiwyg--hl { - .av__row--header, - .av__row--footer, - .av__row--footer .av__colsticky, - .av__row--select .av__cell, - .av__colsticky.av__firstcol, - .av__colsticky > div, - .av__cell--select, - .av__cell--active, - .av__counter { - background-color: var(--b3-av-background-hl) !important; - transition: var(--b3-background-transition); - } -} - -.dragover__top, -.dragover__bottom { - .av__colsticky { - &.av__firstcol, - & > div:not(.av__cell--select):not(.av__cell--active):not(.av__calc--ashow) { - background-color: transparent; - } - } -} - img.av__cellassetimg { max-height: calc(1.625em - 2px); border-radius: var(--b3-border-radius); diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts index 7bc148ce3..1a9f45f7c 100644 --- a/app/src/protyle/render/av/render.ts +++ b/app/src/protyle/render/av/render.ts @@ -94,7 +94,7 @@ export const avRender = (element: Element, protyle: IProtyle, cb?: () => void, v e.dataset.pageSize = data.pageSize.toString(); } // header - let tableHTML = '
'; + let tableHTML = '
'; let calcHTML = ""; let pinIndex = -1; let pinMaxIndex = -1; @@ -169,7 +169,7 @@ style="width: ${column.width || "200px"}">${getCalcValue(column) || ' -1) { tableHTML += '
'; } else { - tableHTML += '
'; + tableHTML += '
'; } row.cells.forEach((cell, index) => { diff --git a/app/src/protyle/render/av/row.ts b/app/src/protyle/render/av/row.ts index cd1224bd4..51ccb947f 100644 --- a/app/src/protyle/render/av/row.ts +++ b/app/src/protyle/render/av/row.ts @@ -109,10 +109,10 @@ export const insertAttrViewBlockAnimation = (protyle: IProtyle, blockElement: El if (blockElement.querySelector('.av__views [data-type="av-sort"]').classList.contains("block__icon--active")) { previousElement = blockElement.querySelector(".av__row--util").previousElementSibling; } - let colHTML = '
'; + let colHTML = '
'; const pinIndex = previousElement.querySelectorAll(".av__colsticky .av__cell").length - 1; if (pinIndex > -1) { - colHTML = '
'; + colHTML = '
'; } previousElement.querySelectorAll(".av__cell").forEach((item: HTMLElement, index) => { let lineNumber = "";