@vtx/components 3.1.136 → 3.1.138

package/lib/vtx-datagrid/index.js

@@ -1,178 +1,135 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = VtxDatagrid;
-
+exports.indexColumnKey = void 0;
 var _react = _interopRequireWildcard(require("react"));
-
 var _classnames2 = _interopRequireDefault(require("classnames"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _table = _interopRequireDefault(require("antd/lib/table"));
-
 var _tooltip = _interopRequireDefault(require("antd/lib/tooltip"));
-
 var _dropdown = _interopRequireDefault(require("antd/lib/dropdown"));
-
 var _menu = _interopRequireDefault(require("antd/lib/menu"));
-
 var _empty = _interopRequireDefault(require("antd/lib/empty"));
-
 var _RedoOutlined = _interopRequireDefault(require("@ant-design/icons/RedoOutlined"));
-
 var _ColumnHeightOutlined = _interopRequireDefault(require("@ant-design/icons/ColumnHeightOutlined"));
-
 var _SettingOutlined = _interopRequireDefault(require("@ant-design/icons/SettingOutlined"));
-
 var _Alert = _interopRequireDefault(require("./Alert"));
-
 var _ColumnSetting = _interopRequireDefault(require("./ColumnSetting"));
-
 var _ResizeableTitle = _interopRequireDefault(require("./ResizeableTitle"));
-
 var _renderColumnButtons = _interopRequireDefault(require("./renderColumnButtons"));
-
 var _useSet3 = _interopRequireDefault(require("../_util/useSet"));
-
 var _isFunction = _interopRequireDefault(require("../_util/isFunction"));
-
 var _axios = _interopRequireDefault(require("axios"));
-
 var _ahooks = require("ahooks");
-
 var _getSignature = _interopRequireDefault(require("@vtx/utils/lib/getSignature"));
-
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _excluded = ["prefixCls", "toolbar", "toolbarClassName", "toolbarTilte", "buttonGroup", "refreshIconVisible", "hideColumnSetting", "hideColumnHeight", "visibleColumnKeys", "defaultVisibleColumnKeys", "onVisibleColumnsChange", "onRefresh", "indexColumn", "indexFixed", "bordered", "indexTitle", "startIndex", "autoFit", "headFootHeight", "columnResizable", "components", "className", "style", "emptyText", "onRowSelectionClear", "disabledColumnKeys", "onColumnsSave", "uniqueKey", "prefixUrl", "customEnumText", "hideSelectionClear", "indexWidth"];
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-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); }
-
-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 _extends() { _extends = Object.assign ? Object.assign.bind() : 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+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 && {}.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 _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-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; }
-
-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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(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 t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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 _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 _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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_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 _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 var isMac = navigator.userAgent.indexOf('Mac OS') !== -1;
-
+var indexColumnKey = exports.indexColumnKey = '_serialNum';
 function VtxDatagrid(props) {
-  var _rest$dataSource, _rest$rowSelection, _rest$rowSelection2, _dataSource2, _classnames, _rest$rowSelection3, _dataSource3;
-
+  var _rest$dataSource, _rest$rowSelection, _rest$rowSelection2, _dataSource2, _rest$rowSelection3, _dataSource3;
   var _useSet = (0, _useSet3["default"])({
-    // 显示列
-    visibleColumns: [],
-    // 列设置选中的列
-    checkedColumnKeys: [],
-    // 列设置选项
-    columnSettingOptions: [],
-    datagridId: "vtx-datagrid-".concat(new Date().getTime()),
-    scrollY: 0,
-    size: 'middle',
-    projectKey: '',
-    // keys in rest.columns
-    keysInColumns: []
-  }),
-      _useSet2 = _slicedToArray(_useSet, 2),
-      state = _useSet2[0],
-      setState = _useSet2[1];
-
+      // 显示列
+      visibleColumns: [],
+      // 列设置选中的列
+      checkedColumnKeys: [],
+      // 列设置选项
+      columnSettingOptions: [],
+      datagridId: "vtx-datagrid-".concat(new Date().getTime()),
+      scrollY: 0,
+      size: 'middle',
+      projectKey: '',
+      firstChangeVisibleColumnKeys: true
+    }),
+    _useSet2 = _slicedToArray(_useSet, 2),
+    state = _useSet2[0],
+    setState = _useSet2[1];
   var visibleColumns = state.visibleColumns,
