cloud-b2b 1.1.65 → 1.1.67

package/es/InputSearch/InputSearch.js

@@ -154,7 +154,8 @@ var InputSearch = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_assertThisInitialized(_this), "isMatch", function (inputValue, option) {
       var _context2;
-      return option.props.children && _indexOfInstanceProperty(_context2 = option.props.children).call(_context2, inputValue) !== -1;
+      // return option.props.children && option.props.children.indexOf(inputValue) !== -1;
+      return option.props.children && _indexOfInstanceProperty(_context2 = option.props.children.toUpperCase()).call(_context2, inputValue.toUpperCase()) !== -1;
     });
     _defineProperty(_assertThisInitialized(_this), "isMatchRemark", function (inputValue, option) {
       var _option$props = option.props,

package/es/SuperTable/SuperTable.js

@@ -9,6 +9,9 @@ import _Table from "antd/es/table";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/objectWithoutProperties";
 import _Tooltip from "antd/es/tooltip";
 import _objectDestructuringEmpty from "@babel/runtime-corejs3/helpers/objectDestructuringEmpty";
+import _Badge from "antd/es/badge";
+import _Tag from "antd/es/tag";
+import _Icon from "antd/es/icon";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
 import _createClass from "@babel/runtime-corejs3/helpers/createClass";
@@ -19,7 +22,7 @@ import _getPrototypeOf from "@babel/runtime-corejs3/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 var _excluded = ["onRowClick"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context9, _context10; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context9 = ownKeys(Object(t), !0)).call(_context9, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context10 = ownKeys(Object(t))).call(_context10, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context10, _context11; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context10 = ownKeys(Object(t), !0)).call(_context10, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context11 = ownKeys(Object(t))).call(_context11, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
@@ -370,16 +373,52 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
       }
       return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, text));
     });
+    _defineProperty(_assertThisInitialized(_this), "tags", function (key, index, item, _ref11) {
+      var tags = _ref11.tags;
+      var list = item[key] || [];
+      return /*#__PURE__*/React.createElement("div", null, _mapInstanceProperty(list).call(list, function (item2, index2) {
+        var _context5;
+        var onClick = _bindInstanceProperty(_context5 = _this.onLink).call(_context5, null, key, index, _objectSpread(_objectSpread({}, item2), item));
+        var tagProps = {
+          key: index2,
+          color: item2.color,
+          style: {
+            cursor: 'default'
+          }
+        };
+        if (item2.click === true) {
+          tagProps.onClick = onClick;
+          tagProps.onDoubleClick = _this.onLinkDouble;
+          tagProps.style = {
+            cursor: 'pointer'
+          };
+        }
+        return item2.tagType === 'warning_tag' ? /*#__PURE__*/React.createElement(_Icon, _extends({
+          type: "alert"
+        }, tagProps, {
+          style: {
+            color: '#FFB90F',
+            fontSize: '16px',
+            margin: '0px 5px',
+            cursor: 'pointer'
+          }
+        })) : item2.tagType === 'exception_tag' ? /*#__PURE__*/React.createElement(_Badge, {
+          count: item2.num,
+          offset: [-8, 0],
+          key: index2
+        }, /*#__PURE__*/React.createElement(_Tag, tagProps, item2[tags])) : /*#__PURE__*/React.createElement(_Tag, tagProps, item2[tags]);
+      }));
+    });
     _defineProperty(_assertThisInitialized(_this), "getColumns", function (cols, items) {
-      var _context5, _context6;
+      var _context6, _context7;
       var _this$props5 = _this.props,
         sortInfo = _this$props5.sortInfo,
         filterInfo = _this$props5.filterInfo;
       var filterVisibleKey = _this.state.filterVisibleKey;
-      return _mapInstanceProperty(_context5 = _concatInstanceProperty(_context6 = _this.getIndexInfo(items)).call(_context6, _filterInstanceProperty(cols).call(cols, function (col) {
+      return _mapInstanceProperty(_context6 = _concatInstanceProperty(_context7 = _this.getIndexInfo(items)).call(_context7, _filterInstanceProperty(cols).call(cols, function (col) {
         return !col.hide;
-      }))).call(_context5, function (_ref11) {
-        var col = _extends({}, (_objectDestructuringEmpty(_ref11), _ref11));
+      }))).call(_context6, function (_ref12) {
+        var col = _extends({}, (_objectDestructuringEmpty(_ref12), _ref12));
         col.dataIndex = col.key;
         col.className = col.key === 'index' ? 'ant-table-selection-column' : col.align ? variables('SuperTable')[col.align] : '';
         col.noWrap && (col.className = variables('SuperTable').noWrap);
@@ -405,6 +444,10 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
           col.render = function (text, record, index) {
             return _this.tooltip(col.key, index, items[index], col);
           };
+        } else if (col.tags) {
+          col.render = function (text, record, index) {
+            return _this.tags(col.key, index, items[index], col);
+          };
         }
         return col;
       });
@@ -419,16 +462,16 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
       }
     });
     _defineProperty(_assertThisInitialized(_this), "link", function (key, index, item, text) {
-      var _context7;
-      var onClick = _bindInstanceProperty(_context7 = _this.onLink).call(_context7, null, key, index, item);
+      var _context8;
+      var onClick = _bindInstanceProperty(_context8 = _this.onLink).call(_context8, null, key, index, item);
       return /*#__PURE__*/React.createElement("a", {
         onClick: onClick,
         onDoubleClick: _this.onLinkDouble
       }, text);
     });
