diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss index c5f66eca3..e439bde22 100644 --- a/app/src/assets/scss/business/_av.scss +++ b/app/src/assets/scss/business/_av.scss @@ -95,6 +95,10 @@ cursor: pointer; } + &__body { + float: left; + } + &__row { display: flex; border-bottom: 1px solid var(--b3-theme-surface-lighter); @@ -244,6 +248,14 @@ top: 5.5px; } + &[data-wrap="true"] { + white-space: pre-wrap; + } + + &[data-wrap="false"] { + white-space: nowrap; + } + &.dragover__right { border-right-color: var(--b3-theme-primary-lighter); } diff --git a/app/src/protyle/render/av/col.ts b/app/src/protyle/render/av/col.ts index ff5d6cffc..9003d00db 100644 --- a/app/src/protyle/render/av/col.ts +++ b/app/src/protyle/render/av/col.ts @@ -386,7 +386,7 @@ export const addAttrViewColAnimation = (options: { } let html = ""; if (index === 0) { - html = `
+ html = `
${options.icon ? unicode2Emoji(options.icon, "av__cellheadericon", true) : ``} ${options.name} @@ -642,7 +642,7 @@ export const showColMenu = (protyle: IProtyle, blockElement: Element, cellElemen } menu.addItem({ label: ``, +`, bind(element) { const inputElement = element.querySelector("input") as HTMLInputElement; inputElement.addEventListener("change", () => { diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts index 4a51a3adc..351a7ce26 100644 --- a/app/src/protyle/render/av/render.ts +++ b/app/src/protyle/render/av/render.ts @@ -93,9 +93,8 @@ export const avRender = (element: Element, protyle: IProtyle, cb?: () => void, v return; } tableHTML += `
+data-icon="${column.icon}" data-dtype="${column.type}" data-wrap="${column.wrap}" data-pin="${column.pin}" +style="width: ${column.width || "200px"};">
${column.icon ? unicode2Emoji(column.icon, "av__cellheadericon", true) : ``} ${column.name} @@ -192,11 +191,10 @@ style="width: ${column.width || "200px"}">${getCalcValue(column) || '`; } tableHTML += `
${text}
`; if (pinIndex === index) { @@ -248,7 +246,7 @@ ${cell.color ? `color:${cell.color};` : ""}">${text}
`;
-
+
${tableHTML}