p96170835
/
amis
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'baidu/master'

This commit is contained in:
2betop 2020-07-02 16:19:47 +08:00
parent 004cd210e0 bb4bad4eb2
commit b46f6ee836
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/utils/api.ts
View File

@ -253,7 +253,10 @@ export function isApiOutdated(
}
export function isValidApi(api: string) {
return api && /^(?:https?:\/\/[^\/]+)?(\/[^\s\/\?]*){1,}(\?.*)?$/.test(api);
return (
api &&
/^(?:(https?|wss?|taf):\/\/[^\/]+)?(\/[^\s\/\?]*){1,}(\?.*)?$/.test(api)
);
}
export function isEffectiveApi(

10
src/utils/tpl-builtin.ts
View File

@ -42,7 +42,7 @@ const entityMap: {
'/': '/'
};
export const escapeHtml = (str: string) =>
String(str).replace(/[&<>"'\/]/g, function(s) {
String(str).replace(/[&<>"'\/]/g, function (s) {
return entityMap[s];
});
@ -218,13 +218,13 @@ export const filters: {
Array.isArray(input)
? input.map(item => resolveVariable(path, item) || item)
: resolveVariable(path, input) || input,
str2date: function(input, inputFormat = 'X', outputFormat = 'X') {
str2date: function (input, inputFormat = 'X', outputFormat = 'X') {
return input
? filterDate(input, this, inputFormat).format(outputFormat)
: '';
},
asArray: input => (Array.isArray(input) ? input : input ? [input] : input),
filter: function(input, keys, expOrDirective, arg1) {
filter: function (input, keys, expOrDirective, arg1) {
if (!Array.isArray(input) || !keys || !expOrDirective) {
return input;
}
@ -243,7 +243,7 @@ export const filters: {
fn = value => arg1 == value;
} else if (directive === 'isIn') {
let list: Array<any> = arg1 ? getStrOrVariable(arg1, this) : [];
list = Array.isArray(list) ? list : [];
list = Array.isArray(list) ? list : [list];
fn = value => !!~list.indexOf(value);
} else if (directive === 'notIn') {
let list: Array<any> = arg1 ? getStrOrVariable(arg1, this) : [];
@ -284,7 +284,7 @@ export const filters: {
return decodeURIComponent(
atob(str)
.split('')
.map(function(c) {
.map(function (c) {
return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
})
.join('')