From 278e9310b47e1ec0ee3fd66e87120351664ff626 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Tue, 28 Mar 2023 10:53:39 +0800
Subject: [PATCH] fix: bug#11094 11099

---
 src/views/init-home/Basic/index.vue |  2 +-
 src/views/init-home/Menu/index.vue  | 25 ++++++++++++++-----------
 src/views/init-home/Role/index.vue  |  2 ++
 src/views/init-home/index.vue       | 18 +++++++++++++++++-
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/views/init-home/Basic/index.vue b/src/views/init-home/Basic/index.vue
index 7f489465..7aa07bc6 100644
--- a/src/views/init-home/Basic/index.vue
+++ b/src/views/init-home/Basic/index.vue
@@ -329,7 +329,7 @@ const { resetFields, validate, validateInfos } = useForm(
  * 提交数据
  */
 const saveBasicInfo = () => {
-    return new Promise(async (resolve) => {
+    return new Promise(async (resolve,reject) => {
         validate()
             .then(async () => {
                 const item = [
diff --git a/src/views/init-home/Menu/index.vue b/src/views/init-home/Menu/index.vue
index 2100fd9c..b39a312a 100644
--- a/src/views/init-home/Menu/index.vue
+++ b/src/views/init-home/Menu/index.vue
@@ -13,13 +13,13 @@
 <script lang="ts" setup>
 import { getImage } from '@/utils/comm';
 import BaseMenu from '../data/baseMenu';
-import { getSystemPermission , updateMenus } from '@/api/initHome';
+import { getSystemPermission, updateMenus } from '@/api/initHome';
 /**
  * 获取菜单数据
  */
 const menuDatas = reactive({
     count: 0,
-    current:undefined,
+    current: undefined,
 });
 /**
  * 获取当前系统权限信息
@@ -68,18 +68,21 @@ const menuCount = (menus: any[]) => {
 /**
  * 初始化菜单
  */
-const initMenu = () =>{
-    return new Promise((resolve) => {
-        updateMenus(menuDatas.current).then((res) => {
-          resolve(res.status === 200);
-      })
-    })
-}
+const initMenu = async () => {
+    return new Promise(async (resolve) => {
+        const res = await updateMenus(menuDatas.current);
+        if (res.status === 200) {
+            resolve(true);
+        } else {
+            resolve(false);
+        }
+    });
+};
 const { count } = toRefs(menuDatas);
 getSystemPermissionData();
 defineExpose({
-    updataMenu:initMenu
-})
+    updataMenu: initMenu,
+});
 </script>
 <style lang="less" scoped>
 .menu-style {
diff --git a/src/views/init-home/Role/index.vue b/src/views/init-home/Role/index.vue
index bcb0553b..299820c2 100644
--- a/src/views/init-home/Role/index.vue
+++ b/src/views/init-home/Role/index.vue
@@ -142,6 +142,8 @@ const addRoleData = async () => {
             } else if (index === keys.value.length - 1) {
                 resolve(Count === keys.value.length);
                 roleData.isSucessRole = 2;
+            }else{
+                resolve(false);
             }
         });
     });
diff --git a/src/views/init-home/index.vue b/src/views/init-home/index.vue
index 53d43f6a..5a921a99 100644
--- a/src/views/init-home/index.vue
+++ b/src/views/init-home/index.vue
@@ -98,12 +98,28 @@ const jump = () => {
 const submitData = async () => {
     loading.value = true;
     const basicRes = await basicRef.value.submitBasic();
+    if (!basicRes) {
+        loading.value = false;
+        return;
+    }
     const menuRes = await menuRef.value.updataMenu();
+    if (!menuRes) {
+        loading.value = false;
+        return;
+    }
     const roleRes = await roleRef.value.submitRole();
+    if (!roleRes) {
+        loading.value = false;
+        return;
+    }
     const initDataRes = await initDataRef.value.save();
+    if (!initDataRes) {
+        loading.value = false;
+        return;
+    }
     loading.value = false;
     // 当前数据是否成功提交
-    if (basicRes && menuRes && roleRes && initDataRes ) {
+    if (basicRes && menuRes && roleRes && initDataRes) {
         message.success('保存成功');
         //     // 记录初始化数据，跳转首页
         const res = await saveInit();