@zat-design/sisyphus-react 4.1.1 → 4.1.2-beta.10

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/Container/index.js

@@ -49,8 +49,9 @@ var Container = props => {
       diffConfig: diffConfig
     }, otherProps));
     if (type === 'ProCollapse') {
+      var hasFieldChildren = Array.isArray(children) && children.length > 0;
       return /*#__PURE__*/_jsx(ProCollapse, _objectSpread(_objectSpread({}, omit(props, ['otherProps', 'children', 'onBlur', 'onChange', 'placeholder', 'className'])), {}, {
-        children: child
+        children: hasFieldChildren ? child : null
       }));
     }
     if (type === 'Container') {

package/es/ProForm/components/combination/Group/component/ComRender.d.ts

@@ -20,6 +20,8 @@ interface Props {
     formItemClassName?: string;
     formItemStyle?: React.CSSProperties;
     dependencies?: NamePath[];
+    required?: boolean;
+    rules?: any[];
 }
 /** 渲染组件 */
 declare const ComRender: React.FC<Props>;

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -89,6 +89,16 @@ var ComRender = props => {
   // 传统模式 compact 模式：需要 Form.Item 包装并应用宽度样式
   // 通过 formItemClassName 和 formItemStyle 来判断是否需要 Form.Item 包装
   if (formItemClassName && name) {
+    // 从 rest 中提取 required 和 rules，在非编辑态时移除校验
+    var formItemProps = _objectSpread({
+      name,
+      className: formItemClassName,
+      style: formItemStyle
+    }, isView ? {} : {
+      required: rest === null || rest === void 0 ? void 0 : rest.required,
+      rules: rest === null || rest === void 0 ? void 0 : rest.rules
+    });
+
     // 如果有依赖字段，使用 shouldUpdate 来实时更新错误状态
     if (dependencies && dependencies.length > 0) {
       return /*#__PURE__*/_jsx(Form.Item, {
@@ -102,7 +112,7 @@ var ComRender = props => {
           });
           var hasChanged = currentFieldChanged || dependenciesChanged;
           // 当检测到变化时，触发字段校验以更新错误状态
-          if (hasChanged && contextProps !== null && contextProps !== void 0 && contextProps.form && name) {
+          if (hasChanged && contextProps !== null && contextProps !== void 0 && contextProps.form && name && !isView) {
             setTimeout(() => {
               contextProps.form.validateFields([name]).catch(() => {});
             }, 0);
@@ -110,10 +120,7 @@ var ComRender = props => {
           return hasChanged;
         },
         noStyle: true,
-        children: () => /*#__PURE__*/_jsx(Form.Item, {
-          name: name,
-          className: formItemClassName,
-          style: formItemStyle,
+        children: () => /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, formItemProps), {}, {
           children: /*#__PURE__*/_jsx(FieldProvider, {
             value: _objectSpread(_objectSpread({}, contextProps), {}, {
               valueType,
@@ -122,14 +129,11 @@ var ComRender = props => {
             }),
             children: renderComponent
           })
-        })
+        }))
       });
     }
     // 没有依赖字段，直接渲染 Form.Item
-    return /*#__PURE__*/_jsx(Form.Item, {
-      name: name,
-      className: formItemClassName,
-      style: formItemStyle,
+    return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, formItemProps), {}, {
       children: /*#__PURE__*/_jsx(FieldProvider, {
         value: _objectSpread(_objectSpread({}, contextProps), {}, {
           valueType,
@@ -138,7 +142,7 @@ var ComRender = props => {
         }),
         children: renderComponent
       })
-    });
+    }));
   }
 
   // 非传统模式 compact 模式：直接渲染组件

package/es/ProForm/components/combination/Group/component/FlexibleGroup.js

