mirror of
https://gitee.com/ant-design/ant-design.git
synced 2024-12-03 04:30:06 +08:00
Merge branch 'master' into feature-merge-master
This commit is contained in:
commit
7fe4d4e844
@ -182,7 +182,7 @@ const Header: React.FC = () => {
|
|||||||
closable: true,
|
closable: true,
|
||||||
zIndex: 99999,
|
zIndex: 99999,
|
||||||
onOk() {
|
onOk() {
|
||||||
window.open('https://ant-design.antgroup.com', '_self');
|
window.location.host = 'ant-design.antgroup.com';
|
||||||
disableAntdMirrorModal();
|
disableAntdMirrorModal();
|
||||||
},
|
},
|
||||||
onCancel() {
|
onCancel() {
|
||||||
|
@ -26,27 +26,27 @@ const App: React.FC = () => {
|
|||||||
animated={{ inkBar, tabPane }}
|
animated={{ inkBar, tabPane }}
|
||||||
items={[
|
items={[
|
||||||
{
|
{
|
||||||
label: `Bamboo`,
|
label: 'Bamboo',
|
||||||
key: '1',
|
key: '1',
|
||||||
children: `Hello Bamboo!`,
|
children: 'Hello Bamboo!',
|
||||||
style: {
|
style: {
|
||||||
height: 200,
|
height: 200,
|
||||||
boxShadow: '0 0 3px rgba(255, 0, 0, 0.5)',
|
boxShadow: '0 0 3px rgba(255, 0, 0, 0.5)',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: `Little`,
|
label: 'Little',
|
||||||
key: '2',
|
key: '2',
|
||||||
children: `Hi Little!`,
|
children: 'Hi Little!',
|
||||||
style: {
|
style: {
|
||||||
height: 300,
|
height: 300,
|
||||||
boxShadow: '0 0 3px rgba(0, 255, 0, 0.5)',
|
boxShadow: '0 0 3px rgba(0, 255, 0, 0.5)',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: `Light`,
|
label: 'Light',
|
||||||
key: '3',
|
key: '3',
|
||||||
children: `Welcome Light!`,
|
children: 'Welcome Light!',
|
||||||
style: {
|
style: {
|
||||||
height: 100,
|
height: 100,
|
||||||
boxShadow: '0 0 3px rgba(0, 0, 255, 0.5)',
|
boxShadow: '0 0 3px rgba(0, 0, 255, 0.5)',
|
||||||
|
@ -9,18 +9,18 @@ const onChange = (key: string) => {
|
|||||||
const items: TabsProps['items'] = [
|
const items: TabsProps['items'] = [
|
||||||
{
|
{
|
||||||
key: '1',
|
key: '1',
|
||||||
label: `Tab 1`,
|
label: 'Tab 1',
|
||||||
children: `Content of Tab Pane 1`,
|
children: 'Content of Tab Pane 1',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: '2',
|
key: '2',
|
||||||
label: `Tab 2`,
|
label: 'Tab 2',
|
||||||
children: `Content of Tab Pane 2`,
|
children: 'Content of Tab Pane 2',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: '3',
|
key: '3',
|
||||||
label: `Tab 3`,
|
label: 'Tab 3',
|
||||||
children: `Content of Tab Pane 3`,
|
children: 'Content of Tab Pane 3',
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -38,17 +38,17 @@ const App: React.FC = () => {
|
|||||||
const [items, setItems] = useState([
|
const [items, setItems] = useState([
|
||||||
{
|
{
|
||||||
key: '1',
|
key: '1',
|
||||||
label: `Tab 1`,
|
label: 'Tab 1',
|
||||||
children: 'Content of Tab Pane 1',
|
children: 'Content of Tab Pane 1',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: '2',
|
key: '2',
|
||||||
label: `Tab 2`,
|
label: 'Tab 2',
|
||||||
children: 'Content of Tab Pane 2',
|
children: 'Content of Tab Pane 2',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: '3',
|
key: '3',
|
||||||
label: `Tab 3`,
|
label: 'Tab 3',
|
||||||
children: 'Content of Tab Pane 3',
|
children: 'Content of Tab Pane 3',
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
Loading…
Reference in New Issue
Block a user