优化过滤列样式

build/FilterDropDown.js

@@ -283,7 +283,7 @@ var FilterDropDown = function (_Component) {
                     _beeButton2["default"],
                     {
                         shape: 'border',
-                        style: { marginLeft: "3px", minWidth: "0px", width: "24px", padding: 0 }
+                        style: { marginLeft: "2px", minWidth: "0px", width: "26px", lineHeight: "24px", padding: 0 }
                     },
                     _react2["default"].createElement(_beeIcon2["default"], { style: { padding: 0, color: '#585858' }, type: 'uf-filter' })
                 )
@@ -293,7 +293,7 @@ var FilterDropDown = function (_Component) {
                 {
                     onClick: this.onClickClear,
                     shape: 'border',
-                    style: { marginLeft: "1px", minWidth: "0px", width: "24px", padding: 0, "visibility": this.props.isShowClear || this.state.selectValue.length > 0 ? "visible" : "hidden" }
+                    style: { marginLeft: "2px", minWidth: "0px", width: "26px", lineHeight: "24px", padding: 0, "visibility": this.props.isShowClear || this.state.selectValue.length > 0 ? "visible" : "hidden" }
                 },
                 _react2["default"].createElement(_beeIcon2["default"], { style: { padding: 0, color: '#585858', "visibility": this.props.isShowClear || this.state.selectValue.length > 0 ? "visible" : "hidden" }, type: 'uf-filterno' })
             )

build/FilterType.js

@@ -248,6 +248,7 @@ var FilterType = function (_Component) {
                         'div',
                         { className: clsPrefix + ' filter-wrap' },
                         _react2["default"].createElement(_beeSelect2["default"], _extends({}, _this.props, {
+                            size: 'sm',
                             value: _this.state.value,
                             onChange: _this.changeSelect
                         })),

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 '参数类型错误';
     }
-    props.sort();
+  } else if (typeof prop == 'function') {
-    for (i = 0; i < len; i++) {
+    for (; i < len; i++) {
-        ret[i] = props[i]._obj;
+      var _oI = arr[i];
+      (props[i] = new String(_oI && prop(_oI) || ''))._obj = _oI;
     }
-    if (desc) ret.reverse();
+  } else {
-    return ret;
+    throw '参数类型错误';
+  }
+  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;
 }

package.json

@@ -62,7 +62,6 @@
   "component-classes": "^1.2.6",
   "lodash.clonedeep": "^4.5.0",
   "object-path": "^0.11.3",
-  "ref-tree": "2.0.1-beta.1",
   "shallowequal": "^1.0.2",
   "throttle-debounce": "^2.0.1",
   "tinper-bee-core": "latest",
@@ -91,6 +90,7 @@
   "react-addons-test-utils": "^15.5.0",
   "react-dom": "^16.6.3",
   "reqwest": "^2.0.5",
-  "tinper-bee": "latest"
+  "tinper-bee": "latest",
+  "ref-tree": "2.0.1-beta.1"
  }
 }

src/FilterDropDown.js

@@ -157,7 +157,7 @@ class FilterDropDown extends Component {
             >
                 <Button
                     shape="border"
-                    style={{ marginLeft: "3px", minWidth: "0px", width: "24px", padding: 0 }}
+                    style={{ marginLeft: "2px", minWidth: "0px", width: "26px", lineHeight: "24px", padding: 0 }}
                 >
                     <Icon style={{ padding: 0, color: '#585858' }} type="uf-filter" />
                 </Button>
@@ -165,7 +165,7 @@ class FilterDropDown extends Component {
             <Button
                 onClick={this.onClickClear}
                 shape="border"
-                style={{ marginLeft: "1px", minWidth: "0px", width: "24px", padding: 0, "visibility": this.props.isShowClear || this.state.selectValue.length > 0 ? "visible" : "hidden" }}
+                style={{ marginLeft: "2px", minWidth: "0px", width: "26px", lineHeight: "24px", padding: 0, "visibility": this.props.isShowClear || this.state.selectValue.length > 0 ? "visible" : "hidden" }}
             >
                 <Icon style={{ padding: 0, color: '#585858', "visibility": this.props.isShowClear || this.state.selectValue.length > 0 ? "visible" : "hidden" }} type="uf-filterno" />
             </Button>

src/FilterType.js

@@ -209,6 +209,7 @@ class FilterType extends Component {
                 return <div className={`${clsPrefix} filter-wrap`}>
                     <Select
                         {...this.props}
+                        size="sm"
                         value={this.state.value}
                         onChange={this.changeSelect}
                     /><FilterDropDown