Table过滤列弹出面板样式调整

build/Table.css

@@ -71,13 +71,8 @@
     overflow: hidden; }
   .u-table-header {
     overflow: hidden;
-<<<<<<< HEAD
-    background: rgb(223, 225, 230);
-    color: rgb(102, 102, 102); }
-=======
     background: rgb(241, 242, 245);
     color: rgb(33, 33, 33); }
->>>>>>> d22d3eedc74d2580946a0e615dff0a862b240889
   .u-table.fixed-height td {
     padding: 0px 8px; }
   .u-table-fixed-header .u-table-body {
@@ -201,19 +196,14 @@
     .u-table-thead .filter-wrap .filter-btns {
       min-width: 58px; }
   .u-table-thead th {
-<<<<<<< HEAD
-    background: rgb(223, 225, 230);
-    color: rgb(102, 102, 102);
-=======
     background: rgb(241, 242, 245);
     color: rgb(33, 33, 33);
->>>>>>> d22d3eedc74d2580946a0e615dff0a862b240889
     background-clip: padding-box;
     -moz-user-select: -moz-none;
     -khtml-user-select: none;
     -webkit-user-select: none;
-    /*
+    /*
-        Introduced in IE 10. 
+        Introduced in IE 10. 
       */
     -ms-user-select: none;
     user-select: none; }
@@ -286,36 +276,39 @@
   .u-table-thead-th:last-child-drag-gap {
     border: none; }
   .u-table-filter-column-pop-cont {
-    margin: 10px;
+    margin: 0px;
-    margin-top: 0px;
+    max-height: 300px;
-    height: 300px;
     overflow-y: scroll; }
   .u-table-filter-column-clear-setting {
-    border-bottom: 1px solid #ccc;
+    margin-bottom: 4px; }
-    cursor: pointer; }
   .u-table-filter-column-cont {
     position: relative; }
   .u-table-filter-column-filter-icon {
     position: absolute;
-    top: 3px;
+    top: 8px;
     right: 18px;
     width: 22px;
     height: 25px;
     line-height: 25px;
     z-index: 2;
-    background: rgb(241, 242, 245); }
+    background: rgb(241, 242, 245);
-    .u-table-filter-column-filter-iconi.uf {
+    text-align: center;
+    cursor: pointer; }
+    .u-table-filter-column-filter-icon i.uf {
       padding: 0px; }
   .u-table-filter-column-pop-cont-item {
-    margin-top: 10px;
+    margin-top: 8px;
-    line-height: 30px;
     cursor: pointer; }
