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

package/es/ProForm/components/base/DatePicker/index.js

@@ -10,18 +10,19 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * @Author: za-xuwenli xuwenli@zhongan.io
  * @Date: 2024-01-19 18:27:41
  * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2024-05-29 11:19:12
+ * @LastEditTime: 2024-06-03 15:33:12
  * @FilePath: /za-material-warehouse/src/ProForm/components/base/DatePicker/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 
-import { isFunction, isString, isObject, uniq } from 'lodash';
+import { isFunction, isString, isObject, uniq, isBoolean } from 'lodash';
 import classNames from 'classnames';
 import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
 import ProForm from '../../../../ProForm';
 import Container from '../../Container';
 var DatePicker = function DatePicker(props) {
+  var _rest$showTime;
   var className = props.className,
     _props$format = props.format,
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
@@ -60,10 +61,20 @@ var DatePicker = function DatePicker(props) {
       children: viewChildren
     });
   }
+  var _defaultShowTime = {
+    format: 'HH:mm:ss'
+  };
   // dateTime模式下默认开启time选择
   var _rest = _objectSpread(_objectSpread({}, rest), {}, {
     showTime: rest.showTime === undefined && valueType === 'dateTime' || rest.showTime
   });
+  if (_rest.showTime && !isBoolean(_rest.showTime) && !Reflect.ownKeys((_rest$showTime = _rest.showTime) !== null && _rest$showTime !== void 0 ? _rest$showTime : {}).includes('format')) {
+    var _rest$showTime2;
+    _rest.showTime = _objectSpread(_objectSpread({}, (_rest$showTime2 = _rest.showTime) !== null && _rest$showTime2 !== void 0 ? _rest$showTime2 : {}), _defaultShowTime);
+  }
+  if (isBoolean(_rest.showTime)) {
+    _rest.showTime = _objectSpread({}, _defaultShowTime);
+  }
   // 字符串时间格式兼容
   if (isString(_rest.value)) {
     _rest.value = moment(_rest.value);
@@ -71,9 +82,16 @@ var DatePicker = function DatePicker(props) {
   if (['dateStartTime', 'dateEndTime'].includes(valueType) && rest.showTime === undefined) {
     _rest.showTime = {
       value: moment(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
-      disabled: true
+      disabled: true,
+      _defaultShowTime: _defaultShowTime
     };
   }
+  if (isBoolean(_rest.showTime)) {
+    _rest.showTime = _objectSpread({}, _defaultShowTime);
+  }
+  if (isObject(_rest.showTime)) {
+    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
+  }
   return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
     format: _format
   }, _rest), {}, {

package/es/ProForm/utils/useShouldUpdate.js

@@ -1,4 +1,3 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useRef, useState } from 'react';
 import { isFunction, isEqualWith } from 'lodash';
@@ -165,9 +164,10 @@ var useShouldUpdate = function useShouldUpdate(props) {
           clearInterval(timerRef.current);
           timerRef.current = setTimeout(function () {
             if (Array.isArray(names)) {
-              form.resetFields(_toConsumableArray(names));
+              form.resetFields(names);
             } else {
-              form.resetFields([formItemProps.name]);
+              var clearName = formItemProps.namePath ? formItemProps.namePath.slice(0, -1).concat(formItemProps.name) : formItemProps.name;
+              form.resetFields([clearName]);
             }
           }, 200);
         } else {

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 } from './utils';
+import { formatColumn, getColumnDataIndex, getRowKey } 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: item === null || item === void 0 ? void 0 : item[rowKey]
+      rowKey: getRowKey(rowKey, item)
     });
   });
   var _useSetState = useSetState({
@@ -96,8 +96,13 @@ function ProTable(props) {
       dataSource: initDataSource
     });
   }, [initDataSource]);
