From 8447331197fc0975f32f5df9cc306ece4a09f400 Mon Sep 17 00:00:00 2001 From: Joyboo Date: Wed, 20 Oct 2021 09:12:27 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20table=20size=E6=94=BE=E5=88=B0settings?= =?UTF-8?q?=20(#1294)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/src/BasicTable.vue | 1 - src/components/Table/src/const.ts | 12 +++++++++++- src/components/Table/src/props.ts | 7 ++++++- src/settings/componentSetting.ts | 2 ++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue index 9d0d6842..6ba20f28 100644 --- a/src/components/Table/src/BasicTable.vue +++ b/src/components/Table/src/BasicTable.vue @@ -222,7 +222,6 @@ const getBindValues = computed(() => { const dataSource = unref(getDataSourceRef); let propsData: Recordable = { - size: 'middle', // ...(dataSource.length === 0 ? { getPopupContainer: () => document.body } : {}), ...attrs, customRow, diff --git a/src/components/Table/src/const.ts b/src/components/Table/src/const.ts index 3b694158..2a45fac7 100644 --- a/src/components/Table/src/const.ts +++ b/src/components/Table/src/const.ts @@ -2,7 +2,14 @@ import componentSetting from '/@/settings/componentSetting'; const { table } = componentSetting; -const { pageSizeOptions, defaultPageSize, fetchSetting, defaultSortFn, defaultFilterFn } = table; +const { + pageSizeOptions, + defaultPageSize, + fetchSetting, + defaultSize, + defaultSortFn, + defaultFilterFn, +} = table; export const ROW_KEY = 'key'; @@ -15,6 +22,9 @@ export const PAGE_SIZE = defaultPageSize; // Common interface field settings export const FETCH_SETTING = fetchSetting; +// Default Size +export const DEFAULT_SIZE = defaultSize; + // Configure general sort function export const DEFAULT_SORT_FN = defaultSortFn; diff --git a/src/components/Table/src/props.ts b/src/components/Table/src/props.ts index 3e5a9c72..302bb3be 100644 --- a/src/components/Table/src/props.ts +++ b/src/components/Table/src/props.ts @@ -7,9 +7,10 @@ import type { SorterResult, TableCustomRecord, TableRowSelection, + SizeType, } from './types/table'; import type { FormProps } from '/@/components/Form'; -import { DEFAULT_FILTER_FN, DEFAULT_SORT_FN, FETCH_SETTING } from './const'; +import { DEFAULT_FILTER_FN, DEFAULT_SORT_FN, FETCH_SETTING, DEFAULT_SIZE } from './const'; import { propTypes } from '/@/utils/propTypes'; export const basicProps = { @@ -141,4 +142,8 @@ export const basicProps = { }) => Promise >, }, + size: { + type: String as PropType, + default: DEFAULT_SIZE, + }, }; diff --git a/src/settings/componentSetting.ts b/src/settings/componentSetting.ts index 025bcda2..b2479b7b 100644 --- a/src/settings/componentSetting.ts +++ b/src/settings/componentSetting.ts @@ -21,6 +21,8 @@ export default { pageSizeOptions: ['10', '50', '80', '100'], // Default display quantity on one page defaultPageSize: 10, + // Default Size + defaultSize: 'middle', // Custom general sort function defaultSortFn: (sortInfo: SorterResult) => { const { field, order } = sortInfo;