From 3c83c1b9cdb3d60e80096cd83ee7343f344f7135 Mon Sep 17 00:00:00 2001 From: chenos Date: Wed, 8 Jan 2025 21:32:31 +0800 Subject: [PATCH] chore: getHref --- .../client/src/application/Application.tsx | 2 +- .../application/__tests__/Application.test.tsx | 18 +++++++++--------- .../src/client/desktop-mode/Header.tsx | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/core/client/src/application/Application.tsx b/packages/core/client/src/application/Application.tsx index 96700c9a15..b172aa12bb 100644 --- a/packages/core/client/src/application/Application.tsx +++ b/packages/core/client/src/application/Application.tsx @@ -208,7 +208,7 @@ export class Application { return this.getPublicPath() + pathname.replace(/^\//g, ''); } - getFullUrl(pathname: string) { + getHref(pathname: string) { const name = this.name; if (name && name !== 'main') { return this.getPublicPath() + 'apps/' + name + '/' + pathname.replace(/^\//g, ''); diff --git a/packages/core/client/src/application/__tests__/Application.test.tsx b/packages/core/client/src/application/__tests__/Application.test.tsx index bbe257eb94..ab52d9c24b 100644 --- a/packages/core/client/src/application/__tests__/Application.test.tsx +++ b/packages/core/client/src/application/__tests__/Application.test.tsx @@ -85,29 +85,29 @@ describe('Application', () => { }); }); - describe('getFullUrl', () => { + describe('getHref', () => { it('default', () => { const app = new Application({}); - expect(app.getFullUrl('test')).toBe('/test'); - expect(app.getFullUrl('/test')).toBe('/test'); + expect(app.getHref('test')).toBe('/test'); + expect(app.getHref('/test')).toBe('/test'); }); it('custom', () => { const app = new Application({ publicPath: '/nocobase' }); - expect(app.getFullUrl('/test')).toBe('/nocobase/test'); - expect(app.getFullUrl('test')).toBe('/nocobase/test'); + expect(app.getHref('/test')).toBe('/nocobase/test'); + expect(app.getHref('test')).toBe('/nocobase/test'); }); it('sub app', () => { const app = new Application({ name: 'sub1' }); - expect(app.getFullUrl('test')).toBe('/apps/sub1/test'); - expect(app.getFullUrl('/test')).toBe('/apps/sub1/test'); + expect(app.getHref('test')).toBe('/apps/sub1/test'); + expect(app.getHref('/test')).toBe('/apps/sub1/test'); }); it('sub app', () => { const app = new Application({ name: 'sub1', publicPath: '/nocobase/' }); - expect(app.getFullUrl('test')).toBe('/nocobase/apps/sub1/test'); - expect(app.getFullUrl('/test')).toBe('/nocobase/apps/sub1/test'); + expect(app.getHref('test')).toBe('/nocobase/apps/sub1/test'); + expect(app.getHref('/test')).toBe('/nocobase/apps/sub1/test'); }); }); diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/desktop-mode/Header.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/desktop-mode/Header.tsx index 9ac87d8549..2fe7aa4cfc 100644 --- a/packages/plugins/@nocobase/plugin-mobile/src/client/desktop-mode/Header.tsx +++ b/packages/plugins/@nocobase/plugin-mobile/src/client/desktop-mode/Header.tsx @@ -95,7 +95,7 @@ export const DesktopModeHeader: FC = () => { } `} > -