From c21844ae4a9d8598482846c42c1af4c8aec9bb75 Mon Sep 17 00:00:00 2001 From: xingyu <xingyu4j@vip.qq.com> Date: Tue, 31 Oct 2023 17:35:33 +0800 Subject: [PATCH] fix: CheckboxGroup onchange event fn type --- .../Table/src/components/settings/ColumnSetting.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Table/src/components/settings/ColumnSetting.vue b/src/components/Table/src/components/settings/ColumnSetting.vue index decd6d5f..26cf0c28 100644 --- a/src/components/Table/src/components/settings/ColumnSetting.vue +++ b/src/components/Table/src/components/settings/ColumnSetting.vue @@ -1,7 +1,7 @@ <script lang="ts" setup> import { computed, nextTick, reactive, ref, unref, useAttrs, watchEffect } from 'vue' import { Checkbox, Divider, Popover, Tooltip } from 'ant-design-vue' -import type { CheckboxChangeEvent } from 'ant-design-vue/lib/checkbox/interface' +import type { CheckboxChangeEvent, CheckboxValueType } from 'ant-design-vue/lib/checkbox/interface' import { DragOutlined, SettingOutlined } from '@ant-design/icons-vue' import { cloneDeep, omit } from 'lodash-es' import Sortablejs from 'sortablejs' @@ -161,17 +161,17 @@ const indeterminate = computed(() => { }) // Trigger when check/uncheck a column -function onChange(checkedList: string[]) { +function onChange(checkedList: CheckboxValueType[]) { const len = plainSortOptions.value.length state.checkAll = checkedList.length === len const sortList = unref(plainSortOptions).map(item => item.value) checkedList.sort((prev, next) => { - return sortList.indexOf(prev) - sortList.indexOf(next) + return sortList.indexOf(String(prev)) - sortList.indexOf(String(next)) }) unref(plainSortOptions).forEach((item) => { (item as BasicColumn).defaultHidden = !checkedList.includes(item.value) }) - setColumns(checkedList) + setColumns(checkedList as string[]) } let sortable: Sortable