efront 4.19.0 → 4.19.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/apps/pivot/db/config.xht +1 -0
- package/apps/pivot/main.js +4 -1
- package/coms/basic/cross_.js +8 -3
- package/package.json +1 -1
- package/public/efront.js +1 -1
package/apps/pivot/db/config.xht
CHANGED
package/apps/pivot/main.js
CHANGED
|
@@ -49,7 +49,10 @@ data.bindInstance("base", async function (base) {
|
|
|
49
49
|
cross.addDirect(base.base);
|
|
50
50
|
var apimap = await data.getConfig();
|
|
51
51
|
for (var k in apimap) {
|
|
52
|
-
|
|
52
|
+
var api = apimap[k];
|
|
53
|
+
if (api.base || !/^\w+\:\/\//.test(api.url)) {
|
|
54
|
+
api.base = base.base;
|
|
55
|
+
}
|
|
53
56
|
}
|
|
54
57
|
});
|
|
55
58
|
var base = data.getInstance('base').base;
|
package/coms/basic/cross_.js
CHANGED
|
@@ -35,23 +35,28 @@ function isChildPath(relative, path) {
|
|
|
35
35
|
return relative.replace(/^(.*\/)[^\/]*$/, path);
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
+
var encodeNA = function (a) {
|
|
39
|
+
return a.replace(/[^\u0021-\u007f]/g, encodeURI);
|
|
40
|
+
};
|
|
38
41
|
var getCrossUrl = function (domain, headers, encrypt) {
|
|
39
42
|
if (notCross(domain, encrypt)) return domain;
|
|
40
43
|
var basehost = parseURL(base).host || parseURL(location_href).host;
|
|
41
44
|
var ishttps = /^(https\:|s\/\/)/i.test(domain);
|
|
42
45
|
var _headers = serialize(headers);
|
|
43
46
|
if (_headers) _headers = "," + _headers;
|
|
47
|
+
var b = encrypt ? "!" : `*`;
|
|
44
48
|
if (parseURL(domain).host === basehost) {
|
|
45
49
|
if (!encrypt) return domain;
|
|
46
50
|
domain = domain.replace(domainReg, "/$3$4");
|
|
47
51
|
if (_headers) domain = _headers + domain;
|
|
48
52
|
}
|
|
49
53
|
else {
|
|
50
|
-
domain = domain
|
|
54
|
+
domain = encodeNA(domain)
|
|
51
55
|
.replace(/^(s?)(\/\/)/i, "http$1:$2")
|
|
52
|
-
.replace(domainReg,
|
|
56
|
+
.replace(domainReg, (_, _1, $2, $3, $4) => {
|
|
57
|
+
return [$2, _headers, '/', $3, $4].join('');
|
|
58
|
+
});
|
|
53
59
|
}
|
|
54
|
-
var b = encrypt ? "!" : `*`;
|
|
55
60
|
if (ishttps) domain = b + domain;
|
|
56
61
|
if (encrypt) domain = encode62.timeencode(encode62.safeencode(domain, encrypt));
|
|
57
62
|
return base + b + domain;
|