CN-361 fix: 修复搜索框bug、优化交互

This commit is contained in:
chenjinsong
2022-03-12 16:56:46 +08:00
parent abf53f5972
commit 01e5a42d44
16 changed files with 139 additions and 18 deletions

View File

@@ -130,13 +130,21 @@ export async function getEntityFilter (params) {
export async function getDictList (params) {
return await getData(api.dict, params, true)
}
function handleResult (response) {
if (response.data.list || response.data.result) {
return response.data.list || response.data.result
} else if (response.data.result === 0) {
return response.data.result
} else {
return response.data
}
}
export async function getData (url, params = {}, isQueryList) {
const request = new Promise((resolve, reject) => {
try {
get(url, params).then(response => {
if (response.code === 200) {
resolve(isQueryList ? response.data.list || response.data.result : response.data.result || response.data)
resolve(handleResult(response))
} else {
reject(response)
}

View File

@@ -410,3 +410,14 @@ export const iso36112 = {
SZ: 'eswatiniLow',
MN: 'mongoliaLow'
}
export const reg = {
// 不严格ipv4
notStrictIpv4: /(?:[0-9]{1,}\.){0,}[0-9]{1,}(\.)?/g,
// 不严格Ipv4带单引号
notStrictWithQuotIpv4: /'(?:[0-9]{1,}\.){0,}[0-9]{1,}(\.)?'/g,
// 不严格ipv6
notStrictIpv6: /(:{0,}[a-fA-F\d]{0,}){0,}:+([a-fA-F\d]{0,}:{0,}){0,}/g,
// 不严格Ipv6带单引号
notStrictWithQuotIpv6: /'(:{0,}[a-fA-F\d]{0,}){0,}:+([a-fA-F\d]{0,}:{0,}){0,}'/g
}