@zat-design/sisyphus-react 3.5.5-beta.3 → 3.5.5-beta.5

package/es/ProEditTable/components/RenderField/index.js

@@ -29,7 +29,7 @@ import { FieldProvider } from '../../../ProForm/utils/useFieldProps';
 import { useListChanged } from '../../../ProForm/utils/useListChanged';
 import useRules from '../../../ProForm/utils/useRules';
 import { isSelect, isTrim } from '../../../ProForm/utils';
-import ConfirmWrapper from '@/ProForm/components/render/ConfirmWrapper';
+import ConfirmWrapper from '../../../ProForm/components/render/ConfirmWrapper';
 var RenderField = function RenderField(_ref) {
   var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps, _componentProps2;
   var value = _ref.text,

package/es/ProEditTable/propsType.d.ts

@@ -1,3 +1,4 @@
+import { ModalFuncProps } from 'antd';
 import { Key, ReactNode } from 'react';
 import { DragEndEvent } from '@dnd-kit/core';
 import type { ButtonProps } from 'antd/es/button';
@@ -5,7 +6,7 @@ import type { TooltipProps } from 'antd/es/tooltip';
 import type { NamePath } from 'antd/es/form/interface';
 import type { ColumnType, TableProps } from 'antd/es/table';
 import type { FormInstance, FormItemProps } from 'antd/es/form';
-import type { ProRule } from '../ProForm/propsType';
+import type { FunctionArgs, ProRule } from '../ProForm/propsType';
 import { ProFormValueType, ColumnPropsMap } from '../ProForm/components/render/propsType';
 export type ActionType = 'edit' | 'delete' | 'save' | 'cancel' | 'add' | 'mulDelete' | 'custom';
 export type ShowFunction<T> = (record?: T, options?: {
@@ -98,6 +99,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     viewRender?: string | number | ReactNode | viewRenderFn<T>;
     hiddenNames?: NamePath[] | NamePath[][];
     rules?: ProRule[] | RulesFn<T>;
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;

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

@@ -64,20 +64,17 @@ var DatePicker = function DatePicker(props) {
     format: 'HH:mm:ss'
   };
   // dateTime模式下默认开启time选择
-  var _rest = _objectSpread(_objectSpread({}, rest), {}, {
-    showTime: rest.showTime === undefined && valueType === 'dateTime' || rest.showTime
-  });
+  var _rest = _objectSpread({}, rest);
+  // showTime默认值受valueType属性影响
+  if (rest.showTime === undefined) {
+    if (valueType === 'dateTime') {
+      _rest.showTime = true;
+    }
+  }
   // 字符串时间格式兼容
   if (isString(_rest.value)) {
     _rest.value = moment(_rest.value);
   }
-  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,
-      _defaultShowTime: _defaultShowTime
-    };
-  }
   if (_rest.showTime === true) {
     _rest.showTime = _objectSpread({}, _defaultShowTime);
   }

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

@@ -15,7 +15,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  */
 // @ts-check
 
-import { isFunction, isString, omit, uniq } from 'lodash';
+import { isFunction, isObject, isString, omit, uniq } from 'lodash';
 import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
 import ProForm from '../../../../ProForm';
@@ -41,12 +41,19 @@ var RangePicker = function RangePicker(props) {
     disabledDate: rest.disabledDate
   });
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
-  var _res = _objectSpread(_objectSpread({}, rest), {}, {
-    showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
-  });
+  var _rest = _objectSpread({}, rest);
+  // showTime默认值受valueType属性影响
+  if (rest.showTime === undefined) {
+    if (valueType === 'dateTime') {
+      _rest.showTime = true;
+    }
+    if (valueType === 'dateStartEndTime') {
+      _rest.showTime = false;
+    }
+  }
   // 字符串时间格式兼容
-  if (Array.isArray(_res.value) && isString(_res.value[0]) && isString(_res.value[1])) {
-    _res.value = [moment(_res.value[0]), moment(_res.value[1])];
+  if (Array.isArray(_rest.value) && isString(_rest.value[0]) && isString(_rest.value[1])) {
+    _rest.value = [moment(_rest.value[0]), moment(_rest.value[1])];
   }
   var _viewFormat = Array.isArray(format) ? format[0] : format;
   var tempFormat = Array.isArray(format) ? format : [format];
@@ -57,11 +64,11 @@ var RangePicker = function RangePicker(props) {
     return !!formatKey;
   });
   var _defaultShowTime = {
-    format: 'YYYY-MM-DD HH:mm:ss'
+    format: 'HH:mm:ss'
   };
   if (isView) {
-    var _res$value = _res.value,
-      value = _res$value === void 0 ? [] : _res$value;
+    var _rest$value = _rest.value,
+      value = _rest$value === void 0 ? [] : _rest$value;
     var viewChildren = null;
     if (!value || !value[0] || !value[1]) {
       viewChildren = null;
@@ -83,10 +90,13 @@ var RangePicker = function RangePicker(props) {
       children: viewChildren
     });
   }
