@zat-design/sisyphus-react 3.5.1-beta.1 → 3.5.1-beta.13

package/es/ProEditTable/components/DndWrapper/index.d.ts

@@ -3,12 +3,14 @@ interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     'data-row-key': string;
     'data-hide'?: boolean;
     disabled?: boolean;
+    rowDraggable?: any;
 }
 export declare const Row: FC<RowProps>;
-declare const DndWrapper: ({ draggable, value, onChange, disabled, children }: {
+declare const DndWrapper: ({ draggable, value, onChange, onDrag, disabled, children }: {
     draggable: any;
     value: any;
     onChange: any;
+    onDrag: any;
     disabled: any;
     children: any;
 }) => any;

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

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["disabled", "children"];
+var _excluded = ["disabled", "rowDraggable", "children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { DndContext } from '@dnd-kit/core';
@@ -9,6 +9,7 @@ import { CSS } from '@dnd-kit/utilities';
 import ProIcon from '../../../ProIcon';
 export var Row = function Row(props) {
   var disabled = props.disabled,
+    rowDraggable = props.rowDraggable,
     children = props.children,
     restProps = _objectWithoutProperties(props, _excluded);
   var data = useSortable({
@@ -35,16 +36,16 @@ export var Row = function Row(props) {
     style: style
   }, attributes), {}, {
     children: React.Children.map(children, function (child) {
-      if (child.key === 'RC_TABLE_KEY') {
-        console.log('走这里么', child.key);
+      if (child.key === 'RC_TABLE_KEY' && !disabled) {
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,
           record = _ref.record,
           renderIndex = _ref.renderIndex;
+        var isDrag = rowDraggable ? rowDraggable === null || rowDraggable === void 0 ? void 0 : rowDraggable(record) : true;
         return /*#__PURE__*/React.cloneElement(child, {
           children: _jsxs("span", {
             className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
-            children: [_jsx(ProIcon, _objectSpread({
+            children: [isDrag ? _jsx(ProIcon, _objectSpread({
               className: "drag-icon",
               style: {
                 touchAction: 'none',
@@ -52,7 +53,9 @@ export var Row = function Row(props) {
               },
               type: "drag",
               size: 20
-            }, listeners)), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+            }, listeners)) : _jsx(ProIcon, {
+              size: 20
+            }), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
           })
         });
       }
@@ -65,12 +68,18 @@ var DndWrapper = function DndWrapper(_ref2) {
   var draggable = _ref2.draggable,
     value = _ref2.value,
     onChange = _ref2.onChange,
+    onDrag = _ref2.onDrag,
     disabled = _ref2.disabled,
     children = _ref2.children;
-  var onDragEnd = function onDragEnd(_ref3) {
-    var active = _ref3.active,
-      over = _ref3.over;
+  var onDragEnd = function onDragEnd(event) {
+    var active = event.active,
+      over = event.over;
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
+      if (onDrag) {
+        var nextList = onDrag(event, value);
+        onChange(nextList);
+        return;
+      }
       var activeIndex = value.findIndex(function (i) {
         return i.rowKey === active.id;
       });

package/es/ProEditTable/index.js

@@ -9,7 +9,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "footerRender", "scroll"];
+var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray } from 'lodash';
@@ -25,6 +25,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$2;
   var value = _ref.value,
     onChange = _ref.onChange,
+    onDrag = _ref.onDrag,
     className = _ref.className,
     columns = _ref.columns,
     type = _ref.type,
@@ -50,6 +51,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     originalDiffTip = _ref.originalDiffTip,
     rowKey = _ref.rowKey,
     rowDisabled = _ref.rowDisabled,
+    rowDraggable = _ref.rowDraggable,
     footerRender = _ref.footerRender,
     scroll = _ref.scroll,
     resetProps = _objectWithoutProperties(_ref, _excluded);
@@ -317,6 +319,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       children: [_jsxs(DndWrapper, {
         value: value,
         onChange: onChange,
+        onDrag: onDrag,
         disabled: disabled,
         draggable: draggable,
         children: [headerRender ? _jsx("div", {
@@ -338,7 +341,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             return {
               disabled: disabled || virtualKey && !!editingKeys.length,
               'data-hide': isHideCheckBox,
-              onClick: function onClick() {}
+              onClick: function onClick() {},
+              rowDraggable: rowDraggable
             };
           }
         }, resetProps), {}, {

package/es/ProEditTable/propsType.d.ts

@@ -1,4 +1,5 @@
 import { Key, ReactNode } from 'react';
+import { DragEndEvent } from '@dnd-kit/core';
 import type { ButtonProps } from 'antd/es/button';
 import type { TooltipProps } from 'antd/es/tooltip';
 import type { NamePath } from 'antd/es/form/interface';
@@ -253,5 +254,7 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      */
     headerRender?: ReactNode;
     rowDisabled?: (record?: T) => string | boolean;
+    rowDraggable?: (record?: T) => string | boolean;
+    onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
     ref?: any;
 }

package/es/ProEnum/index.js

@@ -166,7 +166,7 @@ var ProEnum = function ProEnum(props) {
     }
     switch (type) {
       case 'ProSelect':
-        return _jsx(ProSelect, _objectSpread(_objectSpread({}, omit(enumProps, ['showCodeName'])), {}, {
+        return _jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
           otherProps: otherProps,
           dataSource: list,
           fieldNames: {

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

@@ -1,11 +1,21 @@
 import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["className", "format"];
 import { jsx as _jsx } from "react/jsx-runtime";
-import { isFunction, isString, isObject } from 'lodash';
+/*
+ * @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
+ * @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 classNames from 'classnames';
 import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
@@ -25,6 +35,14 @@ var DatePicker = function DatePicker(props) {
   var _className = classNames(_defineProperty({
     'full-form-item': true
   }, className, !!className));
+  var _viewFormat = Array.isArray(format) ? format[0] : format;
+  var tempFormat = Array.isArray(format) ? format : [format];
+  if (isFunction(format)) {
+    tempFormat = [];
+  }
+  var _format = uniq([].concat(_toConsumableArray(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
+    return !!formatKey;
+  });
   if (isView) {
     var value = rest.value;
     var viewChildren = null;
@@ -35,7 +53,7 @@ var DatePicker = function DatePicker(props) {
     } else if (isFunction(format)) {
       viewChildren = format(value);
     } else if (isString(value)) {
-      viewChildren = moment(value).format(format);
+      viewChildren = moment(value).format(_viewFormat);
     }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
@@ -57,7 +75,7 @@ var DatePicker = function DatePicker(props) {
     };
   }
   return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
-    format: format
+    format: _format
   }, _rest), {}, {
     className: _className
   }));

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

@@ -1,12 +1,21 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
 var _excluded = ["format", "otherProps", "separator", "range"];
 import { jsx as _jsx } from "react/jsx-runtime";
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2024-04-10 11:39:17
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2024-05-29 11:50:49
+ * @FilePath: /za-material-warehouse/src/ProForm/components/base/RangePicker/index.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 // @ts-check
 
-import { isFunction, isString, omit } from 'lodash';
+import { isFunction, isString, omit, uniq } from 'lodash';
 import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
 import ProForm from '../../../../ProForm';
@@ -39,6 +48,14 @@ var RangePicker = function RangePicker(props) {
   if (Array.isArray(_res.value) && isString(_res.value[0]) && isString(_res.value[1])) {
     _res.value = [moment(_res.value[0]), moment(_res.value[1])];
   }
+  var _viewFormat = Array.isArray(format) ? format[0] : format;
+  var tempFormat = Array.isArray(format) ? format : [format];
+  if (isFunction(format)) {
+    tempFormat = [];
+  }
+  var _format = uniq([].concat(_toConsumableArray(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
+    return !!formatKey;
+  });
   if (isView) {
     var _res$value = _res.value,
       value = _res$value === void 0 ? [] : _res$value;
@@ -56,13 +73,15 @@ var RangePicker = function RangePicker(props) {
     } else if (isFunction(format)) {
       viewChildren = "".concat(format(value[0]), " ").concat(separator, " ").concat(format(value[1]));
     } else {
-      viewChildren = "".concat(value[0].format(format), " ").concat(separator, " ").concat(value[1].format(format));
+      viewChildren = "".concat(value[0].format(_viewFormat), " ").concat(separator, " ").concat(value[1].format(_viewFormat));
     }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
       children: viewChildren
     });
   }
-  return _jsx(AntRangePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), omit(_res, ['separator'])), rangeRegulator));
+  return _jsx(AntRangePicker, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, initialConfig), omit(_res, ['separator'])), rangeRegulator), {}, {
+    format: _format
+  }));
 };
 export default RangePicker;

package/es/ProForm/components/combination/Group/propsType.d.ts

@@ -43,6 +43,7 @@ export type GroupColumnProps<Values = any> = {
     trim?: boolean;
     upperCase?: boolean;
     toISOString?: boolean;
+    toCSTString?: boolean;
     clearNotShow?: boolean;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
     valuePropName?: string;

package/es/ProForm/components/combination/Group/utils.d.ts

@@ -39,7 +39,7 @@ export declare const getReactiveProps: (params: Params) => {
     component: any;
     fieldProps: boolean;
 };
-type ValueTypeGetterParams = Pick<ProFormColumnProps, 'valueType' | 'switchValue' | 'toISOString'> & {
+type ValueTypeGetterParams = Pick<ProFormColumnProps, 'valueType' | 'switchValue' | 'toISOString' | 'toCSTString'> & {
     type?: any;
     mode?: string;
 };

package/es/ProForm/components/combination/Group/utils.js

@@ -171,6 +171,7 @@ export var useTransformColumns = function useTransformColumns(params) {
       valueType = column.valueType,
       switchValue = column.switchValue,
       toISOString = column.toISOString,
+      toCSTString = column.toCSTString,
       fieldProps = column.fieldProps,
       normalize = column.normalize,
       disabled = column.disabled,
@@ -221,6 +222,7 @@ export var useTransformColumns = function useTransformColumns(params) {
       valueType: valueType,
       switchValue: switchValue,
       toISOString: toISOString,
+      toCSTString: toCSTString,
       mode: mode
     });
     var newValue;

package/es/ProForm/components/combination/ProNumberRange/index.js

@@ -17,7 +17,7 @@ var formatAmount = tools.formatAmount,
   formatPercent = tools.formatPercent,
   formatPerMill = tools.formatPerMill;
 var ProNumberRange = function ProNumberRange(props) {
-  var _valueProps, _valueProps2, _valueProps3, _valueProps4;
+  var _valueProps, _ref2, _ref3, _value$, _valueProps2, _ref4, _ref5, _value$2, _valueProps3, _valueProps4;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     _props$onChange = props.onChange,
@@ -183,8 +183,8 @@ var ProNumberRange = function ProNumberRange(props) {
       },
       addonBefore: addonBefore
     }, valueProps), {}, {
-      min: min || ((_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min),
-      max: (value === null || value === void 0 ? void 0 : value[1]) || range[1] || max || ((_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max)
+      min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
+      max: (_ref2 = (_ref3 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref3 !== void 0 ? _ref3 : max) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
     }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), _jsx(_Input, {
       className: classnames({
         'range-split': true,
@@ -203,8 +203,8 @@ var ProNumberRange = function ProNumberRange(props) {
       },
       addonAfter: addonAfter
     }, valueProps), {}, {
-      max: max || ((_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.max),
-      min: (value === null || value === void 0 ? void 0 : value[0]) || range[0] || min || ((_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.min)
+      min: (_ref4 = (_ref5 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref5 !== void 0 ? _ref5 : min) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
+      max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
     }, childProps === null || childProps === void 0 ? void 0 : childProps[1]))]
   });
 };

package/es/ProForm/components/combination/ProRangeLimit/index.js

@@ -78,12 +78,13 @@ var ProRangeLimit = function ProRangeLimit(props) {
     'ant-input-disabled': _disabled === null || _disabled === void 0 ? void 0 : _disabled[1],
     'forever-checkbox': true
   });
+  var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
   var _isForever = useMemo(function () {
-    return moment(foreverDate, format).isSame(endDate);
+    return moment(_foreverDate, format).isSame(endDate);
   }, [value]);
   var foreverMoment = useMemo(function () {
-    return moment(foreverDate, format);
-  }, [foreverDate, format]);
+    return moment(_foreverDate, format);
+  }, [_foreverDate, format]);
   if (isView) {
     var _props$value3, _props$value4;
     var _separator = (value === null || value === void 0 ? void 0 : value[0]) && (value === null || value === void 0 ? void 0 : value[1]) ? separator : '';

package/es/ProForm/components/combination/ProTimeLimit/index.d.ts

@@ -9,7 +9,7 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
     value?: string;
     onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Moment) => void;
     disabled?: boolean;
-    foreverTime?: string;
+    foreverDate?: string;
     foreverText?: string;
     viewEmpty?: React.ReactNode;
     format?: string;

package/es/ProForm/components/combination/ProTimeLimit/index.js

@@ -7,7 +7,7 @@ import _Input from "antd/es/input";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType", "otherProps"],
+var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps"],
   _excluded2 = ["mode"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
@@ -25,7 +25,8 @@ export var ProTimeLimit = function ProTimeLimit(props) {
   var _props$format = props.format,
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
     disabled = props.disabled,
-    foreverTime = props.foreverTime,
+    _props$foreverDate = props.foreverDate,
+    foreverDate = _props$foreverDate === void 0 ? '9999-01-01' : _props$foreverDate,
     _props$foreverText = props.foreverText,
     foreverText = _props$foreverText === void 0 ? locale.ProTimeLimit.foreverText : _props$foreverText,
     _props$valueType = props.valueType,
@@ -35,12 +36,14 @@ export var ProTimeLimit = function ProTimeLimit(props) {
   var _ref = ProForm.useFieldProps() || {},
     isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var initialConfig = useProConfig('ProTimeLimit');
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
+  var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
   var _useMemo = useMemo(function () {
-      var foreverMoment = foreverTime ? moment(foreverTime, format) : moment('9999-01-01', 'YYYY-MM-DD');
-      var foreverString = foreverTime || foreverMoment.format(format);
+      var foreverMoment = moment(_foreverDate, format);
+      var foreverString = _foreverDate || foreverMoment.format(format);
       return [foreverString, foreverMoment];
-    }, [format, foreverTime]),
+    }, [format, _foreverDate]),
     _useMemo2 = _slicedToArray(_useMemo, 2),
     foreverString = _useMemo2[0],
     foreverMoment = _useMemo2[1];
@@ -51,7 +54,6 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     _useControlled2 = _slicedToArray(_useControlled, 2),
     value = _useControlled2[0],
     onChange = _useControlled2[1];
-  var initialConfig = useProConfig('ProTimeLimit');
   var isForever = useMemo(function () {
     if (isObject(value)) {
       return foreverMoment.format(format) === value.format(format);
@@ -112,9 +114,15 @@ var LimitPick = function LimitPick(props) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'DatePicker' : _props$mode,
     rest = _objectWithoutProperties(props, _excluded2);
+  var _ref2 = useProConfig('ProTimeLimit') || {},
+    foreverDate = _ref2.foreverDate;
   if (mode === 'RangePicker') {
-    return _jsx(ProRangeLimit, _objectSpread({}, rest));
+    return _jsx(ProRangeLimit, _objectSpread({
+      foreverDate: foreverDate
+    }, rest));
   }
-  return _jsx(ProTimeLimit, _objectSpread({}, rest));
+  return _jsx(ProTimeLimit, _objectSpread({
+    foreverDate: foreverDate
+  }, rest));
 };
 export default LimitPick;

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

@@ -171,7 +171,7 @@ var Render = function Render(props) {
     };
   }
   /** 移除多余参数，防止透传给formItem报错 */
-  var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
+  var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow']);
   /**
    * globalControl 全局控制优先
    * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】

package/es/ProForm/components/render/propsType.d.ts

@@ -205,6 +205,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;
+    toCSTString?: boolean;
     clearNotShow?: boolean;
     index?: number;
     namePath?: NamePath;

package/es/ProForm/utils/valueType.d.ts

@@ -1,32 +1,37 @@
 declare const _default: {
     /** 年月日 */
-    date: ({ type, toISOString, mode }: {
+    date: ({ type, toISOString, toCSTString, mode }: {
         type: any;
         toISOString: any;
+        toCSTString: any;
         mode: any;
     }) => {};
     /** 年月日 时分秒 */
-    dateTime: ({ type, toISOString, mode }: {
+    dateTime: ({ type, toISOString, toCSTString, mode }: {
         type: any;
         toISOString: any;
+        toCSTString: any;
         mode: any;
     }) => {};
     /** 年月日 00:00:00 */
-    dateStartTime: ({ type, toISOString, mode }: {
+    dateStartTime: ({ type, toISOString, toCSTString, mode }: {
         type: any;
         toISOString: any;
+        toCSTString: any;
         mode: any;
     }) => {};
     /** 年月日 23:59:59 */
-    dateEndTime: ({ type, toISOString, mode }: {
+    dateEndTime: ({ type, toISOString, toCSTString, mode }: {
         type: any;
         toISOString: any;
+        toCSTString: any;
         mode: any;
     }) => {};
     /** 年月日 00:00:00 ~ 年月日 23:59:59 */
-    dateStartEndTime: ({ type, toISOString, mode }: {
+    dateStartEndTime: ({ type, toISOString, toCSTString, mode }: {
         type: any;
         toISOString: any;
+        toCSTString: any;
         mode: any;
     }) => {};
     /** 百分比 */

package/es/ProForm/utils/valueType.js

@@ -93,6 +93,8 @@ var dateTransform = function dateTransform(_ref2) {
     _valueType = _ref2$_valueType === void 0 ? 'date' : _ref2$_valueType,
     _ref2$toISOString = _ref2.toISOString,
     toISOString = _ref2$toISOString === void 0 ? false : _ref2$toISOString,
+    _ref2$toCSTString = _ref2.toCSTString,
+    toCSTString = _ref2$toCSTString === void 0 ? false : _ref2$toCSTString,
     mode = _ref2.mode;
   var result = {};
   if (type === 'RangePicker' && ['dateStartTime', 'dateEndTime'].includes(_valueType)) {
@@ -103,27 +105,36 @@ var dateTransform = function dateTransform(_ref2) {
     console.error("Warning: DatePicker valueType can only be set to ['date' | 'dateTime' | 'dateStartTime'| 'dateEndTime']");
     return result;
   }
+  var newValueType = function () {
+    if (toISOString) {
+      return 'ISOString';
+    }
+    if (toCSTString) {
+      return 'CSTString';
+    }
+    return 'string';
+  }();
   switch (type) {
     case 'DatePicker':
       if (_valueType === 'date') {
         result = transformDate({
           type: 'DatePicker',
           format: 'YYYY-MM-DD',
-          valueType: toISOString ? 'ISOString' : 'string'
+          valueType: newValueType
         });
       }
       if (_valueType === 'dateTime') {
         result = transformDate({
           type: 'DatePicker',
           format: 'YYYY-MM-DD HH:mm:ss',
-          valueType: toISOString ? 'ISOString' : 'string'
+          valueType: newValueType
         });
       }
       if (_valueType === 'dateStartTime') {
         result = transformDate({
           type: 'DatePicker',
           format: 'YYYY-MM-DD HH:mm:ss',
-          valueType: toISOString ? 'ISOString' : 'string',
+          valueType: newValueType,
           timeType: 'startTime'
         });
       }
@@ -131,7 +142,7 @@ var dateTransform = function dateTransform(_ref2) {
         result = transformDate({
           type: 'DatePicker',
           format: 'YYYY-MM-DD HH:mm:ss',
-          valueType: toISOString ? 'ISOString' : 'string',
+          valueType: newValueType,
           timeType: 'endTime'
         });
       }
@@ -141,21 +152,21 @@ var dateTransform = function dateTransform(_ref2) {
         result = transformDate({
           type: 'RangePicker',
           format: 'YYYY-MM-DD',
-          valueType: toISOString ? 'ISOString' : 'string'
+          valueType: newValueType
         });
       }
       if (_valueType === 'dateTime') {
         result = transformDate({
           type: 'RangePicker',
           format: 'YYYY-MM-DD HH:mm:ss',
-          valueType: toISOString ? 'ISOString' : 'string'
+          valueType: newValueType
         });
       }
       if (_valueType === 'dateStartEndTime') {
         result = transformDate({
           type: 'RangePicker',
           format: 'YYYY-MM-DD HH:mm:ss',
-          valueType: toISOString ? 'ISOString' : 'string',
+          valueType: newValueType,
           timeType: 'startEndTime'
         });
       }
@@ -166,13 +177,13 @@ var dateTransform = function dateTransform(_ref2) {
   if (type === 'ProTimeLimit' && (!mode || mode === 'DatePicker')) {
     return transformDate(_objectSpread({
       type: 'DatePicker',
-      valueType: toISOString ? 'ISOString' : 'string'
+      valueType: newValueType
     }, formatMap[_valueType]));
   }
   if (type === 'ProRangeLimit' || type === 'ProTimeLimit' && mode === 'RangePicker') {
     return transformDate(_objectSpread({
       type: 'RangePicker',
-      valueType: toISOString ? 'ISOString' : 'string'
+      valueType: newValueType
     }, formatMap[_valueType]));
   }
   return result;
@@ -182,11 +193,13 @@ export default {
   date: function date(_ref3) {
     var type = _ref3.type,
       toISOString = _ref3.toISOString,
+      toCSTString = _ref3.toCSTString,
       mode = _ref3.mode;
     return dateTransform({
       type: type,
       _valueType: 'date',
       toISOString: toISOString,
+      toCSTString: toCSTString,
       mode: mode
     });
   },
@@ -194,11 +207,13 @@ export default {
   dateTime: function dateTime(_ref4) {
     var type = _ref4.type,
       toISOString = _ref4.toISOString,
+      toCSTString = _ref4.toCSTString,
       mode = _ref4.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateTime',
       toISOString: toISOString,
+      toCSTString: toCSTString,
       mode: mode
     });
   },
@@ -206,11 +221,13 @@ export default {
   dateStartTime: function dateStartTime(_ref5) {
     var type = _ref5.type,
       toISOString = _ref5.toISOString,
+      toCSTString = _ref5.toCSTString,
       mode = _ref5.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateStartTime',
       toISOString: toISOString,
+      toCSTString: toCSTString,
       mode: mode
     });
   },
@@ -218,11 +235,13 @@ export default {
   dateEndTime: function dateEndTime(_ref6) {
     var type = _ref6.type,
       toISOString = _ref6.toISOString,
+      toCSTString = _ref6.toCSTString,
       mode = _ref6.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateEndTime',
       toISOString: toISOString,
+      toCSTString: toCSTString,
       mode: mode
     });
   },
@@ -230,11 +249,13 @@ export default {
   dateStartEndTime: function dateStartEndTime(_ref7) {
     var type = _ref7.type,
       toISOString = _ref7.toISOString,
+      toCSTString = _ref7.toCSTString,
       mode = _ref7.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateStartEndTime',
       toISOString: toISOString,
+      toCSTString: toCSTString,
       mode: mode
     });
   },