chore: trim post dependencies from retained user views
This commit is contained in:
@@ -9,7 +9,6 @@ export * from './menu';
|
|||||||
export * from './message';
|
export * from './message';
|
||||||
export * from './oauth';
|
export * from './oauth';
|
||||||
export * from './permission';
|
export * from './permission';
|
||||||
export * from './post';
|
|
||||||
export * from './role';
|
export * from './role';
|
||||||
export * from './resource-scope';
|
export * from './resource-scope';
|
||||||
export * from './server-health';
|
export * from './server-health';
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import { ElAvatar, ElPopover } from 'element-plus';
|
|||||||
|
|
||||||
import { getUserDetailApi } from '#/api/core/user';
|
import { getUserDetailApi } from '#/api/core/user';
|
||||||
import DeptTag from '#/components/dept-tag/index.vue';
|
import DeptTag from '#/components/dept-tag/index.vue';
|
||||||
import PostTag from '#/components/post-tag/index.vue';
|
|
||||||
import RoleTag from '#/components/role-tag/index.vue';
|
import RoleTag from '#/components/role-tag/index.vue';
|
||||||
import { getFileUrl } from '#/composables/useFileUrl';
|
import { getFileUrl } from '#/composables/useFileUrl';
|
||||||
import { generateAvatarGradient, generateAvatarText } from '#/utils/avatar';
|
import { generateAvatarGradient, generateAvatarText } from '#/utils/avatar';
|
||||||
@@ -345,7 +344,7 @@ watch(
|
|||||||
<div v-if="userDetail.post_id" class="detail-item">
|
<div v-if="userDetail.post_id" class="detail-item">
|
||||||
<span class="detail-label">岗位:</span>
|
<span class="detail-label">岗位:</span>
|
||||||
<span class="detail-value">
|
<span class="detail-value">
|
||||||
<PostTag :post-id="userDetail.post_id" />
|
{{ userDetail.post_name || userDetail.post_id }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ import {
|
|||||||
ElTooltip,
|
ElTooltip,
|
||||||
} from 'element-plus';
|
} from 'element-plus';
|
||||||
|
|
||||||
import { getPostUsersApi } from '#/api/core/post';
|
|
||||||
import { getRoleUsersApi } from '#/api/core/role';
|
import { getRoleUsersApi } from '#/api/core/role';
|
||||||
import { getUserListApi } from '#/api/core/user';
|
import { getUserListApi } from '#/api/core/user';
|
||||||
|
|
||||||
@@ -56,10 +55,10 @@ const UserCard = defineAsyncComponent(() => import('./user-card.vue'));
|
|||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
const UserListItem = defineAsyncComponent(() => import('./user-list-item.vue'));
|
const UserListItem = defineAsyncComponent(() => import('./user-list-item.vue'));
|
||||||
|
|
||||||
type DataSource = 'all' | 'dept' | 'post' | 'role';
|
type DataSource = 'all' | 'dept' | 'role';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
dataSource?: DataSource; // 数据源类型:all-所有用户, dept-部门用户, post-岗位用户, role-角色用户
|
dataSource?: DataSource; // 数据源类型:all-所有用户, dept-部门用户, role-角色用户
|
||||||
sourceId?: string; // 数据源ID(部门ID或岗位ID)
|
sourceId?: string; // 数据源ID(部门ID或岗位ID)
|
||||||
tempSelectedUsers?: Set<string>;
|
tempSelectedUsers?: Set<string>;
|
||||||
filterable?: boolean;
|
filterable?: boolean;
|
||||||
@@ -111,10 +110,6 @@ async function loadUsers(isLoadMore = false) {
|
|||||||
// 使用 getUserListApi 并传入 dept_ids
|
// 使用 getUserListApi 并传入 dept_ids
|
||||||
params.dept_ids = [props.sourceId];
|
params.dept_ids = [props.sourceId];
|
||||||
result = await getUserListApi(params);
|
result = await getUserListApi(params);
|
||||||
} else if (props.dataSource === 'post' && props.sourceId) {
|
|
||||||
params.search = params.name;
|
|
||||||
delete params.name;
|
|
||||||
result = await getPostUsersApi(props.sourceId, params);
|
|
||||||
} else if (props.dataSource === 'role' && props.sourceId) {
|
} else if (props.dataSource === 'role' && props.sourceId) {
|
||||||
params.username = params.name;
|
params.username = params.name;
|
||||||
delete params.name;
|
delete params.name;
|
||||||
|
|||||||
Reference in New Issue
Block a user