@zat-design/sisyphus-react 4.1.2-beta.7 → 4.1.2-beta.8

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

@@ -19,6 +19,22 @@ import { useDateRange } from "./useDateRange";
 import { jsx as _jsx } from "react/jsx-runtime";
 var AntRangePicker = DatePicker.RangePicker;
 
+/** 与 DatePicker 一致：无 valueType 时按 picker 决定默认展示格式 */
+var getDefaultFormat = picker => {
+  switch (picker) {
+    case 'week':
+      return 'YYYY-ww';
+    case 'month':
+      return 'YYYY-MM';
+    case 'quarter':
+      return 'YYYY-[Q]Q';
+    case 'year':
+      return 'YYYY';
+    default:
+      return 'YYYY-MM-DD';
+  }
+};
+
 // 获取默认快捷选项（presets 格式）
 var getDefaultPresets = () => {
   var _locale$RangePicker;
@@ -47,8 +63,7 @@ var getDefaultPresets = () => {
   }];
 };
 var RangePicker = props => {
-  var _props$format = props.format,
-    format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
+  var format = props.format,
     otherProps = props.otherProps,
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '~' : _props$separator,
@@ -61,6 +76,22 @@ var RangePicker = props => {
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
 
+  // 优先级：valueType > format > picker 默认（与 DatePicker 一致）
+  var nextFormat;
+  if (valueType === 'dateTime') {
+    nextFormat = 'YYYY-MM-DD HH:mm:ss';
+  } else if (valueType === 'date' || valueType === 'dateStartEndTime') {
+    nextFormat = 'YYYY-MM-DD';
+  } else if (isFunction(format)) {
+    nextFormat = undefined;
+  } else if (Array.isArray(format) && format.length && !isFunction(format[0])) {
+    nextFormat = format[0];
+  } else if (typeof format === 'string') {
+    nextFormat = format;
+  } else {
+    nextFormat = getDefaultFormat(rest.picker);
+  }
+
   // 返回函数管理起止时间可选范围
   var rangeRegulator = useDateRange({
     range,
@@ -89,16 +120,35 @@ var RangePicker = props => {
     }
   }
 
-  // 字符串时间格式兼容
+  // 字符串时间格式兼容（与 DatePicker 一致：优先按 nextFormat 严格解析）
   if (Array.isArray(_rest.value) && isString(_rest.value[0]) && isString(_rest.value[1])) {
-    _rest.value = [dayjs(_rest.value[0]), dayjs(_rest.value[1])];
+    var parseRangeString = s => {
+      if (nextFormat && !isFunction(format)) {
+        var parsed = dayjs(s, nextFormat, true);
+        if (parsed.isValid()) return parsed;
+      }
+      return dayjs(s);
+    };
+    _rest.value = [parseRangeString(_rest.value[0]), parseRangeString(_rest.value[1])];
   }
-  var _viewFormat = Array.isArray(format) ? format[0] : format;
-  var tempFormat = Array.isArray(format) ? format : [format];
+  var tempFormat;
   if (isFunction(format)) {
     tempFormat = [];
+  } else if (valueType === 'dateTime') {
+    tempFormat = ['YYYY-MM-DD HH:mm:ss'];
+  } else if (valueType === 'date' || valueType === 'dateStartEndTime') {
+    tempFormat = ['YYYY-MM-DD'];
+  } else if (Array.isArray(format)) {
+    tempFormat = format.filter(f => typeof f === 'string') || [];
+    if (!tempFormat.length) {
+      tempFormat = [getDefaultFormat(rest.picker)];
+    }
+  } else if (typeof format === 'string') {
+    tempFormat = [format];
+  } else {
+    tempFormat = [getDefaultFormat(rest.picker)];
   }
-  var _format = uniq([...tempFormat, 'YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD']).filter(formatKey => !!formatKey);
+  var _format = uniq([...tempFormat, 'YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD']).filter(formatKey => !!formatKey);
   var _defaultShowTime = {
     format: 'HH:mm:ss'
   };
@@ -108,6 +158,9 @@ var RangePicker = props => {
     var viewChildren = null;
     if (!value || !value[0] || !value[1]) {
       viewChildren = null;
+    } else if (valueType === 'dateTime' || valueType === 'date' || valueType === 'dateStartEndTime') {
+      var vf = nextFormat || 'YYYY-MM-DD';
+      viewChildren = `${value[0].format(vf)} ${separator} ${value[1].format(vf)}`;
     } else if (Array.isArray(format)) {
       var formattedList = format.map((formatItem, index) => {
         var _format2, _ref2;
@@ -120,7 +173,8 @@ var RangePicker = props => {
     } else if (isFunction(format)) {
       viewChildren = `${format(value[0])} ${separator} ${format(value[1])}`;
     } else {
-      viewChildren = `${value[0].format(_viewFormat)} ${separator} ${value[1].format(_viewFormat)}`;
+      var _vf = (typeof format === 'string' ? format : nextFormat) || 'YYYY-MM-DD';
+      viewChildren = `${value[0].format(_vf)} ${separator} ${value[1].format(_vf)}`;
     }
     return /*#__PURE__*/_jsx(Container, {
       viewEmpty: viewEmpty,

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

@@ -75,40 +75,29 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     confirm?: boolean | import("antd").ModalFuncProps | import("../../../render/propsType").FunctionArgs<any, boolean | import("antd").ModalFuncProps>;
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
-    toISOString?: boolean;
-    toCSTString?: boolean;
-    switchValue?: [any, any];
-    clearNotShow?: boolean;
-    style?: React.CSSProperties;
-    valueType?: import("../../../render/propsType").ProFormValueType;
-    viewRender?: (value: any, record: any, { form, index, namePath, }: {
-        [key: string]: any;
-        form: FormInstance<any>;
-        index?: number;
-    }) => string | React.ReactElement<any, any>;
-    className?: string;
-    trim?: boolean;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    validateTrigger?: string | false | string[];
     id?: string;
+    className?: string;
     hidden?: boolean;
+    style?: React.CSSProperties;
     children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
     onReset?: () => void;
     prefixCls?: string;
-    rootClassName?: string;
     status?: "" | "warning" | "error" | "success" | "validating";
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
-    shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
+    rootClassName?: string;
+    isView?: boolean;
     colon?: boolean;
     htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
     vertical?: boolean;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
     trigger?: string;
+    validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
+    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     messageVariables?: Record<string, string>;
     initialValue?: any;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
@@ -124,9 +113,20 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     wrapperCol?: import("antd").ColProps;
     help?: React.ReactNode;
     fieldId?: string;
-    isView?: boolean;
+    valueType?: import("../../../render/propsType").ProFormValueType;
+    switchValue?: [any, any];
+    viewRender?: (value: any, record: any, { form, index, namePath, }: {
+        [key: string]: any;
+        form: FormInstance<any>;
+        index?: number;
+    }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
+    trim?: boolean;
     upperCase?: boolean;
+    toISOString?: boolean;
+    toCSTString?: boolean;
+    clearNotShow?: boolean;
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
     name: any;
     dependencies: any[];
     tooltip: string | {
@@ -141,7 +141,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
  * 创建组件属性
  */
 export declare const createComponentProps: (column: FlexibleGroupColumnType, formItemProps: any) => {
-    componentProps: import("lodash").Omit<any, "format" | "toISOString" | "toCSTString" | "switchValue" | "precision" | "clearNotShow" | "dependNames" | "valueType">;
+    componentProps: import("lodash").Omit<any, "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

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

@@ -25,6 +25,22 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
 var AntRangePicker = _antd.DatePicker.RangePicker;
 
+/** 与 DatePicker 一致：无 valueType 时按 picker 决定默认展示格式 */
+var getDefaultFormat = picker => {
+  switch (picker) {
+    case 'week':
+      return 'YYYY-ww';
+    case 'month':
+      return 'YYYY-MM';
+    case 'quarter':
+      return 'YYYY-[Q]Q';
+    case 'year':
+      return 'YYYY';
+    default:
+      return 'YYYY-MM-DD';
+  }
+};
+
 // 获取默认快捷选项（presets 格式）
 var getDefaultPresets = () => {
   var _locale$RangePicker;
@@ -53,8 +69,7 @@ var getDefaultPresets = () => {
   }];
 };
 var RangePicker = props => {
-  var _props$format = props.format,
-    format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
+  var format = props.format,
     otherProps = props.otherProps,
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '~' : _props$separator,
@@ -67,6 +82,22 @@ var RangePicker = props => {
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
 
+  // 优先级：valueType > format > picker 默认（与 DatePicker 一致）
+  var nextFormat;
+  if (valueType === 'dateTime') {
+    nextFormat = 'YYYY-MM-DD HH:mm:ss';
+  } else if (valueType === 'date' || valueType === 'dateStartEndTime') {
+    nextFormat = 'YYYY-MM-DD';
+  } else if ((0, _lodash.isFunction)(format)) {
+    nextFormat = undefined;
+  } else if (Array.isArray(format) && format.length && !(0, _lodash.isFunction)(format[0])) {
+    nextFormat = format[0];
+  } else if (typeof format === 'string') {
+    nextFormat = format;
+  } else {
+    nextFormat = getDefaultFormat(rest.picker);
+  }
+
   // 返回函数管理起止时间可选范围
   var rangeRegulator = (0, _useDateRange.useDateRange)({
     range,
@@ -95,16 +126,35 @@ var RangePicker = props => {
     }
   }
 
-  // 字符串时间格式兼容
+  // 字符串时间格式兼容（与 DatePicker 一致：优先按 nextFormat 严格解析）
   if (Array.isArray(_rest.value) && (0, _lodash.isString)(_rest.value[0]) && (0, _lodash.isString)(_rest.value[1])) {
-    _rest.value = [(0, _dayjs.default)(_rest.value[0]), (0, _dayjs.default)(_rest.value[1])];
+    var parseRangeString = s => {
+      if (nextFormat && !(0, _lodash.isFunction)(format)) {
+        var parsed = (0, _dayjs.default)(s, nextFormat, true);
+        if (parsed.isValid()) return parsed;
+      }
+      return (0, _dayjs.default)(s);
+    };
+    _rest.value = [parseRangeString(_rest.value[0]), parseRangeString(_rest.value[1])];
   }
-  var _viewFormat = Array.isArray(format) ? format[0] : format;
-  var tempFormat = Array.isArray(format) ? format : [format];
+  var tempFormat;
   if ((0, _lodash.isFunction)(format)) {
     tempFormat = [];
+  } else if (valueType === 'dateTime') {
+    tempFormat = ['YYYY-MM-DD HH:mm:ss'];
+  } else if (valueType === 'date' || valueType === 'dateStartEndTime') {
+    tempFormat = ['YYYY-MM-DD'];
+  } else if (Array.isArray(format)) {
+    tempFormat = format.filter(f => typeof f === 'string') || [];
+    if (!tempFormat.length) {
+      tempFormat = [getDefaultFormat(rest.picker)];
+    }
+  } else if (typeof format === 'string') {
+    tempFormat = [format];
+  } else {
+    tempFormat = [getDefaultFormat(rest.picker)];
   }
-  var _format = (0, _lodash.uniq)([...tempFormat, 'YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD']).filter(formatKey => !!formatKey);
+  var _format = (0, _lodash.uniq)([...tempFormat, 'YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD']).filter(formatKey => !!formatKey);
   var _defaultShowTime = {
     format: 'HH:mm:ss'
   };
@@ -114,6 +164,9 @@ var RangePicker = props => {
     var viewChildren = null;
     if (!value || !value[0] || !value[1]) {
       viewChildren = null;
+    } else if (valueType === 'dateTime' || valueType === 'date' || valueType === 'dateStartEndTime') {
+      var vf = nextFormat || 'YYYY-MM-DD';
+      viewChildren = `${value[0].format(vf)} ${separator} ${value[1].format(vf)}`;
     } else if (Array.isArray(format)) {
       var formattedList = format.map((formatItem, index) => {
         var _format2, _ref2;
@@ -126,7 +179,8 @@ var RangePicker = props => {
     } else if ((0, _lodash.isFunction)(format)) {
       viewChildren = `${format(value[0])} ${separator} ${format(value[1])}`;
     } else {
-      viewChildren = `${value[0].format(_viewFormat)} ${separator} ${value[1].format(_viewFormat)}`;
+      var _vf = (typeof format === 'string' ? format : nextFormat) || 'YYYY-MM-DD';
+      viewChildren = `${value[0].format(_vf)} ${separator} ${value[1].format(_vf)}`;
     }
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.1.2-beta.7",
+  "version": "4.1.2-beta.8",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",