+    .u-table-filter-column-pop-cont-item .u-checkbox {
+      margin: 0px; }
   .u-table-filter-column-pop-cont-item > span {
-    margin-left: 5px;
+    margin-left: -3px;
-    width: 100px;
+    width: 132px;
     overflow: hidden;
     text-overflow: ellipsis;
-    white-space: nowrap; }
+    white-space: nowrap;
+    display: inline-block;
+    vertical-align: middle; }
   .u-table-filter-column-pop .u-modal-dialog {
     border: 1px solid #ccc;
     background: #fff; }

build/Table.js

@@ -1125,7 +1125,7 @@ var Table = function (_Component) {
         columns = _props7.columns,
         heightConsistent = _props7.heightConsistent;
 
-    var headRows = this.refs.headTable ? this.refs.headTable.querySelectorAll('thead') : this.refs.bodyTable.querySelectorAll('thead');
+    var headRows = this.refs.headTable ? this.refs.headTable.querySelectorAll('thead') : this.refs.headTable.querySelectorAll('thead');
     var bodyRows = this.refs.bodyTable.querySelectorAll('.' + clsPrefix + '-row') || [];
     var leftBodyRows = this.refs.fixedColumnsBodyLeft && this.refs.fixedColumnsBodyLeft.querySelectorAll('.' + clsPrefix + '-row') || [];
     var rightBodyRows = this.refs.fixedColumnsBodyRight && this.refs.fixedColumnsBodyRight.querySelectorAll('.' + clsPrefix + '-row') || [];

build/lib/dragColumn.js

@@ -1,7 +1,7 @@
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
-    value: true
+  value: true
 });
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -36,137 +36,137 @@ var cloneDeep = require('lodash.clonedeep');
 
 function dragColumn(Table) {
 
-    return function (_Component) {
+  return function (_Component) {
-        _inherits(DragColumn, _Component);
+    _inherits(DragColumn, _Component);
 
-        function DragColumn(props) {
+    function DragColumn(props) {
-            _classCallCheck(this, DragColumn);
+      _classCallCheck(this, DragColumn);
 
-            var _this = _possibleConstructorReturn(this, _Component.call(this, props));
+      var _this = _possibleConstructorReturn(this, _Component.call(this, props));
 
-            _this.setColumOrderByIndex = function (_column) {
+      _this.setColumOrderByIndex = function (_column) {
-                _column.forEach(function (da, i) {
+        _column.forEach(function (da, i) {
-                    da.dragIndex = i;
+          da.dragIndex = i;
-                    da.drgHover = false;
+          da.drgHover = false;
-                });
-                return _column;
-            };
-
-            _this.onDrop = function (event, data) {
-                var dragSource = data.dragSource,
-                    dragTarg = data.dragTarg;
-                var columns = _this.state.columns;
-
-                var sourceIndex = -1,
-                    targetIndex = -1;
-
-                sourceIndex = columns.findIndex(function (da, i) {
-                    return da.key == dragSource.key;
-                });
-                targetIndex = columns.findIndex(function (da, i) {
-                    return da.key == dragTarg.key;
-                });
-                // for (let index = 0; index < columns.length; index++) {
-                //   const da = columns[index];
-                //   if(da.key === dragSource.key){
-                //     columns[index] = dragTargColum; 
-                //   }
-                //   if(da.key === dragTarg.key){
-                //     columns[index] = dragSourceColum;
-                //   }
-                // }
-                // 向前移动
-                if (targetIndex < sourceIndex) {
-                    targetIndex = targetIndex + 1;
-                }
-                columns.splice(targetIndex, 0, columns.splice(sourceIndex, 1)[0]);
-                _this.setState({
-                    columns: cloneDeep(columns)
-                });
-                if (_this.props.onDrop) {
-                    _this.props.onDrop(event, data, columns);
-                }
-            };
-
-            _this.getTarget = function (evt) {
-                return evt.target || evt.srcElement;
-            };
-
-            _this.state = {
-                columns: _this.setColumOrderByIndex(props.columns)
-            };
-            return _this;
-        }
-
-        DragColumn.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
-            if (nextProps.columns != this.props.columns) {
-                this.setState({
-                    columns: this.setColumOrderByIndex(nextProps.columns)
-                });
-            }
-        };
-
-        DragColumn.prototype.cloneDeep = function cloneDeep(obj) {
-            if ((typeof obj === 'undefined' ? 'undefined' : _typeof(obj)) !== 'object' || Object.keys(obj).length === 0) {
-                return obj;
-            }
-            var resultData = {};
-            return this.recursion(obj, resultData);
-        };
-
-        DragColumn.prototype.recursion = function (_recursion) {
-            function recursion(_x) {
-                return _recursion.apply(this, arguments);
-            }
-
-            recursion.toString = function () {
-                return _recursion.toString();
-            };
-
-            return recursion;
-        }(function (obj) {
-            var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-            for (key in obj) {
-                if (_typeof(obj[key]) == 'object' && Object.keys(obj[key].length > 0)) {
-                    data[key] = recursion(obj[key]);
-                } else {
-                    data[key] = obj[key];
-                }
-            }
-            return data;
         });
+        return _column;
+      };
 
-        DragColumn.prototype.render = function render() {
+      _this.onDrop = function (event, data) {
-            var _props = this.props,
+        var dragSource = data.dragSource,
-                data = _props.data,
+            dragTarg = data.dragTarg;
-                dragborder = _props.dragborder,
+        var columns = _this.state.columns;
-                draggable = _props.draggable,
-                className = _props.className,
-                columns = _props.columns,
-                onDragStart = _props.onDragStart,
-                onDragEnter = _props.onDragEnter,
-                onDragOver = _props.onDragOver,
-                onDrop = _props.onDrop,
-                others = _objectWithoutProperties(_props, ['data', 'dragborder', 'draggable', 'className', 'columns', 'onDragStart', 'onDragEnter', 'onDragOver', 'onDrop']);
 
-            var key = new Date().getTime();
+        var sourceIndex = -1,
-            return _react2["default"].createElement(Table, _extends({}, others, {
+            targetIndex = -1;
-                columns: this.state.columns,
-                data: data,
-                className: className + ' u-table-drag-border',
-                onDragStart: this.onDragStart,
-                onDragOver: this.onDragOver,
-                onDrop: this.onDrop,
-                onDragEnter: this.onDragEnter,
-                draggable: draggable,
-                dragborder: dragborder
-                // dragborder={false}
-                , dragborderKey: key
-            }));
-        };
 
-        return DragColumn;
+        sourceIndex = columns.findIndex(function (da, i) {
-    }(_react.Component);
+          return da.key == dragSource.key;
+        });
+        targetIndex = columns.findIndex(function (da, i) {
+          return da.key == dragTarg.key;
+        });
+        // for (let index = 0; index < columns.length; index++) {
+        //   const da = columns[index];
+        //   if(da.key === dragSource.key){
+        //     columns[index] = dragTargColum; 
+        //   }
+        //   if(da.key === dragTarg.key){
+        //     columns[index] = dragSourceColum;
+        //   }
+        // }
+        // 向前移动
+        if (targetIndex < sourceIndex) {
+          targetIndex = targetIndex + 1;
+        }
+        columns.splice(targetIndex, 0, columns.splice(sourceIndex, 1)[0]);
+        _this.setState({
+          columns: cloneDeep(columns)
+        });
+        if (_this.props.onDrop) {
+          _this.props.onDrop(event, data, columns);
+        }
+      };
+
+      _this.getTarget = function (evt) {
+        return evt.target || evt.srcElement;
+      };
+
+      _this.state = {
+        columns: _this.setColumOrderByIndex(props.columns)
+      };
+      return _this;
+    }
+
+    DragColumn.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
+      if (nextProps.columns != this.props.columns) {
+        this.setState({
+          columns: this.setColumOrderByIndex(nextProps.columns)
+        });
+      }
+    };
+
+    DragColumn.prototype.cloneDeep = function cloneDeep(obj) {
+      if ((typeof obj === 'undefined' ? 'undefined' : _typeof(obj)) !== 'object' || Object.keys(obj).length === 0) {
+        return obj;
+      }
+      var resultData = {};
+      return this.recursion(obj, resultData);
+    };
+
+    DragColumn.prototype.recursion = function (_recursion) {
+      function recursion(_x) {
+        return _recursion.apply(this, arguments);
+      }
+
+      recursion.toString = function () {
+        return _recursion.toString();
+      };
+
+      return recursion;
+    }(function (obj) {
+      var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+      for (key in obj) {
+        if (_typeof(obj[key]) == 'object' && Object.keys(obj[key].length > 0)) {
+          data[key] = recursion(obj[key]);
+        } else {
+          data[key] = obj[key];
+        }
+      }
+      return data;
+    });
+
+    DragColumn.prototype.render = function render() {
+      var _props = this.props,
+          data = _props.data,
+          dragborder = _props.dragborder,
+          draggable = _props.draggable,
+          className = _props.className,
+          columns = _props.columns,
+          onDragStart = _props.onDragStart,
+          onDragEnter = _props.onDragEnter,
+          onDragOver = _props.onDragOver,
+          onDrop = _props.onDrop,
+          others = _objectWithoutProperties(_props, ['data', 'dragborder', 'draggable', 'className', 'columns', 'onDragStart', 'onDragEnter', 'onDragOver', 'onDrop']);
+
+      var key = new Date().getTime();
+      return _react2["default"].createElement(Table, _extends({}, others, {
+        columns: this.state.columns,
+        data: data,
+        className: className + ' u-table-drag-border',
+        onDragStart: this.onDragStart,
+        onDragOver: this.onDragOver,
+        onDrop: this.onDrop,
+        onDragEnter: this.onDragEnter,
+        draggable: draggable,
+        dragborder: dragborder
+        // dragborder={false}
+        , dragborderKey: key
+      }));
+    };
+
+    return DragColumn;
+  }(_react.Component);
 }
 module.exports = exports['default'];