-  var originalObj = originalDataSource ? keyBy(originalDataSource, rowKey) : undefined;
-  var dataSourceObj = _dataSource ? keyBy(_dataSource, rowKey) : {};
+  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 propsColumnObj = useMemo(function () {
     return propsColumns.reduce(function (acc, cur) {
       // @ts-ignore
@@ -188,7 +193,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]);
@@ -427,7 +432,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,3 +18,4 @@ 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,4 +396,13 @@ 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/ProForm/components/base/DatePicker/index.js

@@ -22,11 +22,12 @@ var _excluded = ["className", "format"];
  * @Author: za-xuwenli xuwenli@zhongan.io
  * @Date: 2024-01-19 18:27:41
  * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2024-05-29 11:19:12
+ * @LastEditTime: 2024-06-03 15:33:12
  * @FilePath: /za-material-warehouse/src/ProForm/components/base/DatePicker/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 var DatePicker = function DatePicker(props) {
+  var _rest$showTime;
   var className = props.className,
     _props$format = props.format,
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
@@ -65,10 +66,20 @@ var DatePicker = function DatePicker(props) {
       children: viewChildren
     });
   }
+  var _defaultShowTime = {
+    format: 'HH:mm:ss'
+  };
   // dateTime模式下默认开启time选择
   var _rest = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
     showTime: rest.showTime === undefined && valueType === 'dateTime' || rest.showTime
   });
+  if (_rest.showTime && !(0, _lodash.isBoolean)(_rest.showTime) && !Reflect.ownKeys((_rest$showTime = _rest.showTime) !== null && _rest$showTime !== void 0 ? _rest$showTime : {}).includes('format')) {
+    var _rest$showTime2;
+    _rest.showTime = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (_rest$showTime2 = _rest.showTime) !== null && _rest$showTime2 !== void 0 ? _rest$showTime2 : {}), _defaultShowTime);
+  }
+  if ((0, _lodash.isBoolean)(_rest.showTime)) {
+    _rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
+  }
   // 字符串时间格式兼容
   if ((0, _lodash.isString)(_rest.value)) {
     _rest.value = (0, _moment.default)(_rest.value);
@@ -76,9 +87,16 @@ var DatePicker = function DatePicker(props) {
   if (['dateStartTime', 'dateEndTime'].includes(valueType) && rest.showTime === undefined) {
     _rest.showTime = {
       value: (0, _moment.default)(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
-      disabled: true
+      disabled: true,
+      _defaultShowTime: _defaultShowTime
     };
   }
+  if ((0, _lodash.isBoolean)(_rest.showTime)) {
+    _rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
+  }
+  if ((0, _lodash.isObject)(_rest.showTime)) {
+    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
+  }
   return (0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), {}, {
     format: _format
   }, _rest), {}, {

package/lib/ProForm/utils/useShouldUpdate.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _lodash = require("lodash");
@@ -172,9 +171,10 @@ var useShouldUpdate = function useShouldUpdate(props) {
           clearInterval(timerRef.current);
           timerRef.current = setTimeout(function () {
             if (Array.isArray(names)) {
-              form.resetFields((0, _toConsumableArray2.default)(names));
+              form.resetFields(names);
             } else {
-              form.resetFields([formItemProps.name]);
+              var clearName = formItemProps.namePath ? formItemProps.namePath.slice(0, -1).concat(formItemProps.name) : formItemProps.name;
+              form.resetFields([clearName]);
             }
           }, 200);
         } else {

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: item === null || item === void 0 ? void 0 : item[rowKey]
+      rowKey: (0, _utils3.getRowKey)(rowKey, item)
     });
   });
   var _useSetState = (0, _ahooks.useSetState)({
@@ -100,8 +100,13 @@ function ProTable(props) {
       dataSource: initDataSource
     });
   }, [initDataSource]);
-  var originalObj = originalDataSource ? (0, _lodash.keyBy)(originalDataSource, rowKey) : undefined;
-  var dataSourceObj = _dataSource ? (0, _lodash.keyBy)(_dataSource, rowKey) : {};
+  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 propsColumnObj = (0, _react.useMemo)(function () {
     return propsColumns.reduce(function (acc, cur) {
       // @ts-ignore
@@ -192,7 +197,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]);
@@ -431,7 +436,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,3 +18,4 @@ 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.getParentElement = exports.getColumnDataIndex = exports.formatColumn = void 0;
+exports.isListResult = exports.getRowKey = exports.getParentElement = exports.getColumnDataIndex = exports.formatColumn = void 0;
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _moment15 = _interopRequireDefault(require("moment"));
@@ -403,4 +403,13 @@ 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",
+  "version": "3.5.3-beta.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",