perf: fs-button增加buttonProps参数，当fs-button的属性与x-button属性名重复时使用

#221
fast-crud · Aug 18, 2023 · 5ca5333 · 5ca5333
1 parent aeb4868
commit 5ca5333
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/packages/fast-admin/fs-admin-antdv b/packages/fast-admin/fs-admin-antdv
diff --git a/packages/fast-admin/fs-admin-antdv4 b/packages/fast-admin/fs-admin-antdv4
diff --git a/packages/fast-admin/fs-admin-element b/packages/fast-admin/fs-admin-element
diff --git a/packages/fast-admin/fs-admin-naive-ui b/packages/fast-admin/fs-admin-naive-ui
diff --git a/packages/fast-crud/src/components/basic/fs-button.tsx b/packages/fast-crud/src/components/basic/fs-button.tsx
@@ -41,7 +41,7 @@ export default defineComponent({
      * x-button的配置，当x-button的配置与fs-button的配置有冲突时可以配置在此处
      * 比如：n-button的text
      */
-    props: {
+    buttonProps: {
       type: Object,
       default: undefined
     }
@@ -115,7 +115,7 @@ export default defineComponent({
             "is-thin": !props.text && !ctx.slots.default
           }
         },
-        { ...ctx.attrs, ...props.props }
+        { ...ctx.attrs, ...props.buttonProps }
       );
       if (iconProp) {
         // @ts-ignore