-      checkedColumnKeys = state.checkedColumnKeys,
-      columnSettingOptions = state.columnSettingOptions,
-      datagridId = state.datagridId,
-      scrollY = state.scrollY,
-      size = state.size;
-  var datagridRef = (0, _react.useRef)(null); // 列设置提示高度
-
-  var alertHeight = (0, _react.useRef)(0); // 工具栏高度
-
-  var toolbarHeight = (0, _react.useRef)(0); // 列接口显示字段
-
+    checkedColumnKeys = state.checkedColumnKeys,
+    columnSettingOptions = state.columnSettingOptions,
+    datagridId = state.datagridId,
+    scrollY = state.scrollY,
+    size = state.size;
+  var datagridRef = (0, _react.useRef)(null);
+  // 列设置提示高度
+  var alertHeight = (0, _react.useRef)(0);
+  // 工具栏高度
+  var toolbarHeight = (0, _react.useRef)(0);
+  // 列接口显示字段
   var settingRef = (0, _react.useRef)();
-
   var _props$prefixCls = props.prefixCls,
-      prefixCls = _props$prefixCls === void 0 ? 'vtx-datagrid' : _props$prefixCls,
-      _props$toolbar = props.toolbar,
-      toolbar = _props$toolbar === void 0 ? true : _props$toolbar,
-      toolbarClassName = props.toolbarClassName,
-      _props$toolbarTilte = props.toolbarTilte,
-      toolbarTilte = _props$toolbarTilte === void 0 ? '查询结果' : _props$toolbarTilte,
-      buttonGroup = props.buttonGroup,
-      _props$refreshIconVis = props.refreshIconVisible,
-      refreshIconVisible = _props$refreshIconVis === void 0 ? true : _props$refreshIconVis,
-      hideColumnSetting = props.hideColumnSetting,
-      hideColumnHeight = props.hideColumnHeight,
-      visibleColumnKeys = props.visibleColumnKeys,
-      defaultVisibleColumnKeys = props.defaultVisibleColumnKeys,
-      onVisibleColumnsChange = props.onVisibleColumnsChange,
-      onRefresh = props.onRefresh,
-      _props$indexColumn = props.indexColumn,
-      indexColumn = _props$indexColumn === void 0 ? true : _props$indexColumn,
-      _props$indexFixed = props.indexFixed,
-      indexFixed = _props$indexFixed === void 0 ? false : _props$indexFixed,
-      _props$bordered = props.bordered,
-      bordered = _props$bordered === void 0 ? true : _props$bordered,
-      _props$indexTitle = props.indexTitle,
-      indexTitle = _props$indexTitle === void 0 ? '序号' : _props$indexTitle,
-      _props$startIndex = props.startIndex,
-      startIndex = _props$startIndex === void 0 ? 1 : _props$startIndex,
-      _props$autoFit = props.autoFit,
-      autoFit = _props$autoFit === void 0 ? true : _props$autoFit,
-      _props$headFootHeight = props.headFootHeight,
-      headFootHeight = _props$headFootHeight === void 0 ? 115 : _props$headFootHeight,
-      columnResizable = props.columnResizable,
-      components = props.components,
-      className = props.className,
-      style = props.style,
-      _props$emptyText = props.emptyText,
-      emptyText = _props$emptyText === void 0 ? '暂无数据' : _props$emptyText,
-      onRowSelectionClear = props.onRowSelectionClear,
-      disabledColumnKeys = props.disabledColumnKeys,
-      onColumnsSave = props.onColumnsSave,
-      uniqueKey = props.uniqueKey,
-      prefixUrl = props.prefixUrl,
-      _props$customEnumText = props.customEnumText,
-      customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText,
-      _props$hideSelectionC = props.hideSelectionClear,
-      hideSelectionClear = _props$hideSelectionC === void 0 ? false : _props$hideSelectionC,
-      _props$indexWidth = props.indexWidth,
-      indexWidth = _props$indexWidth === void 0 ? 70 : _props$indexWidth,
-      rest = _objectWithoutProperties(props, _excluded);
-
+    prefixCls = _props$prefixCls === void 0 ? 'vtx-datagrid' : _props$prefixCls,
+    _props$toolbar = props.toolbar,
+    toolbar = _props$toolbar === void 0 ? true : _props$toolbar,
+    toolbarClassName = props.toolbarClassName,
+    _props$toolbarTilte = props.toolbarTilte,
+    toolbarTilte = _props$toolbarTilte === void 0 ? '查询结果' : _props$toolbarTilte,
+    buttonGroup = props.buttonGroup,
+    _props$refreshIconVis = props.refreshIconVisible,
+    refreshIconVisible = _props$refreshIconVis === void 0 ? true : _props$refreshIconVis,
+    hideColumnSetting = props.hideColumnSetting,
+    hideColumnHeight = props.hideColumnHeight,
+    visibleColumnKeys = props.visibleColumnKeys,
+    defaultVisibleColumnKeys = props.defaultVisibleColumnKeys,
+    onVisibleColumnsChange = props.onVisibleColumnsChange,
+    onRefresh = props.onRefresh,
+    _props$indexColumn = props.indexColumn,
+    indexColumn = _props$indexColumn === void 0 ? true : _props$indexColumn,
+    _props$indexFixed = props.indexFixed,
+    indexFixed = _props$indexFixed === void 0 ? false : _props$indexFixed,
+    _props$bordered = props.bordered,
+    bordered = _props$bordered === void 0 ? true : _props$bordered,
+    _props$indexTitle = props.indexTitle,
+    indexTitle = _props$indexTitle === void 0 ? '序号' : _props$indexTitle,
+    _props$startIndex = props.startIndex,
+    startIndex = _props$startIndex === void 0 ? 1 : _props$startIndex,
+    _props$autoFit = props.autoFit,
+    autoFit = _props$autoFit === void 0 ? true : _props$autoFit,
+    _props$headFootHeight = props.headFootHeight,
+    headFootHeight = _props$headFootHeight === void 0 ? 115 : _props$headFootHeight,
+    columnResizable = props.columnResizable,
+    components = props.components,
+    className = props.className,
+    style = props.style,
+    _props$emptyText = props.emptyText,
+    emptyText = _props$emptyText === void 0 ? '暂无数据' : _props$emptyText,
+    onRowSelectionClear = props.onRowSelectionClear,
+    disabledColumnKeys = props.disabledColumnKeys,
+    onColumnsSave = props.onColumnsSave,
+    uniqueKey = props.uniqueKey,
+    prefixUrl = props.prefixUrl,
+    _props$customEnumText = props.customEnumText,
+    customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText,
+    _props$hideSelectionC = props.hideSelectionClear,
+    hideSelectionClear = _props$hideSelectionC === void 0 ? false : _props$hideSelectionC,
+    _props$indexWidth = props.indexWidth,
+    indexWidth = _props$indexWidth === void 0 ? 70 : _props$indexWidth,
+    rest = _objectWithoutProperties(props, _excluded);
   var TextEnum = _objectSpread({
     refreshText: '刷新',
     densityDefaultText: '默认',
@@ -191,12 +148,11 @@ function VtxDatagrid(props) {
     messageWarningOneText: '至少勾选一列保存',
     paginationTotalText: '共',
     paginationItemText: '条'
-  }, customEnumText); // 规则，菜单根目录_页面路由
-
+  }, customEnumText);
 