-  if (_res.showTime === true) {
-    _res.showTime = _objectSpread({}, _defaultShowTime);
+  if (_rest.showTime === true) {
+    _rest.showTime = _objectSpread({}, _defaultShowTime);
+  }
+  if (isObject(_rest.showTime)) {
+    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  return _jsx(AntRangePicker, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, initialConfig), omit(_res, ['separator'])), rangeRegulator), {}, {
+  return _jsx(AntRangePicker, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, initialConfig), omit(_rest, ['separator'])), rangeRegulator), {}, {
     format: _format
   }));
 };

package/es/ProForm/components/render/ConfirmWrapper.js

@@ -45,6 +45,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
               option: other[0],
               form: form,
               namePath: otherProps.namePath,
+              name: otherProps.name,
               index: otherProps.index
             });
           case 5:

package/es/ProForm/utils/valueType.js

@@ -133,7 +133,7 @@ var dateTransform = function dateTransform(_ref2) {
       if (_valueType === 'dateStartTime') {
         result = transformDate({
           type: 'DatePicker',
-          format: 'YYYY-MM-DD HH:mm:ss',
+          format: 'YYYY-MM-DD',
           valueType: newValueType,
           timeType: 'startTime'
         });
@@ -141,7 +141,7 @@ var dateTransform = function dateTransform(_ref2) {
       if (_valueType === 'dateEndTime') {
         result = transformDate({
           type: 'DatePicker',
-          format: 'YYYY-MM-DD HH:mm:ss',
+          format: 'YYYY-MM-DD',
           valueType: newValueType,
           timeType: 'endTime'
         });
@@ -165,7 +165,7 @@ var dateTransform = function dateTransform(_ref2) {
       if (_valueType === 'dateStartEndTime') {
         result = transformDate({
           type: 'RangePicker',
-          format: 'YYYY-MM-DD HH:mm:ss',
+          format: 'YYYY-MM-DD',
           valueType: newValueType,
           timeType: 'startEndTime'
         });

package/lib/ProEditTable/components/RenderField/index.js

@@ -29,7 +29,7 @@ var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
 var _useListChanged3 = require("../../../ProForm/utils/useListChanged");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
-var _ConfirmWrapper = _interopRequireDefault(require("@/ProForm/components/render/ConfirmWrapper"));
+var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */

package/lib/ProEditTable/propsType.d.ts

@@ -1,3 +1,4 @@
+import { ModalFuncProps } from 'antd';
 import { Key, ReactNode } from 'react';
 import { DragEndEvent } from '@dnd-kit/core';
 import type { ButtonProps } from 'antd/es/button';
@@ -5,7 +6,7 @@ import type { TooltipProps } from 'antd/es/tooltip';
 import type { NamePath } from 'antd/es/form/interface';
 import type { ColumnType, TableProps } from 'antd/es/table';
 import type { FormInstance, FormItemProps } from 'antd/es/form';
-import type { ProRule } from '../ProForm/propsType';
+import type { FunctionArgs, ProRule } from '../ProForm/propsType';
 import { ProFormValueType, ColumnPropsMap } from '../ProForm/components/render/propsType';
 export type ActionType = 'edit' | 'delete' | 'save' | 'cancel' | 'add' | 'mulDelete' | 'custom';
 export type ShowFunction<T> = (record?: T, options?: {
@@ -98,6 +99,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     viewRender?: string | number | ReactNode | viewRenderFn<T>;
     hiddenNames?: NamePath[] | NamePath[][];
     rules?: ProRule[] | RulesFn<T>;
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;

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

@@ -69,20 +69,17 @@ var DatePicker = function DatePicker(props) {
     format: 'HH:mm:ss'
   };
   // dateTime模式下默认开启time选择
-  var _rest = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
-    showTime: rest.showTime === undefined && valueType === 'dateTime' || rest.showTime
-  });
+  var _rest = (0, _objectSpread2.default)({}, rest);
+  // showTime默认值受valueType属性影响
+  if (rest.showTime === undefined) {
+    if (valueType === 'dateTime') {
+      _rest.showTime = true;
+    }
+  }
   // 字符串时间格式兼容
   if ((0, _lodash.isString)(_rest.value)) {
     _rest.value = (0, _moment.default)(_rest.value);
   }
-  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,
-      _defaultShowTime: _defaultShowTime
-    };
-  }
   if (_rest.showTime === true) {
     _rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
   }

package/lib/ProForm/components/base/RangePicker/index.js

@@ -46,12 +46,19 @@ var RangePicker = function RangePicker(props) {
     disabledDate: rest.disabledDate
   });
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
-  var _res = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
-    showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
-  });
+  var _rest = (0, _objectSpread2.default)({}, rest);
+  // showTime默认值受valueType属性影响
+  if (rest.showTime === undefined) {
+    if (valueType === 'dateTime') {
+      _rest.showTime = true;
+    }
+    if (valueType === 'dateStartEndTime') {
+      _rest.showTime = false;
+    }
+  }
   // 字符串时间格式兼容
-  if (Array.isArray(_res.value) && (0, _lodash.isString)(_res.value[0]) && (0, _lodash.isString)(_res.value[1])) {
-    _res.value = [(0, _moment.default)(_res.value[0]), (0, _moment.default)(_res.value[1])];
+  if (Array.isArray(_rest.value) && (0, _lodash.isString)(_rest.value[0]) && (0, _lodash.isString)(_rest.value[1])) {
+    _rest.value = [(0, _moment.default)(_rest.value[0]), (0, _moment.default)(_rest.value[1])];
   }
   var _viewFormat = Array.isArray(format) ? format[0] : format;
   var tempFormat = Array.isArray(format) ? format : [format];
@@ -62,11 +69,11 @@ var RangePicker = function RangePicker(props) {
     return !!formatKey;
   });
   var _defaultShowTime = {
-    format: 'YYYY-MM-DD HH:mm:ss'
+    format: 'HH:mm:ss'
   };
   if (isView) {
-    var _res$value = _res.value,
-      value = _res$value === void 0 ? [] : _res$value;
+    var _rest$value = _rest.value,
+      value = _rest$value === void 0 ? [] : _rest$value;
     var viewChildren = null;
     if (!value || !value[0] || !value[1]) {
       viewChildren = null;
@@ -88,10 +95,13 @@ var RangePicker = function RangePicker(props) {
       children: viewChildren
     });
   }
-  if (_res.showTime === true) {
-    _res.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
+  if (_rest.showTime === true) {
+    _rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
+  }
+  if ((0, _lodash.isObject)(_rest.showTime)) {
+    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  return (0, _jsxRuntime.jsx)(AntRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), (0, _lodash.omit)(_res, ['separator'])), rangeRegulator), {}, {
+  return (0, _jsxRuntime.jsx)(AntRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), (0, _lodash.omit)(_rest, ['separator'])), rangeRegulator), {}, {
     format: _format
   }));
 };

