build 信息更新

build/ExpandIcon.js

@@ -60,17 +60,29 @@ var ExpandIcon = function (_Component) {
         needIndentSpaced = _props.needIndentSpaced,
         expanded = _props.expanded,
         record = _props.record,
-        isHiddenExpandIcon = _props.isHiddenExpandIcon;
+        isHiddenExpandIcon = _props.isHiddenExpandIcon,
+        expandedIcon = _props.expandedIcon,
+        collapsedIcon = _props.collapsedIcon;
 
     if (expandable && !isHiddenExpandIcon) {
       var expandClassName = expanded ? 'expanded' : 'collapsed';
-      return _react2["default"].createElement(_beeIcon2["default"], {
+      var currentIcon = _react2["default"].createElement(_beeIcon2["default"], {
         className: clsPrefix + '-expand-icon ' + clsPrefix + '-' + expandClassName,
-        type: expanded ? 'uf-triangle-down' : 'uf-triangle-right',
+        type: expanded ? 'uf-triangle-down' : 'uf-triangle-right'
-        onClick: function onClick(e) {
+
-          return onExpand(!expanded, record, e);
-        }
       });
+      if (expanded && expandedIcon) {
+        currentIcon = expandedIcon;
+      } else if (!expanded && collapsedIcon) {
+        currentIcon = collapsedIcon;
+      }
+      return _react2["default"].createElement(
+        'span',
+        { onClick: function onClick(e) {
+            return onExpand(!expanded, record, e);
+          }, className: 'expand-icon-con' },
+        currentIcon
+      );
     } else if (needIndentSpaced || isHiddenExpandIcon) {
       return _react2["default"].createElement('span', { className: clsPrefix + '-expand-icon ' + clsPrefix + '-spaced' });
     }

build/Table.css

@@ -223,6 +223,9 @@
     .u-table th.text-right,
     .u-table td.text-right {
       text-align: right; }
+    .u-table th .expand-icon-con,
+    .u-table td .expand-icon-con {
+      cursor: pointer; }
   .u-table-sm td {
     padding: 8px 8px; }
   .u-table-lg td {

build/Table.js

@@ -851,7 +851,9 @@ var Table = function (_Component) {
         rowDraggAble: this.props.rowDraggAble,
         onDragRow: this.onDragRow,
         contentTable: this.contentTable,
-        tableUid: this.tableUid
+        tableUid: this.tableUid,
+        expandedIcon: props.expandedIcon,
+        collapsedIcon: props.collapsedIcon
       })));
       this.treeRowIndex++;
       var subVisible = visible && isRowExpanded;

build/TableRow.js

@@ -449,7 +449,9 @@ var TableRow = function (_Component) {
         indentSize = _props9.indentSize,
         isHiddenExpandIcon = _props9.isHiddenExpandIcon,
         fixed = _props9.fixed,
-        bodyDisplayInRow = _props9.bodyDisplayInRow;
+        bodyDisplayInRow = _props9.bodyDisplayInRow,
+        expandedIcon = _props9.expandedIcon,
+        collapsedIcon = _props9.collapsedIcon;
 
     var showSum = false;
     var className = this.props.className;
@@ -470,6 +472,8 @@ var TableRow = function (_Component) {
       needIndentSpaced: needIndentSpaced,
       expanded: expanded,
       record: record,
+      expandedIcon: expandedIcon,
+      collapsedIcon: collapsedIcon,
       isHiddenExpandIcon: isHiddenExpandIcon
     });
 

build/lib/sum.js

@@ -106,9 +106,9 @@ function sum(Table) {
       return _this;
     }
 
-    /**
+    /**
-     * 获取当前的表格类型。
+     * 获取当前的表格类型。
-     * 
+     * 
      */
 
 

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; };
@@ -9,71 +9,71 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 exports.sortBy = sortBy;
 exports.compare = compare;
 exports.ObjectAssign = ObjectAssign;
-/*
+/*
-* 快速排序，按某个属性，或按“获取排序依据的函数”，来排序.
+* 快速排序，按某个属性，或按“获取排序依据的函数”，来排序.
-* @method soryBy
+* @method soryBy
-* @static
+* @static
-* @param {array} arr 待处理数组
+* @param {array} arr 待处理数组
-* @param {string|function} prop 排序依据属性，获取
+* @param {string|function} prop 排序依据属性，获取
-* @param {boolean} desc 降序
+* @param {boolean} desc 降序
-* @return {array} 返回排序后的新数组
+* @return {array} 返回排序后的新数组
 */
 
 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;
 };
 
-/**
+/**
- * 数组对象排序
+ * 数组对象排序
- * console.log(arr.sort(compare('age')))
+ * console.log(arr.sort(compare('age')))
- * @param {} property 
+ * @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;
-  };
+    };
 }
 
-/**
+/**
- * 简单数组数据对象拷贝
+ * 简单数组数据对象拷贝
- * @param {*} obj 要拷贝的对象 
+ * @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;
 }

build/render/CheckboxRender.js

@@ -19,11 +19,11 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
 
-/**
+/**
- * 渲染checkbox
+ * 渲染checkbox
- * @param Checkbox
+ * @param Checkbox
- * @param Icon
+ * @param Icon
- * @returns {CheckboxRender}
+ * @returns {CheckboxRender}
  */
 function renderCheckbox(Checkbox, Icon) {
     return function (_Component) {

build/render/InputRender.js

@@ -28,12 +28,12 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
 
-/**
+/**
- * 渲染输入框
+ * 渲染输入框
- * @param Form
+ * @param Form
- * @param Input
+ * @param Input
- * @param Icon
+ * @param Icon
- * @returns {InputRender}
+ * @returns {InputRender}
  */
 function renderInput(Form, Input, Icon) {
     var _class, _temp2;

build/render/SelectRender.js

@@ -26,11 +26,11 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); }
 
-/**
+/**
- * 渲染下拉框
+ * 渲染下拉框
- * @param Select
+ * @param Select
- * @param Icon
+ * @param Icon
- * @returns {SelectRender}
+ * @returns {SelectRender}
  */
 function renderSelect(Select, Icon) {
     var _class, _temp2;

package.json

@@ -1,6 +1,6 @@
 {
  "name": "bee-table",
- "version": "2.0.16",
+ "version": "2.0.17-beta.0",
  "description": "Table ui component for react",
  "keywords": [
   "react",