diff --git a/src/components/Button/src/props.ts b/src/components/Button/src/props.ts
index fd5fa52ff..a61c6c316 100644
--- a/src/components/Button/src/props.ts
+++ b/src/components/Button/src/props.ts
@@ -23,4 +23,5 @@ export const buttonProps = {
    */
   iconSize: { type: Number, default: 14 },
   onClick: { type: [Function, Array] as PropType<(() => any) | (() => any)[]>, default: null },
+  text: { type: String },
 };
diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue
index 6a56104ab..e509b6b2f 100644
--- a/src/components/Form/src/BasicForm.vue
+++ b/src/components/Form/src/BasicForm.vue
@@ -342,10 +342,6 @@
           display: flex;
         }
 
-        .ant-form-item-control {
-          // margin-top: 4px;
-        }
-
         .suffix {
           display: inline-flex;
           align-items: center;
diff --git a/src/components/Form/src/components/FormAction.vue b/src/components/Form/src/components/FormAction.vue
index cd3700dc5..64c6e195b 100644
--- a/src/components/Form/src/components/FormAction.vue
+++ b/src/components/Form/src/components/FormAction.vue
@@ -49,8 +49,6 @@
   import { useI18n } from '@/hooks/web/useI18n';
   import { propTypes } from '@/utils/propTypes';
 
-  type ButtonOptions = Partial<ButtonProps> & { text: string };
-
   defineOptions({ name: 'BasicFormAction' });
 
   const props = defineProps({
@@ -59,11 +57,11 @@
     showSubmitButton: propTypes.bool.def(true),
     showAdvancedButton: propTypes.bool.def(true),
     resetButtonOptions: {
-      type: Object as PropType<ButtonOptions>,
+      type: Object as PropType<ButtonProps>,
       default: () => ({}),
     },
     submitButtonOptions: {
-      type: Object as PropType<ButtonOptions>,
+      type: Object as PropType<ButtonProps>,
       default: () => ({}),
     },
     actionColOptions: {
@@ -93,7 +91,7 @@
     return actionColOpt;
   });
 
-  const getResetBtnOptions = computed((): ButtonOptions => {
+  const getResetBtnOptions = computed((): ButtonProps => {
     return Object.assign(
       {
         text: t('common.resetText'),
@@ -102,7 +100,7 @@
     );
   });
 
-  const getSubmitBtnOptions = computed(() => {
+  const getSubmitBtnOptions = computed((): ButtonProps => {
     return Object.assign(
       {
         text: t('common.queryText'),
diff --git a/src/components/Form/src/props.ts b/src/components/Form/src/props.ts
index fb96e471e..91c69f9ca 100644
--- a/src/components/Form/src/props.ts
+++ b/src/components/Form/src/props.ts
@@ -2,10 +2,11 @@ import type { FieldMapToTime, FormSchema } from './types/form';
 import type { CSSProperties, PropType } from 'vue';
 import type { ColEx } from './types';
 import type { TableActionType } from '@/components/Table';
-import type { ButtonProps } from 'ant-design-vue/es/button/buttonTypes';
 import type { RowProps } from 'ant-design-vue/lib/grid/Row';
 import { propTypes } from '@/utils/propTypes';
 
+import { ButtonProps } from '@/components/Button';
+
 export const basicProps = {
   model: {
     type: Object as PropType<Recordable>,
diff --git a/src/components/SimpleMenu/src/components/SubMenuItem.vue b/src/components/SimpleMenu/src/components/SubMenuItem.vue
index 9c4a8c6bc..b21e2d652 100644
--- a/src/components/SimpleMenu/src/components/SubMenuItem.vue
+++ b/src/components/SimpleMenu/src/components/SubMenuItem.vue
@@ -44,8 +44,7 @@
           :class="`${prefixCls}-submenu-title-icon`"
         />
       </div>
-      <!-- eslint-disable-next-line -->
-      <template #content v-show="state.opened">
+      <template #content v-if="state.opened">
         <div v-bind="getEvents(true)">
           <ul :class="[prefixCls, `${prefixCls}-${getTheme}`, `${prefixCls}-popup`]">
             <slot></slot>