mirror of
https://github.com/continew-org/continew-admin-ui.git
synced 2025-10-30 00:58:37 +08:00
fix(GiTable): 修复 GiTable 升级后表格选择器、禁用工具配置失效的问题
This commit is contained in:
@@ -110,6 +110,7 @@ defineOptions({ name: 'GiTable' })
|
|||||||
const props = withDefaults(defineProps<Props>(), {
|
const props = withDefaults(defineProps<Props>(), {
|
||||||
title: '',
|
title: '',
|
||||||
disabledColumnKeys: () => [],
|
disabledColumnKeys: () => [],
|
||||||
|
disabledTools: () => [],
|
||||||
data: () => [],
|
data: () => [],
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -155,9 +156,13 @@ interface Props extends TableProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const slots = useSlots()
|
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')
|
const tableRef = useTemplateRef('tableRef')
|
||||||
@@ -197,7 +202,7 @@ const showFullscreenBtn = computed(() => !props.disabledTools?.includes('fullscr
|
|||||||
/** 列设置相关逻辑 */
|
/** 列设置相关逻辑 */
|
||||||
const showSettingColumnBtn = computed(() => {
|
const showSettingColumnBtn = computed(() => {
|
||||||
const columns = props.columns as TableColumnData[] | undefined
|
const columns = props.columns as TableColumnData[] | undefined
|
||||||
return Boolean(columns?.length)
|
return !props.disabledTools?.includes('setting') && Boolean(columns?.length)
|
||||||
})
|
})
|
||||||
|
|
||||||
/** 列设置项类型 */
|
/** 列设置项类型 */
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
<div class="gi_table_page">
|
<div class="gi_table_page">
|
||||||
<GiTable
|
<GiTable
|
||||||
v-model:selectedKeys="selectedKeys"
|
v-model:selectedKeys="selectedKeys"
|
||||||
title=""
|
|
||||||
row-key="tableName"
|
row-key="tableName"
|
||||||
:data="dataList"
|
:data="dataList"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="gi_table_page">
|
<div class="gi_table_page">
|
||||||
<GiTable
|
<GiTable
|
||||||
title=""
|
|
||||||
row-key="id"
|
row-key="id"
|
||||||
:data="dataList"
|
:data="dataList"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="gi_table_page">
|
<div class="gi_table_page">
|
||||||
<GiTable
|
<GiTable
|
||||||
title=""
|
|
||||||
row-key="id"
|
row-key="id"
|
||||||
:data="dataList"
|
:data="dataList"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="gi_table_page">
|
<div class="gi_table_page">
|
||||||
<GiTable
|
<GiTable
|
||||||
title=""
|
|
||||||
row-key="id"
|
row-key="id"
|
||||||
:data="dataList"
|
:data="dataList"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="gi_table_page">
|
<div class="gi_table_page">
|
||||||
<GiTable
|
<GiTable
|
||||||
title=""
|
|
||||||
row-key="id"
|
row-key="id"
|
||||||
:data="dataList"
|
:data="dataList"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
<GiTable
|
<GiTable
|
||||||
v-show="viewType === 'table'"
|
v-show="viewType === 'table'"
|
||||||
ref="tableRef"
|
ref="tableRef"
|
||||||
title=""
|
|
||||||
row-key="id"
|
row-key="id"
|
||||||
:data="dataList"
|
:data="dataList"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
<div class="gi_table_page">
|
<div class="gi_table_page">
|
||||||
<GiTable
|
<GiTable
|
||||||
ref="tableRef"
|
ref="tableRef"
|
||||||
title=""
|
|
||||||
row-key="id"
|
row-key="id"
|
||||||
:data="dataList"
|
:data="dataList"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
<div class="gi_table_page">
|
<div class="gi_table_page">
|
||||||
<GiTable
|
<GiTable
|
||||||
row-key="id"
|
row-key="id"
|
||||||
title=""
|
|
||||||
:data="dataList"
|
:data="dataList"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
|
|||||||
Reference in New Issue
Block a user