diff --git a/src/components/column/index.vue b/src/components/column/index.vue index 5e6ac9d..f014e9e 100644 --- a/src/components/column/index.vue +++ b/src/components/column/index.vue @@ -2,6 +2,7 @@
-
- -
- - - -
- -
+ + + +
@@ -61,7 +37,8 @@ import columnProps from './props'; import { defineComponent, useSlots, computed } from 'vue'; import useStyle from '@/composables/useStyle'; import useSlotsBox from '@/composables/useSlotsBox'; -import useData from '@/composables/useData'; +import SelectionVue from './selection.vue'; +// import useData from '@/composables/useData'; export default defineComponent({ name: Variables.name.column @@ -74,8 +51,6 @@ const slots = useSlots(); const { $styleBox, rowHeight } = useStyle(); const { $slotsBox, isMerge } = useSlotsBox(); -const { $data } = useData(); - const realWidth = computed(() => { let curWidth = $slotsBox.tableHeaders.leafs[props!.__index ?? 1].width; @@ -91,8 +66,12 @@ const realWidth = computed(() => { return curWidth; }); -// TODO: 合并列通过这个实现 -// const colspan = ref(1); + +// 计算第一列的宽度。选择框 + 层级递进 +// const { $data } = useData(); +// const firstColumnWidth = computed(() => { +// return ($styleBox.showCheckbox ? 30 : 0) + $data.level * 20; +// });