From 1256a69455fecf6756a81c93cd9a2949172b441b Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Sat, 7 May 2022 01:57:33 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=A3=20=E5=9F=BA=E4=BA=8Evben=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E5=8E=9F=E7=94=9F=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kicc-ui/src/views/system/config/index.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/kicc-ui/src/views/system/config/index.vue b/kicc-ui/src/views/system/config/index.vue index 85f9142f..853b0428 100644 --- a/kicc-ui/src/views/system/config/index.vue +++ b/kicc-ui/src/views/system/config/index.vue @@ -149,7 +149,7 @@ import { RedoOutlined, ColumnHeightOutlined, FullscreenOutlined, FullscreenExitOutlined } from '@ant-design/icons-vue'; import { ref, onMounted, computed, watch } from 'vue'; import { Table, Form, Row, Col, Divider, Tooltip, Dropdown, Menu, Select, DatePicker, Alert } from 'ant-design-vue'; - import { BasicTableProps, PaginationProps, SizeType } from '/@/components/Table'; + import {BasicColumn, BasicTableProps, PaginationProps, SizeType} from '/@/components/Table'; import { listConfig, delConfig } from '/@/api/platform/system/controller/config'; import ConfigModal from './ConfigModal.vue'; import { columns } from './config.data'; @@ -233,6 +233,8 @@ tableProps: { // 表格ID rowKey: 'id', + // 表格列 + columns, // 遮罩层 loading: false, // 数据列表 @@ -248,6 +250,7 @@ const defineBasicTableProps = defineProps(basicProps); const basicTableProps = computed(() => ({ ...toRaw(defineBasicTableProps), ...state.tableProps } as unknown as BasicTableProps)); const dataSourceRef = computed(() => state.tableProps.dataSource); + const columnsRef = computed(() => state.tableProps.columns); // 基于vben-table扩展rowSelection,实现勾选数据自主可控 const { getRowSelection, @@ -269,12 +272,11 @@ // 使用vben-table行斑马线 const { getRowClassName } = useTableStyle(basicTableProps, prefixCls); // 使用vben-table自动计算表格高度跟在指定区域显示滚动条 - const { getScrollRef, redoHeight } = useTableScroll(basicTableProps, tableElRef, columns as any, getRowSelectionRef, dataSourceRef); + const { getScrollRef, redoHeight } = useTableScroll(basicTableProps, tableElRef, columnsRef, getRowSelectionRef, dataSourceRef); // 设置并绑定a-table属性 const getBindValues = computed(() => { const propsData: Recordable = { ...state.tableProps, - columns: columns, size: state.selectedKeys[0], scroll: unref(getScrollRef), rowClassName: unref(getRowClassName),