@hi-ui/hiui 3.9.0-rc → 3.9.0-rc.12

package/CHANGELOG.md

@@ -3,13 +3,15 @@
 # 3.8.0-rc
 
 - 新增 `Table` 组件 `hiddenColKeys` 和 `onHiddenColKeysChange` 受控控制列显隐  [#1994](https://github.com/XiaoMi/hiui/issues/1994)
-- 新增 `Input` 组件的支持 placeholder 受控动态更新  [#1982](https://github.com/XiaoMi/hiui/issues/1982)
+- 新增 `Input` 组件支持 placeholder 受控动态更新  [#1982](https://github.com/XiaoMi/hiui/issues/1982)
+- 新增 `Table` 组件支持 checkAll 复选框右侧自定义操作按钮  [#2007](https://github.com/XiaoMi/hiui/issues/2007)
 - 修复 `Select` 组件高亮词搜索存在正则注入  [#1972](https://github.com/XiaoMi/hiui/issues/1972)
 - 修复 `Table` 组件 resizable 调节列宽功能失效  [#1970](https://github.com/XiaoMi/hiui/issues/1970)
 - 修复 `Input` 组件的 placeholder 没法动态更新  [#1970](https://github.com/XiaoMi/hiui/issues/1982)
 - 优化 `Dropdown` 组件 props 中的 data 消除副作用 [#1991](https://github.com/XiaoMi/hiui/issues/1991)
 - 修复 `TimePicker` 组件使用 minusStep 当点击 clear 后会再次自动回显值  [#1986](https://github.com/XiaoMi/hiui/issues/1986)
 - 修复 `Table` 组件 window 系统 `draggable=false` 禁用失效  [#1993](https://github.com/XiaoMi/hiui/issues/1993)
+- 修复 `Popper` 组件 Popper DOM 节点位置移动时未同步进行位置计算  [#2011](https://github.com/XiaoMi/hiui/issues/2011)
 
 # 3.8.0
 

package/es/carousel/index.js

@@ -212,7 +212,7 @@ var Carousel = /*#__PURE__*/function (_Component) {
         });
       })), showPages && /*#__PURE__*/_react["default"].createElement("div", {
         className: "hi-carousel__pages"
-      }, /*#__PURE__*/_react["default"].createElement("span", null, active, " / ", len)));
+      }, /*#__PURE__*/_react["default"].createElement("span", null, active + 1, " / ", len)));
     }
   }]);
   return Carousel;

package/es/date-picker/BasePicker.js

@@ -177,6 +177,8 @@ var BasePicker = function BasePicker(_ref) {
     }
   };
 
