Skip to content

fix(grid): remove grid xxxl attribute #6572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 16, 2023
Merged

fix(grid): remove grid xxxl attribute #6572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2664d2c
fix: remove grid xxxl attribute
aibayanyu20 May 14, 2023
02544f6
docs: remove xxxl in grid docs
aibayanyu20 May 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions components/grid/Col.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,13 @@ export const colProps = () => ({
type: [String, Number, Object] as PropType<string | number | ColSize>,
default: undefined as string | number | ColSize,
},
xxxl: {
type: [String, Number, Object] as PropType<string | number | ColSize>,
default: undefined as string | number | ColSize,
},
prefixCls: String,
flex: [String, Number],
});

export type ColProps = Partial<ExtractPropTypes<ReturnType<typeof colProps>>>;

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',
Expand Down
4 changes: 1 addition & 3 deletions components/grid/Row.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<T> = {
[key in Responsive]?: T;
};
Expand Down Expand Up @@ -64,7 +64,6 @@ const ARow = defineComponent({
lg: true,
xl: true,
xxl: true,
xxxl: true,
});

const curScreens = ref<ScreenMap>({
Expand All @@ -74,7 +73,6 @@ const ARow = defineComponent({
lg: false,
xl: false,
xxl: false,
xxxl: false,
});

const mergePropsByScreen = (oriProp: 'align' | 'justify') => {
Expand Down
2 changes: 1 addition & 1 deletion components/grid/demo/responsive-more.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }"`.
</docs>

<template>
Expand Down
5 changes: 1 addition & 4 deletions components/list/demo/resposive.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ Responsive grid list. The size property is as same as [Layout Grid](https://www.
</docs>

<template>
<a-list
:grid="{ gutter: 16, xs: 1, sm: 2, md: 4, lg: 4, xl: 6, xxl: 3, xxxl: 2 }"
:data-source="data"
>
<a-list :grid="{ gutter: 16, xs: 1, sm: 2, md: 4, lg: 4, xl: 6, xxl: 3 }" :data-source="data">
<template #renderItem="{ item }">
<a-list-item>
<a-card :title="item.title">Card content</a-card>
Expand Down