+  // 规则，菜单根目录_页面路由
   function getUniqueKey() {
     var route = location.href.match(/#\/(\S*)\?/);
-
     if (route) {
       (0, _axios["default"])({
         method: 'GET',
@@ -204,7 +160,6 @@ function VtxDatagrid(props) {
         headers: _objectSpread({}, (0, _getSignature["default"])({}))
       }).then(function (res) {
         var _res$data;
-
         if ((res === null || res === void 0 ? void 0 : res.status) == 200 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.key) {
           setState({
             projectKey: "".concat(res.data.key, "_").concat(route ? route[1] : 'test')
@@ -212,53 +167,48 @@ function VtxDatagrid(props) {
         }
       });
     }
-  } // 高度计算
-
+  }
 
+  // 高度计算
   var _useThrottleFn = (0, _ahooks.useThrottleFn)(function () {
-    var _datagridRef$current;
-
-    if (!datagridRef.current) {
-      return null;
-    }
-
-    var bodyHeight = ((_datagridRef$current = datagridRef.current) === null || _datagridRef$current === void 0 ? void 0 : _datagridRef$current.clientHeight) - headFootHeight - toolbarHeight.current - alertHeight.current;
-    var divs = datagridRef.current.getElementsByTagName('div');
-    var bodyDiv = Array.prototype.filter.call(divs, function (dom) {
-      return dom.className.includes('ant-table-body') || dom.className.includes('ant-table-content');
-    })[0];
-    bodyDiv.style.minHeight = "".concat(bodyHeight - (rest.scrollY || 0), "px");
-    setState({
-      scrollY: bodyHeight
-    });
-  }, {
-    wait: 350
-  }),
-      calculateHeight = _useThrottleFn.run;
-
+      var _datagridRef$current;
+      if (!datagridRef.current) {
+        return null;
+      }
+      var bodyHeight = ((_datagridRef$current = datagridRef.current) === null || _datagridRef$current === void 0 ? void 0 : _datagridRef$current.clientHeight) - headFootHeight - toolbarHeight.current - alertHeight.current;
+      var divs = datagridRef.current.getElementsByTagName('div');
+      var bodyDiv = Array.prototype.filter.call(divs, function (dom) {
+        return dom.className.includes('ant-table-body') || dom.className.includes('ant-table-content');
+      })[0];
+      bodyDiv.style.minHeight = "".concat(bodyHeight - (rest.scrollY || 0), "px");
+      setState({
+        scrollY: bodyHeight
+      });
+    }, {
+      wait: 350
+    }),
+    calculateHeight = _useThrottleFn.run;
   (0, _react.useEffect)(function () {
     // 当没有传入唯一值而且没有自定义列保存的时候且根据规则自动生成唯一值
     if (!uniqueKey && !onColumnsSave && toolbar && !hideColumnSetting) {
       getUniqueKey();
     }
-
     var resizeObserver = new ResizeObserver(function () {
       calculateHeight();
-    }); // componentDidMount
-
+    });
+    // componentDidMount
     if (autoFit && datagridRef.current) {
       resizeObserver.observe(datagridRef.current, {
         box: 'border-box'
       });
     }
-
     return function () {
       // componentWillUnmount
       if (autoFit) {
         resizeObserver.disconnect();
       }
     };
-  }, []);
+  }, [autoFit]);
   (0, _react.useLayoutEffect)(function () {
     if (autoFit) {
       calculateHeight();
@@ -266,8 +216,6 @@ function VtxDatagrid(props) {
   }, [(_rest$dataSource = rest.dataSource) === null || _rest$dataSource === void 0 ? void 0 : _rest$dataSource.length, (((_rest$rowSelection = rest.rowSelection) === null || _rest$rowSelection === void 0 ? void 0 : _rest$rowSelection.selectedRowKeys) || []).join(',')]);
   (0, _react.useEffect)(function () {
     var _rest$columns;
-
-    parseColumns();
     var keys = [];
     var options = (_rest$columns = rest.columns) === null || _rest$columns === void 0 ? void 0 : _rest$columns.map(function (col) {
       keys.push(col.dataIndex || col.key);
@@ -275,76 +223,89 @@ function VtxDatagrid(props) {
         key: col.dataIndex || col.key
       });
     });
+    // 序号添加操作列
+    if (indexColumn) {
+      options = [{
+        title: indexTitle,
+        dataIndex: indexColumnKey,
+        key: indexColumnKey,
+        width: indexWidth,
+        fixed: indexFixed
+      }].concat(_toConsumableArray(options));
+    }
     setState({
-      columnSettingOptions: options,
-      keysInColumns: keys
+      columnSettingOptions: options
     });
-  }, [rest.columns]);
+  }, [JSON.stringify(rest.columns), indexColumn]);
   (0, _react.useEffect)(function () {
-    var _settingRef$current;
-
-    (_settingRef$current = settingRef.current) === null || _settingRef$current === void 0 ? void 0 : _settingRef$current.updateShowColumns(visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.join(","));
-  }, [visibleColumnKeys]);
+    parseColumns();
+  }, [JSON.stringify(columnSettingOptions)]);
   (0, _react.useEffect)(function () {
-    handleChangeColumns(state.keysInColumns);
-  }, [JSON.stringify(state.keysInColumns)]);
-
+    /**
+     * 首次传入（后面修改 采用内部的checkedColumnKeys控制）
+     * 有值
+     * 并且和当前选中的不一样才需要更新
+     */
+    if (state.firstChangeVisibleColumnKeys && visibleColumnKeys && !(0, _isEqual["default"])(checkedColumnKeys, visibleColumnKeys)) {
+      var _settingRef$current;
+      setState({
+        firstChangeVisibleColumnKeys: false
+      });
+      var newVisibleColumnKeys = state.firstChangeVisibleColumnKeys ? [indexColumn ? [indexColumnKey] : []].concat(_toConsumableArray(visibleColumnKeys)) : visibleColumnKeys;
+      (_settingRef$current = settingRef.current) === null || _settingRef$current === void 0 || _settingRef$current.updateShowColumns(newVisibleColumnKeys === null || newVisibleColumnKeys === void 0 ? void 0 : newVisibleColumnKeys.join(','));
+    }
+  }, [Array.isArray(visibleColumnKeys) ? JSON.stringify(visibleColumnKeys) : visibleColumnKeys]);
   var parseColumns = function parseColumns(type) {
     // 显示工具栏的同时并显示列设置
     if (toolbar && !hideColumnSetting) {
       var _settingRef$current2;
-
       if (defaultVisibleColumnKeys || visibleColumnKeys || (_settingRef$current2 = settingRef.current) !== null && _settingRef$current2 !== void 0 && _settingRef$current2.showColumns) {
-        var _rest$columns2, _settingRef$current3, _rest$columns3;
-
-        var columnKeys = type === 'reset' ? defaultVisibleColumnKeys || ((_rest$columns2 = rest.columns) === null || _rest$columns2 === void 0 ? void 0 : _rest$columns2.map(function (item) {
+        var _settingRef$current3;
+        var columnKeys = type === 'reset' ? defaultVisibleColumnKeys || (columnSettingOptions === null || columnSettingOptions === void 0 ? void 0 : columnSettingOptions.map(function (item) {
           return item.key;
         })) : ((_settingRef$current3 = settingRef.current) === null || _settingRef$current3 === void 0 ? void 0 : _settingRef$current3.showColumns) || visibleColumnKeys || defaultVisibleColumnKeys;
         setState({
           checkedColumnKeys: columnKeys,
-          visibleColumns: (_rest$columns3 = rest.columns) === null || _rest$columns3 === void 0 ? void 0 : _rest$columns3.filter(function (item) {
+          visibleColumns: columnSettingOptions === null || columnSettingOptions === void 0 ? void 0 : columnSettingOptions.filter(function (item) {
             return columnKeys.includes(item.dataIndex || item.key);
           })
         });
       } else {
-        var _rest$columns4;
-
         setState({
-          checkedColumnKeys: (_rest$columns4 = rest.columns) === null || _rest$columns4 === void 0 ? void 0 : _rest$columns4.map(function (item) {
+          checkedColumnKeys: columnSettingOptions === null || columnSettingOptions === void 0 ? void 0 : columnSettingOptions.map(function (item) {
             return item.dataIndex || item.key;
           }),
-          visibleColumns: rest.columns
+          visibleColumns: columnSettingOptions
         });
       }
     } else {
       setState({
-        visibleColumns: rest.columns
+        visibleColumns: columnSettingOptions
       });
     }
   };
-
   var hasAlert = (((_rest$rowSelection2 = rest.rowSelection) === null || _rest$rowSelection2 === void 0 ? void 0 : _rest$rowSelection2.selectedRowKeys) || []).length > 0;
   alertHeight.current = !hideSelectionClear && hasAlert ? 49 : 0;
-  toolbarHeight.current = toolbar ? 56 : 0; // 列设置回调
+  toolbarHeight.current = toolbar ? 56 : 0;
 
+  // 列设置回调
   var handleChangeColumns = function handleChangeColumns(keys) {
-    var _rest$columns5;
-
-    var columnKeys = keys || ((_rest$columns5 = rest.columns) === null || _rest$columns5 === void 0 ? void 0 : _rest$columns5.map(function (item) {
+    var columnKeys = keys || (columnSettingOptions === null || columnSettingOptions === void 0 ? void 0 : columnSettingOptions.map(function (item) {
       return item.dataIndex || item.key;
     }));
-    setState({
-      checkedColumnKeys: columnKeys,
-      visibleColumns: columnSettingOptions === null || columnSettingOptions === void 0 ? void 0 : columnSettingOptions.filter(function (item) {
-        return columnKeys.includes(item.key);
-      })
-    });
-    onVisibleColumnsChange && onVisibleColumnsChange(columnKeys);
-  }; // 工具栏
-
+    if (!(0, _isEqual["default"])(checkedColumnKeys, columnKeys)) {
+      setState({
+        checkedColumnKeys: columnKeys,
+        visibleColumns: columnSettingOptions === null || columnSettingOptions === void 0 ? void 0 : columnSettingOptions.filter(function (item) {
+          return columnKeys.includes(item.key);
+        })
+      });
+      onVisibleColumnsChange && onVisibleColumnsChange(columnKeys);
+    }
+  };
 
+  // 工具栏
   var toolbarRender;
-
   if (toolbar) {
     toolbarRender = /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames2["default"])("".concat(prefixCls, "-toolbar"), toolbarClassName)
@@ -406,14 +367,13 @@ function VtxDatagrid(props) {
     }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
       title: TextEnum.columnSettingText
     }, /*#__PURE__*/_react["default"].createElement(_SettingOutlined["default"], null)))))));
-  } // 分页
-
+  }
 
