diff --git a/src/components/column/index.vue b/src/components/column/index.vue index 04bfe29..974fb8d 100644 --- a/src/components/column/index.vue +++ b/src/components/column/index.vue @@ -7,10 +7,7 @@ ...$styleBox.getBorderColor() }" > -
+
- +
+ - + +
@@ -55,6 +57,10 @@ watch( } ); +const originData = computed( + () => props.data?.data?.[props.prop ?? ''] ?? props.emptyData +); + const { $styleBox, rowHeight } = useStyle(); const { toRowData } = useData(); diff --git a/src/components/column/props.ts b/src/components/column/props.ts index 7f4c06d..9ab1818 100644 --- a/src/components/column/props.ts +++ b/src/components/column/props.ts @@ -52,14 +52,6 @@ export default { default: Variables.noData }, - /** - * 是否可以选择文本 - */ - selectable: { - type: Boolean, - default: false - }, - /** * 内容样式 */ diff --git a/src/components/column/selection.vue b/src/components/column/selection.vue index b45eb68..d6981ab 100644 --- a/src/components/column/selection.vue +++ b/src/components/column/selection.vue @@ -11,6 +11,7 @@ } " > + div { width: calc(100% - 12px); overflow: hidden; white-space: nowrap; - font-size: 14px; - vertical-align: middle; + font-size: 13px; text-overflow: ellipsis; padding: 0 6px; + display: flex; + align-items: baseline; + justify-content: flex-start; .expand-icon { - display: inline-block; - vertical-align: middle; margin-right: 4px; cursor: pointer; transition: transform 0.2s ease-in-out; - position: relative; - transform-origin: center 45%; } .expand-icon__expanded { @@ -31,5 +29,13 @@ .level-block { display: inline-block; } + + .cell { + flex: 1; + } + + .cell-center { + text-align: center; + } } }