Skip to content

Commit 9f525a5

Browse files
Merge pull request #605 from xzz2021/master
fix: 修复表格列设置弹窗出现警告问题
2 parents 6ba8aa8 + d240b73 commit 9f525a5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/components/Table/src/components/ColumnSetting.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const confirm = () => {
5151
const newColumns = cloneDeep(unref(settingColumns))?.map((item) => {
5252
const fixed = unref(settingColumns)?.find((col) => col.field === item.field)?.fixed
5353
item.hidden = !unref(checkColumns)?.includes(item.field)
54-
item.fixed = fixed ? fixed : undefined
54+
item.fixed = fixed ? fixed : false
5555
return item
5656
})
5757
emit('confirm', [...unref(hiddenColumns), ...(newColumns || [])])
@@ -65,7 +65,7 @@ const restore = () => {
6565
const initColumns = (columns: TableColumn[], isReStore = false) => {
6666
const newColumns = columns?.filter((item) => {
6767
if (!isReStore) {
68-
item.fixed = item.fixed !== void 0 ? item.fixed : undefined
68+
item.fixed = item.fixed !== void 0 ? item.fixed : false
6969
}
7070
return (item.type && !DEFAULT_FILTER_COLUMN.includes(item.type)) || !item.type
7171
})
@@ -133,18 +133,18 @@ watch(
133133
:key="item.field"
134134
class="flex items-center justify-between mt-12px"
135135
>
136-
<ElCheckbox :label="item.field">
136+
<ElCheckbox :value="item.field">
137137
{{ item.label }}
138138
</ElCheckbox>
139139
<div class="flex items-center">
140140
<ElRadioGroup size="small" v-model="item.fixed">
141-
<ElRadioButton label="left">
141+
<ElRadioButton value="left">
142142
<Icon icon="vi-ep:arrow-left" />
143143
</ElRadioButton>
144-
<ElRadioButton :label="undefined">
144+
<ElRadioButton :value="false">
145145
<Icon icon="vi-ep:close" />
146146
</ElRadioButton>
147-
<ElRadioButton label="right">
147+
<ElRadioButton value="right">
148148
<Icon icon="vi-ep:arrow-right" />
149149
</ElRadioButton>
150150
</ElRadioGroup>

0 commit comments

Comments
 (0)