fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-09 23:49:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2025-01-08 13:33:45 +00:00
commit d82e0a69b0
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/client/src/application/Application.tsx
View File

@ -267,7 +267,7 @@ export class Application {
return this.getPublicPath() + pathname.replace(/^\//g, ''); return this.getPublicPath() + pathname.replace(/^\//g, '');
} }
getFullUrl(pathname: string) { getHref(pathname: string) {
const name = this.name; const name = this.name;
if (name && name !== 'main') { if (name && name !== 'main') {
return this.getPublicPath() + 'apps/' + name + '/' + pathname.replace(/^\//g, ''); return this.getPublicPath() + 'apps/' + name + '/' + pathname.replace(/^\//g, '');

18
packages/core/client/src/application/__tests__/Application.test.tsx
View File

@ -85,29 +85,29 @@ describe('Application', () => {
}); });
}); });
describe('getFullUrl', () => { describe('getHref', () => {
it('default', () => { it('default', () => {
const app = new Application({}); const app = new Application({});
expect(app.getFullUrl('test')).toBe('/test'); expect(app.getHref('test')).toBe('/test');
expect(app.getFullUrl('/test')).toBe('/test'); expect(app.getHref('/test')).toBe('/test');
}); });
it('custom', () => { it('custom', () => {
const app = new Application({ publicPath: '/nocobase' }); const app = new Application({ publicPath: '/nocobase' });
expect(app.getFullUrl('/test')).toBe('/nocobase/test'); expect(app.getHref('/test')).toBe('/nocobase/test');
expect(app.getFullUrl('test')).toBe('/nocobase/test'); expect(app.getHref('test')).toBe('/nocobase/test');
}); });
it('sub app', () => { it('sub app', () => {
const app = new Application({ name: 'sub1' }); const app = new Application({ name: 'sub1' });
expect(app.getFullUrl('test')).toBe('/apps/sub1/test'); expect(app.getHref('test')).toBe('/apps/sub1/test');
expect(app.getFullUrl('/test')).toBe('/apps/sub1/test'); expect(app.getHref('/test')).toBe('/apps/sub1/test');
}); });
it('sub app', () => { it('sub app', () => {
const app = new Application({ name: 'sub1', publicPath: '/nocobase/' }); const app = new Application({ name: 'sub1', publicPath: '/nocobase/' });
expect(app.getFullUrl('test')).toBe('/nocobase/apps/sub1/test'); expect(app.getHref('test')).toBe('/nocobase/apps/sub1/test');
expect(app.getFullUrl('/test')).toBe('/nocobase/apps/sub1/test'); expect(app.getHref('/test')).toBe('/nocobase/apps/sub1/test');
}); });
}); });

2
packages/plugins/@nocobase/plugin-mobile/src/client/desktop-mode/Header.tsx
View File

@ -95,7 +95,7 @@ export const DesktopModeHeader: FC = () => {
} }
`} `}
> >
<Button style={{ color: 'white' }} href={app.getFullUrl('/admin')}> <Button style={{ color: 'white' }} href={app.getHref('/admin')}>
{t('Back')} {t('Back')}
</Button> </Button>
<div style={{ display: 'flex', alignItems: 'center' }}> <div style={{ display: 'flex', alignItems: 'center' }}>