fix(GiTable): 修复 GiTable 升级后表格选择器、禁用工具配置失效的问题

This commit is contained in:
2025-03-19 20:11:11 +08:00
parent eaabe47546
commit 7d4beb0283
9 changed files with 7 additions and 10 deletions

View File

@@ -110,6 +110,7 @@ defineOptions({ name: 'GiTable' })
const props = withDefaults(defineProps<Props>(), {
title: '',
disabledColumnKeys: () => [],
disabledTools: () => [],
data: () => [],
})
@@ -155,9 +156,13 @@ interface Props extends TableProps {
}
const slots = useSlots()
const attrs = useAttrs()
/** 表格属性计算 */
const tableProps = computed(() => omit(props, ['title', 'disabledColumnKeys']))
const tableProps = computed(() => ({
...omit(props, ['title', 'disabledColumnKeys', 'disabledTools']),
...attrs,
}))
/** 组件状态 */
const tableRef = useTemplateRef('tableRef')
@@ -197,7 +202,7 @@ const showFullscreenBtn = computed(() => !props.disabledTools?.includes('fullscr
/** 列设置相关逻辑 */
const showSettingColumnBtn = computed(() => {
const columns = props.columns as TableColumnData[] | undefined
return Boolean(columns?.length)
return !props.disabledTools?.includes('setting') && Boolean(columns?.length)
})
/** 列设置项类型 */

View File

@@ -2,7 +2,6 @@
<div class="gi_table_page">
<GiTable
v-model:selectedKeys="selectedKeys"
title=""
row-key="tableName"
:data="dataList"
:columns="columns"

View File

@@ -1,7 +1,6 @@
<template>
<div class="gi_table_page">
<GiTable
title=""
row-key="id"
:data="dataList"
:columns="columns"

View File

@@ -1,7 +1,6 @@
<template>
<div class="gi_table_page">
<GiTable
title=""
row-key="id"
:data="dataList"
:columns="columns"

View File

@@ -1,7 +1,6 @@
<template>
<div class="gi_table_page">
<GiTable
title=""
row-key="id"
:data="dataList"
:columns="columns"

View File

@@ -1,7 +1,6 @@
<template>
<div class="gi_table_page">
<GiTable
title=""
row-key="id"
:data="dataList"
:columns="columns"

View File

@@ -9,7 +9,6 @@
<GiTable
v-show="viewType === 'table'"
ref="tableRef"
title=""
row-key="id"
:data="dataList"
:columns="columns"

View File

@@ -2,7 +2,6 @@
<div class="gi_table_page">
<GiTable
ref="tableRef"
title=""
row-key="id"
:data="dataList"
:columns="columns"

View File

@@ -2,7 +2,6 @@
<div class="gi_table_page">
<GiTable
row-key="id"
title=""
:data="dataList"
:columns="columns"
:loading="loading"