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

package/es/ProEditTable/index.js

@@ -278,7 +278,9 @@ var ProEditTable = (_ref, ref) => {
       getIsNew,
       handlePageChange
     }, resetProps);
-  }, [actionDirection, actionProps, actionWidth, cellNamePath, deletePoConfirmMsg, disabled, diffConfig, editingKeys, emptyBtnText, form, forceUpdate, getIsNew, handlePageChange, insertType, isView, max, mode, mulDeletePoConfirmMsg, name, namePath, onlyOneLineMsg, originalValues, prefixCls, requiredAlign, resetProps, rowDisabled, selectedRowKeys, selectedRows, shouldUpdateDebounce, tableRef, toolbarProps, value === null || value === void 0 ? void 0 : value.length, viewEmpty, virtualKey, page]);
+  }, [actionDirection, actionProps, actionWidth, cellNamePath, deletePoConfirmMsg, disabled, diffConfig, editingKeys, emptyBtnText, form,
+  // forceUpdate 不应该作为依赖项，因为它是触发刷新的信号，而非用于比较的数据
+  getIsNew, handlePageChange, insertType, isView, max, mode, mulDeletePoConfirmMsg, name, namePath, onlyOneLineMsg, originalValues, prefixCls, requiredAlign, resetProps, rowDisabled, selectedRowKeys, selectedRows, shouldUpdateDebounce, tableRef, toolbarProps, value === null || value === void 0 ? void 0 : value.length, viewEmpty, virtualKey, page]);
 
   // 编辑行设置下样式
   var _rowClassName = record => {
@@ -373,7 +375,7 @@ var ProEditTable = (_ref, ref) => {
   };
   var _columns = useMemo(() => {
     return transformColumns(columns, config);
-  }, [columns, config]);
+  }, [disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath, config]);
   var initDataSource = () => {
     var _value$every, _value$some;
     // 检查每一项是否有 rowKey 或通过 rowKey 字段获取的 key
@@ -422,9 +424,17 @@ var ProEditTable = (_ref, ref) => {
     rowSelection: renderRowSelection()
   }) : summary;
   var TableComponent = draggable ? DraggableTable : BaseTable;
