alicorn-dev/KintoneAppBuilder
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev3' of https://dev.azure.com/alicorn-dev/KintoneAppBuilder/_git/KintoneAppBuilder into dev3

Browse Source
This commit is contained in:
方 柏
2024-12-04 21:45:00 +09:00
parent b98c20d7ff 93f44282d3
commit a6576827fd
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/ShareDomain/ShareDomainDialog.vue
View File

@@ -161,7 +161,7 @@ const getUsers = async () => {
} }
loading.value = true; loading.value = true;
const result = await api.get(`api/v1/users`); const result = await api.get(`api/v1/users`);
allUsers.value = result.data.map(itemToDisplay); allUsers.value = result.data.data.map(itemToDisplay);
loading.value = false; loading.value = false;
} }

2
frontend/src/components/UserList.vue
View File

@@ -24,7 +24,7 @@ defineExpose({
const getUsers = async (filter = () => true) => { const getUsers = async (filter = () => true) => {
loading.value = true; loading.value = true;
const result = await api.get(`api/v1/users`); const result = await api.get(`api/v1/users`);
rows.value = result.data.map((item) => { rows.value = result.data.data.map((item) => {
return { id: item.id, firstName: item.first_name, lastName: item.last_name, email: item.email, isSuperuser: item.is_superuser, isActive: item.is_active } return { id: item.id, firstName: item.first_name, lastName: item.last_name, email: item.email, isSuperuser: item.is_superuser, isActive: item.is_active }
}).filter(filter); }).filter(filter);
loading.value = false; loading.value = false;

2
frontend/src/pages/UserManagement.vue
View File

@@ -190,7 +190,7 @@ let editId = ref(0);
const getUsers = async (filter = () => true) => { const getUsers = async (filter = () => true) => {
loading.value = true; loading.value = true;
const result = await api.get(`api/v1/users`); const result = await api.get(`api/v1/users`);
rows.value = result.data.map((item) => { rows.value = result.data.data.map((item) => {
return { id: item.id, firstName: item.first_name, lastName: item.last_name, email: item.email, isSuperuser: item.is_superuser, isActive: item.is_active } return { id: item.id, firstName: item.first_name, lastName: item.last_name, email: item.email, isSuperuser: item.is_superuser, isActive: item.is_active }
}).filter(filter); }).filter(filter);
loading.value = false; loading.value = false;

2
frontend/src/stores/useAuthStore.ts
View File

@@ -77,7 +77,7 @@ export const useAuthStore = defineStore('auth', {
}; };
}, },
async getUserInfo():Promise<UserInfo>{ async getUserInfo():Promise<UserInfo>{
const resp = (await api.get(`api/v1/users/me`)).data; const resp = (await api.get(`api/v1/users/me`)).data.data;
return { return {
firstName: resp.first_name, firstName: resp.first_name,
lastName: resp.last_name, lastName: resp.last_name,