Browse Source

fix meun border style

pull/1630/merge
qixian.cs@outlook.com 8 years ago
parent
commit
233b4fb774
  1. 24
      src/components/SiderMenu/SiderMenu.test.js
  2. 0
      src/components/SiderMenu/SliderMenu.js
  3. 2
      src/components/SiderMenu/SliderMenu.test.js
  4. 2
      src/components/SiderMenu/index.js
  5. 2
      src/components/TopNavHeader/index.js
  6. 8
      src/components/TopNavHeader/index.less

24
src/components/SiderMenu/SiderMenu.test.js

@ -1,24 +0,0 @@
import { getMenuMatches } from './BaseMenu';
const menu = ['/dashboard', '/userinfo', '/dashboard/name', '/userinfo/:id', '/userinfo/:id/info'];
describe('test menu match', () => {
it('simple path', () => {
expect(getMenuMatches(menu, '/dashboard')).toEqual(['/dashboard']);
});
it('error path', () => {
expect(getMenuMatches(menu, '/dashboardname')).toEqual([]);
});
it('Secondary path', () => {
expect(getMenuMatches(menu, '/dashboard/name')).toEqual(['/dashboard/name']);
});
it('Parameter path', () => {
expect(getMenuMatches(menu, '/userinfo/2144')).toEqual(['/userinfo/:id']);
});
it('three parameter path', () => {
expect(getMenuMatches(menu, '/userinfo/2144/info')).toEqual(['/userinfo/:id/info']);
});
});

0
src/components/SiderMenu/SiderMenu.js → src/components/SiderMenu/SliderMenu.js

2
src/components/SiderMenu/SilderMenu.test.js → src/components/SiderMenu/SliderMenu.test.js

@ -1,5 +1,5 @@
import { urlToList } from '../_utils/pathTools';
import { getFlatMenuKeys, getMenuMatchKeys } from './SiderMenu';
import { getFlatMenuKeys, getMenuMatchKeys } from './SliderMenu';
const menu = [
{

2
src/components/SiderMenu/index.js

@ -1,7 +1,7 @@
import 'rc-drawer/assets/index.css';
import React from 'react';
import DrawerMenu from 'rc-drawer';
import SiderMenu from './SiderMenu';
import SiderMenu from './SliderMenu';
/**
* Recursively flatten the data

2
src/components/TopNavHeader/index.js

@ -16,7 +16,7 @@ export default class TopNavHeader extends PureComponent {
<h1>Ant Design Pro</h1>
</Link>
</div>
<BaseMenu {...this.props} style={{ padding: '9px 0', border: 'none' }} />
<BaseMenu {...this.props} style={{ paddingTop: '9px', border: 'none' }} />
</div>
<div className={styles.right}>
<RightContent {...this.props} />

8
src/components/TopNavHeader/index.less

@ -5,6 +5,14 @@
padding: 0 12px 0 0;
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
position: relative;
:global {
.ant-menu-submenu.ant-menu-submenu-horizontal {
height: 100%;
.ant-menu-submenu-title {
height: 100%;
}
}
}
&.light {
background-color: #fff;
}

Loading…
Cancel
Save