Skip to content

fix: 修复表格列设置弹窗出现警告问题 #605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kailong321200875 merged 1 commit into from
Mar 3, 2025
+6 −6
Merged

fix: 修复表格列设置弹窗出现警告问题 #605

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/components/Table/src/components/ColumnSetting.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const confirm = () => {
const newColumns = cloneDeep(unref(settingColumns))?.map((item) => {
const fixed = unref(settingColumns)?.find((col) => col.field === item.field)?.fixed
item.hidden = !unref(checkColumns)?.includes(item.field)
item.fixed = fixed ? fixed : undefined
item.fixed = fixed ? fixed : false
return item
})
emit('confirm', [...unref(hiddenColumns), ...(newColumns || [])])
Expand All @@ -65,7 +65,7 @@ const restore = () => {
const initColumns = (columns: TableColumn[], isReStore = false) => {
const newColumns = columns?.filter((item) => {
if (!isReStore) {
item.fixed = item.fixed !== void 0 ? item.fixed : undefined
item.fixed = item.fixed !== void 0 ? item.fixed : false
}
return (item.type && !DEFAULT_FILTER_COLUMN.includes(item.type)) || !item.type
})
Expand Down Expand Up @@ -133,18 +133,18 @@ watch(
:key="item.field"
class="flex items-center justify-between mt-12px"
>
<ElCheckbox :label="item.field">
<ElCheckbox :value="item.field">
{{ item.label }}
</ElCheckbox>
<div class="flex items-center">
<ElRadioGroup size="small" v-model="item.fixed">
<ElRadioButton label="left">
<ElRadioButton value="left">
<Icon icon="vi-ep:arrow-left" />
</ElRadioButton>
<ElRadioButton :label="undefined">
<ElRadioButton :value="false">
<Icon icon="vi-ep:close" />
</ElRadioButton>
<ElRadioButton label="right">
<ElRadioButton value="right">
<Icon icon="vi-ep:arrow-right" />
</ElRadioButton>
</ElRadioGroup>
Expand Down