diff --git a/components/_util/responsiveObserve.ts b/components/_util/responsiveObserve.ts index 2d15daccf5..497f01bb9b 100644 --- a/components/_util/responsiveObserve.ts +++ b/components/_util/responsiveObserve.ts @@ -1,9 +1,9 @@ -export type Breakpoint = 'xxl' | 'xl' | 'lg' | 'md' | 'sm' | 'xs'; +export type Breakpoint = 'xxxl' | 'xxl' | 'xl' | 'lg' | 'md' | 'sm' | 'xs'; export type BreakpointMap = Record; export type ScreenMap = Partial>; export type ScreenSizeMap = Partial>; -export const responsiveArray: Breakpoint[] = ['xxl', 'xl', 'lg', 'md', 'sm', 'xs']; +export const responsiveArray: Breakpoint[] = ['xxxl', 'xxl', 'xl', 'lg', 'md', 'sm', 'xs']; export const responsiveMap: BreakpointMap = { xs: '(max-width: 575px)', @@ -12,6 +12,7 @@ export const responsiveMap: BreakpointMap = { lg: '(min-width: 992px)', xl: '(min-width: 1200px)', xxl: '(min-width: 1600px)', + xxxl: '(min-width: 2000px)', }; type SubscribeFunc = (screens: ScreenMap) => void; diff --git a/components/grid/Col.tsx b/components/grid/Col.tsx index f819915d49..2aaf61dd29 100644 --- a/components/grid/Col.tsx +++ b/components/grid/Col.tsx @@ -51,6 +51,7 @@ const colProps = { lg: objectOrNumber, xl: objectOrNumber, xxl: objectOrNumber, + xxxl: objectOrNumber, prefixCls: PropTypes.string, flex: stringOrNumber, }; @@ -67,7 +68,7 @@ export default defineComponent({ const { span, order, offset, push, pull } = props; const pre = prefixCls.value; let sizeClassObj = {}; - ['xs', 'sm', 'md', 'lg', 'xl', 'xxl'].forEach(size => { + ['xs', 'sm', 'md', 'lg', 'xl', 'xxl', 'xxxl'].forEach(size => { let sizeProps: ColSize = {}; const propSize = props[size]; if (typeof propSize === 'number') { diff --git a/components/grid/Row.tsx b/components/grid/Row.tsx index a9402da28b..73db795377 100644 --- a/components/grid/Row.tsx +++ b/components/grid/Row.tsx @@ -44,6 +44,7 @@ const ARow = defineComponent({ lg: true, xl: true, xxl: true, + xxxl: true, }); const supportFlexGap = useFlexGapSupport(); diff --git a/components/grid/demo/responsive-more.vue b/components/grid/demo/responsive-more.vue index dc18321a1d..4fd810ad4e 100644 --- a/components/grid/demo/responsive-more.vue +++ b/components/grid/demo/responsive-more.vue @@ -14,7 +14,7 @@ title: ## en-US -`span` `pull` `push` `offset` `order` property can be embedded into `xs` `sm` `md` `lg` `xl` `xxl` properties to use, where `:xs="6"` is equivalent to `:xs="{ span: 6 }"`. +`span` `pull` `push` `offset` `order` property can be embedded into `xs` `sm` `md` `lg` `xl` `xxl` `xxxl` properties to use, where `:xs="6"` is equivalent to `:xs="{ span: 6 }"`.