Merge branch 'master' of https://github.com/ant-design/test2

src/components/Charts/WaterWave/index.js

@@ -102,7 +102,7 @@ class WaterWave extends PureComponent {
       ctx.lineTo(xOffset, canvasHeight);
       ctx.lineTo(startPoint[0], startPoint[1]);
 
-      const gradient = ctx.createLinearGradient(0, 0, 0, 170);
+      const gradient = ctx.createLinearGradient(0, 0, 0, canvasHeight);
       gradient.addColorStop(0, '#ffffff');
       gradient.addColorStop(1, '#1890FF');
       ctx.fillStyle = gradient;

src/components/PageHeader/index.js

@@ -59,9 +59,8 @@ export default class PageHeader extends PureComponent {
         const url = `/${pathSnippets.slice(0, index + 1).join('/')}`;
         return (
           <Breadcrumb.Item key={url}>
-            {createElement(linkElement, {
-              to: url,
-              href: url,
+            {createElement(index === pathSnippets.length - 1 ? 'span' : linkElement, {
+              [linkElement === 'a' ? 'href' : 'to']: url,
             }, breadcrumbNameMap[url] || breadcrumbNameMap[url.replace('/', '')] || url)}
           </Breadcrumb.Item>
         );
@@ -69,8 +68,7 @@ export default class PageHeader extends PureComponent {
       const breadcrumbItems = [(
         <Breadcrumb.Item key="home">
           {createElement(linkElement, {
-            to: '/',
-            href: '/',
+            [linkElement === 'a' ? 'href' : 'to']: '/',
           }, '首页')}
         </Breadcrumb.Item>
       )].concat(extraBreadcrumbItems);
@@ -85,7 +83,11 @@ export default class PageHeader extends PureComponent {
           {
             breadcrumbList.map(item => (
               <Breadcrumb.Item key={item.title}>
-                {item.href ? <a href="">{item.title}</a> : item.title}
+                {item.href ? (
+                  createElement(linkElement, {
+                    [linkElement === 'a' ? 'href' : 'to']: item.href,
+                  }, '首页')
+                ) : item.title}
               </Breadcrumb.Item>)
             )
           }

src/layouts/BasicLayout.js

@@ -58,6 +58,9 @@ class BasicLayout extends React.PureComponent {
   getDefaultCollapsedSubMenus(props) {
     const currentMenuSelectedKeys = [...this.getCurrentMenuSelectedKeys(props)];
     currentMenuSelectedKeys.splice(-1, 1);
+    if (currentMenuSelectedKeys.length === 0) {
+      return ['dashboard'];
+    }
     return currentMenuSelectedKeys;
   }
   getCurrentMenuSelectedKeys(props) {

src/routes/Forms/BasicForm.js

@@ -150,7 +150,7 @@ export default class BasicForms extends PureComponent {
                 {getFieldDecorator('public', {
                   initialValue: '1',
                 })(
-                  <Radio.Group className={styles.radioGroup}>
+                  <Radio.Group>
                     <Radio value="1">公开</Radio>
                     <Radio value="2">部分公开</Radio>
                     <Radio value="3">不公开</Radio>

src/routes/Forms/style.less

@@ -88,11 +88,3 @@
   color: @text-color-secondary;
   font-style: normal;
 }
-
-.radioGroup {
-  :global {
-    .ant-radio-wrapper {
-      margin-right: 16px;
-    }
-  }
-}