Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

some simple bug fix

Browse Source
This commit is contained in:
undefined committed 2020-06-23 12:36:47 +08:00
1 parent d2173eeb38
commit d7c9b695b0
6 files changed
+55 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

hydro/service/server.js
+19 -17
View File
@@ -210,23 +210,24 @@ class Handler {
this.response.disposition = `attachment; filename="${name}"`;
}
url(name, kwargs = {}) { // eslint-disable-line class-methods-use-this
url(name, kwargs = {}) {
let res = '#';
const args = { ...kwargs };
try {
delete kwargs.__keywords;
delete args.__keywords;
if (this.args.domainId !== 'system') {
name += '_with_domainId';
kwargs.domainId = kwargs.domainId || this.args.domainId;
args.domainId = args.domainId || this.args.domainId;
}
const { anchor, query } = kwargs;
delete kwargs.anchor;
delete kwargs.query;
if (query) res = router.url(name, kwargs, { query });
else res = router.url(name, kwargs);
const { anchor, query } = args;
delete args.anchor;
delete args.query;
if (query) res = router.url(name, args, { query });
else res = router.url(name, args);
if (anchor) return `${res}#${anchor}`;
} catch (e) {
console.error(e.message);
console.log(name, kwargs);
console.log(name, args);
}
return res;
}
@@ -417,19 +418,20 @@ class ConnectionHandler {
for (const i in p) this.request.params[p[i][0]] = decodeURIComponent(p[i][1]);
}
url(name, kwargs = {}) { // eslint-disable-line class-methods-use-this
url(name, kwargs = {}) {
let res = '#';
const args = { ...kwargs };
try {
delete kwargs.__keywords;
delete args.__keywords;
if (this.args.domainId !== 'system') {
name += '_with_domainId';
kwargs.domainId = kwargs.domainId || this.args.domainId;
args.domainId = args.domainId || this.args.domainId;
}
const { anchor, query } = kwargs;
delete kwargs.anchor;
delete kwargs.query;
if (query) res = router.url(name, kwargs, { query });
else res = router.url(name, kwargs);
const { anchor, query } = args;
delete args.anchor;
delete args.query;
if (query) res = router.url(name, args, { query });
else res = router.url(name, args);
if (anchor) return `${res}#${anchor}`;
} catch (e) {
console.error(e.message);