Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into antdv-next

packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts

@@ -27,8 +27,10 @@ export type CustomRenderType = (() => Component | string) | string;
 
 export type ValueType = boolean | number | string;
 
-export interface VbenButtonGroupProps
-  extends Pick<VbenButtonProps, 'disabled'> {
+export interface VbenButtonGroupProps extends Pick<
+  VbenButtonProps,
+  'disabled'
+> {
   /** 单选模式下允许清除选中 */
   allowClear?: boolean;
   /** 值改变前的回调 */

packages/@core/ui-kit/shadcn-ui/src/components/render-content/render-content.vue

@@ -42,14 +42,17 @@ export default defineComponent({
           return props.content;
         }
       }
-      return h(props.content as never, {
-        ...attrs,
-        props: {
-          ...props,
+      return h(
+        props.content as never,
+        {
           ...attrs,
+          props: {
+            ...props,
+            ...attrs,
+          },
         },
         slots,
-      });
+      );
     };
   },
 });

packages/@core/ui-kit/shadcn-ui/src/components/spinner/loading.vue

@@ -32,19 +32,19 @@ const props = withDefaults(defineProps<Props>(), {
 // const startTime = ref(0);
 const showSpinner = ref(false);
 const renderSpinner = ref(false);
-const timer = ref<ReturnType<typeof setTimeout>>();
+let timer: ReturnType<typeof setTimeout> | undefined;
 
 watch(
   () => props.spinning,
   (show) => {
     if (!show) {
       showSpinner.value = false;
-      clearTimeout(timer.value);
+      timer && clearTimeout(timer);
       return;
     }
 
     // startTime.value = performance.now();
-    timer.value = setTimeout(() => {
+    timer = setTimeout(() => {
       // const loadingTime = performance.now() - startTime.value;
 
       showSpinner.value = true;