-    _defineProperty(_assertThisInitialized(_this), "tooltip", function (key, index, item, _ref12) {
-      var tipLen = _ref12.tooltip,
-        options = _ref12.options;
+    _defineProperty(_assertThisInitialized(_this), "tooltip", function (key, index, item, _ref13) {
+      var tipLen = _ref13.tooltip,
+        options = _ref13.options;
       var text = _this.getText(item[key], options);
       var needTip = tipLen > 1 && text && typeof text === 'string' && text.length > tipLen;
       return needTip ? /*#__PURE__*/React.createElement(_Tooltip, {
@@ -470,21 +513,21 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_assertThisInitialized(_this), "getDataSource", function (items, cols) {
       return _mapInstanceProperty(items).call(items, function (item, index) {
-        return _reduceInstanceProperty(cols).call(cols, function (result, _ref13) {
-          var key = _ref13.key,
-            options = _ref13.options,
-            link = _ref13.link,
-            icon = _ref13.icon,
-            dataSource = _ref13.dataSource;
+        return _reduceInstanceProperty(cols).call(cols, function (result, _ref14) {
+          var key = _ref14.key,
+            options = _ref14.options,
+            link = _ref14.link,
+            icon = _ref14.icon,
+            dataSource = _ref14.dataSource;
           if (link) {
             if (typeof link === 'boolean') {
               result[key] = _this.link(key, index, item, _this.getText(item[key], options));
             }
           } else if (icon) {
-            var _context8;
+            var _context9;
             //单独的icon列，icon=true数据值根据options获得显示的图片url
             var src = _this.getImgSrc(item[key], options);
-            var onClick = _bindInstanceProperty(_context8 = _this.onLink).call(_context8, null, key, index, item);
+            var onClick = _bindInstanceProperty(_context9 = _this.onLink).call(_context9, null, key, index, item);
             result[key] = src ? /*#__PURE__*/React.createElement("img", {
               src: src,
               onClick: onClick
@@ -586,9 +629,10 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
         };
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "getRowProps", function (onRowClick) {
+    _defineProperty(_assertThisInitialized(_this), "getRowProps", function (onRowClick, items) {
       return function (record) {
-        return {
+        var item = items[record.key];
+        var rowProps = {
           onClick: function onClick() {
             return onRowClick && onRowClick(record);
           },
@@ -596,6 +640,10 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
             return _this.onDoubleClick(record);
           }
         };
+        item && item.__bgColor && (rowProps.style = {
+          backgroundColor: item.__bgColor
+        });
+        return rowProps;
       };
     });
     _defineProperty(_assertThisInitialized(_this), "getRowPropsForDrag", function () {
@@ -618,10 +666,10 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
       var resItems = items;
       if (!dragSort && items.length > 1) {
         if (pageTotal || searchTotal) {
-          var totalItem = _reduceInstanceProperty(cols).call(cols, function (result, _ref14) {
-            var key = _ref14.key,
-              _ref14$total = _ref14.total,
-              total = _ref14$total === void 0 ? false : _ref14$total;
+          var totalItem = _reduceInstanceProperty(cols).call(cols, function (result, _ref15) {
+            var key = _ref15.key,
+              _ref15$total = _ref15.total,
+              total = _ref15$total === void 0 ? false : _ref15$total;
             if (total) {
               result[key] = _parseFloat(Number(_reduceInstanceProperty(items).call(items, function (result, item) {
                 return _parseFloat(String(item[key] || 0)) + result;
@@ -659,11 +707,11 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
           return item.checked;
         });
         var countItems = checkedItems.length ? checkedItems : items;
-        var totalItems = _mapInstanceProperty(totalCols).call(totalCols, function (_ref15) {
-          var title = _ref15.title,
-            key = _ref15.key,
-            _ref15$props = _ref15.props,
-            props = _ref15$props === void 0 ? {} : _ref15$props;
+        var totalItems = _mapInstanceProperty(totalCols).call(totalCols, function (_ref16) {
+          var title = _ref16.title,
+            key = _ref16.key,
+            _ref16$props = _ref16.props,
+            props = _ref16$props === void 0 ? {} : _ref16$props;
           var value = _reduceInstanceProperty(countItems).call(countItems, function (result, item) {
             return _parseFloat((result + Number(item[key] || 0)).toFixed(props.precision || 6));
           }, 0);
@@ -681,9 +729,9 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
           style: {
             marginRight: "15px"
           }
-        }, checkedItems.length ? '【当页勾选汇总】' : '【当页汇总】'), _mapInstanceProperty(totalItems).call(totalItems, function (_ref16, index) {
-          var title = _ref16.title,
-            value = _ref16.value;
+        }, checkedItems.length ? '【当页勾选汇总】' : '【当页汇总】'), _mapInstanceProperty(totalItems).call(totalItems, function (_ref17, index) {
+          var title = _ref17.title,
+            value = _ref17.value;
           return /*#__PURE__*/React.createElement("span", {
             key: index,
             style: {
@@ -725,7 +773,7 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
           x: true
         },
         onChange: _this.onTableChange,
-        onRow: dragSort ? _this.getRowPropsForDrag() : _this.getRowProps(onRowClick),
+        onRow: dragSort ? _this.getRowPropsForDrag() : _this.getRowProps(onRowClick, items),
         components: dragSort ? {
           body: {
             row: DragSortRow

package/es/SuperTable2/SuperTable2.js

@@ -6,13 +6,13 @@ import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/inst
 import _Object$getOwnPropertyDescriptors from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors";
 import _Object$defineProperties from "@babel/runtime-corejs3/core-js-stable/object/define-properties";
 import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
-import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
 import _getIteratorMethod from "@babel/runtime-corejs3/core-js/get-iterator-method";
 import _Table from "antd/es/table";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/objectWithoutProperties";
 import _objectDestructuringEmpty from "@babel/runtime-corejs3/helpers/objectDestructuringEmpty";
+import _Tooltip from "antd/es/tooltip";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _Switch from "antd/es/switch";
 import _Button from "antd/es/button";
@@ -38,6 +38,7 @@ import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _bindInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/bind";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
+import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import _reduceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/reduce";
 import _someInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/some";
 import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
@@ -630,18 +631,56 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       var _context11;
       return !_includesInstanceProperty(_context11 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar', 'uploadImg', 'double']).call(_context11, type);
     });
-    _defineProperty(_assertThisInitialized(_this), "getColumns", function (cols) {
+    _defineProperty(_assertThisInitialized(_this), "tooltip", function (key, index, item, _ref18) {
+      var tipLen = _ref18.tooltip,
+        options = _ref18.options,
+        width = _ref18.width;
+      var text = _this.getText(item[key], options);
+      var needTip = tipLen > 1 && text && typeof text === 'string' && text.length > tipLen;
+      return needTip ? /*#__PURE__*/React.createElement(_Tooltip, {
+        title: text
+      }, /*#__PURE__*/React.createElement("div", {
+        style: {
+          minHeight: '20px',
+          minWidth: '10px',
+          maxWidth: "".concat(width - 16, "px"),
+          overflow: 'hidden',
+          textOverflow: 'ellipsis',
+          display: '-webkit-box',
+          WebkitLineClamp: 2,
+          WebkitBoxOrient: "vertical",
+          whiteSpace: 'break-spaces'
+        },
+        title: true
+      }, _sliceInstanceProperty(text).call(text, 0, tipLen) + '...')) : /*#__PURE__*/React.createElement("div", {
+        style: {
+          minHeight: '20px',
+          minWidth: '10px',
+          maxWidth: "".concat(width - 16, "px"),
+          overflow: 'hidden',
+          textOverflow: 'ellipsis',
+          display: '-webkit-box',
+          WebkitLineClamp: 2,
+          WebkitBoxOrient: "vertical",
+          whiteSpace: 'break-spaces'
+        },
+        title: true
+      }, _Array$isArray(text) ? text.join(',') : text, " ");
+    });
+    _defineProperty(_assertThisInitialized(_this), "getColumns", function (cols, items) {
       var _context12;
       var readonly = _this.props.readonly;
       return _mapInstanceProperty(_context12 = _filterInstanceProperty(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context12, function (_ref18, index) {
+      })).call(_context12, function (_ref19, index) {
         var _context13;
-        var col = _extends({}, (_objectDestructuringEmpty(_ref18), _ref18));
+        var col = _extends({}, (_objectDestructuringEmpty(_ref19), _ref19));
         col.className = _this.getColumnClassName(col);
         col.title = _this.getColumnTitle(col);
         col.dataIndex = col.key;
-        col.width = col.width ? col.width : _includesInstanceProperty(_context13 = ['index', 'checked']).call(_context13, col.key) ? 70 : col.type === 'img' ? 200 : 120;
+        !_this.props.autoAdjustingWidth && (col.width = col.width ? col.width : _includesInstanceProperty(_context13 = ['index', 'checked']).call(_context13, col.key) ? 70 : col.type === 'img' ? 200 : 120);
+        // col.width = col.width ? col.width : (['index','checked'].includes(col.key) ? 70 : (col.type === 'img' ? 200 : 120));
+
         // const {props = {}} =
         // const {edit = false} = props
         // if (!(readonly || col.type === 'readonly') || !this.canReadonly(col.type)) {
@@ -663,6 +702,10 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
               return text ? "\uFFE5".concat(text.toFixed(2)) : text;
             }
           };
+        } else if (col.tooltip) {
+          col.render = function (text, record, index) {
+            return _this.tooltip(col.key, index, items[index], col);
+          };
         }
         return col;
       });
@@ -678,11 +721,11 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_assertThisInitialized(_this), "getDataSource", function (items, cols) {
       return _mapInstanceProperty(items).call(items, function (item, index) {
-        return _reduceInstanceProperty(cols).call(cols, function (result, _ref19) {
+        return _reduceInstanceProperty(cols).call(cols, function (result, _ref20) {
           var _context14, _context15;
-          var key = _ref19.key,
-            type = _ref19.type,
-            options = _ref19.options;
+          var key = _ref20.key,
+            type = _ref20.type,
+            options = _ref20.options;
           if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || _Array$isArray(item.isReadonly) && !_includesInstanceProperty(_context14 = item.isReadonly).call(_context14, key)) || _includesInstanceProperty(_context15 = ['img', 'switch', 'custom', 'img', 'toolbar', 'uploadImg']).call(_context15, type)) {
             result[key] = item[key];
           } else {
@@ -839,29 +882,47 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         _this$props4$expanded = _this$props4.expandedRowRender,
         expandedRowRender = _this$props4$expanded === void 0 ? undefined : _this$props4$expanded,
         _this$props4$onExpand = _this$props4.onExpand,
-        onExpand = _this$props4$onExpand === void 0 ? undefined : _this$props4$onExpand;
+        onExpand = _this$props4$onExpand === void 0 ? undefined : _this$props4$onExpand,
+        _this$props4$expanded2 = _this$props4.expandedRowRenderKeepScroll,
+        expandedRowRenderKeepScroll = _this$props4$expanded2 === void 0 ? false : _this$props4$expanded2,
+        _this$props4$autoAdju = _this$props4.autoAdjustingWidth,
+        autoAdjustingWidth = _this$props4$autoAdju === void 0 ? false : _this$props4$autoAdju;
       var widthX = _reduceInstanceProperty(_context16 = _filterInstanceProperty(cols).call(cols, function (col) {
         return !col.hide;
       })).call(_context16, function (width, item) {
         var _context17;
         return width += item.width ? item.width : _includesInstanceProperty(_context17 = ['index', 'checked']).call(_context17, item.key) ? 70 : item.type === 'img' ? 200 : 120;
       }, 0);
-      var scrollProps = !helper.isEmpty2(expandedRowRender) ? {
-        expandedRowRender: expandedRowRender
-      } : {
-        scroll: {
-          x: _someInstanceProperty(cols).call(cols, function (item) {
-            return !helper.isEmpty2(item.fixed);
-          }) ? widthX : true,
-          y: maxHeight
-        }
-      };
+      var scrollProps = {};
+      if (expandedRowRenderKeepScroll) {
+        //拥有expandedRowRender时候保持scroll属性
+        scrollProps = {
+          expandedRowRender: expandedRowRender,
+          scroll: {
+            x: _someInstanceProperty(cols).call(cols, function (item) {
+              return !helper.isEmpty2(item.fixed);
+            }) ? widthX : true,
+            y: maxHeight
+          }
+        };
+      } else {
+        scrollProps = !helper.isEmpty2(expandedRowRender) ? {
+          expandedRowRender: expandedRowRender
+        } : {
+          scroll: {
+            x: _someInstanceProperty(cols).call(cols, function (item) {
+              return !helper.isEmpty2(item.fixed);
+            }) ? widthX : true,
+            y: maxHeight
+          }
+        };
+      }
       var _this$getPropsByCheck = _this.getPropsByCheckbox2(items),
         onRowClick = _this$getPropsByCheck.onRowClick,
         extraProps = _objectWithoutProperties(_this$getPropsByCheck, _excluded);
-      return _objectSpread(_objectSpread({
+      var props = _objectSpread(_objectSpread({
         className: !isEmphasized ? variables('SuperTable2') : variables('SuperTable2').noTransition,
-        columns: _this.getColumns(cols),
+        columns: _this.getColumns(cols, items),
         dataSource: _this.getDataSource(items, cols),
         style: _Object$assign({}, {
           whiteSpace: 'nowrap'
@@ -881,6 +942,10 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       }, _this.getPropsByCheckbox()), {}, {
         onExpand: onExpand
       }, scrollProps);
+      autoAdjustingWidth && (props.scroll = {
+        x: true
+      });
+      return props;
     });
     _defineProperty(_assertThisInitialized(_this), "setScroll", function () {
       if (_this.props.maxHeight && _this.props.items.length) {
@@ -926,6 +991,7 @@ _defineProperty(SuperTable2, "propTypes", {
   footer: PropTypes.func,
   callback: PropTypes.shape(CallbackType),
   isEmphasized: PropTypes.bool,
-  dragSort: PropTypes.bool
+  dragSort: PropTypes.bool,
+  autoAdjustingWidth: PropTypes.bool //列宽度随内容自适应
 });
 export default SuperTable2;

package/lib/InputSearch/InputSearch.js

@@ -162,7 +162,8 @@ var InputSearch = /*#__PURE__*/function (_React$Component) {
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "isMatch", function (inputValue, option) {
       var _context2;
-      return option.props.children && (0, _indexOf["default"])(_context2 = option.props.children).call(_context2, inputValue) !== -1;
+      // return option.props.children && option.props.children.indexOf(inputValue) !== -1;
+      return option.props.children && (0, _indexOf["default"])(_context2 = option.props.children.toUpperCase()).call(_context2, inputValue.toUpperCase()) !== -1;
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "isMatchRemark", function (inputValue, option) {
       var _option$props = option.props,

package/lib/SuperTable/SuperTable.js

@@ -33,6 +33,9 @@ var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-st
 var _parseFloat2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/parse-float"));
 var _tooltip = _interopRequireDefault(require("antd/lib/tooltip"));
 var _objectDestructuringEmpty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectDestructuringEmpty"));
+var _badge = _interopRequireDefault(require("antd/lib/badge"));
+var _tag = _interopRequireDefault(require("antd/lib/tag"));
+var _icon = _interopRequireDefault(require("antd/lib/icon"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
@@ -51,7 +54,7 @@ var _DragSortRow = _interopRequireDefault(require("./DragSortRow"));
 var _variables = _interopRequireDefault(require("../variables"));
 var _excluded = ["onRowClick"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty2(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context9, _context10; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty2(_context9 = ownKeys(Object(t), !0)).call(_context9, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty2(_context10 = ownKeys(Object(t))).call(_context10, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context10, _context11; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty2(_context10 = ownKeys(Object(t), !0)).call(_context10, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty2(_context11 = ownKeys(Object(t))).call(_context11, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 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 { Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 /**
@@ -378,16 +381,52 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
       }
       return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("p", null, text));
     });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "tags", function (key, index, item, _ref11) {
+      var tags = _ref11.tags;
+      var list = item[key] || [];
+      return /*#__PURE__*/_react["default"].createElement("div", null, (0, _map["default"])(list).call(list, function (item2, index2) {
+        var _context5;
+        var onClick = (0, _bind["default"])(_context5 = _this.onLink).call(_context5, null, key, index, _objectSpread(_objectSpread({}, item2), item));
+        var tagProps = {
+          key: index2,
+          color: item2.color,
+          style: {
+            cursor: 'default'
+          }
+        };
+        if (item2.click === true) {
+          tagProps.onClick = onClick;
+          tagProps.onDoubleClick = _this.onLinkDouble;
+          tagProps.style = {
+            cursor: 'pointer'
+          };
+        }
+        return item2.tagType === 'warning_tag' ? /*#__PURE__*/_react["default"].createElement(_icon["default"], (0, _extends2["default"])({
+          type: "alert"
+        }, tagProps, {
+          style: {
+            color: '#FFB90F',
+            fontSize: '16px',
+            margin: '0px 5px',
+            cursor: 'pointer'
+          }
+        })) : item2.tagType === 'exception_tag' ? /*#__PURE__*/_react["default"].createElement(_badge["default"], {
+          count: item2.num,
+          offset: [-8, 0],
+          key: index2
+        }, /*#__PURE__*/_react["default"].createElement(_tag["default"], tagProps, item2[tags])) : /*#__PURE__*/_react["default"].createElement(_tag["default"], tagProps, item2[tags]);
+      }));
+    });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumns", function (cols, items) {
-      var _context5, _context6;
+      var _context6, _context7;
       var _this$props5 = _this.props,
         sortInfo = _this$props5.sortInfo,
         filterInfo = _this$props5.filterInfo;
       var filterVisibleKey = _this.state.filterVisibleKey;
-      return (0, _map["default"])(_context5 = (0, _concat["default"])(_context6 = _this.getIndexInfo(items)).call(_context6, (0, _filter["default"])(cols).call(cols, function (col) {
+      return (0, _map["default"])(_context6 = (0, _concat["default"])(_context7 = _this.getIndexInfo(items)).call(_context7, (0, _filter["default"])(cols).call(cols, function (col) {
         return !col.hide;
-      }))).call(_context5, function (_ref11) {
-        var col = (0, _extends2["default"])({}, ((0, _objectDestructuringEmpty2["default"])(_ref11), _ref11));
+      }))).call(_context6, function (_ref12) {
+        var col = (0, _extends2["default"])({}, ((0, _objectDestructuringEmpty2["default"])(_ref12), _ref12));
         col.dataIndex = col.key;
         col.className = col.key === 'index' ? 'ant-table-selection-column' : col.align ? (0, _variables["default"])('SuperTable')[col.align] : '';
         col.noWrap && (col.className = (0, _variables["default"])('SuperTable').noWrap);
@@ -413,6 +452,10 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
           col.render = function (text, record, index) {
             return _this.tooltip(col.key, index, items[index], col);
           };
+        } else if (col.tags) {
+          col.render = function (text, record, index) {
+            return _this.tags(col.key, index, items[index], col);
+          };
         }
         return col;
       });
@@ -427,16 +470,16 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
       }
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "link", function (key, index, item, text) {
-      var _context7;
-      var onClick = (0, _bind["default"])(_context7 = _this.onLink).call(_context7, null, key, index, item);
+      var _context8;
+      var onClick = (0, _bind["default"])(_context8 = _this.onLink).call(_context8, null, key, index, item);
       return /*#__PURE__*/_react["default"].createElement("a", {
         onClick: onClick,
         onDoubleClick: _this.onLinkDouble
       }, text);
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "tooltip", function (key, index, item, _ref12) {
-      var tipLen = _ref12.tooltip,
-        options = _ref12.options;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "tooltip", function (key, index, item, _ref13) {
+      var tipLen = _ref13.tooltip,
+        options = _ref13.options;
       var text = _this.getText(item[key], options);
       var needTip = tipLen > 1 && text && typeof text === 'string' && text.length > tipLen;
       return needTip ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
@@ -478,21 +521,21 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getDataSource", function (items, cols) {
       return (0, _map["default"])(items).call(items, function (item, index) {
-        return (0, _reduce["default"])(cols).call(cols, function (result, _ref13) {
-          var key = _ref13.key,
-            options = _ref13.options,
-            link = _ref13.link,
-            icon = _ref13.icon,
-            dataSource = _ref13.dataSource;
+        return (0, _reduce["default"])(cols).call(cols, function (result, _ref14) {
+          var key = _ref14.key,
+            options = _ref14.options,
+            link = _ref14.link,
+            icon = _ref14.icon,
+            dataSource = _ref14.dataSource;
           if (link) {
             if (typeof link === 'boolean') {
               result[key] = _this.link(key, index, item, _this.getText(item[key], options));
             }
           } else if (icon) {
-            var _context8;
+            var _context9;
             //单独的icon列，icon=true数据值根据options获得显示的图片url
             var src = _this.getImgSrc(item[key], options);
-            var onClick = (0, _bind["default"])(_context8 = _this.onLink).call(_context8, null, key, index, item);
+            var onClick = (0, _bind["default"])(_context9 = _this.onLink).call(_context9, null, key, index, item);
             result[key] = src ? /*#__PURE__*/_react["default"].createElement("img", {
               src: src,
               onClick: onClick
@@ -594,9 +637,10 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
         };
       }
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getRowProps", function (onRowClick) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getRowProps", function (onRowClick, items) {
       return function (record) {
-        return {
+        var item = items[record.key];
+        var rowProps = {
           onClick: function onClick() {
             return onRowClick && onRowClick(record);
           },
@@ -604,6 +648,10 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
             return _this.onDoubleClick(record);
           }
         };
+        item && item.__bgColor && (rowProps.style = {
+          backgroundColor: item.__bgColor
+        });
+        return rowProps;
       };
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getRowPropsForDrag", function () {
@@ -626,10 +674,10 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
       var resItems = items;
       if (!dragSort && items.length > 1) {
         if (pageTotal || searchTotal) {
-          var totalItem = (0, _reduce["default"])(cols).call(cols, function (result, _ref14) {
-            var key = _ref14.key,
-              _ref14$total = _ref14.total,
-              total = _ref14$total === void 0 ? false : _ref14$total;
+          var totalItem = (0, _reduce["default"])(cols).call(cols, function (result, _ref15) {
+            var key = _ref15.key,
+              _ref15$total = _ref15.total,
+              total = _ref15$total === void 0 ? false : _ref15$total;
             if (total) {
               result[key] = (0, _parseFloat2["default"])(Number((0, _reduce["default"])(items).call(items, function (result, item) {
                 return (0, _parseFloat2["default"])(String(item[key] || 0)) + result;
@@ -667,11 +715,11 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
           return item.checked;
         });
         var countItems = checkedItems.length ? checkedItems : items;
-        var totalItems = (0, _map["default"])(totalCols).call(totalCols, function (_ref15) {
-          var title = _ref15.title,
-            key = _ref15.key,
-            _ref15$props = _ref15.props,
-            props = _ref15$props === void 0 ? {} : _ref15$props;
+        var totalItems = (0, _map["default"])(totalCols).call(totalCols, function (_ref16) {
+          var title = _ref16.title,
+            key = _ref16.key,
+            _ref16$props = _ref16.props,
+            props = _ref16$props === void 0 ? {} : _ref16$props;
           var value = (0, _reduce["default"])(countItems).call(countItems, function (result, item) {
             return (0, _parseFloat2["default"])((result + Number(item[key] || 0)).toFixed(props.precision || 6));
           }, 0);
@@ -689,9 +737,9 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
           style: {
             marginRight: "15px"
           }
-        }, checkedItems.length ? '【当页勾选汇总】' : '【当页汇总】'), (0, _map["default"])(totalItems).call(totalItems, function (_ref16, index) {
-          var title = _ref16.title,
-            value = _ref16.value;
+        }, checkedItems.length ? '【当页勾选汇总】' : '【当页汇总】'), (0, _map["default"])(totalItems).call(totalItems, function (_ref17, index) {
+          var title = _ref17.title,
+            value = _ref17.value;
           return /*#__PURE__*/_react["default"].createElement("span", {
             key: index,
             style: {
@@ -733,7 +781,7 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
           x: true
         },
         onChange: _this.onTableChange,
-        onRow: dragSort ? _this.getRowPropsForDrag() : _this.getRowProps(onRowClick),
+        onRow: dragSort ? _this.getRowPropsForDrag() : _this.getRowProps(onRowClick, items),
         components: dragSort ? {
           body: {
             row: _DragSortRow["default"]

package/lib/SuperTable2/SuperTable2.js

@@ -10,7 +10,7 @@ var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/in
 var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
 var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
-var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
+var _sliceInstanceProperty2 = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
 var _Array$from = require("@babel/runtime-corejs3/core-js-stable/array/from");
 var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
 var _getIteratorMethod = require("@babel/runtime-corejs3/core-js/get-iterator-method");
@@ -29,10 +29,12 @@ var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/bind"));
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
+var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
 var _reduce = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/reduce"));
 var _some = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/some"));
 var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
 var _objectDestructuringEmpty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectDestructuringEmpty"));
+var _tooltip = _interopRequireDefault(require("antd/lib/tooltip"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _switch = _interopRequireDefault(require("antd/lib/switch"));
 var _button = _interopRequireDefault(require("antd/lib/button"));
@@ -60,7 +62,7 @@ var _excluded = ["onRowClick"];
 function _getRequireWildcardCache(e) { if ("function" != typeof _WeakMap) return null; var r = new _WeakMap(), t = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? _Object$getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? _Object$defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (_Array$isArray2(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { var _context20; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context20 = Object.prototype.toString.call(o)).call(_context20, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _unsupportedIterableToArray(o, minLen) { var _context20; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty2(_context20 = Object.prototype.toString.call(o)).call(_context20, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty2(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context18, _context19; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context18 = ownKeys(Object(t), !0)).call(_context18, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context19 = ownKeys(Object(t))).call(_context19, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -643,18 +645,56 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       var _context11;
       return !(0, _includes["default"])(_context11 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar', 'uploadImg', 'double']).call(_context11, type);
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumns", function (cols) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "tooltip", function (key, index, item, _ref18) {
+      var tipLen = _ref18.tooltip,
+        options = _ref18.options,
+        width = _ref18.width;
+      var text = _this.getText(item[key], options);
+      var needTip = tipLen > 1 && text && typeof text === 'string' && text.length > tipLen;
+      return needTip ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+        title: text
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          minHeight: '20px',
+          minWidth: '10px',
+          maxWidth: "".concat(width - 16, "px"),
+          overflow: 'hidden',
+          textOverflow: 'ellipsis',
+          display: '-webkit-box',
+          WebkitLineClamp: 2,
+          WebkitBoxOrient: "vertical",
+          whiteSpace: 'break-spaces'
+        },
+        title: true
+      }, (0, _slice["default"])(text).call(text, 0, tipLen) + '...')) : /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          minHeight: '20px',
+          minWidth: '10px',
+          maxWidth: "".concat(width - 16, "px"),
+          overflow: 'hidden',
+          textOverflow: 'ellipsis',
+          display: '-webkit-box',
+          WebkitLineClamp: 2,
+          WebkitBoxOrient: "vertical",
+          whiteSpace: 'break-spaces'
+        },
+        title: true
+      }, (0, _isArray["default"])(text) ? text.join(',') : text, " ");
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumns", function (cols, items) {
       var _context12;
       var readonly = _this.props.readonly;
       return (0, _map["default"])(_context12 = (0, _filter["default"])(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context12, function (_ref18, index) {
+      })).call(_context12, function (_ref19, index) {
         var _context13;
-        var col = (0, _extends2["default"])({}, ((0, _objectDestructuringEmpty2["default"])(_ref18), _ref18));
+        var col = (0, _extends2["default"])({}, ((0, _objectDestructuringEmpty2["default"])(_ref19), _ref19));
         col.className = _this.getColumnClassName(col);
         col.title = _this.getColumnTitle(col);
         col.dataIndex = col.key;
-        col.width = col.width ? col.width : (0, _includes["default"])(_context13 = ['index', 'checked']).call(_context13, col.key) ? 70 : col.type === 'img' ? 200 : 120;
+        !_this.props.autoAdjustingWidth && (col.width = col.width ? col.width : (0, _includes["default"])(_context13 = ['index', 'checked']).call(_context13, col.key) ? 70 : col.type === 'img' ? 200 : 120);
+        // col.width = col.width ? col.width : (['index','checked'].includes(col.key) ? 70 : (col.type === 'img' ? 200 : 120));
+
         // const {props = {}} =
         // const {edit = false} = props
         // if (!(readonly || col.type === 'readonly') || !this.canReadonly(col.type)) {
@@ -676,6 +716,10 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
               return text ? "\uFFE5".concat(text.toFixed(2)) : text;
             }
           };
+        } else if (col.tooltip) {
+          col.render = function (text, record, index) {
+            return _this.tooltip(col.key, index, items[index], col);
+          };
         }
         return col;
       });
@@ -691,11 +735,11 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getDataSource", function (items, cols) {
       return (0, _map["default"])(items).call(items, function (item, index) {
-        return (0, _reduce["default"])(cols).call(cols, function (result, _ref19) {
+        return (0, _reduce["default"])(cols).call(cols, function (result, _ref20) {
           var _context14, _context15;
-          var key = _ref19.key,
-            type = _ref19.type,
-            options = _ref19.options;
+          var key = _ref20.key,
+            type = _ref20.type,
+            options = _ref20.options;
           if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || (0, _isArray["default"])(item.isReadonly) && !(0, _includes["default"])(_context14 = item.isReadonly).call(_context14, key)) || (0, _includes["default"])(_context15 = ['img', 'switch', 'custom', 'img', 'toolbar', 'uploadImg']).call(_context15, type)) {
             result[key] = item[key];
           } else {
@@ -852,29 +896,47 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         _this$props4$expanded = _this$props4.expandedRowRender,
         expandedRowRender = _this$props4$expanded === void 0 ? undefined : _this$props4$expanded,
         _this$props4$onExpand = _this$props4.onExpand,
-        onExpand = _this$props4$onExpand === void 0 ? undefined : _this$props4$onExpand;
+        onExpand = _this$props4$onExpand === void 0 ? undefined : _this$props4$onExpand,
+        _this$props4$expanded2 = _this$props4.expandedRowRenderKeepScroll,
+        expandedRowRenderKeepScroll = _this$props4$expanded2 === void 0 ? false : _this$props4$expanded2,
+        _this$props4$autoAdju = _this$props4.autoAdjustingWidth,
+        autoAdjustingWidth = _this$props4$autoAdju === void 0 ? false : _this$props4$autoAdju;
       var widthX = (0, _reduce["default"])(_context16 = (0, _filter["default"])(cols).call(cols, function (col) {
         return !col.hide;
       })).call(_context16, function (width, item) {
         var _context17;
         return width += item.width ? item.width : (0, _includes["default"])(_context17 = ['index', 'checked']).call(_context17, item.key) ? 70 : item.type === 'img' ? 200 : 120;
       }, 0);
-      var scrollProps = !_helper["default"].isEmpty2(expandedRowRender) ? {
-        expandedRowRender: expandedRowRender
-      } : {
-        scroll: {
-          x: (0, _some["default"])(cols).call(cols, function (item) {
-            return !_helper["default"].isEmpty2(item.fixed);
-          }) ? widthX : true,
-          y: maxHeight
-        }
-      };
+      var scrollProps = {};
+      if (expandedRowRenderKeepScroll) {
+        //拥有expandedRowRender时候保持scroll属性
+        scrollProps = {
+          expandedRowRender: expandedRowRender,
+          scroll: {
+            x: (0, _some["default"])(cols).call(cols, function (item) {
+              return !_helper["default"].isEmpty2(item.fixed);
+            }) ? widthX : true,
+            y: maxHeight
+          }
+        };
+      } else {
+        scrollProps = !_helper["default"].isEmpty2(expandedRowRender) ? {
+          expandedRowRender: expandedRowRender
+        } : {
+          scroll: {
+            x: (0, _some["default"])(cols).call(cols, function (item) {
+              return !_helper["default"].isEmpty2(item.fixed);
+            }) ? widthX : true,
+            y: maxHeight
+          }
+        };
+      }
       var _this$getPropsByCheck = _this.getPropsByCheckbox2(items),
         onRowClick = _this$getPropsByCheck.onRowClick,
         extraProps = (0, _objectWithoutProperties2["default"])(_this$getPropsByCheck, _excluded);
-      return _objectSpread(_objectSpread({
+      var props = _objectSpread(_objectSpread({
         className: !isEmphasized ? (0, _variables["default"])('SuperTable2') : (0, _variables["default"])('SuperTable2').noTransition,
-        columns: _this.getColumns(cols),
+        columns: _this.getColumns(cols, items),
         dataSource: _this.getDataSource(items, cols),
         style: (0, _assign["default"])({}, {
           whiteSpace: 'nowrap'
@@ -894,6 +956,10 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       }, _this.getPropsByCheckbox()), {}, {
         onExpand: onExpand
       }, scrollProps);
+      autoAdjustingWidth && (props.scroll = {
+        x: true
+      });
+      return props;
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "setScroll", function () {
       if (_this.props.maxHeight && _this.props.items.length) {
@@ -939,6 +1005,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
   footer: _propTypes["default"].func,
   callback: _propTypes["default"].shape(CallbackType),
   isEmphasized: _propTypes["default"].bool,
-  dragSort: _propTypes["default"].bool
+  dragSort: _propTypes["default"].bool,
+  autoAdjustingWidth: _propTypes["default"].bool //列宽度随内容自适应
 });
 var _default = exports["default"] = SuperTable2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud-b2b",
-  "version": "1.1.65",
+  "version": "1.1.67",
   "description": "A react component library dependent antd",
   "keywords": [
     "react",