yumoqing/bricks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: normalize full URLs to relative paths in Router

Browse Source 
When ?page= param contains a full URL (e.g. https://domain/module/page.ui),
normalize it to relative path (/module/page.ui) before loading.
Applied in _restore, _loadInto, navigate, and _onReplace.
This commit is contained in:
yumoqing 2026-06-01 23:41:50 +08:00
parent e5981ba447
commit d67bd84d4d
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bricks/router.js
View File

@ -40,6 +40,23 @@ bricks.Router = (function(){
return new URLSearchParams(window.location.search).get(key); return new URLSearchParams(window.location.search).get(key);
} }
/** Normalize a URL value to a relative path.
* Full URLs to same origin → extract pathname
* Already relative → return as-is
*/
function _normalizeUrl(url){
if (!url) return url;
try {
if (url.indexOf('://') !== -1){
var parsed = new URL(url);
if (parsed.origin === window.location.origin){
return parsed.pathname;
}
}
} catch(e){}
return url;
}
function _pushState(){ function _pushState(){
var url = new URL(window.location); var url = new URL(window.location);
for (var id in _targets){ for (var id in _targets){
@ -76,6 +93,7 @@ bricks.Router = (function(){
async function _loadInto(targetId, url){ async function _loadInto(targetId, url){
if (!bricks.app){ return; } if (!bricks.app){ return; }
url = _normalizeUrl(url);
var target = bricks.getWidgetById(targetId, bricks.app); var target = bricks.getWidgetById(targetId, bricks.app);
if (!target){ if (!target){
console.log('[Router] target not found:', targetId); console.log('[Router] target not found:', targetId);
@ -119,7 +137,7 @@ bricks.Router = (function(){
var anyRoute = false; var anyRoute = false;
for (var id in _targets){ for (var id in _targets){
var cfg = _targets[id]; var cfg = _targets[id];
var url = _getURLParam(cfg.param); var url = _normalizeUrl(_getURLParam(cfg.param));
if (url){ if (url){
cfg.current = url; cfg.current = url;
anyRoute = true; anyRoute = true;
@ -167,6 +185,7 @@ bricks.Router = (function(){
if (!_enabled || _restoring || _isPopState){ return; } if (!_enabled || _restoring || _isPopState){ return; }
var cfg = _targets[target.id]; var cfg = _targets[target.id];
if (!cfg){ return; } if (!cfg){ return; }
url = _normalizeUrl(url);
if (cfg.current === url){ return; } if (cfg.current === url){ return; }
cfg.current = url; cfg.current = url;
_pushState(); _pushState();
@ -208,6 +227,7 @@ bricks.Router = (function(){
console.error('[Router] unknown target:', targetId); console.error('[Router] unknown target:', targetId);
return; return;
} }
url = _normalizeUrl(url);
_loadInto(targetId, url).then(function(){ _loadInto(targetId, url).then(function(){
cfg.current = url; cfg.current = url;
_pushState(); _pushState();