Merge branch 'main' into tdesign

packages/@core/base/shared/src/utils/date.ts

@@ -7,7 +7,19 @@ dayjs.extend(timezone);
 
 type FormatDate = Date | dayjs.Dayjs | number | string;
 
-export function formatDate(time: FormatDate, format = 'YYYY-MM-DD') {
+type Format =
+  | 'HH'
+  | 'HH:mm'
+  | 'HH:mm:ss'
+  | 'YYYY'
+  | 'YYYY-MM'
+  | 'YYYY-MM-DD'
+  | 'YYYY-MM-DD HH'
+  | 'YYYY-MM-DD HH:mm'
+  | 'YYYY-MM-DD HH:mm:ss'
+  | (string & {});
+
+export function formatDate(time?: FormatDate, format: Format = 'YYYY-MM-DD') {
   try {
     const date = dayjs.isDayjs(time) ? time : dayjs(time);
     if (!date.isValid()) {
@@ -16,11 +28,11 @@ export function formatDate(time: FormatDate, format = 'YYYY-MM-DD') {
     return date.tz().format(format);
   } catch (error) {
     console.error(`Error formatting date: ${error}`);
-    return String(time);
+    return String(time ?? '');
   }
 }
 
-export function formatDateTime(time: FormatDate) {
+export function formatDateTime(time?: FormatDate) {
   return formatDate(time, 'YYYY-MM-DD HH:mm:ss');
 }
 

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

@@ -13,7 +13,7 @@ export interface VbenButtonProps {
   /**
    * Change the default rendered element for the one passed as a child, merging their props and behavior.
    *
-   * Read our [Composition](https://www.radix-vue.com/guides/composition.html) guide for more details.
+   * Read our [Composition](https://www.reka-ui.com/docs/guides/composition) guide for more details.
    */
   asChild?: boolean;
   class?: any;

packages/@core/ui-kit/tabs-ui/src/use-tabs-view-scroll.ts

@@ -59,7 +59,7 @@ export function useTabsViewScroll(props: TabsProps) {
     }
 
     const viewportEl = scrollbarEl?.querySelector(
-      'div[data-radix-scroll-area-viewport]',
+      'div[data-reka-scroll-area-viewport]',
     );
 
     scrollViewportEl.value = viewportEl;