mirror of
				https://github.com/continew-org/continew-admin-ui.git
				synced 2025-10-31 22:57:15 +08:00 
			
		
		
		
	refactor(system/user): 分页列表调整排除用户 ID 列表参数为 roleId,改为后端根据 roleId 查询
This commit is contained in:
		| @@ -38,7 +38,7 @@ export interface UserQuery { | |||||||
|   deptId?: string |   deptId?: string | ||||||
|   sort: Array<string> |   sort: Array<string> | ||||||
|   userIds?: Array<string> |   userIds?: Array<string> | ||||||
|   excludeUserIds?: Array<string> |   roleId?: string | ||||||
| } | } | ||||||
| export interface UserPageQuery extends UserQuery, PageQuery {} | export interface UserPageQuery extends UserQuery, PageQuery {} | ||||||
|  |  | ||||||
|   | |||||||
| @@ -94,13 +94,13 @@ const emit = defineEmits<{ | |||||||
| interface Props { | interface Props { | ||||||
|   multiple?: boolean |   multiple?: boolean | ||||||
|   value: string | string[] |   value: string | string[] | ||||||
|   excludeValue?: string[] |   roleId?: string | ||||||
| } | } | ||||||
|  |  | ||||||
| // 查询表单 | // 查询表单 | ||||||
| const queryForm = reactive<UserQuery>({ | const queryForm = reactive<UserQuery>({ | ||||||
|   sort: ['t1.createTime,desc', 't1.id,desc'], |   sort: ['t1.createTime,desc', 't1.id,desc'], | ||||||
|   excludeUserIds: props.excludeValue, |   roleId: props.roleId, | ||||||
| }) | }) | ||||||
|  |  | ||||||
| // 用户列表 | // 用户列表 | ||||||
|   | |||||||
| @@ -9,14 +9,14 @@ | |||||||
|     @before-ok="save" |     @before-ok="save" | ||||||
|     @close="reset" |     @close="reset" | ||||||
|   > |   > | ||||||
|     <UserSelect v-if="visible" ref="UserSelectRef" v-model:value="selectedUsers" :exclude-value="excludeUsers" @select-user="onSelectUser" /> |     <UserSelect v-if="visible" ref="UserSelectRef" v-model:value="selectedUsers" :role-id="dataId" @select-user="onSelectUser" /> | ||||||
|   </a-modal> |   </a-modal> | ||||||
| </template> | </template> | ||||||
|  |  | ||||||
| <script setup lang="ts"> | <script setup lang="ts"> | ||||||
| import { Message } from '@arco-design/web-vue' | import { Message } from '@arco-design/web-vue' | ||||||
| import { useWindowSize } from '@vueuse/core' | import { useWindowSize } from '@vueuse/core' | ||||||
| import { assignToUsers, listRoleUserId } from '@/apis/system/role' | import { assignToUsers } from '@/apis/system/role' | ||||||
|  |  | ||||||
| const emit = defineEmits<{ | const emit = defineEmits<{ | ||||||
|   (e: 'save-success'): void |   (e: 'save-success'): void | ||||||
| @@ -27,7 +27,6 @@ const { width } = useWindowSize() | |||||||
| const dataId = ref('') | const dataId = ref('') | ||||||
| const visible = ref(false) | const visible = ref(false) | ||||||
| const selectedUsers = ref<string[]>([]) | const selectedUsers = ref<string[]>([]) | ||||||
| const excludeUsers = ref<string[]>([]) |  | ||||||
|  |  | ||||||
| // 用户选择回调 | // 用户选择回调 | ||||||
| const onSelectUser = (value: string[]) => { | const onSelectUser = (value: string[]) => { | ||||||
| @@ -63,9 +62,6 @@ const save = async () => { | |||||||
| // 打开 | // 打开 | ||||||
| const onOpen = async (id: string) => { | const onOpen = async (id: string) => { | ||||||
|   dataId.value = id |   dataId.value = id | ||||||
|   // 初始化选择的用户 |  | ||||||
|   const { data } = await listRoleUserId(id) |  | ||||||
|   excludeUsers.value = data |  | ||||||
|   selectedUsers.value = [] |   selectedUsers.value = [] | ||||||
|   visible.value = true |   visible.value = true | ||||||
| } | } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user