@hi-ui/hiui 2.15.10 → 2.15.11

package/es/table/index.js

@@ -1,43 +1,17 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Table = exports["default"] = void 0;
-
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _ClickOuterside = _interopRequireDefault(require("./ClickOuterside"));
+var _clickOuterside = _interopRequireDefault(require("./clickOuterside"));
 
-var _TableContent = _interopRequireDefault(require("./TableContent"));
+var _tableContent = _interopRequireDefault(require("./tableContent"));
 
 var _prefix = _interopRequireDefault(require("./prefix"));
 
@@ -55,38 +29,87 @@ require("../pagination/style");
 
 require("../icon/style");
 
-var _context = _interopRequireDefault(require("../context"));
-
 var _tool = require("./tool");
 
 var _axios = _interopRequireDefault(require("axios"));
 
 var _qs = _interopRequireDefault(require("qs"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+var _context = _interopRequireDefault(require("../context"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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 _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+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) { _defineProperty(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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-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 _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-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 _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-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 _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-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; } }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+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; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var Table = /*#__PURE__*/function (_Component) {
-  (0, _inherits2["default"])(Table, _Component);
+  _inherits(Table, _Component);
 
   var _super = _createSuper(Table);
 
   function Table(props) {
     var _this;
 
-    (0, _classCallCheck2["default"])(this, Table);
+    _classCallCheck(this, Table);
+
     _this = _super.call(this, props); // 只有dataSource,columns重造
 
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "cbs", {
+    _defineProperty(_assertThisInitialized(_this), "cbs", {
       highlighCol: function highlighCol(key) {
         var highlightCols = _this.state.highlightCols;
         var col = highlightCols.indexOf(key);
@@ -211,18 +234,30 @@ var Table = /*#__PURE__*/function (_Component) {
 
         _this.setState(_objectSpread({
           dataSource: dataSource
-        }, columnsDetail));
+        }, columnsDetail)); // let {index, open} = e.target.dataset
+        // index = parseInt(index)
+        // open = open === 'true'
+        //
+        // let {data} = this.props
+        // if (!open) {
+        //   data.splice(index + 1, 0, {expand: true, parent: index, ...{width: '50px'}, ...item})
+        // } else {
+        //   data.splice(index + 1, 1)
+        // }
+        // e.target.dataset.open = !open
+        // this.setState({dataSource: data})
+
       }
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "showColumsPanel", function (e) {});
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "fetch", function (extra) {
+
+    _defineProperty(_assertThisInitialized(_this), "showColumsPanel", function (e) {});
+
+    _defineProperty(_assertThisInitialized(_this), "fetch", function (extra) {
       extra = extra || {};
       var origin = _this.props.origin;
       var data = origin.data,
           url = origin.url,
           headers = origin.headers,
-          _origin$withCredentia = origin.withCredentials,
-          withCredentials = _origin$withCredentia === void 0 ? false : _origin$withCredentia,
           _origin$type = origin.type,
           type = _origin$type === void 0 ? 'GET' : _origin$type,
           _origin$success = origin.success,
@@ -234,18 +269,17 @@ var Table = /*#__PURE__*/function (_Component) {
           _origin$currentPageNa = origin.currentPageName,
           currentPageName = _origin$currentPageNa === void 0 ? Table.config.currentPageName : _origin$currentPageNa;
 
-      _loading["default"].open(_this.dom.current, {
-        key: 'loading'
+      var l = _loading["default"].open({
+        target: _this.dom.current
       });
 
       var current = _this.state.serverPagination.current;
 
-      var requestParams = _objectSpread(_objectSpread((0, _defineProperty2["default"])({}, currentPageName, current), data), extra);
+      var requestParams = _objectSpread(_objectSpread(_defineProperty({}, currentPageName, current), data), extra);
 
       var options = {
         url: url,
-        method: ['GET', 'get'].includes(type) ? 'GET' : 'POST',
-        withCredentials: withCredentials
+        method: ['GET', 'get'].includes(type) ? 'GET' : 'POST'
       };
 
       if (options.method === 'GET') {
@@ -278,10 +312,9 @@ var Table = /*#__PURE__*/function (_Component) {
 
         _this.runMemory();
 
-        _loading["default"].close('loading');
+        l.close();
       })["catch"](function (e) {
-        _loading["default"].close('loading');
-
+        l.close();
         error(e);
       });
     });
@@ -312,7 +345,7 @@ var Table = /*#__PURE__*/function (_Component) {
     return _this;
   }
 
-  (0, _createClass2["default"])(Table, [{
+  _createClass(Table, [{
     key: "runMemory",
     value: function runMemory() {
       var name = this.props.name;
@@ -411,11 +444,12 @@ var Table = /*#__PURE__*/function (_Component) {
           headerColumns = _this$state4.headerColumns,
           leftFiexColumns = _this$state4.leftFiexColumns,
           rightFixColumns = _this$state4.rightFixColumns,
-          highlightRows = _this$state4.highlightRows;
+          highlightRows = _this$state4.highlightRows; // let {scroll} = this.state
+
       var _this$props2 = this.props,
           _this$props2$style = _this$props2.style,
           style = _this$props2$style === void 0 ? {} : _this$props2$style,
-          props = (0, _objectWithoutProperties2["default"])(_this$props2, ["style"]);
+          props = _objectWithoutProperties(_this$props2, ["style"]);
 
       var handleScroll = function handleScroll(e) {
         var onLeft = e.target.scrollLeft === 0;
@@ -452,7 +486,7 @@ var Table = /*#__PURE__*/function (_Component) {
           style: {
             overflowX: 'auto'
           }
-        }, /*#__PURE__*/_react["default"].createElement(_TableContent["default"], (0, _extends2["default"])({
+        }, /*#__PURE__*/_react["default"].createElement(_tableContent["default"], _extends({
           style: _objectSpread({}, style)
         }, Object.assign({}, _objectSpread({}, props), {
           columns: columns
@@ -482,7 +516,7 @@ var Table = /*#__PURE__*/function (_Component) {
             className: (0, _prefix["default"])('table-outer')
           }, /*#__PURE__*/_react["default"].createElement("div", {
             className: (0, _prefix["default"])('table-inner')
-          }, /*#__PURE__*/_react["default"].createElement(_TableContent["default"], (0, _extends2["default"])({
+          }, /*#__PURE__*/_react["default"].createElement(_tableContent["default"], _extends({
             style: _objectSpread({
               width: 'auto'
             }, style),
@@ -512,7 +546,7 @@ var Table = /*#__PURE__*/function (_Component) {
             className: (0, _prefix["default"])('table-outer')
           }, /*#__PURE__*/_react["default"].createElement("div", {
             className: (0, _prefix["default"])('table-inner')
-          }, /*#__PURE__*/_react["default"].createElement(_TableContent["default"], (0, _extends2["default"])({
+          }, /*#__PURE__*/_react["default"].createElement(_tableContent["default"], _extends({
             style: _objectSpread({
               width: 'auto'
             }, style),
@@ -548,17 +582,19 @@ var Table = /*#__PURE__*/function (_Component) {
           headerColumns = _this$state5.headerColumns,
           highlightRows = _this$state5.highlightRows;
       var scroll = this.state.scroll;
+
       var _this$props3 = this.props,
           _this$props3$style = _this$props3.style,
           style = _this$props3$style === void 0 ? {} : _this$props3$style,
-          props = (0, _objectWithoutProperties2["default"])(_this$props3, ["style"]);
+          props = _objectWithoutProperties(_this$props3, ["style"]);
+
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _prefix["default"])('table-content')
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _prefix["default"])('table-scroll')
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _prefix["default"])('table-head')
-      }, /*#__PURE__*/_react["default"].createElement(_TableContent["default"], Object.assign({}, _objectSpread({}, props), {
+      }, /*#__PURE__*/_react["default"].createElement(_tableContent["default"], Object.assign({}, _objectSpread({}, props), {
         style: _objectSpread({}, style)
       }, {
         columns: columns
@@ -578,7 +614,7 @@ var Table = /*#__PURE__*/function (_Component) {
           maxHeight: scroll.y + 'px',
           overflow: 'auto'
         }
-      }, /*#__PURE__*/_react["default"].createElement(_TableContent["default"], Object.assign({}, _objectSpread({}, props), {
+      }, /*#__PURE__*/_react["default"].createElement(_tableContent["default"], Object.assign({}, _objectSpread({}, props), {
         style: _objectSpread({}, style)
       }, {
         columns: columns
@@ -605,10 +641,12 @@ var Table = /*#__PURE__*/function (_Component) {
           columns = _this$state6.columns,
           headerColumns = _this$state6.headerColumns,
           highlightRows = _this$state6.highlightRows;
+
       var _this$props4 = this.props,
           _this$props4$style = _this$props4.style,
           style = _this$props4$style === void 0 ? {} : _this$props4$style,
-          props = (0, _objectWithoutProperties2["default"])(_this$props4, ["style"]);
+          props = _objectWithoutProperties(_this$props4, ["style"]);
+
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _prefix["default"])('table-content')
       }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -616,7 +654,7 @@ var Table = /*#__PURE__*/function (_Component) {
         style: {
           overflowX: 'auto'
         }
-      }, /*#__PURE__*/_react["default"].createElement(_TableContent["default"], Object.assign({}, {
+      }, /*#__PURE__*/_react["default"].createElement(_tableContent["default"], Object.assign({}, {
         style: _objectSpread({}, style)
       }, _objectSpread({}, props), {
         columns: columns
@@ -633,51 +671,11 @@ var Table = /*#__PURE__*/function (_Component) {
         headerColumns: headerColumns
       }))), this.isEmpty ? this.getEmptyContent() : null);
     }
-  }, {
-    key: "isEmpty",
-    get: function get() {
-      var dataLen = this.state.dataSource.length;
-
-      if (dataLen > 0) {
-        return false;
-      }
-
-      if (!this.props.advance) {
-        return true;
-      }
-
-      var advance = this.props.advance;
-      var prefixLen = 0;
-      var suffixLen = 0;
-
-      if (advance.prefix) {
-        prefixLen = advance.prefix.length;
-      }
-
-      if (advance.suffix) {
-        suffixLen = advance.suffix.length;
-      }
-
-      if (prefixLen + suffixLen > 0) {
-        return false;
-      }
-
-      return true;
-    }
   }, {
     key: "getEmptyContent",
     value: function getEmptyContent() {
-      var _this$props5 = this.props,
-          emptyText = _this$props5.emptyText,
-          localeDatas = _this$props5.localeDatas;
-      var text = emptyText;
-
-      if (emptyText) {
-        text = typeof emptyText === 'string' ? emptyText : emptyText();
-      } else {
-        text = localeDatas.table.emptyText;
-      }
-
+      var emptyText = this.props.emptyText;
+      var text = typeof emptyText === 'string' ? emptyText : emptyText();
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "hi-table-placeholder"
       }, text);
@@ -687,13 +685,14 @@ var Table = /*#__PURE__*/function (_Component) {
     value: function componentDidUpdate() {
       var _this3 = this;
 
-      var _this$props6 = this.props,
-          fixTop = _this$props6.fixTop,
-          height = _this$props6.height,
-          rowSelection = _this$props6.rowSelection;
+      var _this$props5 = this.props,
+          fixTop = _this$props5.fixTop,
+          height = _this$props5.height;
       var leftFixTable = this.dom.current.querySelectorAll('.hi-table-fixed-left table tr');
       var rightFixTable = this.dom.current.querySelectorAll('.hi-table-fixed-right table tr');
-      var scrollTable = this.dom.current.querySelectorAll('.hi-table-scroll table tr');
+      var scrollTable = this.dom.current.querySelectorAll('.hi-table-scroll table tr'); // if(fixTable && scrollTable){
+      //
+      // }
 
       if (scrollTable) {
         scrollTable.forEach(function (tr, index) {
@@ -707,7 +706,7 @@ var Table = /*#__PURE__*/function (_Component) {
         });
       }
 
-      if (!fixTop && !rowSelection && height) {
+      if (!fixTop && height) {
         var hiTableBody = this.dom.current.querySelectorAll('.hi-table-body');
         hiTableBody && hiTableBody.length > 0 && hiTableBody.forEach(function (item) {
           item.style.maxHeight = height;
@@ -739,21 +738,21 @@ var Table = /*#__PURE__*/function (_Component) {
 
       // 多选配置
       // noinspection JSAnnotator
-      var _this$props7 = this.props,
-          pagination = _this$props7.pagination,
-          name = _this$props7.name,
-          _this$props7$size = _this$props7.size,
-          size = _this$props7$size === void 0 ? 'normal' : _this$props7$size,
-          _this$props7$bordered = _this$props7.bordered,
-          bordered = _this$props7$bordered === void 0 ? false : _this$props7$bordered,
-          _this$props7$striped = _this$props7.striped,
-          striped = _this$props7$striped === void 0 ? false : _this$props7$striped,
-          scrollX = _this$props7.scrollX,
-          _this$props7$header = _this$props7.header,
-          header = _this$props7$header === void 0 ? null : _this$props7$header,
-          _this$props7$footer = _this$props7.footer,
-          footer = _this$props7$footer === void 0 ? null : _this$props7$footer,
-          theme = _this$props7.theme; // noinspection JSAnnotator
+      var _this$props6 = this.props,
+          pagination = _this$props6.pagination,
+          name = _this$props6.name,
+          _this$props6$size = _this$props6.size,
+          size = _this$props6$size === void 0 ? 'normal' : _this$props6$size,
+          _this$props6$bordered = _this$props6.bordered,
+          bordered = _this$props6$bordered === void 0 ? false : _this$props6$bordered,
+          _this$props6$striped = _this$props6.striped,
+          striped = _this$props6$striped === void 0 ? false : _this$props6$striped,
+          scrollX = _this$props6.scrollX,
+          _this$props6$header = _this$props6.header,
+          header = _this$props6$header === void 0 ? null : _this$props6$header,
+          _this$props6$footer = _this$props6.footer,
+          footer = _this$props6$footer === void 0 ? null : _this$props6$footer,
+          localeDatas = _this$props6.localeDatas; // noinspection JSAnnotator
 
       var _this$state7 = this.state,
           scroll = _this$state7.scroll,
@@ -817,10 +816,18 @@ var Table = /*#__PURE__*/function (_Component) {
       }
 
       var serverPaginationConfig = serverPagination;
+
+      if (serverPagination && serverPagination.current) {
+        serverPaginationConfig = _objectSpread(_objectSpread({}, serverPagination), {}, {
+          defaultCurrent: serverPagination.current
+        });
+        delete serverPaginationConfig.current;
+      }
+
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _prefix["default"])((_prifix = {
           table: true
-        }, (0, _defineProperty2["default"])(_prifix, "theme__".concat(theme), true), (0, _defineProperty2["default"])(_prifix, size, size), (0, _defineProperty2["default"])(_prifix, "bordered", bordered), (0, _defineProperty2["default"])(_prifix, "striped", striped), _prifix)),
+        }, _defineProperty(_prifix, size, size), _defineProperty(_prifix, "bordered", bordered), _defineProperty(_prifix, "striped", striped), _prifix)),
         ref: this.dom
       }, header && /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _prefix["default"])({
@@ -844,9 +851,10 @@ var Table = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
         name: "menu",
         style: {
+          color: '#4284F5',
           fontSize: '24px'
         }
-      })), columnMenu && /*#__PURE__*/_react["default"].createElement(_ClickOuterside["default"], {
+      })), columnMenu && /*#__PURE__*/_react["default"].createElement(_clickOuterside["default"], {
         onClickOutside: function onClickOutside(e) {
           return _this4.setState({
             columnMenu: false
@@ -859,11 +867,11 @@ var Table = /*#__PURE__*/function (_Component) {
           key: item.key
         }, /*#__PURE__*/_react["default"].createElement("div", null, function () {
           if (item.type === 'select') {
-            return '多选';
+            return localeDatas.table.checkAll;
           }
 
           if (item.type === 'expand') {
-            return '展开';
+            return localeDatas.table.expand;
           }
 
           if (typeof item.title === 'function') {
@@ -888,7 +896,7 @@ var Table = /*#__PURE__*/function (_Component) {
         }
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _prefix["default"])('table-page')
-      }, /*#__PURE__*/_react["default"].createElement(_pagination["default"], pagination))), serverPaginationConfig && /*#__PURE__*/_react["default"].createElement("div", {
+      }, /*#__PURE__*/_react["default"].createElement(_pagination["default"], pagination))), serverPaginationConfig && serverPaginationConfig.defaultCurrent && /*#__PURE__*/_react["default"].createElement("div", {
         style: {
           display: 'flex',
           justifyContent: serverPagePosition
@@ -896,7 +904,7 @@ var Table = /*#__PURE__*/function (_Component) {
         a: "1"
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _prefix["default"])('table-page')
-      }, /*#__PURE__*/_react["default"].createElement(_pagination["default"], (0, _extends2["default"])({}, serverPaginationConfig, {
+      }, /*#__PURE__*/_react["default"].createElement(_pagination["default"], _extends({}, serverPaginationConfig, {
         onChange: function onChange(current) {
           serverPaginationConfig.onChange && serverPaginationConfig.onChange(current);
 
@@ -913,10 +921,10 @@ var Table = /*#__PURE__*/function (_Component) {
     value: function xscroll() {
       var _this5 = this;
 
-      var _this$props8 = this.props,
-          _this$props8$fixTop = _this$props8.fixTop,
-          fixTop = _this$props8$fixTop === void 0 ? false : _this$props8$fixTop,
-          name = _this$props8.name;
+      var _this$props7 = this.props,
+          _this$props7$fixTop = _this$props7.fixTop,
+          fixTop = _this$props7$fixTop === void 0 ? false : _this$props7$fixTop,
+          name = _this$props7.name;
 
       if (typeof fixTop === 'boolean') {
         fixTop = 0;
@@ -926,12 +934,13 @@ var Table = /*#__PURE__*/function (_Component) {
 
       var dom = this.dom.current;
       var thead = dom ? dom.querySelectorAll('thead') : null;
-      var offsetTop = (0, _tool.offset)(dom).top; // 表格距离顶部的位置 < 表格+ 自己的高度
+      var offsetTop = (0, _tool.offset)(dom).top; //     表格距离顶部的位置 < 表格+ 自己的高度
 
       if (thead) {
-        if ((0, _tool.scrollTop)() + fixTop > offsetTop && fixTop < parseInt((0, _tool.getStyle)(dom, 'height'), 10) - parseInt((0, _tool.getStyle)(thead[0], 'height'), 10)) {
+        if ((0, _tool.scrollTop)() + fixTop > offsetTop && offsetTop + fixTop < offsetTop + parseInt((0, _tool.getStyle)(dom, 'height')) - parseInt(thead ? (0, _tool.getStyle)(thead[0], 'height') : 0)) {
           thead.forEach(function (th) {
-            th.style.display = 'table-header-group';
+            th.style.display = 'table-header-group'; // let h = (dom.offsetTop - scrollTop() - fixTop) * -1
+
             var h = (0, _tool.getPosition)(dom).y * -1 + fixTop;
             th.style.transform = "translate(0,".concat(h, "px)");
 
@@ -978,7 +987,7 @@ var Table = /*#__PURE__*/function (_Component) {
         return !fixed || fixed !== 'left' && fixed !== 'right';
       }); // 讲表格重新排序，并且去掉slelect ，因为是null
 
-      columns = [].concat((0, _toConsumableArray2["default"])(leftFiexColumns), (0, _toConsumableArray2["default"])(commanColumns), (0, _toConsumableArray2["default"])(rightFixColumns)).filter(function (item) {
+      columns = [].concat(_toConsumableArray(leftFiexColumns), _toConsumableArray(commanColumns), _toConsumableArray(rightFixColumns)).filter(function (item) {
         return item !== select;
       }).filter(function (col) {
         return !!col;
@@ -993,9 +1002,7 @@ var Table = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "getHeaderGroup",
-    value: function getHeaderGroup(columns, rowSelection) {
-      var _this6 = this;
-
+    value: function getHeaderGroup(columns) {
       columns = columns.map(function (item) {
         item.title = item.title || item.dataIndex;
         item.key = item.key || item.dataIndex || item.title || item.id;
@@ -1006,109 +1013,23 @@ var Table = /*#__PURE__*/function (_Component) {
 
         return item;
       });
-
-      if (rowSelection) {
-        var _rowSelection$selecte = rowSelection.selectedRowKeys,
-            selectedRowKeys = _rowSelection$selecte === void 0 ? [] : _rowSelection$selecte,
-            _rowSelection$dataNam = rowSelection.dataName,
-            dataName = _rowSelection$dataNam === void 0 ? 'key' : _rowSelection$dataNam;
-        columns.unshift({
-          width: '50px',
-          type: 'select',
-          key: 'hi-table-select-' + this.props.name,
-          title: function title() {
-            var _rowSelection$getChec = rowSelection.getCheckboxProps,
-                getCheckboxProps = _rowSelection$getChec === void 0 ? function (record) {
-              return {
-                disabled: false
-              };
-            } : _rowSelection$getChec,
-                _onChange = rowSelection.onChange;
-            return /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
-              type: "checkbox",
-              checked: selectedRowKeys.length === _this6.state.dataSource.filter(function (record) {
-                return !getCheckboxProps(record).disabled;
-              }).length && _this6.state.dataSource.filter(function (record) {
-                return !getCheckboxProps(record).disabled;
-              }).length > 0,
-              onChange: function onChange(e, checked) {
-                var data = _this6.state.dataSource.filter(function (record) {
-                  return !getCheckboxProps(record).disabled;
-                });
-
-                var _selectedRowKeys = (0, _toConsumableArray2["default"])(selectedRowKeys);
-
-                if (checked) {
-                  _selectedRowKeys.splice(0, selectedRowKeys.length);
-
-                  for (var i = 0; i < data.length; i++) {
-                    _selectedRowKeys.push(data[i][dataName]);
-                  }
-                } else {
-                  _selectedRowKeys.splice(0, _selectedRowKeys.length);
-                }
-
-                _onChange(_selectedRowKeys, data.filter(function (record) {
-                  return _selectedRowKeys.includes(record[dataName]);
-                }));
-              }
-            });
-          },
-          render: function render(text, record, index) {
-            var _rowSelection$getChec2 = rowSelection.getCheckboxProps,
-                getCheckboxProps = _rowSelection$getChec2 === void 0 ? function (record) {
-              return {
-                disabled: false
-              };
-            } : _rowSelection$getChec2,
-                _onChange2 = rowSelection.onChange; // todo dataName 是干嘛的不明白
-
-            return /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
-              type: "checkbox",
-              checked: selectedRowKeys.includes(record[dataName]),
-              disabled: getCheckboxProps(record).disabled,
-              onChange: function onChange(e, checked) {
-                var data = _this6.state.dataSource.filter(function (record) {
-                  return !getCheckboxProps(record).disabled;
-                });
-
-                var _selectedRowKeys = (0, _toConsumableArray2["default"])(selectedRowKeys);
-
-                if (checked) {
-                  _selectedRowKeys.push(record[dataName]);
-                } else {
-                  _selectedRowKeys = _selectedRowKeys.filter(function (key) {
-                    return record[dataName] !== key;
-                  });
-                }
-
-                _onChange2(_selectedRowKeys, data.filter(function (record) {
-                  return _selectedRowKeys.includes(record[dataName]);
-                }));
-              },
-              key: record[dataName]
-            });
-          }
-        });
-      }
-
       var bodyColumns = [];
       var headerColumns = [];
 
       var deepMap = function deepMap(columns, parent) {
-        for (var i = 0; i < columns.length; i++) {
-          columns[i].key = columns[i].key || columns[i].title;
-          columns[i].depth = parent.depth + 1;
-          var children = columns[i].children;
+        for (var key in columns) {
+          columns[key].key = columns[key].key || columns[key].title;
+          columns[key].depth = parent.depth + 1;
+          var children = columns[key].children;
 
           if (children && children.length > 0) {
-            columns[i].isLast = false;
-            deepMap(children, columns[i]);
+            columns[key].isLast = false;
+            deepMap(children, columns[key]); // delete columns[key].children
           } else {
-            columns[i].isLast = true;
+            columns[key].isLast = true;
           }
 
-          bodyColumns.push(columns[i]);
+          bodyColumns.push(columns[key]);
         }
       };
 
@@ -1142,9 +1063,10 @@ var Table = /*#__PURE__*/function (_Component) {
         bodyColumns[key].headColSpan = getNum(bodyColumns[key]);
       }
 
-      var maxArray = (0, _toConsumableArray2["default"])(bodyColumns).sort(function (pre, next) {
+      var maxArray = _toConsumableArray(bodyColumns).sort(function (pre, next) {
         return next.depth - pre.depth;
       });
+
       var max = maxArray.length > 0 ? maxArray[0].depth : 0; // 设置header-rowSpan
 
       var bd = bodyColumns.map(function (item) {
@@ -1176,17 +1098,104 @@ var Table = /*#__PURE__*/function (_Component) {
   }, {
     key: "setColumnsDetail",
     value: function setColumnsDetail(bool, prop, c) {
+      var _this6 = this;
+
       var props = prop || this.props;
       var leftFiexColumns = [];
       var rightFixColumns = [];
 
-      var _this$getHeaderGroup = this.getHeaderGroup(c || props.columns, props.rowSelection),
-          _this$getHeaderGroup2 = (0, _slicedToArray2["default"])(_this$getHeaderGroup, 2),
+      var _this$getHeaderGroup = this.getHeaderGroup(c || props.columns),
+          _this$getHeaderGroup2 = _slicedToArray(_this$getHeaderGroup, 2),
           headerColumns = _this$getHeaderGroup2[0],
           columns = _this$getHeaderGroup2[1];
 
-      var scroll = props.scroll,
-          scrollX = props.scrollX; // TODO 这里的逻辑要优化
+      var rowSelection = props.rowSelection,
+          scroll = props.scroll,
+          name = props.name,
+          scrollX = props.scrollX;
+
+      if (rowSelection) {
+        var _rowSelection$selecte = rowSelection.selectedRowKeys,
+            selectedRowKeys = _rowSelection$selecte === void 0 ? [] : _rowSelection$selecte,
+            _rowSelection$dataNam = rowSelection.dataName,
+            dataName = _rowSelection$dataNam === void 0 ? 'key' : _rowSelection$dataNam;
+        columns.unshift({
+          width: '50px',
+          type: 'select',
+          key: 'hi-table-select-' + name,
+          title: function title() {
+            var _rowSelection$getChec = rowSelection.getCheckboxProps,
+                getCheckboxProps = _rowSelection$getChec === void 0 ? function (record) {
+              return {
+                disabled: false
+              };
+            } : _rowSelection$getChec,
+                _onChange = rowSelection.onChange;
+            return /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+              type: "checkbox",
+              checked: selectedRowKeys.length === _this6.state.dataSource.filter(function (record) {
+                return !getCheckboxProps(record).disabled;
+              }).length && _this6.state.dataSource.filter(function (record) {
+                return !getCheckboxProps(record).disabled;
+              }).length > 0,
+              onChange: function onChange(e, checked) {
+                var data = _this6.state.dataSource.filter(function (record) {
+                  return !getCheckboxProps(record).disabled;
+                });
+
+                if (checked) {
+                  selectedRowKeys.splice(0, selectedRowKeys.length);
+
+                  for (var i = 0; i < data.length; i++) {
+                    selectedRowKeys.push(data[i][dataName]);
+                  }
+                } else {
+                  selectedRowKeys.splice(0, selectedRowKeys.length);
+                }
+
+                _onChange(selectedRowKeys, data.filter(function (record) {
+                  return selectedRowKeys.includes(record[dataName]);
+                }));
+              }
+            });
+          },
+          render: function render(text, record, index) {
+            var _rowSelection$getChec2 = rowSelection.getCheckboxProps,
+                getCheckboxProps = _rowSelection$getChec2 === void 0 ? function (record) {
+              return {
+                disabled: false
+              };
+            } : _rowSelection$getChec2,
+                _onChange2 = rowSelection.onChange; // todo dataName 是干嘛的不明白
+
+            return /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+              type: "checkbox",
+              che: selectedRowKeys.includes(record[dataName]),
+              checked: selectedRowKeys.includes(record[dataName]),
+              disabled: getCheckboxProps(record).disabled,
+              onChange: function onChange(e, checked) {
+                var data = _this6.state.dataSource.filter(function (record) {
+                  return !getCheckboxProps(record).disabled;
+                });
+
+                if (checked) {
+                  selectedRowKeys.push(record[dataName]);
+                } else {
+                  selectedRowKeys = selectedRowKeys.filter(function (key) {
+                    return record[dataName] !== key;
+                  });
+                }
+
+                _onChange2(selectedRowKeys, data.filter(function (record) {
+                  return selectedRowKeys.includes(record[dataName]);
+                }));
+              },
+              key: record[dataName]
+            });
+          }
+        });
+      } // TODO 这里的逻辑要优化
+
 
       if (scroll.x || scrollX || bool) {
         var obj = this.getColumns(columns);
@@ -1217,8 +1226,6 @@ var Table = /*#__PURE__*/function (_Component) {
           type = _ref7$origin$type === void 0 ? 'GET' : _ref7$origin$type,
           _ref7$origin$mode = _ref7$origin.mode,
           mode = _ref7$origin$mode === void 0 ? 'json' : _ref7$origin$mode,
-          _ref7$origin$withCred = _ref7$origin.withCredentials,
-          withCredentials = _ref7$origin$withCred === void 0 ? false : _ref7$origin$withCred,
           _ref7$origin$success = _ref7$origin.success,
           success = _ref7$origin$success === void 0 ? function (res) {} : _ref7$origin$success,
           _ref7$origin$error = _ref7$origin.error,
@@ -1226,8 +1233,8 @@ var Table = /*#__PURE__*/function (_Component) {
           _ref7$origin$currentP = _ref7$origin.currentPageName,
           currentPageName = _ref7$origin$currentP === void 0 ? Table.config.currentPageName : _ref7$origin$currentP;
 
-      _loading["default"].open(this.dom.current, {
-        key: 'loading'
+      var l = _loading["default"].open({
+        target: this.dom.current
       });
 
       this.setState({
@@ -1242,8 +1249,7 @@ var Table = /*#__PURE__*/function (_Component) {
 
       var options = {
         method: ['GET', 'get'].includes(type) ? 'GET' : 'POST',
-        url: url,
-        withCredentials: withCredentials
+        url: url
       };
 
       if (options.method === 'GET') {
@@ -1278,11 +1284,10 @@ var Table = /*#__PURE__*/function (_Component) {
 
           _this7.runMemory();
 
-          _loading["default"].close('loading');
+          l.close();
         });
       })["catch"](function (e) {
-        _loading["default"].close('loading');
-
+        l.close();
         error(e);
       });
     }
@@ -1291,11 +1296,11 @@ var Table = /*#__PURE__*/function (_Component) {
     value: function componentDidMount() {
       var _this8 = this;
 
-      var _this$props9 = this.props,
-          fixTop = _this$props9.fixTop,
-          scroll = _this$props9.scroll,
-          name = _this$props9.name,
-          origin = _this$props9.origin;
+      var _this$props8 = this.props,
+          fixTop = _this$props8.fixTop,
+          scroll = _this$props8.scroll,
+          name = _this$props8.name,
+          origin = _this$props8.origin;
       var dom = this.dom.current;
 
       if (fixTop) {
@@ -1303,7 +1308,7 @@ var Table = /*#__PURE__*/function (_Component) {
         document.addEventListener('scroll', function () {
           _this8.xscroll();
         });
-      } // 如果有列冻结的配置
+      } else {} // 如果有列冻结的配置
 
 
       if (scroll.x) {
@@ -1352,7 +1357,7 @@ var Table = /*#__PURE__*/function (_Component) {
           columns = _ref8.columns,
           width = _ref8.width,
           scroll = _ref8.scroll,
-          props = (0, _objectWithoutProperties2["default"])(_ref8, ["data", "columns", "width", "scroll"]);
+          props = _objectWithoutProperties(_ref8, ["data", "columns", "width", "scroll"]);
 
       // 服务端表格
       if (props.origin) {
@@ -1414,12 +1419,43 @@ var Table = /*#__PURE__*/function (_Component) {
         }, 0);
       }
     }
+  }, {
+    key: "isEmpty",
+    get: function get() {
+      var dataLen = this.state.dataSource.length;
+
+      if (dataLen > 0) {
+        return false;
+      }
+
+      if (!this.props.advance) {
+        return true;
+      }
+
+      var advance = this.props.advance;
+      var prefixLen = 0;
+      var suffixLen = 0;
+
+      if (advance.prefix) {
+        prefixLen = advance.prefix.length;
+      }
+
+      if (advance.suffix) {
+        suffixLen = advance.suffix.length;
+      }
+
+      if (prefixLen + suffixLen > 0) {
+        return false;
+      }
+
+      return true;
+    }
   }]);
+
   return Table;
 }(_react.Component);
 
-exports.Table = Table;
-(0, _defineProperty2["default"])(Table, "propTypes", {
+_defineProperty(Table, "propTypes", {
   data: _propTypes["default"].array,
   useFixedHeader: _propTypes["default"].bool,
   columns: _propTypes["default"].array,
@@ -1440,7 +1476,8 @@ exports.Table = Table;
   emptyText: _propTypes["default"].oneOfType([_propTypes["default"].node, _propTypes["default"].func]),
   scroll: _propTypes["default"].object
 });
-(0, _defineProperty2["default"])(Table, "defaultProps", {
+
+_defineProperty(Table, "defaultProps", {
   data: [],
   columns: [],
   useFixedHeader: false,
@@ -1464,6 +1501,7 @@ exports.Table = Table;
     return 'No Data';
   }
 });
+
 Table.config = {
   currentPageName: 'current',
   pageSizeName: 'pageSize',