fix(TextArea): omit showCount from fieldProps in render function

fix(Item): handle expandedRowClassName type correctly
ant-design · Nov 14, 2024 · 34ce674 · 34ce674
1 parent 87eb331
commit 34ce674
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/field/src/components/TextArea/index.tsx b/packages/field/src/components/TextArea/index.tsx
@@ -1,5 +1,6 @@
 import { useIntl } from '@ant-design/pro-provider';
 import { Input } from 'antd';
+import omit from 'omit.js';
 import React from 'react';
 import type { ProFieldFC } from '../../index';
 import FieldTextAreaReadonly from './readonly';
@@ -15,13 +16,17 @@ import 'antd/lib/input/style';
 const FieldTextArea: ProFieldFC<{
   text: string;
 }> = (props, ref) => {
-  const { text, mode, render, , fieldProps } = props;
+  const { text, mode, render, renderFormItem, fieldProps } = props;
   const intl = useIntl();
 
   if (mode === 'read') {
     const dom = <FieldTextAreaReadonly {...props} ref={ref} />;
     if (render) {
-      return render(text, { mode, ...omit(fieldProps, ['showCount']) }, dom);
+      return render(
+        text,
+        { mode, ...(omit(fieldProps, ['showCount']) as any) },
+        dom,
+      );
     }
     return dom;
   }

diff --git a/packages/list/src/Item.tsx b/packages/list/src/Item.tsx
@@ -328,7 +328,9 @@ function ProListItem<RecordType>(props: ItemProps<RecordType>) {
               <div
                 className={
                   expandedRowClassName &&
-                  expandedRowClassName(record, index, indentSize)
+                  typeof expandedRowClassName !== 'string'
+                    ? expandedRowClassName(record, index, indentSize)
+                    : expandedRowClassName
                 }
               >
                 {expandedRowDom}