diff --git a/src/components/Container/src/collapse/CollapseContainer.vue b/src/components/Container/src/collapse/CollapseContainer.vue
index 1abdf4ac2ed6b6bdbd82c2cb32d1be28be7db56f..ba8f0a7606236eeb077ff49a4263387483cdf076 100644
--- a/src/components/Container/src/collapse/CollapseContainer.vue
+++ b/src/components/Container/src/collapse/CollapseContainer.vue
@@ -9,10 +9,10 @@
       </template>
     </CollapseHeader>
 
-    <div class="p-2">
+    <div class="p-2" v-show="show">
       <CollapseTransition :enable="canExpan">
         <Skeleton v-if="loading" :active="loading" />
-        <div :class="`${prefixCls}__body`" v-else v-show="show">
+        <div :class="`${prefixCls}__body`" v-else>
           <slot></slot>
         </div>
       </CollapseTransition>
@@ -63,6 +63,8 @@
     lazyTime: { type: Number, default: 0 },
   });
 
+  const emit = defineEmits(['update:expand']);
+
   const show = ref(true);
 
   const { prefixCls } = useDesign('collapse-container');
@@ -86,6 +88,7 @@
       // 200 milliseconds here is because the expansion has animation,
       useTimeoutFn(triggerWindowResize, 200);
     }
+    emit('update:expand', show.value);
   }
 </script>
 <style lang="less">
diff --git a/src/components/Table/src/components/editable/EditableCell.vue b/src/components/Table/src/components/editable/EditableCell.vue
index 44cbbc48b8cfe5a807f23b000098a5378317a7f3..8d2bc1ef8785f8e6c939472b23cff61901d2285e 100644
--- a/src/components/Table/src/components/editable/EditableCell.vue
+++ b/src/components/Table/src/components/editable/EditableCell.vue
@@ -113,8 +113,17 @@
         return ['Checkbox', 'Switch'].includes(component);
       });
 
+      const getEditComponentProps = computed(() => {
+        const { value: text, record, column, index } = props;
+        let compProps = props.column?.editComponentProps ?? {};
+        if (isFunction(compProps)) {
+          compProps = compProps({ text, record, column, index }) ?? {};
+        }
+        return compProps;
+      });
+
       const getComponentProps = computed(() => {
-        const compProps = props.column?.editComponentProps ?? {};
+        const compProps = unref(getEditComponentProps);
 
         const val = unref(currentValueRef);
         const labelVal = unref(currentLabelValueRef);
@@ -205,7 +214,7 @@
           value = e;
         }
 
-        const format = props.column?.editComponentProps?.format;
+        const format = unref(getEditComponentProps)?.format;
         if (format) {
           if (isObject(value)) {
             value = value._isAMomentObject ? value?.format(format) : value;
@@ -218,7 +227,7 @@
         currentValueRef.value = value;
         currentLabelValueRef.value = labelValue;
 
-        const onChange = props.column?.editComponentProps?.onChange;
+        const onChange = unref(getEditComponentProps)?.onChange;
         if (onChange && isFunction(onChange)) onChange(...arguments);
 
         table.emit?.('edit-change', {
diff --git a/src/components/Table/src/types/table.ts b/src/components/Table/src/types/table.ts
index a564cb0c7e0866068aa83ed8da86522a75866f78..a60c59443b0912cf6df89d415474a874ad3c33f2 100644
--- a/src/components/Table/src/types/table.ts
+++ b/src/components/Table/src/types/table.ts
@@ -10,6 +10,7 @@ import { ComponentType } from './componentType';
 import { VueNode } from '/@/utils/propTypes';
 import { RoleEnum } from '/@/enums/roleEnum';
 import { ActionItem } from './tableAction';
+import { EditRecordRow } from '../components/editable';
 
 export declare type SortOrder = 'ascend' | 'descend';
 
@@ -445,7 +446,14 @@ export interface BasicColumn extends ColumnProps {
   editRow?: boolean;
   editable?: boolean;
   editComponent?: ComponentType;
-  editComponentProps?: Recordable;
+  editComponentProps?:
+    | ((opt: {
+        text: any;
+        record: EditRecordRow;
+        column: BasicColumn;
+        index: number;
+      }) => Recordable)
+    | Recordable;
   editRule?: boolean | ((text: string, record: Recordable) => Promise<string>);
   editValueMap?: (value: any) => string;
   onEditRow?: () => void;