+
+  // 给每个 record 附加编辑状态标识，让 shouldCellUpdate 能检测到状态变化
+  var enrichedValue = useMemo(() => {
+    if (!virtualKey) return value;
+    return value === null || value === void 0 ? void 0 : value.map(record => _objectSpread(_objectSpread({}, record), {}, {
+      _isEditing: editingKeys.includes(record.rowKey) || record._addFlag
+    }));
+  }, [value, virtualKey, editingKeys]);
   var tableProps = useMemo(() => ({
     rowKey,
-    value,
+    value: enrichedValue,
     headerRender,
     tableRef,
     className: _className,
@@ -443,7 +453,7 @@ var ProEditTable = (_ref, ref) => {
     formatMessage,
     locale,
     handlePageChange
-  }), [_className, _columns, _rowClassName, disabled, editingKeys, formatMessage, handlePageChange, headerRender, isHideCheckBox, locale, page, pagination, renderRowSelection, rowDraggable, rowKey, scroll, _summary, tableRef, value, virtualKey]);
+  }), [_className, _columns, _rowClassName, disabled, editingKeys, formatMessage, handlePageChange, headerRender, isHideCheckBox, locale, page, pagination, renderRowSelection, rowDraggable, rowKey, scroll, _summary, tableRef, enrichedValue, virtualKey]);
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(ConfigProvider, {
       renderEmpty: value !== null && value !== void 0 && value.length ? undefined : emptyDom,

package/es/ProEditTable/propsType.d.ts

@@ -130,6 +130,11 @@ export type RequiredFn<T = any> = ReactiveFunction<T, boolean | boolean[]>;
  * @template T 记录类型
  */
 export type viewRenderFn<T = any> = (text?: any, record?: T, options?: OptionsProps) => string | number | ReactNode | void;
+/**
+ * 组件渲染函数类型（与 ReactiveFunction 保持一致）
+ * @template T 记录类型
+ */
+export type ComponentRenderFn<T = any> = ReactiveFunction<T, string | number | ReactNode | void>;
 /**
  * 表格列属性接口
  * @template Values 值类型
@@ -153,7 +158,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
         icon?: string | ReactNode;
     } & TooltipProps);
     /** 组件 */
-    component?: string | number | ReactNode | viewRenderFn<T>;
+    component?: string | number | ReactNode | ComponentRenderFn<T>;
     /** 视图渲染 */
     viewRender?: string | number | ReactNode | viewRenderFn<T>;
     /** 隐藏的字段名 */

package/es/ProEditTable/style/index.less

@@ -425,4 +425,12 @@
   table tr th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-start{
     text-align: right;
   }
+  table .@{ant-prefix}-table-thead{
+    th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-start{
+      text-align: left;
+      .@{ant-prefix}-table-selection{
+        padding-left: 27px;
+      }
+    }
+  }
 }

package/es/ProEditTable/utils/index.js

@@ -22,10 +22,13 @@ import { filterInternalFields } from "../../ProForm/utils";
 import ProTooltip from "../../ProTooltip";
 import { RenderField, ActionButton } from "../components";
 import locale from "../../locale";
-
-// 渲染操作栏
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+var columnDataSourceRefCache = new Map();
+/** 追踪 component 函数引用，用于检测外部状态（如异步 list）变化导致的闭包更新 */
+var columnComponentRefCache = new Map();
+
+// 渲染操作栏
 var getActionColumn = config => {
   var _cloneDeepWith = cloneDeepWith(config, value => {
       if ( /*#__PURE__*/React.isValidElement(value)) {
@@ -41,7 +44,8 @@ var getActionColumn = config => {
     actionProps = _cloneDeepWith.actionProps,
     page = _cloneDeepWith.page,
     rowDisabled = _cloneDeepWith.rowDisabled,
-    actionDirection = _cloneDeepWith.actionDirection;
+    actionDirection = _cloneDeepWith.actionDirection,
+    editingKeys = _cloneDeepWith.editingKeys;
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);
   // actionProps配置为false 默认不插入
@@ -89,7 +93,7 @@ var getActionColumn = config => {
     action.onEvent = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, _ref) {
         var _form$getFieldValue;
-        var index, form, name, namePath, tableLength, selectedRows, rowName, lastRecord, onEvent, result, actionHandler;
+        var index, form, name, namePath, tableLength, selectedRows, rowName, _isEditing, lastRecord, onEvent, result, actionHandler;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -97,33 +101,39 @@ var getActionColumn = config => {
               index = tools.calc(firstIndex, '+', index);
               rowName = [...virtualRowName, index];
               if (!(type === 'save')) {
-                _context.next = 13;
+                _context.next = 15;
                 break;
               }
-              _context.prev = 4;
-              _context.next = 7;
+              // 判断该行是否处于编辑状态
+              _isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record._addFlag; // 只有编辑中的行才需要校验
+              if (!_isEditing) {
+                _context.next = 15;
+                break;
+              }
+              _context.prev = 6;
+              _context.next = 9;
               return customValidate(validateKeys, form, rowName);
-            case 7:
-              _context.next = 13;
-              break;
             case 9:
-              _context.prev = 9;
-              _context.t0 = _context["catch"](4);
+              _context.next = 15;
+              break;
+            case 11:
+              _context.prev = 11;
+              _context.t0 = _context["catch"](6);
               handleScrollToError();
               return _context.abrupt("return", Promise.reject(_context.t0));
-            case 13:
+            case 15:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               lastRecord = filterInternalFields((_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record); // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
               if (onEvent) {
-                _context.next = 19;
+                _context.next = 21;
                 break;
               }
               result = true;
-              _context.next = 22;
+              _context.next = 24;
               break;
-            case 19:
-              _context.next = 21;
+            case 21:
+              _context.next = 23;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(lastRecord, {
                 form,
                 index,
@@ -132,9 +142,9 @@ var getActionColumn = config => {
                 namePath,
                 selectedRows
               });
-            case 21:
+            case 23:
               result = _context.sent;
-            case 22:
+            case 24:
               if (result !== false && type !== 'custom') {
                 actionHandler = actions[type];
                 actionHandler(_objectSpread(_objectSpread({}, config), {}, {
@@ -145,11 +155,11 @@ var getActionColumn = config => {
                   validateKeys
                 }));
               }
-            case 23:
+            case 25:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[4, 9]]);
+        }, _callee, null, [[6, 11]]);
       }));
       return function (_x, _x2) {
         return _ref2.apply(this, arguments);
@@ -368,13 +378,45 @@ export var transformColumns = function transformColumns() {
     // 精准控制单元格更新，减少不必要的渲染
     if (!item.shouldCellUpdate) {
       var hasComponent = isFunction(item.component);
+      var columnCacheKey = `${Array.isArray(name) ? name.join('.') : String(name)}::${String(columnName)}`;
       item.shouldCellUpdate = (record, prevRecord) => {
-        if ((record === null || record === void 0 ? void 0 : record.rowKey) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.rowKey)) return true;
+        var _item$fieldProps;
+        var currentDataSourceRef = !isFunction(item === null || item === void 0 ? void 0 : item.fieldProps) ? item === null || item === void 0 || (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.dataSource : undefined;
+        if (currentDataSourceRef !== undefined) {
+          var prevDataSourceRef = columnDataSourceRefCache.get(columnCacheKey);
+          if (prevDataSourceRef !== currentDataSourceRef) {
+            columnDataSourceRefCache.set(columnCacheKey, currentDataSourceRef);
+            return true;
+          }
+        }
+        if ((record === null || record === void 0 ? void 0 : record.rowKey) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.rowKey)) {
+          return true;
+        }
+        // 单行编辑模式下，需要检测编辑状态变化
+        if (virtualKey && (record === null || record === void 0 ? void 0 : record._isEditing) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._isEditing)) {
+          return true;
+        }
         // 动态 component 可能依赖行内其他字段，需比较整行
-        if (hasComponent) return !isEqual(record, prevRecord);
+        if (hasComponent) {
+          // component 函数引用变化说明外部依赖（如异步 list）已更新，必须重渲染
+          // 即使行数据未变，旧闭包仍持有过时的外部状态
+          var prevComponentRef = columnComponentRefCache.get(columnCacheKey);
+          var currentComponentRef = item.component;
+          if (prevComponentRef !== currentComponentRef) {
+            columnComponentRefCache.set(columnCacheKey, currentComponentRef);
+            return true;
+          }
+          // 同引用时 isEqual 恒为 true，无法感知原地修改，必须重渲染
+          if (record === prevRecord) {
+            return true;
+          }
+          var rowChanged = !isEqual(record, prevRecord);
+          return rowChanged;
+        }
         var key = item.dataIndex || item.key;
         if (!key) return true;
-        return (record === null || record === void 0 ? void 0 : record[key]) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord[key]);
+        var keyChanged = (record === null || record === void 0 ? void 0 : record[key]) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord[key]);
+        return keyChanged;
       };
     }
   });