package/lib/ProForm/components/render/ConfirmWrapper.js

@@ -51,6 +51,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
               option: other[0],
               form: form,
               namePath: otherProps.namePath,
+              name: otherProps.name,
               index: otherProps.index
             });
           case 5:

package/lib/ProForm/utils/valueType.js

@@ -140,7 +140,7 @@ var dateTransform = function dateTransform(_ref2) {
       if (_valueType === 'dateStartTime') {
         result = transformDate({
           type: 'DatePicker',
-          format: 'YYYY-MM-DD HH:mm:ss',
+          format: 'YYYY-MM-DD',
           valueType: newValueType,
           timeType: 'startTime'
         });
@@ -148,7 +148,7 @@ var dateTransform = function dateTransform(_ref2) {
       if (_valueType === 'dateEndTime') {
         result = transformDate({
           type: 'DatePicker',
-          format: 'YYYY-MM-DD HH:mm:ss',
+          format: 'YYYY-MM-DD',
           valueType: newValueType,
           timeType: 'endTime'
         });
@@ -172,7 +172,7 @@ var dateTransform = function dateTransform(_ref2) {
       if (_valueType === 'dateStartEndTime') {
         result = transformDate({
           type: 'RangePicker',
-          format: 'YYYY-MM-DD HH:mm:ss',
+          format: 'YYYY-MM-DD',
           valueType: newValueType,
           timeType: 'startEndTime'
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.5.5-beta.3",
+  "version": "3.5.5-beta.5",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -58,7 +58,7 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "^1.1.26",
+    "@zat-design/utils": "^1.1.28",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",