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()
}"
>
-
+
-
+
+
- {{
- props.dateFormat
- ? formatDate(props.data?.data?.[props.prop], props.dateFormat)
- : props.data?.data?.[props.prop]
- }}
+ {{
+ props.dateFormat
+ ? formatDate(originData, props.dateFormat)
+ : originData
+ }}
+
@@ -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 @@
}
"
>
+