@@ -118,16 +118,16 @@ var FlexibleGroupRender = props => {
     var childDisabled = typeof child.disabled === 'function' ? false : child.disabled;
     var finalDisabled = groupDisabled || childDisabled;
 
-    // 构建 formItemProps
+    // 构建 formItemProps - 在非编辑态时移除校验规则
     var formItemProps = {
       name: fullName,
       label: child.label,
-      rules: child.rules,
+      rules: isView ? undefined : child.rules,
       dependencies: processedDependencies,
       extra: child.extra,
       before: child.before,
       after: child.after,
-      required: child.required,
+      required: isView ? undefined : child.required,
       disabled: finalDisabled,
       validateFirst: child.validateFirst
     };
@@ -148,13 +148,40 @@ var FlexibleGroupRender = props => {
       formItemProps.tooltip = child.tooltip;
     }
 
+    // 在ProEditTable场景下，如果同组其他字段有值，则当前字段空值不显示 -
+    var childViewEmpty = otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty;
+    if (isView && (otherProps === null || otherProps === void 0 ? void 0 : otherProps.source) === 'ProEditTable' && form && children.length > 1) {
+      // 检查同组其他字段是否有值
+      var hasOtherValues = children.some(otherChild => {
+        if (otherChild === child) return false; // 跳过当前字段
+
+        var otherChildNamePath = otherChild.namePath || contextProps.namePath;
+        var otherFullName = (() => {
+          if (otherChildNamePath && Array.isArray(otherChild.name) && otherChild.name.length > 1) {
+            return [...otherChildNamePath, ...otherChild.name];
+          }
+          if (otherChildNamePath) {
+            return [...otherChildNamePath, otherChild.name];
+          }
+          return otherChild.name;
+        })();
+        var value = form.getFieldValue(otherFullName);
+        return value !== undefined && value !== null && value !== '';
+      });
+
+      // 如果有其他字段有值，当前字段空值显示为空字符串
+      if (hasOtherValues) {
+        childViewEmpty = '';
+      }
+    }
+
     // 构建 otherProps
     var renderOtherProps = {
       label: child.label,
       name: fullName,
       disabled: finalDisabled,
       isView,
-      viewEmpty: otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty,
+      viewEmpty: childViewEmpty,
       valueType: child.valueType,
       form,
       type,
@@ -268,12 +295,16 @@ var FlexibleGroupRender = props => {
       elements.push(formElement);
 
       // 添加分隔符
-      if (index < visibleChildren.length - 1 && space !== null && space !== void 0 && space.separator) {
+      // 查看模式下，如果没有配置separator，使用默认的 finalSeparator
+      var separatorToUse = isView ? (space === null || space === void 0 ? void 0 : space.separator) || finalSeparator : space === null || space === void 0 ? void 0 : space.separator;
+      if (index < visibleChildren.length - 1 && separatorToUse) {
         var shouldAddSeparator = space.separatorIndex ? Array.isArray(space.separatorIndex) ? space.separatorIndex.includes(originalIndex) : space.separatorIndex === originalIndex : true;
         if (shouldAddSeparator) {
+          // 查看模式下使用不同的className，避免显示边框
+          var separatorClassName = isView ? 'pro-group-separator-compact pro-group-separator-view' : 'pro-group-separator-compact';
           elements.push( /*#__PURE__*/_jsx("span", {
-            className: "pro-group-separator-compact",
-            children: space.separator
+            className: separatorClassName,
+            children: separatorToUse
           }, child.name ? `separator-${child.name}` : `separator-${originalIndex}`));
         }
       }
@@ -303,6 +334,29 @@ var FlexibleGroupRender = props => {
     return (otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty) || '-';
   }
 
+  // 查看模式下，检查所有children的值是否都为空
+  if (isView && form && children.length > 0) {
+    var allValuesEmpty = children.every(child => {
+      var childNamePath = child.namePath || contextProps.namePath;
+      var fullName = (() => {
+        if (childNamePath && Array.isArray(child.name) && child.name.length > 1) {
+          return [...childNamePath, ...child.name];
+        }
+        if (childNamePath) {
+          return [...childNamePath, child.name];
+        }
+        return child.name;
+      })();
+      var value = form.getFieldValue(fullName);
+      return value === undefined || value === null || value === '';
+    });
+
+    // 如果所有值都为空，显示一个 -
+    if (allValuesEmpty) {
+      return (otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty) || '-';
+    }
+  }
+
   // 渲染内容
   var renderContent = () => {
     return /*#__PURE__*/_jsx("div", {

package/es/ProForm/components/combination/Group/style/index.less

@@ -4,6 +4,15 @@
   display: flex;
   width: unset !important;
 
+  &.pro-group-view {
+    .pro-group-form-item {
+      flex: 0 0 auto !important;
+   
+    }
+    .@{ant-prefix}-space-compact .pro-group-separator-compact{
+      color: #333 !important;
+    }
+  }
 
 
   &.pro-group-view {
@@ -385,6 +394,13 @@
       // margin: 0 !important;
     }
 
+    // 查看模式下，Form.Item不平分空间，而是根据内容自适应
+    &.pro-group-view {
+      .pro-group-form-item {
+        flex: 0 0 auto;
+      }
+    }
+
     // 当有自定义宽度时，只有设置了宽度的 Form.Item 不使用 flex:1
     &.pro-group-diy-width {
       // 覆盖 Space.Compact 内设置了宽度的 Form.Item
@@ -430,7 +446,7 @@
         }
 
         .@{ant-prefix}-input-number-input {
-          border-left: 1px solid #ff4d4f !important;
+          border-left: 0 !important;
         }
       }
 
@@ -467,6 +483,15 @@
     margin-left: -1px;
   }
 
+  // 查看模式下的分隔符样式 - 移除边框，使用简洁样式
+  .pro-group-separator-view {
+    border: none !important;
+    background: transparent !important;
+    padding: 0 2px !important;
+    margin-inline-start: 0 !important;
+    color: #999 !important;
+  }
+
 
   /* 1. 处理第一个子元素：左上、左下圆角 */
   > .pro-group-form-item:first-child{

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

@@ -75,31 +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>;
-    trim?: boolean;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    vertical?: boolean;
     id?: string;
     className?: string;
     hidden?: boolean;
     style?: React.CSSProperties;
+    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
     onReset?: () => void;
     prefixCls?: string;
+    status?: "" | "warning" | "error" | "success" | "validating";
     rootClassName?: string;
-    status?: "" | "success" | "error" | "warning" | "validating";
-    trigger?: string;
-    colon?: boolean;
     isView?: boolean;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
+    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;
@@ -110,7 +108,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     hasFeedback?: boolean | {
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
-    validateStatus?: "" | "success" | "error" | "warning" | "validating";
+    validateStatus?: "" | "warning" | "error" | "success" | "validating";
     layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
     help?: React.ReactNode;
@@ -123,10 +121,12 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         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 | {

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

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { DefaultOptionType } from 'rc-select/lib/Select';
+import { DefaultOptionType } from '@rc-component/select/es/Select';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
 export interface FieldNamesType {
     label: string;

package/es/ProForm/propsType.d.ts

@@ -1,9 +1,9 @@
+import React, { ReactNode } from 'react';
 import { ButtonProps, ColProps, RowProps } from 'antd';
 import { FormProps, FormInstance } from 'antd/es/form/Form';
 import { NamePath } from 'antd/es/form/interface';
-import { StoreValue, Store } from 'rc-field-form/es/interface.d';
-import { ShouldUpdate } from 'rc-field-form/es/Field.d';
-import React, { ReactNode } from 'react';
+import type { StoreValue, Store } from '@rc-component/form/es/interface';
+import type { ShouldUpdate } from '@rc-component/form/es/Field';
 import type { ProFormColumnType, ViewType } from './components/render/propsType';
 import type { ProFormComponentType } from './components';
 export interface ButtonType extends ButtonProps {

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

@@ -1,6 +1,6 @@
 import { FormInstance, FormItemProps } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
-import { StoreValue, Store } from 'rc-field-form/es/interface.d';
+import type { StoreValue, Store } from '@rc-component/form/es/interface';
 import type { TransformType } from '../propsType';
 export declare const transformValue: (names: NamePath[], form: FormInstance, fieldName: NamePath, normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue, getValueProps?: FormItemProps['getValueProps']) => TransformType;
 export default transformValue;

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

@@ -1,6 +1,6 @@
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
-import { ValuedNotifyInfo } from 'rc-field-form/es/interface';
+import type { ValuedNotifyInfo } from '@rc-component/form/es/interface';
 export type ModifiedFormInstanceType<T> = FormInstance<T> & {
     isModified?: boolean;
     /** 默认清空设置值的报错状态 */

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

@@ -1,4 +1,5 @@
-import { FormInstance, NamePath } from 'rc-field-form/es/interface';
+import { FormInstance } from 'antd/es/form/Form';
+import { NamePath } from 'antd/es/form/interface';
 export declare function toArray<T>(value?: T | T[] | null): T[];
 /**
  * ProForm的useWatch hook，用于监听表单字段变化

package/es/ProForm/utils/useWatch.js

@@ -112,7 +112,9 @@ function useWatch(dependencies, form, wait) {
       }
     }
     return paths;
-  }, [/* dependencies 故意忽略，与原实现一致 */]);
+  }, [
+    /* dependencies 故意忽略，与原实现一致 */
+  ]);
 
   // 保存防抖函数引用，避免重复创建
   var debouncedFn = useMemo(() => {

package/es/ProLayout/components/ProCollapse/index.js

@@ -3,7 +3,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { useLayoutEffect } from 'react';
+import React, { useLayoutEffect } from 'react';
 import { Collapse, Descriptions, Space } from 'antd';
 import { CaretRightOutlined } from '@ant-design/icons';
 import classNames from 'classnames';
@@ -55,11 +55,12 @@ var ProCollapse = props => {
     'pro-collapse-no-level1-title': !title && level !== '2' && level !== '3',
     [`${className}`]: className
   });
-  var content = /*#__PURE__*/_jsx("div", {
+  var shouldRenderContent = children !== null && children !== undefined;
+  var content = shouldRenderContent ? /*#__PURE__*/_jsx("div", {
     className: "pro-collapse-content",
     style: contentStyle,
     children: children
-  });
+  }) : null;
 
   // 生成 Collapse items 配置
   var getCollapseItems = () => {