Merge branch 'master' into new-design-spec

CHANGELOG.md

@@ -9,6 +9,8 @@
 - 修复 TimePicker 受控模式点选即关闭面板的问题。[#818](https://github.com/ant-design/ant-design/issues/818)
 - 修复一个两栏的 TimePicker 点击右边空白处无法关闭面板的问题。[#826](https://github.com/ant-design/ant-design/issues/826)
 - 修复 Table `pagination.onChange` 指定无效的问题。[#824](https://github.com/ant-design/ant-design/issues/824)
+- 修复 Transfer 搜索功能失效的问题。
+- 修复二维码图标，新增一个扫描图标。[#772](https://github.com/ant-design/ant-design/issues/772)
 
 ## 0.11.2
 

components/icon/index.md

@@ -151,7 +151,7 @@ const icons1 = ['step-backward', 'step-forward', 'fast-backward', 'fast-forward'
 
 const icons2 = ['question', 'question-circle-o', 'question-circle', 'plus', 'plus-circle-o', 'plus-circle', 'pause', 'pause-circle-o', 'pause-circle', 'minus', 'minus-circle-o', 'minus-circle', 'plus-square', 'minus-square', 'info', 'info-circle-o', 'info-circle', 'exclamation', 'exclamation-circle-o', 'exclamation-circle', 'cross', 'cross-circle-o', 'cross-circle', 'check', 'check-circle-o', 'check-circle', 'clock-circle-o', 'clock-circle'];
 
-const icons3 = ['lock', 'unlock', 'android', 'apple', 'area-chart', 'bar-chart', 'bars', 'book', 'calendar', 'cloud', 'cloud-download', 'code', 'copy', 'credit-card', 'delete', 'desktop', 'download', 'edit', 'ellipsis', 'file', 'file-text', 'file-unknown', 'folder', 'folder-open', 'github', 'hdd', 'frown', 'meh', 'inbox', 'laptop', 'appstore', 'line-chart', 'link', 'logout', 'mail', 'menu-fold', 'menu-unfold', 'mobile', 'notification', 'paper-clip', 'picture', 'pie-chart', 'poweroff', 'reload', 'search', 'setting', 'share-alt', 'shopping-cart', 'smile', 'tablet', 'tag', 'tags', 'to-top', 'upload', 'user', 'video-camera', 'windows', 'ie', 'chrome', 'home', 'loading', 'smile-circle', 'meh-circle', 'frown-circle', 'tags-o', 'tag-o', 'cloud-upload-o', 'cloud-download-o', 'cloud-upload', 'cloud-o', 'star-o', 'star', 'environment', 'environment-o', 'eye', 'eye-o', 'camera', 'camera-o', 'aliwangwang', 'aliwangwang-o', 'save', 'team', 'solution', 'phone', 'filter', 'exception', 'export', 'customerservice', 'qrcode', 'like', 'dislike', 'message', 'pay-circle', 'pay-circle-o'];
+const icons3 = ['lock', 'unlock', 'android', 'apple', 'area-chart', 'bar-chart', 'bars', 'book', 'calendar', 'cloud', 'cloud-download', 'code', 'copy', 'credit-card', 'delete', 'desktop', 'download', 'edit', 'ellipsis', 'file', 'file-text', 'file-unknown', 'folder', 'folder-open', 'github', 'hdd', 'frown', 'meh', 'inbox', 'laptop', 'appstore', 'line-chart', 'link', 'logout', 'mail', 'menu-fold', 'menu-unfold', 'mobile', 'notification', 'paper-clip', 'picture', 'pie-chart', 'poweroff', 'reload', 'search', 'setting', 'share-alt', 'shopping-cart', 'smile', 'tablet', 'tag', 'tags', 'to-top', 'upload', 'user', 'video-camera', 'windows', 'ie', 'chrome', 'home', 'loading', 'smile-circle', 'meh-circle', 'frown-circle', 'tags-o', 'tag-o', 'cloud-upload-o', 'cloud-download-o', 'cloud-upload', 'cloud-o', 'star-o', 'star', 'environment', 'environment-o', 'eye', 'eye-o', 'camera', 'camera-o', 'aliwangwang', 'aliwangwang-o', 'save', 'team', 'solution', 'phone', 'filter', 'exception', 'export', 'customerservice', 'qrcode', 'scan', 'like', 'dislike', 'message', 'pay-circle', 'pay-circle-o'];
 
 
 ReactDOM.render(<IconSet icons={icons1} />, document.getElementById('iconset-direction'));

components/modal/Modal.jsx

+import React from 'react';
+import Dialog from 'rc-dialog';
+import { Dom } from 'rc-util';
+import Button from '../button';
+
+function noop() {}
+
+let mousePosition;
+let mousePositionEventBinded;
+
+let AntModal = React.createClass({
+  getDefaultProps() {
+    return {
+      prefixCls: 'ant-modal',
+      onOk: noop,
+      onCancel: noop,
+      okText: '确定',
+      cancelText: '取消',
+      width: 520,
+      transitionName: 'zoom',
+      maskAnimation: 'fade',
+      confirmLoading: false,
+      visible: false
+    };
+  },
+
+  handleCancel() {
+    this.props.onCancel();
+  },
+
+  handleOk() {
+    this.props.onOk();
+  },
+
+  componentDidMount() {
+    if (mousePositionEventBinded) {
+      return;
+    }
+    // 只有点击事件支持从鼠标位置动画展开
+    Dom.addEventListener(document.body, 'click', function onDocumentMousemove(e) {
+      mousePosition = {
+        x: e.pageX,
+        y: e.pageY
+      };
+      // 20ms 内发生过点击事件，则从点击位置动画展示
+      // 否则直接 zoom 展示
+      // 这样可以兼容非点击方式展开
+      setTimeout(() => mousePosition = null, 20);
+    });
+    mousePositionEventBinded = true;
+  },
+
+  render() {
+    let props = this.props;
+    let defaultFooter = [
+      <Button key="cancel"
+        type="ghost"
+        size="large"
+        onClick={this.handleCancel}>
+        {props.cancelText}
+      </Button>,
+      <Button key="confirm"
+        type="primary"
+        size="large"
+        loading={props.confirmLoading}
+        onClick={this.handleOk}>
+        {props.okText}
+      </Button>
+    ];
+    let footer = props.footer || defaultFooter;
+    return <Dialog onClose={this.handleCancel} footer={footer} {...props}
+      visible={props.visible} mousePosition={mousePosition} />;
+  }
+});
+
+export default AntModal;

components/modal/confirm.jsx

 import React from 'react';
 import ReactDOM from 'react-dom';
-import Dialog from './index';
+import Dialog from './modal';
 import Icon from '../icon';
 import Button from '../button';
 

components/modal/index.jsx

-import React from 'react';
-import Dialog from 'rc-dialog';
-import { Dom } from 'rc-util';
+import AntModal from './Modal';
 import confirm from './confirm';
-import Button from '../button';
-
-function noop() {}
-
-let mousePosition;
-let mousePositionEventBinded;
-
-let AntModal = React.createClass({
-  getDefaultProps() {
-    return {
-      prefixCls: 'ant-modal',
-      onOk: noop,
-      onCancel: noop,
-      okText: '确定',
-      cancelText: '取消',
-      width: 520,
-      transitionName: 'zoom',
-      maskAnimation: 'fade',
-      confirmLoading: false,
-      visible: false
-    };
-  },
-
-  handleCancel() {
-    this.props.onCancel();
-  },
-
-  handleOk() {
-    this.props.onOk();
-  },
-
-  componentDidMount() {
-    if (mousePositionEventBinded) {
-      return;
-    }
-    // 只有点击事件支持从鼠标位置动画展开
-    Dom.addEventListener(document.body, 'click', function onDocumentMousemove(e) {
-      mousePosition = {
-        x: e.pageX,
-        y: e.pageY
-      };
-      // 20ms 内发生过点击事件，则从点击位置动画展示
-      // 否则直接 zoom 展示
-      // 这样可以兼容非点击方式展开
-      setTimeout(() => mousePosition = null, 20);
-    });
-    mousePositionEventBinded = true;
-  },
-
-  render() {
-    let props = this.props;
-    let defaultFooter = [
-      <Button key="cancel"
-        type="ghost"
-        size="large"
-        onClick={this.handleCancel}>
-        {props.cancelText}
-      </Button>,
-      <Button key="confirm"
-        type="primary"
-        size="large"
-        loading={props.confirmLoading}
-        onClick={this.handleOk}>
-        {props.okText}
-      </Button>
-    ];
-    let footer = props.footer || defaultFooter;
-    return <Dialog onClose={this.handleCancel} footer={footer} {...props}
-      visible={props.visible} mousePosition={mousePosition} />;
-  }
-});
 
 AntModal.info = function (props) {
   props.iconClassName = 'info-circle';

components/transfer/list.jsx

@@ -78,6 +78,22 @@ class TransferList extends Component {
       [prefixCls + '-with-footer']: !!footerDom,
     });
 
+    const showItems = dataSource.map((item) => {
+      // apply filter
+      const itemText = this.props.render(item);
+      const filterResult = this.matchFilter(itemText, filter);
+      const renderedText = this.props.render(item);
+
+      if (filterResult) {
+        return (
+          <li onClick={this.handleSelect.bind(this, item)} key={item.key} title={renderedText}>
+            <Checkbox checked={checkedKeys.some(key => key === item.key)} />
+            {renderedText}
+          </li>
+        );
+      }
+    }).filter(item => !!item);
+
     return <div className={listCls} {...this.props}>
       <div className={`${prefixCls}-header`}>
         {this.renderCheckbox({
@@ -96,24 +112,7 @@ class TransferList extends Component {
         <Animate component="ul"
           transitionName={this.state.mounted ? `${prefixCls}-highlight` : ''}
           transitionLeave={false}>
-          {dataSource.length > 0 ?
-            dataSource.map((item) => {
-              // apply filter
-              const itemText = this.props.render(item);
-              const filterResult = this.matchFilter(itemText, filter);
-
-              const renderedText = this.props.render(item);
-
-              if (filterResult) {
-                return (
-                  <li onClick={this.handleSelect.bind(this, item)} key={item.key} title={renderedText}>
-                    <Checkbox checked={checkedKeys.some(key => key === item.key)} />
-                    {renderedText}
-                  </li>
-                );
-              }
-            }) : <div className={`${prefixCls}-body-not-found`}>Not Found</div>
-          }
+          {showItems.length > 0 ? showItems : <div className={`${prefixCls}-body-not-found`}>Not Found</div>}
         </Animate>
       </div>}
       { footerDom ? <div className={`${prefixCls}-footer`}>

components/transfer/search.jsx

@@ -12,13 +12,18 @@ class Search extends Component {
     this.props.onChange(e);
   }
 
+  handleClear(e) {
+    e.preventDefault();
+    this.props.handleClear(e);
+  }
+
   render() {
     const {placeholder, value, prefixCls} = this.props;
     return <div>
       <input placeholder={placeholder} className={ prefixCls + ' ant-input' } value={ value } ref="input"
              onChange={this.handleChange.bind(this)}/>
       { value && value.length > 0 ?
-        <a href="javascirpt:;" className={ prefixCls + '-action' } onClick={this.props.handleClear}>
+        <a href="#" className={ prefixCls + '-action' } onClick={this.handleClear.bind(this)}>
           <Icon type="cross-circle" />
         </a>
         : <span className={ prefixCls + '-action' }><Icon type="search" /></span>
@@ -30,12 +35,14 @@ class Search extends Component {
 Search.defaultProps = {
   placeholder: '请输入搜索内容',
   onChange: noop,
+  handleClear: noop,
 };
 
 Search.propTypes = {
   prefixCls: PropTypes.string,
   placeholder: PropTypes.string,
-  onChange: PropTypes.func
+  onChange: PropTypes.func,
+  handleClear: PropTypes.func,
 };
 
 export default Search;

style/core/iconfont.less

@@ -179,6 +179,7 @@
 .@{iconfont-css-prefix}-caret-circle-up:before          {content:"\e606";}
 .@{iconfont-css-prefix}-caret-circle-down:before        {content:"\e607";}
 .@{iconfont-css-prefix}-qrcode:before                   {content:"\e6a5";}
+.@{iconfont-css-prefix}-scan:before                     {content:"\e6af";}
 .@{iconfont-css-prefix}-like:before                     {content:"\e6a3";}
 .@{iconfont-css-prefix}-dislike:before                  {content:"\e6a2";}
 .@{iconfont-css-prefix}-pay-circle:before               {content:"\e6a8";}

style/themes/default/custom.less

@@ -20,7 +20,7 @@
 
 // ICONFONT
 @iconfont-css-prefix    : anticon;
-@icon-url               : "//at.alicdn.com/t/font_1450842624_7594283";
+@icon-url               : "//at.alicdn.com/t/font_1452596235_7047422";
 
 // LINK
 @link-color             : #2db7f5;