+  // 分页
   var getPagination = function getPagination(pagination) {
     if (typeof pagination === 'boolean' && !pagination) {
       return pagination;
     }
-
     return _objectSpread({
       pageSizeOptions: ['10', '20', '30', '40', '50'],
       showSizeChanger: true,
@@ -422,20 +382,16 @@ function VtxDatagrid(props) {
         return "".concat(TextEnum.paginationTotalText, " ").concat(total, " ").concat(TextEnum.paginationItemText);
       }
     }, pagination);
-  }; // 处理操作按钮
-
-
+  };
+  // 处理操作按钮
   var columns = (visibleColumns || []).map(function (column) {
     var newColumn = _objectSpread({}, column);
-
     if (newColumn.renderButtons) {
       delete newColumn.renderButtons;
     }
-
     if (newColumn.renderButtonsVisibleNum) {
       delete newColumn.renderButtonsVisibleNum;
     }
-
     return _objectSpread(_objectSpread({}, newColumn), {}, {
       render: (0, _isFunction["default"])(column.renderButtons) ? function (text, record, index) {
         return (0, _renderColumnButtons["default"])(column.renderButtons, column.renderButtonsVisibleNum, text, record, index, TextEnum);
@@ -443,8 +399,8 @@ function VtxDatagrid(props) {
         return ['', null, undefined].includes(text) ? '-' : text;
       }
     });
-  }); // 配置了列可伸缩
-
+  });
+  // 配置了列可伸缩
   if (columnResizable) {
     columns = columns.map(function (col, index) {
       return _objectSpread(_objectSpread({}, col), {}, {
@@ -456,15 +412,12 @@ function VtxDatagrid(props) {
         }
       });
     });
-
     var handleResize = function handleResize(index) {
       return function (e, _ref2) {
         var size = _ref2.size;
         setState(function (_ref3) {
           var visibleColumns = _ref3.visibleColumns;
-
           var nextColumns = _toConsumableArray(visibleColumns);
-
           nextColumns[index] = _objectSpread(_objectSpread({}, nextColumns[index]), {}, {
             width: size.width
           });
@@ -474,39 +427,36 @@ function VtxDatagrid(props) {
         });
       };
     };
-  } // 序号添加
-
-
+  }
+  // 序号添加
   var dataSource = rest.dataSource;