build/lib/util.js

@@ -1,7 +1,7 @@
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -20,29 +20,29 @@ exports.ObjectAssign = ObjectAssign;
 */
 
 function sortBy(arr, prop, desc) {
-  var props = [],
+    var props = [],
-      ret = [],
+        ret = [],
-      i = 0,
+        i = 0,
-      len = arr.length;
+        len = arr.length;
-  if (typeof prop == 'string') {
+    if (typeof prop == 'string') {
-    for (; i < len; i++) {
+        for (; i < len; i++) {
-      var oI = arr[i];
+            var oI = arr[i];
-      (props[i] = new String(oI && oI[prop] || ''))._obj = oI;
+            (props[i] = new String(oI && oI[prop] || ''))._obj = oI;
+        }
+    } else if (typeof prop == 'function') {
+        for (; i < len; i++) {
+            var _oI = arr[i];
+            (props[i] = new String(_oI && prop(_oI) || ''))._obj = _oI;
+        }
+    } else {
+        throw '参数类型错误';
     }
-  } else if (typeof prop == 'function') {
+    props.sort();
-    for (; i < len; i++) {
+    for (i = 0; i < len; i++) {
-      var _oI = arr[i];
+        ret[i] = props[i]._obj;
-      (props[i] = new String(_oI && prop(_oI) || ''))._obj = _oI;
     }
-  } else {
+    if (desc) ret.reverse();
-    throw '参数类型错误';
+    return ret;
-  }
-  props.sort();
-  for (i = 0; i < len; i++) {
-    ret[i] = props[i]._obj;
-  }
-  if (desc) ret.reverse();
-  return ret;
 };
 
 /**
@@ -51,11 +51,11 @@ function sortBy(arr, prop, desc) {
  * @param {} property 
  */
 function compare(property) {
-  return function (a, b) {
+    return function (a, b) {
-    var value1 = a[property];
+        var value1 = a[property];
-    var value2 = b[property];
+        var value2 = b[property];
-    return value1 - value2;
+        return value1 - value2;
-  };
+    };
 }
 
 /**
@@ -63,17 +63,17 @@ function compare(property) {
  * @param {*} obj 要拷贝的对象 
  */
 function ObjectAssign(obj) {
-  var b = obj instanceof Array;
+    var b = obj instanceof Array;
-  var tagObj = b ? [] : {};
+    var tagObj = b ? [] : {};
-  if (b) {
+    if (b) {
-    //数组
+        //数组
-    obj.forEach(function (da) {
+        obj.forEach(function (da) {
-      var _da = {};
+            var _da = {};
-      _extends(_da, da);
+            _extends(_da, da);
-      tagObj.push(_da);
+            tagObj.push(_da);
-    });
+        });
-  } else {
+    } else {
-    _extends(tagObj, obj);
+        _extends(tagObj, obj);
-  }
+    }
-  return tagObj;
+    return tagObj;
 }

dist/demo.css

@@ -71,8 +71,8 @@
     overflow: hidden; }
   .u-table-header {
     overflow: hidden;
-    background: rgb(223, 225, 230);
+    background: rgb(241, 242, 245);
-    color: rgb(102, 102, 102); }
+    color: rgb(33, 33, 33); }
   .u-table.fixed-height td {
     padding: 0px 8px; }
   .u-table-fixed-header .u-table-body {
@@ -202,8 +202,8 @@
     .u-table-thead .filter-wrap .filter-btns {
       min-width: 58px; }
   .u-table-thead th {
-    background: rgb(223, 225, 230);
+    background: rgb(241, 242, 245);
-    color: rgb(102, 102, 102);
+    color: rgb(33, 33, 33);
     background-clip: padding-box;
     -moz-user-select: -moz-none;
     -webkit-user-select: none;
@@ -280,7 +280,8 @@
   .u-table-filter-column-pop-cont {
     margin: 0px;
     max-height: 300px;
-    overflow-y: scroll; }
+    overflow-y: scroll;
+    color: #212121; }
   .u-table-filter-column-clear-setting {
     margin-bottom: 4px; }
   .u-table-filter-column-cont {
@@ -293,7 +294,7 @@
     height: 25px;
     line-height: 25px;
     z-index: 2;
-    background: rgb(223, 225, 230);
+    background: rgb(241, 242, 245);
     text-align: center;
     cursor: pointer; }
     .u-table-filter-column-filter-icon i.uf {

src/Table.scss

@@ -473,6 +473,7 @@ $checkbox-height:16px;
       margin: 0px;
       max-height: 300px;
       overflow-y: scroll;
+      color:#212121;
     }
     &-clear-setting{ 
       // border-bottom: 1px solid #ccc;