From 4c8cc0129f98595e01955b379e0ab26bcf62566d Mon Sep 17 00:00:00 2001 From: Zev Zhu <45655660+aibayanyu20@users.noreply.github.com> Date: Tue, 16 May 2023 22:30:18 +0800 Subject: [PATCH] fix(grid): remove grid xxxl attribute (#6572) * fix: remove grid xxxl attribute * docs: remove xxxl in grid docs --- components/grid/Col.tsx | 6 +----- components/grid/Row.tsx | 4 +--- components/grid/demo/responsive-more.vue | 2 +- components/list/demo/resposive.vue | 5 +---- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/components/grid/Col.tsx b/components/grid/Col.tsx index 9ae07aa24..898f5db21 100644 --- a/components/grid/Col.tsx +++ b/components/grid/Col.tsx @@ -59,17 +59,13 @@ export const colProps = () => ({ type: [String, Number, Object] as PropType, default: undefined as string | number | ColSize, }, - xxxl: { - type: [String, Number, Object] as PropType, - default: undefined as string | number | ColSize, - }, prefixCls: String, flex: [String, Number], }); export type ColProps = Partial>>; -const sizes = ['xs', 'sm', 'md', 'lg', 'xl', 'xxl', 'xxxl'] as const; +const sizes = ['xs', 'sm', 'md', 'lg', 'xl', 'xxl'] as const; export default defineComponent({ compatConfig: { MODE: 3 }, name: 'ACol', diff --git a/components/grid/Row.tsx b/components/grid/Row.tsx index f19666b89..fcddd9dd9 100644 --- a/components/grid/Row.tsx +++ b/components/grid/Row.tsx @@ -19,7 +19,7 @@ const RowJustify = [ 'space-evenly', ] as const; -type Responsive = 'xxxl' | 'xxl' | 'xl' | 'lg' | 'md' | 'sm' | 'xs'; +type Responsive = 'xxl' | 'xl' | 'lg' | 'md' | 'sm' | 'xs'; type ResponsiveLike = { [key in Responsive]?: T; }; @@ -64,7 +64,6 @@ const ARow = defineComponent({ lg: true, xl: true, xxl: true, - xxxl: true, }); const curScreens = ref({ @@ -74,7 +73,6 @@ const ARow = defineComponent({ lg: false, xl: false, xxl: false, - xxxl: false, }); const mergePropsByScreen = (oriProp: 'align' | 'justify') => { diff --git a/components/grid/demo/responsive-more.vue b/components/grid/demo/responsive-more.vue index 4fd810ad4..dc18321a1 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` `xxxl` 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` properties to use, where `:xs="6"` is equivalent to `:xs="{ span: 6 }"`.