Merge branch '1.x-stable'

components/cascader/demo/basic.md

@@ -24,31 +24,7 @@ const options = [{
     label: '杭州',
     children: [{
       value: 'xihu',
-      label: '西湖西湖西湖西湖西湖西湖',
-    }, {
-      value: 'xihu1',
-      label: '西湖西湖西湖西湖西湖西湖',
-    }, {
-      value: 'xihu2',
-      label: '西湖西湖西湖西湖西湖西湖',
-    }, {
-      value: 'xihu3',
-      label: '西湖西湖西湖西湖西湖西湖',
-    }, {
-      value: 'xihu4',
-      label: '西湖西湖西湖西湖西湖西湖',
-    }, {
-      value: 'xihu5',
-      label: '西湖西湖西湖西湖西湖西湖',
-    }, {
-      value: 'xihu6',
-      label: '西湖西湖西湖西湖西湖西湖',
-    }, {
-      value: 'xihu7',
-      label: '西湖西湖西湖西湖西湖西湖',
-    }, {
-      value: 'xihu8',
-      label: '西湖西湖西湖西湖西湖西湖',
+      label: '西湖',
     }],
   }],
 }, {
@@ -59,7 +35,7 @@ const options = [{
     label: '南京',
     children: [{
       value: 'zhonghuamen',
-      label: '中华门中华门中华门中华门中华门',
+      label: '中华门',
     }],
   }],
 }];

components/cascader/style/index.less

@@ -9,7 +9,6 @@
     display: block;
     cursor: pointer;
     width: 100%;
-    background: rgba(255, 255, 255, 0);
     z-index: 1;
   }
   &-picker {
@@ -37,13 +36,14 @@
       overflow: hidden;
       width: 100%;
       padding: 0 12px 0 8px;
+      z-index: 1;
     }
 
     &-clear {
       opacity: 0;
       position: absolute;
       right: 8px;
-      z-index: 1;
+      z-index: 2;
       background: #fff;
       top: 50%;
       font-size: 12px;
@@ -66,6 +66,7 @@
     // arrow
     &-arrow {
       position: absolute;
+      z-index: 1;
       top: 50%;
       right: 8px;
       width: 12px;
@@ -73,7 +74,6 @@
       margin-top: -6px;
       line-height: 12px;
       color: #999;
-      background: #fff;
       .iconfont-size-under-12px(8px);
       &:before {
         transition: transform 0.2s ease;

components/date-picker/style/Picker.less

@@ -39,9 +39,9 @@
   }
   &-clear {
     opacity: 0;
+    z-index: -1;
     position: absolute;
     right: 7px;
-    z-index: 1;
     background: #fff;
     top: 50%;
     font-size: 12px;
@@ -59,6 +59,7 @@
 
   &:hover &-clear {
     opacity: 1;
+    z-index: 1;
   }
   &-icon {
     position: absolute;

components/tag/index.tsx

@@ -86,7 +86,12 @@ export default class Tag extends React.Component<TagProps, any> {
         onEnd={this.animationEnd}
         >
         {this.state.closed ? null : (
-          <div data-show={!this.state.closing} {...divProps} className={classString}>
+          <div
+            data-show={!this.state.closing}
+            {...divProps}
+            className={classString}
+            style={{ backgroundColor: /blue|red|green|yellow/.test(color) ? null : color }}
+          >
             <span className={`${prefixCls}-text`}>{children}</span>
             {closeIcon}
           </div>

components/tree-select/style/index.less

@@ -118,3 +118,10 @@
   cursor: not-allowed;
   display: block;
 }
+
+.ant-select-not-found {
+  cursor: not-allowed;
+  color: #ccc;
+  padding: 7px 15px;
+  display: block;
+}

components/upload/style/index.less

@@ -237,7 +237,7 @@
   }
 
   &-picture-card {
-    display: inline-block;
+    display: inline;
 
     .@{upload-item} {
       display: inline-block;
@@ -317,6 +317,7 @@
       }
 
       .@{upload-item}-info {
+        height: auto;
         &:before,
         .anticon-eye-o,
         .anticon-delete {