p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'ui-v0.3' into 'test' 

fix: install process adjustment

See merge request opensource/answer!207
This commit is contained in:
Li Shuailing 2022-11-09 07:24:49 +00:00
parent 7f49f8bcb1 a5150d06a8
commit 865bf95b37
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ui/src/pages/Install/index.tsx
View File

@ -116,26 +116,6 @@ const Index: FC = () => {
setStep((pre) => pre + 1);
};
const submitDatabaseForm = () => {
const params = {
lang: formData.lang.value,
db_type: formData.db_type.value,
db_username: formData.db_username.value,
db_password: formData.db_password.value,
db_host: formData.db_host.value,
db_name: formData.db_name.value,
db_file: formData.db_file.value,
};
dbCheck(params)
.then(() => {
handleNext();
})
.catch((err) => {
console.log(err);
handleErr(err);
});
};
const checkInstall = () => {
const params = {
lang: formData.lang.value,
@ -155,6 +135,27 @@ const Index: FC = () => {
});
};
const submitDatabaseForm = () => {
const params = {
lang: formData.lang.value,
db_type: formData.db_type.value,
db_username: formData.db_username.value,
db_password: formData.db_password.value,
db_host: formData.db_host.value,
db_name: formData.db_name.value,
db_file: formData.db_file.value,
};
dbCheck(params)
.then(() => {
// handleNext();
checkInstall();
})
.catch((err) => {
console.log(err);
handleErr(err);
});
};
const submitSiteConfig = () => {
const params = {
lang: formData.lang.value,
@ -183,7 +184,11 @@ const Index: FC = () => {
submitDatabaseForm();
}
if (step === 3) {
checkInstall();
if (errorData.msg) {
checkInstall();
} else {
handleNext();
}
}
if (step === 4) {
submitSiteConfig();