+  var _weekOffset = weekOffset !== undefined ? weekOffset : locale === 'en-US' ? 0 : 1;
+
   var callback = function callback(dates) {
     var emitOnChange = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
 
@@ -185,12 +187,28 @@ var BasePicker = function BasePicker(_ref) {
     var returnDate = {};
     var returnDateStr = '';
 
-    if (type.includes('range') || type === 'timeperiod' || type === 'week') {
+    var formatWeek = function formatWeek(disposeDate) {
+      if (!disposeDate) return '';
+      if (typeof format !== 'undefined') return disposeDate.format(iFormat);
+      var clone = (0, _utils.normalizeWeekOffset)(disposeDate, _weekOffset);
+      return clone.weekYear() + '-W' + clone.week();
+    };
+
+    if (type.includes('week')) {
+      returnDate = {
+        start: _dates[0].toDate(),
+        end: _dates[1].toDate()
+      };
+      returnDateStr = type.includes('range') ? {
+        start: formatWeek(_dates[0]),
+        end: formatWeek(_dates[1])
+      } : formatWeek(_dates[0]);
+    } else if (type.includes('range') || type === 'timeperiod') {
       returnDate = {
         start: _dates[0].toDate(),
         end: _dates[1].toDate()
       };
-      returnDateStr = type === 'week' ? _dates[0].format(iFormat) : {
+      returnDateStr = {
         start: _dates[0].format(iFormat),
         end: _dates[1].format(iFormat)
       };
@@ -258,9 +276,6 @@ var BasePicker = function BasePicker(_ref) {
     }
   }, [propsOnSelect]);
   var popperCls = (0, _classnames["default"])('hi-datepicker__popper', type === 'date' && showTime && 'hi-datepicker__popper--time', type.includes('range') && 'hi-datepicker__popper--range', type === 'timeperiod' && 'hi-datepicker__popper--timeperiod', shortcuts && 'hi-datepicker__popper--shortcuts', isLarge && 'hi-datepicker__popper--large');
-
-  var _weekOffset = weekOffset !== undefined ? weekOffset : locale === 'en-US' ? 0 : 1;
-
   return /*#__PURE__*/_react["default"].createElement(_context["default"].Provider, {
     value: _objectSpread(_objectSpread({}, otherPorps), {}, {
       locale: locale,

package/es/date-picker/components/Input.js

@@ -19,6 +19,8 @@ var _context = _interopRequireDefault(require("../context"));
 
 var _hooks = require("../hooks");
 
+var _utils = require("../utils");
+
 var Input = function Input(_ref) {
   var date = _ref.date,
       onChange = _ref.onChange,
@@ -35,6 +37,7 @@ var Input = function Input(_ref) {
       minuteStep = _useContext.minuteStep,
       secondStep = _useContext.secondStep,
       inputReadOnly = _useContext.inputReadOnly,
+      weekOffset = _useContext.weekOffset,
       locale = _useContext.locale;
 
   var _useFormat = (0, _hooks.useFormat)({
@@ -57,14 +60,15 @@ var Input = function Input(_ref) {
     var vals = date && (0, _moment["default"])(date).format(iFormat);
 
     if (type.includes('week') && date) {
-      var y = (0, _moment["default"])(date).weekYear();
-
-      var _date = (0, _moment["default"])(date).year(y);
+      if (typeof format === 'undefined') {
+        var clone = (0, _utils.normalizeWeekOffset)(date, weekOffset);
+        vals = clone.weekYear() + '-W' + clone.week();
+      } else {
+        var y = (0, _moment["default"])(date).weekYear();
 
-      vals = (0, _moment["default"])(_date).format(iFormat);
+        var _date = (0, _moment["default"])(date).year(y);
 
-      if (locale === 'zh-CN' && typeof format === 'undefined') {
-        vals = y + '-W' + (0, _moment["default"])(_date).week();
+        vals = (0, _moment["default"])(_date).format(iFormat);
       }
     }
 

package/es/date-picker/utils.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.parseValue = exports.getInRangeDate = exports.getFullTime = exports.getPRCDate = exports.showLargeCalendar = exports.getTimePeriodData = exports.parseRenderDates = exports.genNewDates = exports.getView = exports.deconstructDate = void 0;
+exports.normalizeWeekOffset = exports.parseValue = exports.getInRangeDate = exports.getFullTime = exports.getPRCDate = exports.showLargeCalendar = exports.getTimePeriodData = exports.parseRenderDates = exports.genNewDates = exports.getView = exports.deconstructDate = void 0;
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
@@ -342,6 +342,15 @@ var parseValue = function parseValue(value, type, format, weekOffset) {
   }
 
   return [isValid ? _value : null];
+}; // fix: 周计算 52 53 周偏差
+
+
+exports.parseValue = parseValue;
+
+var normalizeWeekOffset = function normalizeWeekOffset(date, weekOffset) {
+  var clone = date.clone();
+  clone.locale(weekOffset === 1 ? 'zh-CN' : 'en-US');
+  return clone;
 };
 
-exports.parseValue = parseValue;
+exports.normalizeWeekOffset = normalizeWeekOffset;

package/es/form/Form.js

@@ -164,11 +164,15 @@ var InternalForm = function InternalForm(props) {
 
     Object.keys(changeValues).forEach(function (changeValuesKey) {
       fields.forEach(function (filedItem) {
-        var realField = filedItem.realField,
+        var field = filedItem.field,
+            realField = filedItem.realField,
             _type = filedItem._type,
-            listname = filedItem.listname;
+            listname = filedItem.listname; // bugfix: https://github.com/XiaoMi/hiui/issues/2077
 
-        if (realField === changeValuesKey && _type === 'list') {
+        if (_type === 'SchemaForm' && field === changeValuesKey) {
+          _changeValues[realField] = _transformValues[realField];
+          delete _changeValues[changeValuesKey];
+        } else if (realField === changeValuesKey && _type === 'list') {
           _changeValues[listname] = _transformValues[listname];
           delete _changeValues[changeValuesKey];
         }

package/es/form/Item.js

@@ -407,7 +407,16 @@ var FormItem = function FormItem(props) {
     }
 
     if (_field && !isExist) {
-      _value = initialValues && typeof initialValues[field] !== 'undefined' ? initialValues[_field] : _value;
+      // 初始化值
+      if (initialValues) {
+        // TODO： 如果 field 是数组，无法完成嵌套对象初始化值，感觉这块实现没想清楚，暂时维护现状，对用户不建议使用数组模式
+        // 这里逻辑判断 field，但是最终操作的是 _field，暂时不调整，暂不清楚是否存在破坏性更新
+        if (typeof initialValues[field] !== 'undefined') {
+          _value = initialValues[_field];
+        } else if (_type === 'SchemaForm' && typeof initialValues[realField] !== 'undefined') {
+          _value = initialValues[realField];
+        }
+      }
 
       if (_type === 'list' && listItemValue) {
         _value = Object.keys(listItemValue).includes(name) ? listItemValue[name] : listItemValue;
@@ -494,6 +503,7 @@ var FormItem = function FormItem(props) {
   var _labelWidth = labelWidth();
 
   var contentWidth = formProps.labelPlacement === 'top' ? '100%' : "calc(100% - ".concat(_labelWidth, "px)");
+  var alignItems = getItemPosition(contentPosition);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])('hi-form-item', className, obj),
     style: style,
@@ -519,7 +529,7 @@ var FormItem = function FormItem(props) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: 'hi-form-item' + '__children',
     style: {
-      alignItems: getItemPosition(contentPosition)
+      alignItems: alignItems
     }
   }, renderChildren()), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])('hi-form-item--msg__error', {

package/es/form/utils.js

@@ -33,6 +33,7 @@ var transformValues = function transformValues(allvalue, fields) {
 
   sortfields.forEach(function (filedItem) {
     var realField = filedItem.realField,
+        field = filedItem.field,
         propsField = filedItem.propsField,
         _type = filedItem._type,
         listname = filedItem.listname;
@@ -57,13 +58,21 @@ var transformValues = function transformValues(allvalue, fields) {
         tranformValues[listname] = [allvalue[realField]];
       }
     } else {
+      var readField = realField; // bugfix: https://github.com/XiaoMi/hiui/issues/2077
+
+      if (_type === 'SchemaForm' && field) {
+        if (Object.keys(allvalue).includes(field)) {
+          readField = field;
+        }
+      }
+
       if (Array.isArray(propsField)) {
         var chainKeys = propsField.reduceRight(function (pre, next) {
           return (0, _defineProperty2["default"])({}, next, pre);
-        }, allvalue[realField]);
+        }, allvalue[readField]);
         tranformValues = _lodash["default"].merge(tranformValues, chainKeys);
       } else {
-        tranformValues = _lodash["default"].merge(tranformValues, (0, _defineProperty2["default"])({}, realField, allvalue[realField]));
+        tranformValues = _lodash["default"].merge(tranformValues, (0, _defineProperty2["default"])({}, realField, allvalue[readField]));
       }
     }
   });

package/es/input/Input.js

@@ -11,6 +11,8 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
@@ -31,6 +33,10 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _util = require("./util");
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
@@ -202,8 +208,11 @@ var Input = /*#__PURE__*/function (_Component) {
 
           value = (0, _util.format)(value, type); // 保证 onChange 拿到的是值是最新的 formatted value
 
-          e.target.value = value;
-          _this2.props.onChange && _this2.props.onChange(e, valueTrue);
+          var event = Object.create(e);
+          event.target = _objectSpread(_objectSpread({}, e.target), {}, {
+            value: value
+          });
+          _this2.props.onChange && _this2.props.onChange(event, valueTrue);
           _this2.props.value === undefined && _this2.setState({
             value: value,
             valueTrue: valueTrue
@@ -302,6 +311,7 @@ var Input = /*#__PURE__*/function (_Component) {
           attrs = (0, _objectWithoutProperties2["default"])(_this$attrs2, ["defaultValue"]);
       var filterAttrs = (0, _util.filterObjProps)(attrs, ['locale', 'theme', 'suffixicon', 'suffix', 'prepend', 'prefixicon', 'prefix', 'localeDatas', 'append', 'innerRef', 'clearable']);
       return /*#__PURE__*/_react["default"].createElement("textarea", (0, _extends2["default"])({
+        ref: this._Input,
         className: "hi-input theme__".concat(theme, " ").concat(active ? 'active' : '', " ").concat(disabled ? 'disabled' : '', " ").concat(className || ''),
         style: this.props.style,
         autoComplete: "off",

package/es/popper/Overlay.js

@@ -151,6 +151,8 @@ var Overlay = function Overlay(props) {
     }
   });
   (0, _react.useEffect)(function () {
+    if (!show) return;
+
     if (state.popperRef) {
       var _offset = (0, _positionUtils.getOffset)(props, state);
 
@@ -158,7 +160,7 @@ var Overlay = function Overlay(props) {
         offset: _offset
       }));
     }
-  }, [state.popperRef]); // DidMount
+  }, [show, state.popperRef]); // DidMount
 
   (0, _react.useEffect)(function () {
     var container = props.container;

package/es/search/index.js

@@ -73,6 +73,7 @@ var Search = function Search(_ref) {
   var optionsClick = (0, _react.useCallback)(function (value, item) {
     setInputVal(value);
     setDropdownShow(false);
+    _onChange && _onChange(value);
     onSearch && onSearch(value, item);
   }, [onSearch]);
   var moveFocus = (0, _react.useCallback)(function (direction) {

package/es/select/Select.js

@@ -422,30 +422,29 @@ var InternalSelect = function InternalSelect(props) {
     return shouldMatch || String(item[(0, _utils.transKeys)(fieldNames, 'id')] || '').includes(keyword) || String(item[(0, _utils.transKeys)(fieldNames, 'title')] || '').includes(keyword);
   }, [dataSource, searchable, keyword, filterOption]);
   var remoteSearch = (0, _react.useCallback)(function (keyword) {
-    var _dataSource = typeof dataSource === 'function' ? dataSource(keyword) : dataSource;
+    var resultMayBePromise = typeof dataSource === 'function' ? dataSource(keyword) : dataSource;
+    if ((0, _lodash.isNil)(resultMayBePromise)) return;
 
-    if (Array.isArray(_dataSource)) {
-      setDropdownItems(_dataSource);
+    if (Array.isArray(resultMayBePromise)) {
+      setDropdownItems(resultMayBePromise);
       return;
-    } // 处理promise函数
-
+    }
 
-    if (_dataSource.toString() === '[object Promise]') {
+    if (resultMayBePromise.toString() === '[object Promise]') {
       setLoading(true);
-
-      _dataSource.then(function (res) {
+      resultMayBePromise.then(function (res) {
         setLoading(false);
+        if ((0, _lodash.isNil)(res)) return;
         setDropdownItems(Array.isArray(res) ? res : []);
       }, function () {
         setLoading(false);
         setDropdownItems([]);
       });
-
       return;
-    } // 调用接口
+    } // 传入对象, 调用接口
 
 
-    HiRequestSearch(_dataSource, keyword);
+    HiRequestSearch(resultMayBePromise, keyword);
   }, [dataSource, keyword]);
   var HiRequestSearch = (0, _react.useCallback)(function (_dataSource, keyword) {
     var url = _dataSource.url,

package/es/select-tree/SelectTreeHook.js

@@ -85,7 +85,14 @@ var SelectTree = function SelectTree(_ref) {
       _ref$bordered = _ref.bordered,
       bordered = _ref$bordered === void 0 ? true : _ref$bordered,
       _ref$fieldNames = _ref.fieldNames,
-      fieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames;
+      fieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
+      filterOption = _ref.filterOption;
+  var isCustomFilter = typeof filterOption === 'function';
+
+  if (isCustomFilter) {
+    searchMode = '';
+  }
+
   (0, _util.setFieldNames)(fieldNames || {});
 
   var _useState = (0, _react.useState)(false),
@@ -308,13 +315,13 @@ var SelectTree = function SelectTree(_ref) {
   }, []); // 过滤方法
 
   var searchTreeNode = function searchTreeNode(val) {
+    var _keyword = val;
     var matchNodes = [];
 
     var _data = _lodash["default"].cloneDeep(flattenData);
 
     if (searchMode === 'highlight') {
       var filterArr = _data.map(function (node) {
-        var _keyword = val;
         _keyword = val.includes('[') ? _keyword.replace(/\[/gi, '\\[') : _keyword;
         _keyword = val.includes('(') ? _keyword.replace(/\(/gi, '\\(') : _keyword;
         _keyword = val.includes(')') ? _keyword.replace(/\)/gi, '\\)') : _keyword;
@@ -337,6 +344,18 @@ var SelectTree = function SelectTree(_ref) {
       });
       matchNodesSet = _lodash["default"].uniq(matchNodesSet);
       setExpandIds(matchNodesSet);
+    } else if (searchMode === '' && isCustomFilter) {
+      // filterOption 模式展开全部
+      var _matchNodesSet = [];
+
+      _data.forEach(function (mn) {
+        _matchNodesSet.push(mn[(0, _util.transKeys)(fieldNames, 'id')]);
+
+        _matchNodesSet = _matchNodesSet.concat(mn.ancestors || []);
+      });
+
+      _matchNodesSet = _lodash["default"].uniq(_matchNodesSet);
+      setExpandIds(_matchNodesSet);
     }
   };
   /**
@@ -543,7 +562,7 @@ var SelectTree = function SelectTree(_ref) {
 
   var debouncedFilterItems = _lodash["default"].debounce(changeEvents, 300);
 
-  var searchable = searchMode === 'filter' || searchMode === 'highlight'; // 按键操作
+  var searchable = searchMode === 'filter' || searchMode === 'highlight' || isCustomFilter; // 按键操作
 
   var handleKeyDown = (0, _react.useCallback)(function (evt) {
     // space
@@ -741,7 +760,8 @@ var SelectTree = function SelectTree(_ref) {
     onClick: selectedEvents,
     emptyContent: emptyContent,
     isRemoteLoadData: !!dataSource,
-    onCheck: checkedEvents
+    onCheck: checkedEvents,
+    filterOption: filterOption
   })))));
 };
 

package/es/select-tree/components/tree/TreeNode.js

@@ -67,7 +67,8 @@ var TreeNode = function TreeNode(_ref2) {
       isRemoteLoadData = _useContext.isRemoteLoadData,
       activeId = _useContext.activeId,
       searchMode = _useContext.searchMode,
-      searchValue = _useContext.searchValue;
+      searchValue = _useContext.searchValue,
+      filterOption = _useContext.filterOption;
 
   var treeNodeRef = (0, _react.useRef)(null);
   var renderIndent = (0, _react.useCallback)(function () {
@@ -131,7 +132,14 @@ var TreeNode = function TreeNode(_ref2) {
         isLeaf = node.isLeaf;
     var childrenNodes = (0, _util.getChildrenNodes)(node, flttenData);
     var expand = expandIds.includes(node[(0, _util.transKeys)(fieldNames, 'id')]);
-    var needFilter = searchMode === 'filter' ? !!(0, _util.matchAllDataFilterKey)(node, searchValue) : true;
+    var needFilter = true;
+
+    if (searchMode === 'filter') {
+      needFilter = !!(0, _util.matchAllDataFilterKey)(node, searchValue);
+    } else if (typeof filterOption === 'function') {
+      needFilter = filterOption(searchValue, node);
+    }
+
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {
       key: index
     }, needFilter ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("li", {

package/es/select-tree/components/tree/index.js

@@ -39,6 +39,7 @@ var Tree = function Tree(_ref) {
       emptyContent = _ref.emptyContent,
       searchMode = _ref.searchMode,
       searchValue = _ref.searchValue,
+      filterOption = _ref.filterOption,
       fieldNames = _ref.fieldNames;
   return /*#__PURE__*/_react["default"].createElement(_context["default"].Provider, {
     value: {
@@ -57,7 +58,8 @@ var Tree = function Tree(_ref) {
       isRemoteLoadData: isRemoteLoadData,
       activeId: activeId,
       searchMode: searchMode,
-      searchValue: searchValue
+      searchValue: searchValue,
+      filterOption: filterOption
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(PREFIX)

package/es/table/AdvanceHeader/CustomFilter.js

@@ -47,9 +47,9 @@ var CustomFilter = function CustomFilter(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "-icon"),
     ref: popperAttachEle,
-    onClick: function onClick() {
+    onClick: filterDropdown ? function () {
       return setFilterDropdownVisible(true);
-    }
+    } : undefined
   }, filterIcon), /*#__PURE__*/_react["default"].createElement(_popper["default"] // 弹出层的显示隐藏
   , {
     show: filterDropdownVisible // 依附的元素

package/es/table/AdvanceHeader/select/index.js

@@ -39,6 +39,8 @@ var _utils = require("../../../select/utils");
 
 require("./style");
 
+var _util = require("../../util");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -106,7 +108,7 @@ var InternalSelect = function InternalSelect(props) {
       setCacheSelectItem = _useState8[1]; // value 有可能是0的情况
 
 
-  var _useState9 = (0, _react.useState)((0, _utils.resetSelectedItems)(value === undefined ? defaultValue : value, _lodash["default"].cloneDeep(data), (0, _utils.transKeys)(fieldNames, 'id'))),
+  var _useState9 = (0, _react.useState)((0, _utils.resetSelectedItems)(value === undefined ? defaultValue : value, (0, _util.cloneArray)(data), (0, _utils.transKeys)(fieldNames, 'id'))),
       _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
       selectedItems = _useState10[0],
       setSelectedItems = _useState10[1];
@@ -145,7 +147,7 @@ var InternalSelect = function InternalSelect(props) {
     resetFocusedIndex();
   }, []);
   (0, _react.useEffect)(function () {
-    historyData.current = _lodash["default"].cloneDeep(data);
+    historyData.current = (0, _util.cloneArray)(data);
   }, [data]);
   (0, _react.useEffect)(function () {
     if (dropdownItems && dropdownItems.length) {
@@ -174,7 +176,7 @@ var InternalSelect = function InternalSelect(props) {
     }
   }, [value, cacheSelectItem]);
   (0, _react.useEffect)(function () {
-    var _data = _lodash["default"].cloneDeep(data);
+    var _data = (0, _util.cloneArray)(data);
 
     var selectedItems = (0, _utils.resetSelectedItems)(value === undefined ? defaultValue : value, historyData.current, (0, _utils.transKeys)(fieldNames, 'id')); // setSelectedItems(selectedItems)
 
@@ -213,7 +215,7 @@ var InternalSelect = function InternalSelect(props) {
   var onClickOption = (0, _react.useCallback)(function (item, index) {
     if (!item || item[(0, _utils.transKeys)(fieldNames, 'disabled')]) return;
 
-    var _selectedItems = _lodash["default"].cloneDeep(selectedItems);
+    var _selectedItems = (0, _util.cloneArray)(selectedItems);
 
     if (type === 'multiple') {
       // 获取元素索引

package/es/table/BodyTable.js

@@ -32,6 +32,7 @@ var BodyTable = function BodyTable(_ref) {
       emptyContent = _ref.emptyContent;
 
   var _useContext = (0, _react.useContext)(_context["default"]),
+      checkboxColWidth = _useContext.checkboxColWidth,
       bordered = _useContext.bordered,
       _useContext$data = _useContext.data,
       data = _useContext$data === void 0 ? [] : _useContext$data,
@@ -72,7 +73,7 @@ var BodyTable = function BodyTable(_ref) {
       setDragRowKey = _useState4[1]; // **************** 获取colgroup
 
 
-  var _columns = _lodash["default"].cloneDeep(columns);
+  var _columns = (0, _util.cloneArray)(columns);
 
   var depthArray = [];
   (0, _util.setDepth)(_columns, 0, depthArray);
@@ -238,7 +239,7 @@ var BodyTable = function BodyTable(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("table", {
     ref: tableRef
   }, /*#__PURE__*/_react["default"].createElement("colgroup", null, columnsgroup.map(function (c, index) {
-    var width = c === 'checkbox' ? 50 : c.width;
+    var width = c === 'checkbox' ? checkboxColWidth : c.width;
     return /*#__PURE__*/_react["default"].createElement("col", {
       key: index,
       className: (0, _classnames["default"])((0, _defineProperty2["default"])({}, "".concat(prefix, "__col__hover--highlight"), showColHighlight && hoverColIndex === c.dataKey)),

package/es/table/Cell.js

@@ -55,7 +55,8 @@ var Cell = function Cell(_ref) {
       loadChildren = _useContext.loadChildren,
       hoverColIndex = _useContext.hoverColIndex,
       setHoverColIndex = _useContext.setHoverColIndex,
-      showColHighlight = _useContext.showColHighlight;
+      showColHighlight = _useContext.showColHighlight,
+      cellRender = _useContext.cellRender;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -63,7 +64,14 @@ var Cell = function Cell(_ref) {
       setLoading = _useState2[1]; // 处理自定义 render 或者合并单元格情况
 
 
-  var cellContent = column.render ? column.render(allRowData[column.dataKey], allRowData, rowIndex, column.dataKey) : allRowData[column.dataKey];
+  var cellContent = allRowData[column.dataKey];
+
+  if (column.render) {
+    cellContent = column.render(cellContent, allRowData, rowIndex, column.dataKey);
+  } else if (cellRender) {
+    cellContent = cellRender(cellContent);
+  }
+
   var isMergeCell = cellContent && (0, _typeof2["default"])(cellContent) === 'object' && !cellContent.$$typeof;
 
   if (isMergeCell && (cellContent.props.colSpan === 0 || cellContent.props.rowSpan === 0)) {
@@ -74,11 +82,12 @@ var Cell = function Cell(_ref) {
       leftStickyWidth = column.leftStickyWidth,
       dataKey = column.dataKey;
   var isSticky = typeof rightStickyWidth !== 'undefined' || typeof leftStickyWidth !== 'undefined';
-  var defatultTextAlign = column.align ? column.align : 'left';
+  var defaultTextAlign = column.align ? column.align : 'left';
+  var textAlign = alignRightColumns.includes(dataKey) ? 'right' : defaultTextAlign;
   return /*#__PURE__*/_react["default"].createElement("td", {
     key: dataKey,
     style: {
-      textAlign: alignRightColumns.includes(dataKey) ? 'right' : defatultTextAlign,
+      textAlign: textAlign,
       right: rightStickyWidth + 'px',
       left: leftStickyWidth + 'px'
     },

package/es/table/HeaderTable.js

@@ -19,8 +19,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactResizable = require("react-resizable");
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _context = _interopRequireDefault(require("./context"));
@@ -39,6 +37,7 @@ var HeaderTable = function HeaderTable(_ref) {
   var rightFixedIndex = _ref.rightFixedIndex;
 
   var _useContext = (0, _react.useContext)(_context["default"]),
+      checkboxColWidth = _useContext.checkboxColWidth,
       rowSelection = _useContext.rowSelection,
       propsData = _useContext.data,
       columns = _useContext.columns,
@@ -64,13 +63,13 @@ var HeaderTable = function HeaderTable(_ref) {
       sticky = _useContext.sticky,
       disabledData = _useContext.disabledData;
 
-  var _useState = (0, _react.useState)(_lodash["default"].cloneDeep(propsData)),
+  var _useState = (0, _react.useState)((0, _util.cloneArray)(propsData)),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
       data = _useState2[0],
       setDate = _useState2[1];
 
   (0, _react.useEffect)(function () {
-    setDate(_lodash["default"].cloneDeep(propsData));
+    setDate((0, _util.cloneArray)(propsData));
   }, [propsData]);
 
   var _useState3 = (0, _react.useState)(false),
@@ -116,7 +115,7 @@ var HeaderTable = function HeaderTable(_ref) {
     if (rowSelection) {
       var _rowSelection$selecte = rowSelection.selectedRowKeys,
           selectedRowKeys = _rowSelection$selecte === void 0 ? [] : _rowSelection$selecte;
-      var flattedData = (0, _util.flatTreeData)(_lodash["default"].cloneDeep(data));
+      var flattedData = (0, _util.flatTreeData)((0, _util.cloneArray)(data));
 
       var _isAllChecked = flattedData.filter(function (data) {
         return !disabledData.current.includes(data.key);
@@ -129,7 +128,7 @@ var HeaderTable = function HeaderTable(_ref) {
   }, [data, rowSelection]); // 处理列的深度
 
   (0, _react.useEffect)(function () {
-    var _columns = _lodash["default"].cloneDeep(columns);
+    var _columns = (0, _util.cloneArray)(columns);
 
     var depthArray = [];
     (0, _util.setDepth)(_columns, 0, depthArray);
@@ -189,7 +188,9 @@ var HeaderTable = function HeaderTable(_ref) {
     return col.sorter;
   }).map(function (sorterCol) {
     return sorterCol.dataKey;
-  }); // ******************** 行渲染 ***********************
+  }); // 自定义 checkboxAll 侧边 icon
+
+  var checkboxFilterIcon = rowSelection && rowSelection.checkAllOptions && rowSelection.checkAllOptions.filterIcon || null; // ******************** 行渲染 ***********************
 
   var renderBaseRow = function renderBaseRow(cols, index, isSticky) {
     var _colums = [rowSelection && index === 0 && 'checkbox', expandedRender && index === 0 && 'expandedButton'].concat(cols).filter(function (column) {
@@ -197,7 +198,7 @@ var HeaderTable = function HeaderTable(_ref) {
     });
 
     var isStickyCol = _colums.some(function (item) {
-      return typeof item.leftStickyWidth !== 'undefined' || typeof item.rightStickyWidth !== 'undefined';
+      return typeof item.leftStickyWidth !== 'undefined';
     });
 
     return /*#__PURE__*/_react["default"].createElement("tr", {
@@ -214,7 +215,7 @@ var HeaderTable = function HeaderTable(_ref) {
           }),
           style: {
             boxSizing: 'border-box',
-            width: 50,
+            width: checkboxColWidth,
             height: 'auto',
             backgroundColor: '#fbfbfb'
           }
@@ -223,7 +224,7 @@ var HeaderTable = function HeaderTable(_ref) {
           indeterminate: !isAllChecked && rowSelection.selectedRowKeys.length > 0,
           onChange: function onChange(e) {
             if (rowSelection.onChange) {
-              var targetItems = (0, _util.flatTreeData)(_lodash["default"].cloneDeep(data)).filter(function (data) {
+              var targetItems = (0, _util.flatTreeData)((0, _util.cloneArray)(data)).filter(function (data) {
                 return !disabledData.current.includes(data.key);
               });
               var selectedIds = isAllChecked ? [] : targetItems.map(function (item) {
@@ -232,7 +233,7 @@ var HeaderTable = function HeaderTable(_ref) {
               rowSelection.onChange(selectedIds, targetItems, !isAllChecked);
             }
           }
-        }));
+        }), checkboxFilterIcon);
       } else if (c === 'expandedButton') {
         cell = /*#__PURE__*/_react["default"].createElement("th", {
           key: "expandedButton",
@@ -261,7 +262,7 @@ var HeaderTable = function HeaderTable(_ref) {
 
         var isRowActive = highlightedColKeys.includes(dataKey) || highlightColumns.includes(dataKey);
         var isColActive = showColHighlight && hoverColIndex === dataKey;
-        var defatultTextAlign = align || 'left';
+        var textAlign = alignRightColumns.includes(dataKey) ? 'right' : align || 'left';
         cell = /*#__PURE__*/_react["default"].createElement("th", (0, _extends2["default"])({
           key: idx,
           colSpan: colSpan,
@@ -274,7 +275,7 @@ var HeaderTable = function HeaderTable(_ref) {
           style: {
             height: 'auto',
             boxSizing: 'border-box',
-            textAlign: alignRightColumns.includes(dataKey) ? 'right' : defatultTextAlign,
+            textAlign: textAlign,
             background: isRowActive || isColActive ? '#F4F4F4' : '#fbfbfb',
             right: rightStickyWidth + 'px',
             left: leftStickyWidth + 'px'
@@ -343,7 +344,7 @@ var HeaderTable = function HeaderTable(_ref) {
     return /*#__PURE__*/_react["default"].createElement("col", {
       key: index,
       style: {
-        width: c === 'checkbox' ? 50 : width,
+        width: c === 'checkbox' ? checkboxColWidth : width,
         minWidth: width
       }
     });

package/es/table/Row.js

@@ -9,6 +9,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -23,8 +25,6 @@ var _context = _interopRequireDefault(require("./context"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
 var _checkbox = _interopRequireDefault(require("../checkbox"));
 
 var _loading = _interopRequireDefault(require("../loading"));
@@ -76,6 +76,7 @@ var Row = function Row(_ref) {
   }, [propsExpanded]);
 
   var _useContext = (0, _react.useContext)(_context["default"]),
+      checkboxColWidth = _useContext.checkboxColWidth,
       errorRowKeys = _useContext.errorRowKeys,
       rowSelection = _useContext.rowSelection,
       highlightedRowKeys = _useContext.highlightedRowKeys,
@@ -89,9 +90,10 @@ var Row = function Row(_ref) {
       disabledData = _useContext.disabledData,
       draggable = _useContext.draggable,
       onDragStart = _useContext.onDragStart,
-      dargInfo = _useContext.dargInfo;
+      dargInfo = _useContext.dargInfo,
+      onRow = _useContext.onRow;
 
-  var _columns = _lodash["default"].cloneDeep(columns);
+  var _columns = (0, _util.cloneArray)(columns);
 
   var depthArray = [];
   (0, _util.setDepth)(_columns, 0, depthArray);
@@ -99,7 +101,7 @@ var Row = function Row(_ref) {
     return col.isLast;
   });
   var isSticky = rowColumns.some(function (item) {
-    return typeof item.leftStickyWidth !== 'undefined' || typeof item.rightStickyWidth !== 'undefined';
+    return typeof item.leftStickyWidth !== 'undefined';
   });
   var checkboxConfig = rowSelection && rowSelection.getCheckboxConfig && rowSelection.getCheckboxConfig(allRowData);
   var checkboxDisabled = checkboxConfig && checkboxConfig.disabled || false;
@@ -138,13 +140,15 @@ var Row = function Row(_ref) {
     });
     dragKey !== rowKey && setDropHightLineStatus(clienY < startClientY ? 'top' : 'bottom');
   }, [rowKey, dropHightLineStatus, draggable]);
-  return [/*#__PURE__*/_react["default"].createElement("tr", {
+  var rowProps = onRow();
+  return [/*#__PURE__*/_react["default"].createElement("tr", (0, _extends2["default"])({
     style: isFixed && rowHeight ? {
       height: rowHeight
     } : {},
     ref: innerRef,
     id: rowKey,
-    draggable: draggable,
+    draggable: draggable
+  }, rowProps, {
     onMouseMove: function onMouseMove() {
       setDragRowKey(null);
       setDragStatus(false);
@@ -167,6 +171,10 @@ var Row = function Row(_ref) {
     className: (0, _classnames["default"])("".concat(prefix, "__row"), (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(prefix, "__row--error"), errorRowKeys.includes(rowData.key)), (0, _defineProperty2["default"])(_classNames, "".concat(prefix, "__row--highlight"), hoverRow === rowData.key || highlightedRowKeys.includes(rowData.key)), (0, _defineProperty2["default"])(_classNames, "".concat(prefix, "__row--total"), isSumRow), (0, _defineProperty2["default"])(_classNames, "".concat(prefix, "__row--draggable"), draggable), (0, _defineProperty2["default"])(_classNames, "".concat(prefix, "__row--draging"), draggable && dragRowKey === rowKey), (0, _defineProperty2["default"])(_classNames, "".concat(prefix, "__row--draggable__border--top"), draggable && typeof dargInfo.current.dropKey !== 'undefined' && dropHightLineStatus === 'top'), (0, _defineProperty2["default"])(_classNames, "".concat(prefix, "__row--draggable__border--bottom"), draggable && typeof dargInfo.current.dropKey !== 'undefined' && dropHightLineStatus === 'bottom'), (0, _defineProperty2["default"])(_classNames, "".concat(prefix, "__row--avg"), isAvgRow), _classNames)),
     key: "row",
     onDoubleClick: function onDoubleClick(e) {
+      if (rowProps && rowProps.onDoubleClick) {
+        rowProps.onDoubleClick(e);
+      }
+
       if (highlightedRowKeys.includes(rowData.key)) {
         setHighlightRows(highlightedRowKeys.filter(function (r) {
           return r !== rowData.key;
@@ -175,9 +183,9 @@ var Row = function Row(_ref) {
         setHighlightRows(highlightedRowKeys.concat(rowData.key));
       }
     }
-  }, rowSelection && isFixed !== 'right' && !isSumRow && !isAvgRow && /*#__PURE__*/_react["default"].createElement("td", {
+  }), rowSelection && isFixed !== 'right' && !isSumRow && !isAvgRow && /*#__PURE__*/_react["default"].createElement("td", {
     style: {
-      width: 50
+      width: checkboxColWidth
     },
     className: (0, _classnames["default"])((0, _defineProperty2["default"])({}, "".concat(prefix, "__col--sticky"), isSticky))
   }, /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
@@ -241,12 +249,12 @@ var Row = function Row(_ref) {
     key: "expanded-row",
     className: "".concat(prefix, "--expanded"),
     style: {
-      background: 'rgba(251,251,251,1)'
+      background: 'rgba(251, 251, 251, 1)'
     }
   }, rowSelection && /*#__PURE__*/_react["default"].createElement("td", null), /*#__PURE__*/_react["default"].createElement("td", {
     colSpan: columns.length + 1,
     style: {
-      color: '#666666'
+      color: '#666'
     }
   }, /*#__PURE__*/_react["default"].createElement(_Expandcol["default"], {
     rowData: rowData,

package/es/table/Table.js

@@ -35,8 +35,6 @@ var _pagination2 = _interopRequireDefault(require("../pagination"));
 
 var _axios = _interopRequireDefault(require("axios"));
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
 var _context2 = _interopRequireDefault(require("../context"));
 
 var _loading = _interopRequireDefault(require("../loading"));
@@ -73,8 +71,12 @@ var Table = function Table(_ref) {
       propsExpandRowKeys = _ref.expandedRowKeys,
       expandRowKeys = _ref.expandRowKeys,
       onExpand = _ref.onExpand,
+      _ref$fixedColumnTrigg = _ref.fixedColumnTrigger,
+      fixedColumnTrigger = _ref$fixedColumnTrigg === void 0 ? 'auto' : _ref$fixedColumnTrigg,
       _ref$onHeaderRow = _ref.onHeaderRow,
       onHeaderRow = _ref$onHeaderRow === void 0 ? defaultHeaderRow : _ref$onHeaderRow,
+      _ref$onRow = _ref.onRow,
+      onRow = _ref$onRow === void 0 ? defaultHeaderRow : _ref$onRow,
       _ref$columns = _ref.columns,
       propsColumns = _ref$columns === void 0 ? [] : _ref$columns,
       expandedRender = _ref.expandedRender,
@@ -112,6 +114,7 @@ var Table = function Table(_ref) {
       onDragStart = _ref.onDragStart,
       onDrop = _ref.onDrop,
       onDropEnd = _ref.onDropEnd,
+      cellRender = _ref.cellRender,
       _ref$emptyContent = _ref.emptyContent,
       emptyContent = _ref$emptyContent === void 0 ? localeDatas.table.emptyContent : _ref$emptyContent;
   var dargInfo = (0, _react.useRef)({
@@ -142,9 +145,10 @@ var Table = function Table(_ref) {
       var _dargInfo$current = dargInfo.current,
           rowData = _dargInfo$current.rowData,
           dropRowData = _dargInfo$current.dropRowData;
-      var restData = (0, _util.deleteRowByKey)(_lodash["default"].cloneDeep(data), dargInfo.current);
+      if (dropRowData.key === rowData.key) return;
+      var restData = (0, _util.deleteRowByKey)((0, _util.cloneArray)(data), dargInfo.current);
 
-      var _data = (0, _util.setRowByKey)(_lodash["default"].cloneDeep(restData), dargInfo.current);
+      var _data = (0, _util.setRowByKey)((0, _util.cloneArray)(restData), dargInfo.current);
 
       dargInfo.current = {};
       onDropEnd && onDropEnd(rowData, dropRowData, _data);
@@ -272,7 +276,7 @@ var Table = function Table(_ref) {
   var firstRowRef = (0, _react.useRef)(null); // 处理拉平数据
 
   (0, _react.useEffect)(function () {
-    var _columns = _lodash["default"].cloneDeep(dataSource ? serverTableConfig.columns || [] : propsColumns);
+    var _columns = (0, _util.cloneArray)(dataSource ? serverTableConfig.columns || [] : propsColumns);
 
     var _flattedColumns = (0, _util.flatTreeData)(_columns);
 
@@ -302,7 +306,7 @@ var Table = function Table(_ref) {
       _columns[index] = currentItem;
     }); // 右侧
 
-    var rightCloumns = _lodash["default"].cloneDeep(_columns.slice(rightFixedIndex || _flattedColumns.length).reverse());
+    var rightCloumns = (0, _util.cloneArray)(_columns.slice(rightFixedIndex || _flattedColumns.length).reverse());
 
     if (rightFixedIndex) {
       rightCloumns.forEach(function (currentItem, index) {
@@ -445,9 +449,14 @@ var Table = function Table(_ref) {
     } else {
       onDropCallback && updateData();
     }
-  }, [data, draggable]);
+  }, [data, draggable]); // 自定义设置 checkbox 列宽度
+
+  var checkboxColWidth = rowSelection && typeof rowSelection.checkboxColWidth === 'number' ? rowSelection.checkboxColWidth : 50;
+  var alwaysFixedColumn = fixedColumnTrigger === 'always';
   return /*#__PURE__*/_react["default"].createElement(_context["default"].Provider, {
     value: {
+      cellRender: cellRender,
+      checkboxColWidth: checkboxColWidth,
       disabledData: disabledData,
       rowExpandable: rowExpandable,
       setting: setting,
@@ -467,6 +476,7 @@ var Table = function Table(_ref) {
       expandedRowKeys: expandedRowKeys,
       // 标题点击回调事件
       onHeaderRow: onHeaderRow,
+      onRow: onRow,
       onExpand: onExpand,
       realColumnsWidth: realColumnsWidth,
       setRealColumnsWidth: setRealColumnsWidth,
@@ -539,14 +549,14 @@ var Table = function Table(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_HeaderTable["default"], null), /*#__PURE__*/_react["default"].createElement(_BodyTable["default"], {
     fatherRef: hiTable,
     emptyContent: emptyContent
-  }), scrollSize.scrollLeft > 0 && realLeftFixedColumns.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+  }), (alwaysFixedColumn || scrollSize.scrollLeft > 0) && realLeftFixedColumns.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__shadow-mask  ").concat(prefix, "__shadow-left"),
     style: {
       width: fixedColumnsWidth.left + 'px'
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__shadow-lock")
-  })), scrollSize.scrollRight > 0 && realRightFixedColumns.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+  })), (alwaysFixedColumn || scrollSize.scrollRight > 0) && realRightFixedColumns.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__shadow-mask ").concat(prefix, "__shadow-right"),
     style: {
       width: fixedColumnsWidth.right + 'px'

package/es/table/index.d.ts

@@ -18,7 +18,7 @@ export type TableColumnItem = {
   filterDropdownWidth?: number
   filterDropdownClassName?: string
   onFilterDropdownVisibleChange?: (filterDropdownVisible: boolean, ColumnItem: ColumnItem) => void
-  render?: (text: string, record: object, index: number, dataKey: string) => JSX.Element
+  render?: (text: any, record: object, index: number, dataKey: string) => JSX.Element
 }
 
 export type TableDataSource = {
@@ -38,10 +38,17 @@ export type TableFixedOption = {
   left?: string
   right?: string
 }
+
+export type TableCheckAllOptions = {
+  filterIcon?: React.ReactNode
+}
+
 export type TableRowSelection = {
-  selectedRowKeys?: string[] | number[]
+  selectedRowKeys?: React.ReactText[]
   getCheckboxConfig?: (rowData: object) => object
-  onChange?: (selectedRowKeys: string | number, targetRow?: object | object[], shouldChecked?: boolean) => void
+  onChange?: (selectedRowKeys: React.ReactText[], targetRow?: object | object[], shouldChecked?: boolean) => void
+  checkboxColWidth?: number
+  checkAllOptions?: TableCheckAllOptions
 }
 
 export type TableHeaderRowReturn = {
@@ -54,6 +61,8 @@ export type TableHeaderRowReturn = {
 
 export type HeaderRowFunc = (colums: TableColumnItem[], index: number) => TableHeaderRowReturn
 
+export type RowFunc = () => TableHeaderRowReturn
+
 export interface TableProps {
   size?: 'small' | 'large' | 'default' | 'mini'
   fieldKey?: string
@@ -63,8 +72,9 @@ export interface TableProps {
   sticky?: boolean
   draggable?: boolean
   stickyTop?: number
-  expandRowKeys?: number[]
-  highlightedColKeys?: string[] | number[]
+  fixedColumnTrigger?: 'auto' | 'always'
+  expandRowKeys?: React.ReactText[]
+  highlightedColKeys?: string[]
   expandedRender?: (record: object, index: number) => JSX.Element | Promise
   onLoadChildren?: (record: object) => object[] | Promise
   onExpand?: (expanded: boolean, rowData: object) => void
@@ -73,8 +83,8 @@ export interface TableProps {
   scrollWidth?: number
   fixedToColumn?: string | TableFixedOption
   pagination?: PaginationProps
-  errorRowKeys?: string[] | number[]
-  highlightedRowKeys?: string[] | number[]
+  errorRowKeys?: React.ReactText[]
+  highlightedRowKeys?: React.ReactText[]
   rowSelection?: TableRowSelection
   dataSource?: (current: number) => TableDataSource
   showColMenu?: boolean
@@ -85,6 +95,7 @@ export interface TableProps {
   standard?: boolean
   emptyContent?: string | JSX.Element
   onHeaderRow?: HeaderRowFunc
+  onRow?: RowFunc
   columns: TableColumnItem[]
   data: object[]
   style?: React.CSSProperties
@@ -95,6 +106,7 @@ export interface TableProps {
   onDropEnd?: (dragRowData: object, dropRowData: object, data: object) => void
   hiddenColKeys?: string[]
   onHiddenColKeysChange?: (hiddenColKeys: string[]) => void
+  cellRender?: (text: any) => React.ReactNode
 }
 declare const Table: React.ComponentType<TableProps>
 export default Table

package/es/table/style/index.css

@@ -1 +1 @@
-.hi-table{position:relative}.hi-table__container{position:relative;z-index:1}.hi-table__shadow-mask{position:absolute;top:0;bottom:0;z-index:20;pointer-events:none;overflow:hidden;height:100%;width:200px}.hi-table__shadow-lock{height:100%;-webkit-box-sizing:border-box;box-sizing:border-box}.hi-table__shadow-left{margin-right:10px;left:0;-webkit-box-shadow:6px 0 6px -4px rgba(0,0,0,0.15);box-shadow:6px 0 6px -4px rgba(0,0,0,0.15)}.hi-table__shadow-right{margin-left:10px;right:0;-webkit-box-shadow:-6px 0 6px -4px rgba(0,0,0,0.15);box-shadow:-6px 0 6px -4px rgba(0,0,0,0.15)}.hi-table__container table{width:100%;border-collapse:separate;background:var(--color-white);margin:0;-webkit-box-sizing:border-box;box-sizing:border-box;display:table;border-spacing:0;overflow:auto}.hi-table__container table col{display:table-column}.hi-table__container table td,.hi-table__container table th{padding-left:8px;padding-right:16px;border-bottom:1px solid #e7e7e7;text-align:left;-webkit-box-sizing:border-box;box-sizing:border-box}.hi-table__container table th{background-color:#fbfbfb;color:var(--color-gray-70)}.hi-table__container table th i:hover{color:var(--color-primary)}.hi-table__container table td{color:var(--color-black);word-break:break-word}.hi-table__container table tr{font-size:14px;padding:0;-webkit-box-sizing:border-box;box-sizing:border-box;background-color:var(--color-white)}.hi-table__setting-menu div,.hi-table__setting-menu p,.hi-table__setting-menu ul,.hi-table__setting-menu li{margin:0;padding:0;-webkit-box-sizing:border-box;box-sizing:border-box}.hi-table__col-menu{width:124px;font-size:14px;background:var(--color-white);-webkit-box-shadow:0 2px 8px 0 rgba(56,62,71,0.1);box-shadow:0 2px 8px 0 rgba(56,62,71,0.1);border-radius:4px;border:1px solid #e7e7e7;padding:7px 0}.hi-table__col-menu__item{cursor:pointer;color:var(--color-black);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:4px 12px}.hi-table__col-menu__item:hover{color:var(--color-primary)}.hi-table__col-menu__item.col-menu__item--highlight{color:var(--color-primary)}.hi-table__col-menu__item .hi-icon{font-size:16px}.hi-table__setting-menu .btn-group{display:-webkit-box;display:-ms-flexbox;display:flex;border-top:1px solid #e7e7e7;height:48px;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.hi-table__setting-menu .btn-group .btn{width:50%;text-align:center;cursor:pointer}.hi-table__setting-menu .btn-group .btn--left{border-right:1px solid #e7e7e7}.hi-table .hi-checkbox__input:not(.hi-checkbox__input--checked){background:var(--color-white)}.hi-table .hi-checkbox--disabled .hi-checkbox__input{border-color:#d8d8d8;background:#f2f2f2}.hi-table .hi-checkbox{height:auto}.hi-table th{font-weight:500;white-space:normal}.hi-table td{white-space:normal}.hi-table__setting-btn{position:absolute;height:100%;z-index:11;-webkit-box-sizing:border-box;box-sizing:border-box;right:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;border-left:1px solid #e0e1e2;border-bottom:1px solid #e0e1e2;border-top:none;color:#999;cursor:pointer;font-size:14px;width:16px;background:#fbfbfb}.hi-table__pagination{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-top:20px}.hi-table__pagination--left{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.hi-table__pagination--middle{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.hi-table--small table tr{font-size:14px !important}.hi-table--small table tr>td{padding:8px !important}.hi-table--small table thead>tr>th{padding:8px !important}.hi-table--mini table tr{font-size:14px !important}.hi-table--mini table tr>td{padding:4px !important}.hi-table--mini table thead>tr>th{padding:4px !important}.hi-table--large table tr{font-size:14px !important}.hi-table--large table tr>td{padding:20px !important}.hi-table--large table thead>tr>th{padding:20px !important}.hi-table--striped table tr:nth-child(2n){background:#fbfbfb}.hi-table--striped table tr:nth-child(2n) .hi-table__col--sticky{background:#fbfbfb}.hi-table--bordered table thead>tr>th{border-right:1px solid #e6e7e8}.hi-table--bordered table td{border-right:1px solid var(--color-gray-20)}.hi-table--bordered .hi-table_header>table{border-top:1px solid #e6e7e8;border-left:1px solid #e6e7e8}.hi-table__container--fixed-left{z-index:1;position:absolute;top:0;-webkit-box-shadow:2px 0 4px rgba(187,187,187,0.4);box-shadow:2px 0 4px rgba(187,187,187,0.4);overflow:hidden}.hi-table__container--fixed-right{z-index:1;position:absolute;top:0;-webkit-box-shadow:-2px 0 4px rgba(187,187,187,0.4);box-shadow:-2px 0 4px rgba(187,187,187,0.4);overflow:hidden}.hi-table__header{overflow:hidden;position:relative}.hi-table__header>table{position:relative}.hi-table__header__title{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex}.hi-table__header--sticky{position:fixed;z-index:10;top:0;overflow-x:hidden}.hi-table__body--draging table tr:hover:not(.hi-table__row--draging){background:var(--color-white)}.hi-table__body--draging table tr:hover:not(.hi-table__row--draging) .hi-table__col--sticky{background:var(--color-white)}.hi-table__body--draging table tr.hi-table__row--draging{background:var(--color-primary-20)}.hi-table__body--draging table tr.hi-table__row--draging .hi-table__col--sticky{background:var(--color-primary-20)}.hi-table table{table-layout:fixed}.hi-table table thead>tr>th{background:#fbfbfb;color:var(--color-gray-70);padding:15px;border-bottom:1px solid #e6e7e8;-webkit-box-sizing:border-box;box-sizing:border-box}.hi-table table tr{min-height:52px}.hi-table table tr .hi-table__col--sticky{position:sticky;left:0;z-index:5;background:var(--color-white)}.hi-table table tr:hover{background:var(--color-primary-20)}.hi-table table tr:hover .hi-table__col--sticky{background:var(--color-primary-20)}.hi-table table tr>td{color:var(--color-black);padding:15px;border-bottom:1px solid var(--color-gray-20);-webkit-box-sizing:border-box;box-sizing:border-box}.hi-table table tr.hi-table__row--draggable__border--top td{border-top:2px dashed var(--color-primary)}.hi-table table tr.hi-table__row--draggable__border--bottom td{border-bottom:2px dashed var(--color-primary)}.hi-table table .hi-table__row .hi-table__indent{display:inline-block;width:14px;height:100%}.hi-table table .hi-table__row--expanded{background:#fbfbfb}.hi-table table .hi-table__row--expanded>td{color:var(--color-gray-80)}.hi-table table .hi-table__row.hi-table__row--error>td{color:#f44343}.hi-table table .hi-table__row.hi-table__row--highlight>td{background:var(--color-primary-20)}.hi-table table .hi-table__row.hi-table__row--total>td{background-color:#fbfbfb}.hi-table table .hi-table__row.hi-table__row--avg>td{background-color:#fbfbfb}.hi-table table .hi-table__row.hi-table__row--draggable{cursor:move}.hi-table table .hi-table__row>.hi-table__col--highlight{background:var(--color-primary-20)}.hi-table table .hi-table__row .hi-table__col__hover--highlight{background:var(--color-primary-10)}.react-resizable{position:relative;background-clip:padding-box}.react-resizable-handle{position:absolute;width:10px;height:100%;bottom:0;right:-5px;cursor:col-resize;z-index:1}
+.hi-table{position:relative}.hi-table__container{position:relative;z-index:1}.hi-table__shadow-mask{position:absolute;top:0;bottom:0;z-index:20;pointer-events:none;overflow:hidden;height:100%;width:200px}.hi-table__shadow-lock{height:100%;-webkit-box-sizing:border-box;box-sizing:border-box}.hi-table__shadow-left{margin-right:10px;left:0;-webkit-box-shadow:6px 0 6px -4px rgba(0,0,0,0.15);box-shadow:6px 0 6px -4px rgba(0,0,0,0.15)}.hi-table__shadow-right{margin-left:10px;right:0;-webkit-box-shadow:-6px 0 6px -4px rgba(0,0,0,0.15);box-shadow:-6px 0 6px -4px rgba(0,0,0,0.15)}.hi-table__container table{width:100%;border-collapse:separate;background:var(--color-white);margin:0;-webkit-box-sizing:border-box;box-sizing:border-box;display:table;border-spacing:0;overflow:auto}.hi-table__container table col{display:table-column}.hi-table__container table td,.hi-table__container table th{padding-left:8px;padding-right:16px;border-bottom:1px solid #e7e7e7;text-align:left;-webkit-box-sizing:border-box;box-sizing:border-box}.hi-table__container table th{background-color:#fbfbfb;color:var(--color-gray-70)}.hi-table__container table th i:hover{color:var(--color-primary)}.hi-table__container table td{color:var(--color-black);word-break:break-word}.hi-table__container table tr{font-size:14px;padding:0;-webkit-box-sizing:border-box;box-sizing:border-box;background-color:var(--color-white)}.hi-table__setting-menu div,.hi-table__setting-menu p,.hi-table__setting-menu ul,.hi-table__setting-menu li{margin:0;padding:0;-webkit-box-sizing:border-box;box-sizing:border-box}.hi-table__col-menu{width:124px;font-size:14px;background:var(--color-white);-webkit-box-shadow:0 2px 8px 0 rgba(56,62,71,0.1);box-shadow:0 2px 8px 0 rgba(56,62,71,0.1);border-radius:4px;border:1px solid #e7e7e7;padding:7px 0}.hi-table__col-menu__item{cursor:pointer;color:var(--color-black);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:4px 12px}.hi-table__col-menu__item:hover{color:var(--color-primary)}.hi-table__col-menu__item.col-menu__item--highlight{color:var(--color-primary)}.hi-table__col-menu__item .hi-icon{font-size:16px}.hi-table__setting-menu .btn-group{display:-webkit-box;display:-ms-flexbox;display:flex;border-top:1px solid #e7e7e7;height:48px;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.hi-table__setting-menu .btn-group .btn{width:50%;text-align:center;cursor:pointer}.hi-table__setting-menu .btn-group .btn--left{border-right:1px solid #e7e7e7}.hi-table .hi-checkbox__input:not(.hi-checkbox__input--checked):not(.hi-checkbox__input--indeterminate){background:var(--color-white)}.hi-table .hi-checkbox--disabled .hi-checkbox__input{border-color:#d8d8d8;background:#f2f2f2}.hi-table .hi-checkbox{height:auto}.hi-table th{font-weight:500;white-space:normal}.hi-table td{white-space:normal}.hi-table__setting-btn{position:absolute;height:100%;z-index:11;-webkit-box-sizing:border-box;box-sizing:border-box;right:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;border-left:1px solid #e0e1e2;border-bottom:1px solid #e0e1e2;border-top:none;color:#999;cursor:pointer;font-size:14px;width:16px;background:#fbfbfb}.hi-table__pagination{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-top:20px}.hi-table__pagination--left{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.hi-table__pagination--middle{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.hi-table--small table tr{font-size:14px !important}.hi-table--small table tr>td{padding:8px !important}.hi-table--small table thead>tr>th{padding:8px !important}.hi-table--mini table tr{font-size:14px !important}.hi-table--mini table tr>td{padding:4px !important}.hi-table--mini table thead>tr>th{padding:4px !important}.hi-table--large table tr{font-size:14px !important}.hi-table--large table tr>td{padding:20px !important}.hi-table--large table thead>tr>th{padding:20px !important}.hi-table--striped table tr:nth-child(2n){background:#fbfbfb}.hi-table--striped table tr:nth-child(2n) .hi-table__col--sticky{background:#fbfbfb}.hi-table--bordered table thead>tr>th{border-right:1px solid #e6e7e8}.hi-table--bordered table td{border-right:1px solid var(--color-gray-20)}.hi-table--bordered .hi-table_header>table{border-top:1px solid #e6e7e8;border-left:1px solid #e6e7e8}.hi-table__container--fixed-left{z-index:1;position:absolute;top:0;-webkit-box-shadow:2px 0 4px rgba(187,187,187,0.4);box-shadow:2px 0 4px rgba(187,187,187,0.4);overflow:hidden}.hi-table__container--fixed-right{z-index:1;position:absolute;top:0;-webkit-box-shadow:-2px 0 4px rgba(187,187,187,0.4);box-shadow:-2px 0 4px rgba(187,187,187,0.4);overflow:hidden}.hi-table__header{overflow:hidden;position:relative}.hi-table__header>table{position:relative}.hi-table__header__title{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex}.hi-table__header--sticky{position:fixed;z-index:10;top:0;overflow-x:hidden}.hi-table__body--draging table tr:hover:not(.hi-table__row--draging){background:var(--color-white)}.hi-table__body--draging table tr:hover:not(.hi-table__row--draging) .hi-table__col--sticky{background:var(--color-white)}.hi-table__body--draging table tr.hi-table__row--draging{background:var(--color-primary-20)}.hi-table__body--draging table tr.hi-table__row--draging .hi-table__col--sticky{background:var(--color-primary-20)}.hi-table table{table-layout:fixed}.hi-table table thead>tr>th{background:#fbfbfb;color:var(--color-gray-70);padding:15px;border-bottom:1px solid #e6e7e8;-webkit-box-sizing:border-box;box-sizing:border-box}.hi-table table tr{min-height:52px}.hi-table table tr .hi-table__col--sticky{position:sticky;left:0;z-index:5;background:var(--color-white)}.hi-table table tr:hover{background:var(--color-primary-20)}.hi-table table tr:hover .hi-table__col--sticky{background:var(--color-primary-20)}.hi-table table tr>td{color:var(--color-black);padding:15px;border-bottom:1px solid var(--color-gray-20);-webkit-box-sizing:border-box;box-sizing:border-box}.hi-table table tr.hi-table__row--draggable__border--top td{border-top:2px dashed var(--color-primary)}.hi-table table tr.hi-table__row--draggable__border--bottom td{border-bottom:2px dashed var(--color-primary)}.hi-table table .hi-table__row .hi-table__indent{display:inline-block;width:14px;height:100%}.hi-table table .hi-table__row--expanded{background:#fbfbfb}.hi-table table .hi-table__row--expanded>td{color:var(--color-gray-80)}.hi-table table .hi-table__row.hi-table__row--error>td{color:#f44343}.hi-table table .hi-table__row.hi-table__row--highlight>td{background:var(--color-primary-20)}.hi-table table .hi-table__row.hi-table__row--total>td{background-color:#fbfbfb}.hi-table table .hi-table__row.hi-table__row--avg>td{background-color:#fbfbfb}.hi-table table .hi-table__row.hi-table__row--draggable{cursor:move}.hi-table table .hi-table__row>.hi-table__col--highlight{background:var(--color-primary-20)}.hi-table table .hi-table__row .hi-table__col__hover--highlight{background:var(--color-primary-10)}.react-resizable{position:relative;background-clip:padding-box}.react-resizable-handle{position:absolute;width:10px;height:100%;bottom:0;right:-5px;cursor:col-resize;z-index:1}

package/es/table/util.js

@@ -6,12 +6,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getScrollBarSize = getScrollBarSize;
-exports.deleteRowByKey = exports.setRowByKey = exports.getMaskNums = exports.setColumnsDefaultWidth = exports.parseFixedcolumns = exports.getTotalOrEvgRowData = exports.checkNeedTotalOrEvg = exports.checkIsNumberStr = exports.getStyle = exports.getFixedDataByFixedColumn = exports.groupDataByDepth = exports.getLeafChildren = exports.setDepth = exports.flatTreeData = void 0;
+exports.cloneArray = exports.deleteRowByKey = exports.setRowByKey = exports.getMaskNums = exports.setColumnsDefaultWidth = exports.parseFixedcolumns = exports.getTotalOrEvgRowData = exports.checkNeedTotalOrEvg = exports.checkIsNumberStr = exports.getStyle = exports.getFixedDataByFixedColumn = exports.groupDataByDepth = exports.getLeafChildren = exports.setDepth = exports.flatTreeData = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
+var _treeUtils = require("@hi-ui/tree-utils");
+
 // 将树状数据拍平
 var flatTreeData = function flatTreeData() {
   var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -309,4 +311,10 @@ var deleteRowByKey = function deleteRowByKey(data, dragInfo) {
   return data;
 };
 
-exports.deleteRowByKey = deleteRowByKey;
+exports.deleteRowByKey = deleteRowByKey;
+
+var cloneArray = function cloneArray(arr) {
+  return Array.isArray(arr) ? (0, _treeUtils.cloneTree)(arr) : [];
+};
+
+exports.cloneArray = cloneArray;

package/es/tree/Tree.js

@@ -492,10 +492,13 @@ var Tree = function Tree(props) {
       type: 'deleteNode'
     }];
 
-    if (contextMenu) {
+    if (Array.isArray(contextMenu)) {
+      menu = contextMenu;
+    } else if (typeof contextMenu === 'function') {
       menu = contextMenu(node);
     }
 
+    if (!(Array.isArray(menu) && menu.length > 0)) return null;
     return /*#__PURE__*/_react["default"].createElement("ul", {
       className: "".concat(PREFIX, "__menu theme__").concat(theme)
     }, menu.map(function (m, index) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/hiui",
-  "version": "3.9.0-rc",
+  "version": "3.9.0-rc.12",
   "description": "HIUI for React",
   "scripts": {
     "test": "node_modules/.bin/standard && node_modules/.bin/stylelint --config .stylelintrc 'components/**/*.scss'",
@@ -54,6 +54,7 @@
   },
   "dependencies": {
     "@hi-ui/core-css": "^2.0.1",
+    "@hi-ui/tree-utils": "^4.0.0-alpha.3",
     "@hi-ui/use-latest": "~4.0.0-alpha.2",
     "@hi-ui/use-uncontrolled-state": "~4.0.0-alpha.5",
     "async-validator": "^3.3.0",