refactor: 优化数据加载逻辑.
This commit is contained in:
@@ -69,7 +69,7 @@
|
||||
import { reactive, ref } from 'vue';
|
||||
import useLoading from '@/hooks/loading';
|
||||
import { useDictStore } from '@/store';
|
||||
import UserSelector from '@/components/user/role/user-selector.vue';
|
||||
import UserSelector from '@/components/user/user/user-selector.vue';
|
||||
import { operatorLogModuleKey, operatorLogTypeKey, operatorRiskLevelKey, operatorLogResultKey } from '../types/const';
|
||||
import { labelFilter } from '@/types/form';
|
||||
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
import { ref, onBeforeMount, onUnmounted } from 'vue';
|
||||
import { useCacheStore, useDictStore } from '@/store';
|
||||
import { dictKeys } from './types/const';
|
||||
import { getUserList } from '@/api/user/user';
|
||||
import OperatorLogQueryHeader from './components/operator-log-query-header.vue';
|
||||
import OperatorLogTable from './components/operator-log-table.vue';
|
||||
import JsonViewModal from '@/components/view/json/json-view-modal.vue';
|
||||
@@ -45,18 +44,10 @@
|
||||
const table = ref();
|
||||
const view = ref();
|
||||
|
||||
// 加载全部用户列表
|
||||
const fetchUserList = async () => {
|
||||
const { data } = await getUserList();
|
||||
cacheStore.set('users', data);
|
||||
};
|
||||
|
||||
onBeforeMount(async () => {
|
||||
// 加载字典值
|
||||
const dictStore = useDictStore();
|
||||
await dictStore.loadKeys(dictKeys);
|
||||
// 加载用户列表
|
||||
await fetchUserList();
|
||||
render.value = true;
|
||||
});
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
</a-form-item>
|
||||
<!-- 角色 -->
|
||||
<a-form-item field="roles" label="角色">
|
||||
<user-role-selector v-model="formModel.roleIdList"
|
||||
<role-selector v-model="formModel.roleIdList"
|
||||
:loading="roleLoading"
|
||||
:multiple="true" />
|
||||
</a-form-item>
|
||||
@@ -50,8 +50,7 @@
|
||||
import useLoading from '@/hooks/loading';
|
||||
import useVisible from '@/hooks/visible';
|
||||
import { Message } from '@arco-design/web-vue';
|
||||
import UserRoleSelector from '@/components/user/role/user-role-selector.vue';
|
||||
import { getRoleList } from '@/api/user/role';
|
||||
import RoleSelector from '@/components/user/role/role-selector.vue';
|
||||
import { useCacheStore } from '@/store';
|
||||
import { getUserRoleIdList, grantUserRole } from '@/api/user/user';
|
||||
|
||||
@@ -84,11 +83,6 @@
|
||||
const loadRoles = async () => {
|
||||
try {
|
||||
setRoleLoading(true);
|
||||
// 获取全部角色
|
||||
if (!cacheStore.roles?.length) {
|
||||
const { data } = await getRoleList();
|
||||
cacheStore.set('roles', data);
|
||||
}
|
||||
// 加载用户角色
|
||||
const { data: roleIdList } = await getUserRoleIdList(formModel.value.id as number);
|
||||
formModel.value.roleIdList = roleIdList;
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
const grantRoleModal = ref();
|
||||
|
||||
onBeforeMount(async () => {
|
||||
// 加载字典值
|
||||
const dictStore = useDictStore();
|
||||
await dictStore.loadKeys(dictKeys);
|
||||
render.value = true;
|
||||
|
||||
Reference in New Issue
Block a user