-
   if (indexColumn) {
     var _dataSource;
-
-    columns = [{
-      title: indexTitle,
-      dataIndex: '_serialNum',
-      key: '_serialNum',
-      width: indexWidth,
-      fixed: indexFixed
-    }].concat(_toConsumableArray(columns));
+    // columns = [
+    //     {
+    //         title: indexTitle,
+    //         dataIndex: indexColumnKey,
+    //         key: indexColumnKey,
+    //         width: indexWidth,
+    //         fixed: indexFixed,
+    //     },
+    //     ...columns,
+    // ];
     dataSource = (_dataSource = dataSource) === null || _dataSource === void 0 ? void 0 : _dataSource.map(function (item, i) {
       return _objectSpread(_objectSpread({}, item), {}, {
         _serialNum: i + startIndex
       });
     });
   }
-
   var scroll = rest.scroll || {};
-
   if (autoFit) {
     scroll = _objectSpread(_objectSpread({}, scroll), {}, {
       y: scrollY - (rest.scrollY || 0)
     });
   }
-
   return /*#__PURE__*/_react["default"].createElement("div", {
     id: datagridId,
-    className: (0, _classnames2["default"])(prefixCls, className, (_classnames = {}, _defineProperty(_classnames, "".concat(prefixCls, "-fit"), autoFit), _defineProperty(_classnames, "".concat(prefixCls, "-noFit"), !autoFit), _defineProperty(_classnames, "".concat(prefixCls, "-nodata"), !((_dataSource2 = dataSource) !== null && _dataSource2 !== void 0 && _dataSource2.length)), _defineProperty(_classnames, "".concat(prefixCls, "-userAgent-mac"), isMac), _classnames)),
+    className: (0, _classnames2["default"])(prefixCls, className, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-fit"), autoFit), "".concat(prefixCls, "-noFit"), !autoFit), "".concat(prefixCls, "-nodata"), !((_dataSource2 = dataSource) !== null && _dataSource2 !== void 0 && _dataSource2.length)), "".concat(prefixCls, "-userAgent-mac"), isMac)),
     style: style,
     ref: datagridRef
   }, toolbarRender, !hideSelectionClear && hasAlert ? /*#__PURE__*/_react["default"].createElement("div", {
@@ -539,7 +489,6 @@ function VtxDatagrid(props) {
     }) : components
   })));
 }
-
 VtxDatagrid.propTypes = {
   prefixCls: _propTypes["default"].string,
   refreshIconVisible: _propTypes["default"].bool,