diff --git a/src/views/init-home/Role/index.vue b/src/views/init-home/Role/index.vue index 7f854ba4..de2505b8 100644 --- a/src/views/init-home/Role/index.vue +++ b/src/views/init-home/Role/index.vue @@ -95,69 +95,6 @@ const findMenuByRole = (menu: any[], code: string): any => { }); return _item; }; -/** - * 保存角色 - */ -const addRoleData = async () => { - return new Promise((resolve) => { - if (!keys.value.length) { - return resolve(true); - } - let Count = 0; - let allPromise = []; - allPromise = keys.value.map(async (item, index) => { - return await saveRoleData(item); - // const _itemData = RoleData[item]; - // // 添加该角色 - // const res = await addRole(_itemData); - // if (res.status === 200) { - // const menuTree = await getRoleMenu(res.result.id); - // if (menuTree.status === 200) { - // const _roleData = (RoleMenuData[item] as []).filter( - // (roleItem: any) => { - // const _menu = findMenuByRole( - // menuTree.result, - // roleItem.code, - // ); - // if (_menu) { - // roleItem.id = _menu.id; - // roleItem.parentId = _menu.parentId; - // roleItem.createTime = _menu.createTime; - // return true; - // } - // return false; - // }, - // ); - // //更新权限 - // const roleRes = await updateRoleMenu(res.result.id, { - // menus: _roleData, - // }); - // if (roleRes.status === 200) { - // // Count += 1; - // resolve(true); - // } - // // if (index === keys.value.length - 1) { - // // resolve(Count === keys.value.length); - // // } - // } else if (index === keys.value.length - 1) { - // resolve(Count === keys.value.length); - // } - // } else if (index === keys.value.length - 1) { - // resolve(Count === keys.value.length); - // roleData.isSucessRole = 2; - // } else { - // resolve(false); - // } - }); - Promise.all(allPromise).then((item) => { - resolve( - item.every((i) => { - return i; - }), - ); - }); - }); -}; const saveRoleData = (item: any) => { return new Promise(async (resolve) => { @@ -186,11 +123,7 @@ const saveRoleData = (item: any) => { const roleRes = await updateRoleMenu(res.result.id, { menus: _roleData, }); - if (roleRes.status === 200) { - resolve(true); - } else { - resolve(false); - } + resolve(roleRes.status === 200) } else { resolve(false); } @@ -199,6 +132,30 @@ const saveRoleData = (item: any) => { } }); }; + +/** + * 保存角色 + */ +const addRoleData = async () => { + return new Promise((resolve) => { + if (!keys.value.length) { + return resolve(true); + } + + const allPromise = keys.value.map(async (item) => { + return await saveRoleData(item); + }); + + Promise.all(allPromise).then((item) => { + resolve( + item.every((i) => { + return i; + }), + ); + }); + }); +}; + defineExpose({ submitRole: addRoleData, });