From 20410aeb034f97d2b00baf34bfde812dfaf2a42a Mon Sep 17 00:00:00 2001 From: xingyu Date: Sun, 9 Nov 2025 11:49:01 +0800 Subject: [PATCH 1/3] fix: updating Tailwind CSS variables from --radix-* to --reka-* (#6890) * fix: radix => reka * chore: add reka cspell * fix: Composition url --- cspell.json | 1 + internal/tailwind-config/src/index.ts | 8 ++++---- .../ui-kit/shadcn-ui/src/components/button/button.ts | 2 +- packages/@core/ui-kit/tabs-ui/src/use-tabs-view-scroll.ts | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cspell.json b/cspell.json index 89545b43..4e853e97 100644 --- a/cspell.json +++ b/cspell.json @@ -36,6 +36,7 @@ "prefixs", "publint", "qrcode", + "reka", "shadcn", "sonner", "sortablejs", diff --git a/internal/tailwind-config/src/index.ts b/internal/tailwind-config/src/index.ts index 93332a3f..8bbf1f6e 100644 --- a/internal/tailwind-config/src/index.ts +++ b/internal/tailwind-config/src/index.ts @@ -175,18 +175,18 @@ export default { keyframes: { 'accordion-down': { from: { height: '0' }, - to: { height: 'var(--radix-accordion-content-height)' }, + to: { height: 'var(--reka-accordion-content-height)' }, }, 'accordion-up': { - from: { height: 'var(--radix-accordion-content-height)' }, + from: { height: 'var(--reka-accordion-content-height)' }, to: { height: '0' }, }, 'collapsible-down': { from: { height: '0' }, - to: { height: 'var(--radix-collapsible-content-height)' }, + to: { height: 'var(--reka-collapsible-content-height)' }, }, 'collapsible-up': { - from: { height: 'var(--radix-collapsible-content-height)' }, + from: { height: 'var(--reka-collapsible-content-height)' }, to: { height: '0' }, }, float: { diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts b/packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts index dc84a18a..e12729a4 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts +++ b/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; diff --git a/packages/@core/ui-kit/tabs-ui/src/use-tabs-view-scroll.ts b/packages/@core/ui-kit/tabs-ui/src/use-tabs-view-scroll.ts index dc2f70ec..aef32dfa 100644 --- a/packages/@core/ui-kit/tabs-ui/src/use-tabs-view-scroll.ts +++ b/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; From fef1e35c54c7805fcc3813a1edf64e12ed6ff8f0 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Sun, 9 Nov 2025 11:49:38 +0800 Subject: [PATCH 2/3] fix: prevent JSONBigInt parsing error on non-string data (#6891) * Initial plan * Fix json-bigint serialization error when data is not a string Co-authored-by: likui628 <90845831+likui628@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: likui628 <90845831+likui628@users.noreply.github.com> --- playground/src/api/request.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/playground/src/api/request.ts b/playground/src/api/request.ts index e741552d..a8855361 100644 --- a/playground/src/api/request.ts +++ b/playground/src/api/request.ts @@ -29,11 +29,15 @@ function createRequestClient(baseURL: string, options?: RequestClientOptions) { baseURL, transformResponse: (data: any, header: AxiosResponseHeaders) => { // storeAsString指示将BigInt存储为字符串，设为false则会存储为内置的BigInt类型 - return header.getContentType()?.toString().includes('application/json') - ? cloneDeep( - JSONBigInt({ storeAsString: true, strict: true }).parse(data), - ) - : data; + if ( + header.getContentType()?.toString().includes('application/json') && + typeof data === 'string' + ) { + return cloneDeep( + JSONBigInt({ storeAsString: true, strict: true }).parse(data), + ); + } + return data; }, }); From 6bbe523f6fbb47f4f343c2e010cb5028c3b48125 Mon Sep 17 00:00:00 2001 From: Utopia Date: Sun, 9 Nov 2025 12:00:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E5=A2=9E=E5=BC=BA=20util-formatDa?= =?UTF-8?q?te=20ts=20=E7=B1=BB=E5=9E=8B=E6=8F=90=E7=A4=BA=20(#6886)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 为 auth layout 添加 slot: logo, 提升组件的灵活性和可复用性 * feat: 增强 util-formatDate ts 类型提示 --- packages/@core/base/shared/src/utils/date.ts | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/packages/@core/base/shared/src/utils/date.ts b/packages/@core/base/shared/src/utils/date.ts index b56023c8..926050d1 100644 --- a/packages/@core/base/shared/src/utils/date.ts +++ b/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'); }