package/es/ProEditTable/utils/useShouldUpdateForTable.d.ts

@@ -10,6 +10,7 @@ interface Result {
     fieldProps: any;
     desensitization: any;
     valueType: any;
+    component: any;
 }
 declare const useShouldUpdateForTable: (props: UseShouldUpdateForTableProps) => Result;
 export default useShouldUpdateForTable;

package/es/ProEditTable/utils/useShouldUpdateForTable.js

@@ -8,7 +8,7 @@ import { useRef, useState, useEffect } from 'react';
 import { isFunction, isEqualWith, debounce } from 'lodash';
 import { customEqualForFunction } from "../../utils";
 var useShouldUpdateForTable = props => {
-  var _isEditableRef$curren, _requiredRef$current, _rulesRef$current, _fieldPropsRef$curren, _desensitizationRef$c, _valueTypeRef$current;
+  var _isEditableRef$curren, _requiredRef$current, _rulesRef$current, _fieldPropsRef$curren, _desensitizationRef$c, _valueTypeRef$current, _componentRef$current;
   var rowParams = props.rowParams,
     column = props.column,
     shouldUpdateDebounce = props.shouldUpdateDebounce;
@@ -20,11 +20,13 @@ var useShouldUpdateForTable = props => {
   var fieldPropsRef = useRef();
   var desensitizationRef = useRef();
   var valueTypeRef = useRef();
+  var componentRef = useRef();
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     reRender = _useState2[1];
   var debouncedUpdateRef = useRef(null);
   var pendingParamsRef = useRef(null);
+  var isInitializedRef = useRef(false);
 
   // 统一处理所有动态属性的更新
   var processUpdate = params => {
@@ -99,6 +101,19 @@ var useShouldUpdateForTable = props => {
     } else {
       valueTypeRef.current = column.valueType;
     }
+
+    // component 处理（注意：component 是 editRender 的别名）
+    var componentOrEditRender = column.component || column.editRender;
+    if (isFunction(componentOrEditRender)) {
+      var newComponent = componentOrEditRender(values, reactiveParams);
+      // 对于 ReactNode 类型的返回值，使用深度比较
+      if (!isEqualWith(componentRef.current, newComponent, customEqualForFunction)) {
+        componentRef.current = newComponent;
+        hasChange = true;
+      }
+    } else {
+      componentRef.current = componentOrEditRender;
+    }
     if (hasChange) {
       reRender({});
     }
@@ -106,7 +121,8 @@ var useShouldUpdateForTable = props => {
 
   // 创建防抖函数（统一处理所有动态属性）
   useEffect(() => {
-    if (shouldUpdateDebounce > 0 && (isFunction(column.isEditable) || isFunction(column.required) || isFunction(column.rules) || isFunction(column.fieldProps) || isFunction(column.desensitization) || isFunction(column.valueType))) {
+    var componentOrEditRender = column.component || column.editRender;
+    if (shouldUpdateDebounce > 0 && (isFunction(column.isEditable) || isFunction(column.required) || isFunction(column.rules) || isFunction(column.fieldProps) || isFunction(column.desensitization) || isFunction(column.valueType) || isFunction(componentOrEditRender))) {
       debouncedUpdateRef.current = debounce(() => {
         if (pendingParamsRef.current) {
           processUpdate(pendingParamsRef.current);
@@ -121,13 +137,23 @@ var useShouldUpdateForTable = props => {
   }, [shouldUpdateDebounce, column]);
 
   // 统一的属性处理逻辑
-  if (shouldUpdateDebounce > 0 && debouncedUpdateRef.current) {
-    // 使用防抖延迟更新
-    pendingParamsRef.current = rowParams;
-    debouncedUpdateRef.current();
-  } else {
-    // 立即更新（shouldUpdateDebounce = 0 或无防抖函数）
-    processUpdate(rowParams);
+  // 使用 ref 存储上一次的 rowParams，避免引用变化导致的重复调用
+  var prevRowParamsRef = useRef(null);
+
+  // 只有当 rowParams 内容真正变化时才处理更新
+  // 或者是第一次初始化
+  var shouldProcess = !isInitializedRef.current || !isEqualWith(prevRowParamsRef.current, rowParams, customEqualForFunction);
+  if (shouldProcess) {
+    prevRowParamsRef.current = rowParams;
+    isInitializedRef.current = true;
+    if (shouldUpdateDebounce > 0 && debouncedUpdateRef.current) {
+      // 使用防抖延迟更新
+      pendingParamsRef.current = rowParams;
+      debouncedUpdateRef.current();
+    } else {
+      // 立即更新（shouldUpdateDebounce = 0 或无防抖函数）
+      processUpdate(rowParams);
+    }
   }
   return {
     isEditable: (_isEditableRef$curren = isEditableRef.current) !== null && _isEditableRef$curren !== void 0 ? _isEditableRef$curren : column.isEditable,
@@ -135,7 +161,8 @@ var useShouldUpdateForTable = props => {
     rules: (_rulesRef$current = rulesRef.current) !== null && _rulesRef$current !== void 0 ? _rulesRef$current : column.rules,
     fieldProps: (_fieldPropsRef$curren = fieldPropsRef.current) !== null && _fieldPropsRef$curren !== void 0 ? _fieldPropsRef$curren : column.fieldProps,
     desensitization: (_desensitizationRef$c = desensitizationRef.current) !== null && _desensitizationRef$c !== void 0 ? _desensitizationRef$c : column.desensitization,
-    valueType: (_valueTypeRef$current = valueTypeRef.current) !== null && _valueTypeRef$current !== void 0 ? _valueTypeRef$current : column.valueType
+    valueType: (_valueTypeRef$current = valueTypeRef.current) !== null && _valueTypeRef$current !== void 0 ? _valueTypeRef$current : column.valueType,
+    component: (_componentRef$current = componentRef.current) !== null && _componentRef$current !== void 0 ? _componentRef$current : column.component || column.editRender
   };
 };
 export default useShouldUpdateForTable;

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

@@ -87,13 +87,7 @@ var DatePicker = props => {
     restProps.showTime = true;
   }
 
-  // onChange 输出格式化字符串，表单直接存储
-  var handleChange = (date, dateString) => {
-    var _rest$onChange;
-    var valueToStore = date && typeof nextFormat === 'string' ? date.format(nextFormat) : date;
-    (_rest$onChange = rest.onChange) === null || _rest$onChange === void 0 || _rest$onChange.call(rest, valueToStore, dateString);
-  };
-  restProps.onChange = handleChange;
+  // 直接透传 onChange，保持 dayjs 对象类型（与 RangePicker 一致）
 
   // 字符串时间格式兼容，使用 nextFormat 解析 quarter/week 等格式
   if (isString(restProps.value)) {

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/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", {