baha/skyline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix: validate error when clear input-name"

Browse Source
This commit is contained in:
Zuul 2022-09-22 03:00:48 +00:00 committed by Gerrit Code Review
commit bf663778d0
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Progress/index.jsx
View File

@ -59,7 +59,7 @@ export default class index extends Component {
if (label) { if (label) {
options.showInfo = false; options.showInfo = false;
} }
const tip = value === undefined ? '-' : `${value}%`; const tip = [undefined, null, ''].includes(value) ? '-' : `${value}%`;
return ( return (
<Tooltip title={tip} placement="top"> <Tooltip title={tip} placement="top">
<Progress {...options} /> <Progress {...options} />

2
src/containers/TabDetail/index.jsx
View File

@ -246,7 +246,7 @@ export default class DetailBase extends React.Component {
if (unit) { if (unit) {
return getUnitRender(dataConf)(value); return getUnitRender(dataConf)(value);
} }
if (value === undefined || value === '') { if ([undefined, null, ''].includes(value)) {
return '-'; return '-';
} }
return value; return value;

2
src/pages/network/containers/Certificate/actions/Create.jsx
View File

@ -68,7 +68,7 @@ export class CreateAction extends ModalAction {
} }
validateDomain = (rule, value) => { validateDomain = (rule, value) => {
if (value === undefined || value === '') return Promise.resolve(); if ([undefined, null, ''].includes(value)) return Promise.resolve();
const domains = value.split(','); const domains = value.split(',');
const allCorrect = domains.every((it) => it.length <= 100 && isDomain(it)); const allCorrect = domains.every((it) => it.length <= 100 && isDomain(it));
if (domains.length > 30 || !allCorrect) { if (domains.length > 30 || !allCorrect) {

2
src/utils/table.jsx
View File

@ -262,7 +262,7 @@ export const getUnitRender = (column) => {
} }
if (unit) { if (unit) {
return (value) => { return (value) => {
if (value === undefined || value === null) { if ([undefined, null, ''].includes(value)) {
return '-'; return '-';
} }
return `${value}${unit}`; return `${value}${unit}`;

22
src/utils/validate.js
View File

@ -384,7 +384,7 @@ export const macAddressMessage = t(
const asciiMessage = t('Please enter a valid ASCII code'); const asciiMessage = t('Please enter a valid ASCII code');
export const databaseNameValidate = (rule, value) => { export const databaseNameValidate = (rule, value) => {
if (!rule.required && value === undefined) { if (!rule.required && [undefined, null, ''].includes(value)) {
return Promise.resolve(true); return Promise.resolve(true);
} }
if (isDatabaseName(value)) { if (isDatabaseName(value)) {
@ -394,7 +394,7 @@ export const databaseNameValidate = (rule, value) => {
}; };
export const databaseUserNameValidate = (rule, value) => { export const databaseUserNameValidate = (rule, value) => {
if (!rule.required && value === undefined) { if (!rule.required && [undefined, null, ''].includes(value)) {
return Promise.resolve(true); return Promise.resolve(true);
} }
if (['os_admin', 'root'].includes(value)) { if (['os_admin', 'root'].includes(value)) {
@ -433,7 +433,7 @@ export const emailValidate = (rule, value) => {
}; };
const nameValidate = (rule, value) => { const nameValidate = (rule, value) => {
if (!rule.required && value === undefined) { if (!rule.required && [undefined, null, ''].includes(value)) {
return Promise.resolve(true); return Promise.resolve(true);
} }
if (isName(value)) { if (isName(value)) {
@ -443,7 +443,7 @@ const nameValidate = (rule, value) => {
}; };
const nameValidateWithoutChinese = (rule, value) => { const nameValidateWithoutChinese = (rule, value) => {
if (!rule.required && value === undefined) { if (!rule.required && [undefined, null, ''].includes(value)) {
return Promise.resolve(true); return Promise.resolve(true);
} }
if (isNameWithoutChinese(value)) { if (isNameWithoutChinese(value)) {
@ -455,7 +455,7 @@ const nameValidateWithoutChinese = (rule, value) => {
}; };
const fileNameValidate = (rule, value) => { const fileNameValidate = (rule, value) => {
if (!rule.required && value === undefined) { if (!rule.required && [undefined, null, ''].includes(value)) {
return Promise.resolve(true); return Promise.resolve(true);
} }
if (isFilename(value)) { if (isFilename(value)) {
@ -465,7 +465,7 @@ const fileNameValidate = (rule, value) => {
}; };
const swiftFileNameValidate = (rule, value) => { const swiftFileNameValidate = (rule, value) => {
if (!rule.required && value === undefined) { if (!rule.required && [undefined, null, ''].includes(value)) {
return Promise.resolve(true); return Promise.resolve(true);
} }
if (isSwiftFilename(value)) { if (isSwiftFilename(value)) {
@ -475,7 +475,7 @@ const swiftFileNameValidate = (rule, value) => {
}; };
const keypairNameValidate = (rule, value) => { const keypairNameValidate = (rule, value) => {
if (!rule.required && value === undefined) { if (!rule.required && [undefined, null, ''].includes(value)) {
return Promise.resolve(true); return Promise.resolve(true);
} }
if (isKeypairName(value)) { if (isKeypairName(value)) {
@ -485,7 +485,7 @@ const keypairNameValidate = (rule, value) => {
}; };
const stackNameValidate = (rule, value) => { const stackNameValidate = (rule, value) => {
if (!rule.required && value === undefined) { if (!rule.required && [undefined, null, ''].includes(value)) {
return Promise.resolve(true); return Promise.resolve(true);
} }
if (isStackName(value)) { if (isStackName(value)) {
@ -495,7 +495,7 @@ const stackNameValidate = (rule, value) => {
}; };
const crontabNameValidate = (rule, value) => { const crontabNameValidate = (rule, value) => {
if (!rule.required && value === undefined) { if (!rule.required && [undefined, null, ''].includes(value)) {
return Promise.resolve(true); return Promise.resolve(true);
} }
if (isCrontabName(value)) { if (isCrontabName(value)) {
@ -505,7 +505,7 @@ const crontabNameValidate = (rule, value) => {
}; };
const imageNameValidate = (rule, value) => { const imageNameValidate = (rule, value) => {
if (!rule.required && value === undefined) { if (!rule.required && [undefined, null, ''].includes(value)) {
return Promise.resolve(true); return Promise.resolve(true);
} }
if (isImageName(value)) { if (isImageName(value)) {
@ -515,7 +515,7 @@ const imageNameValidate = (rule, value) => {
}; };
const instanceNameValidate = (rule, value) => { const instanceNameValidate = (rule, value) => {
if (!rule.required && value === undefined) { if (!rule.required && [undefined, null, ''].includes(value)) {
return Promise.resolve(true); return Promise.resolve(true);
} }
if (isInstanceName(value)) { if (isInstanceName(value)) {