@zat-design/sisyphus-react 3.5.2-beta.1 → 3.5.2

package/es/ProTable/index.js

@@ -26,7 +26,7 @@ import useAntdTable from './useAntdTable';
 import empty from '../assets/empty.png';
 import resetSvg from '../assets/reset.svg';
 import customColumnSvg from '../assets/customColumn.svg';
-import { formatColumn, getColumnDataIndex, getRowKey } from './utils';
+import { formatColumn, getColumnDataIndex } from './utils';
 import locale from '../locale';
 var defaultCacheTime = 1; // columns 配置保存时间为一天
 // 全局上下文
@@ -82,7 +82,7 @@ function ProTable(props) {
     rowKey = _ref3.rowKey;
   var initDataSource = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
-      rowKey: getRowKey(rowKey, item)
+      rowKey: item === null || item === void 0 ? void 0 : item[rowKey]
     });
   });
   var _useSetState = useSetState({
@@ -96,13 +96,8 @@ function ProTable(props) {
       dataSource: initDataSource
     });
   }, [initDataSource]);
-  var _originalDataSource = originalDataSource === null || originalDataSource === void 0 ? void 0 : originalDataSource.map(function (item) {
-    return _objectSpread(_objectSpread({}, item), {}, {
-      rowKey: getRowKey(rowKey, item)
-    });
-  });
-  var originalObj = _originalDataSource ? keyBy(_originalDataSource, 'rowKey') : undefined;
-  var dataSourceObj = _dataSource ? keyBy(_dataSource, 'rowKey') : {};
+  var originalObj = originalDataSource ? keyBy(originalDataSource, rowKey) : undefined;
+  var dataSourceObj = _dataSource ? keyBy(_dataSource, rowKey) : {};
   var propsColumnObj = useMemo(function () {
     return propsColumns.reduce(function (acc, cur) {
       // @ts-ignore
@@ -193,7 +188,7 @@ function ProTable(props) {
       return !(item === null || item === void 0 ? void 0 : item.delete);
     });
     newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item) {
-      formatColumn(item, originalObj, dataSourceObj, 'rowKey');
+      formatColumn(item, originalObj, dataSourceObj, rowKey);
     });
     return newColumns;
   }, [curColumns, handleResize]);
@@ -432,7 +427,7 @@ function ProTable(props) {
               return renderSummary();
             } : summary,
             rowClassName: function rowClassName(record, index) {
-              if (originalDataSource && !originalObj.hasOwnProperty(get(record, 'rowKey'))) {
+              if (originalDataSource && !originalObj.hasOwnProperty(get(record, rowKey))) {
                 return 'new-cell';
               }
             }

package/es/ProTable/utils.d.ts

@@ -18,4 +18,3 @@ export declare const getParentElement: (element: any, name: any, type?: string)
 export declare const isListResult: (data: {
     [key: string]: any;
 }) => boolean;
-export declare const getRowKey: (rowKey: any, record: any) => any;

package/es/ProTable/utils.js

@@ -396,13 +396,4 @@ export var getParentElement = function getParentElement(element, name) {
  */
 export var isListResult = function isListResult(data) {
   return data.hasOwnProperty('total') && data.hasOwnProperty('list');
-};
-export var getRowKey = function getRowKey(rowKey, record) {
-  // 默认取id
-  var key = record.rowKey || 'id';
-  if (rowKey) {
-    var _ref;
-    key = (_ref = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref !== void 0 ? _ref : key;
-  }
-  return key;
 };

package/lib/ProTable/index.js

@@ -86,7 +86,7 @@ function ProTable(props) {
     rowKey = _ref3.rowKey;
   var initDataSource = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
     return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, item), {}, {
-      rowKey: (0, _utils3.getRowKey)(rowKey, item)
+      rowKey: item === null || item === void 0 ? void 0 : item[rowKey]
     });
   });
   var _useSetState = (0, _ahooks.useSetState)({
@@ -100,13 +100,8 @@ function ProTable(props) {
       dataSource: initDataSource
     });
   }, [initDataSource]);
-  var _originalDataSource = originalDataSource === null || originalDataSource === void 0 ? void 0 : originalDataSource.map(function (item) {
-    return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, item), {}, {
-      rowKey: (0, _utils3.getRowKey)(rowKey, item)
-    });
-  });
-  var originalObj = _originalDataSource ? (0, _lodash.keyBy)(_originalDataSource, 'rowKey') : undefined;
-  var dataSourceObj = _dataSource ? (0, _lodash.keyBy)(_dataSource, 'rowKey') : {};
+  var originalObj = originalDataSource ? (0, _lodash.keyBy)(originalDataSource, rowKey) : undefined;
+  var dataSourceObj = _dataSource ? (0, _lodash.keyBy)(_dataSource, rowKey) : {};
   var propsColumnObj = (0, _react.useMemo)(function () {
     return propsColumns.reduce(function (acc, cur) {
       // @ts-ignore
@@ -197,7 +192,7 @@ function ProTable(props) {
       return !(item === null || item === void 0 ? void 0 : item.delete);
     });
     newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item) {
-      (0, _utils3.formatColumn)(item, originalObj, dataSourceObj, 'rowKey');
+      (0, _utils3.formatColumn)(item, originalObj, dataSourceObj, rowKey);
     });
     return newColumns;
   }, [curColumns, handleResize]);
@@ -436,7 +431,7 @@ function ProTable(props) {
               return renderSummary();
             } : summary,
             rowClassName: function rowClassName(record, index) {
-              if (originalDataSource && !originalObj.hasOwnProperty((0, _lodash.get)(record, 'rowKey'))) {
+              if (originalDataSource && !originalObj.hasOwnProperty((0, _lodash.get)(record, rowKey))) {
                 return 'new-cell';
               }
             }

package/lib/ProTable/utils.d.ts

@@ -18,4 +18,3 @@ export declare const getParentElement: (element: any, name: any, type?: string)
 export declare const isListResult: (data: {
     [key: string]: any;
 }) => boolean;
-export declare const getRowKey: (rowKey: any, record: any) => any;

package/lib/ProTable/utils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isListResult = exports.getRowKey = exports.getParentElement = exports.getColumnDataIndex = exports.formatColumn = void 0;
+exports.isListResult = exports.getParentElement = exports.getColumnDataIndex = exports.formatColumn = void 0;
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _moment15 = _interopRequireDefault(require("moment"));
@@ -403,13 +403,4 @@ var getParentElement = exports.getParentElement = function getParentElement(elem
  */
 var isListResult = exports.isListResult = function isListResult(data) {
   return data.hasOwnProperty('total') && data.hasOwnProperty('list');
-};
-var getRowKey = exports.getRowKey = function getRowKey(rowKey, record) {
-  // 默认取id
-  var key = record.rowKey || 'id';
-  if (rowKey) {
-    var _ref;
-    key = (_ref = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref !== void 0 ? _ref : key;
-  }
-  return key;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.5.2-beta.1",
+  "version": "3.5.2",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",