From e423d8afcf5b9666e166565d0509b621ebab17e7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 13 一月 2025 14:11:00 +0800
Subject: [PATCH] !172 合并 warmflow 功能分支 * update 优化 流程定义页面 点击复制之后跳转到未发布列表 * update 优化 流程定义页面 增加加载loading层 * fix: v-model处理有延迟 需要手动处理 * update 调整流程定义查询 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 调整可驳回的节点 * update: 调整文案 * update: 激活/挂起改为switch操作 * update 优化 代码删除无用输出 * update 统一抄送人使用昵称展示 * update 调整分类接口 * update 统一业务id参数 * update 删除默认顶节点 * !168 优化流程分类 * update 恢复误删除代码 * update 优化流程分类 * update 修复 路由跳转未改全 * [update] * fix 修复一些问题 * update 重构流程分类表 * update 流程定义增加表单路径与编辑功能 修复一些其他bug * fix 修复 一些问题 * update 变量统一命名 * add 增加示例 * Merge branch 'warm-flw-future' of https://gitee.com/JavaLionLi/plus-ui… * update 调整办理人 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * add 增加示例 * update 调整审批记录 添加流程导出 * remove 删除无用代码 * remove 删除无用代码 * [update] * [fix] * 流程干预删除委托 * 增加附件 * 附件修改 * 申请人查询修改 * 1.修改查询条件 * !167 fix 修复 import路径修改不全问题 * fix 修复 import路径修改不全问题 * !166 update 清除 ProcessPreview 引用 * update 清除 ProcessPreview 引用 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * fix 修复 前端路径修改不全问题 * update 优化接口请求路径 * add 添加作废 * add 添加流程干预 * update 调整加签，减签 * update 调整加签，减签 * add 增加流程查看 * update 调整委托，转办 * update 调整流程变量显示 * update 调整办理人修改 * update 调整流程实例状态页面 * update 调整已办页面 * add 添加流程撤销 * update 调整任务，流程实例 ，流程定义页面 * Merge branch 'dev' into warm-flw-future * update 调整流程定义页面 * add 添加流程变量查看 * update 调整设计器路由名称 * update 调整办理人 * update 调整设计器uri * update 调整设计器请求uri 调整待办状态 * update 调整办理 驳回 终止等状态 * add 添加模型新增 * add 添加warm-ui设计器,删除无用代码 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * add 添加流程设计 * update 调整驳回 * update 调整视图类型错误 * Merge branch 'warm-flw-future' of https://gitee.com/JavaLionLi/plus-ui… * 添加已办，未办 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 调整流程实例，待办查询 * add 添加代办人，调整提交按钮校验 * update 调整流程定义查询 * add添加流程定义激活 挂起 * add 添加流程文件部署 调整流程发布 * update 优化 时间搜索组件统一 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * fix 修复 用户管理编辑安全权限错误问题 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 优化 类型报错问题 * update 优化 切换租户后刷新首页 * update 优化 实现表格行选中切换 * update 优化 使用 vueuse 重构 websocket 实现 * update 优化 使用 vueuse 重构 websocket 实现 * fix 修复 登出后重新登录 sse推送报错问题 * reset 回滚 代码修改 采用其他方案 * fix 修复 登出后重新登录 sse推送报错问题 * update 优化 删除无用代码 * update element-plus 2.7.5 => 2.7.8 * reset 回滚 错误修复 * update 优化 代码生成器编辑页禁用缓存 防止同步后页面不更新问题 * fix 修复 代码生成同步点击取消报错问题 * 初始化添加warm-flow
---
src/components/UserSelect/index.vue | 131 +++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 43 deletions(-)
diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue
index 6a68f92..937a395 100644
--- a/src/components/UserSelect/index.vue
+++ b/src/components/UserSelect/index.vue
@@ -24,22 +24,16 @@
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
- <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
- <el-input v-model="queryParams.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable style="width: 200px" @keyup.enter="handleQuery" />
+ <el-input v-model="queryParams.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
- <el-input
- v-model="queryParams.phonenumber"
- placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
- clearable
- style="width: 200px"
- @keyup.enter="handleQuery"
- />
+ <el-input v-model="queryParams.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ <el-button icon="Refresh" @click="() => resetQuery()">閲嶇疆</el-button>
</el-form-item>
</el-form>
</el-card>
@@ -47,9 +41,9 @@
</transition>
<el-card shadow="hover">
- <template #header>
+ <template v-if="prop.multiple" #header>
<el-tag v-for="user in selectUserList" :key="user.userId" closable style="margin: 2px" @close="handleCloseTag(user)">
- {{ user.userName }}
+ {{ user.nickName }}
</el-tag>
</template>
@@ -60,9 +54,8 @@
show-overflow
:data="userList"
:loading="loading"
- :row-config="{ keyField: 'userId' }"
- :checkbox-config="{ reserve: true, checkRowKeys: userIds }"
- highlight-current-row
+ :row-config="{ keyField: 'userId', isHover: true }"
+ :checkbox-config="{ reserve: true, trigger: 'row', highlight: true, showHeader: prop.multiple }"
@checkbox-all="handleCheckboxAll"
@checkbox-change="handleCheckboxChange"
>
@@ -90,14 +83,14 @@
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
:total="total"
- @pagination="getList"
+ @pagination="pageList"
/>
</el-card>
</el-col>
</el-row>
<template #footer>
- <el-button @click="userDialog.closeDialog">鍙栨秷</el-button>
+ <el-button @click="close">鍙栨秷</el-button>
<el-button type="primary" @click="confirm">纭畾</el-button>
</template>
</el-dialog>
@@ -107,22 +100,24 @@
<script setup lang="ts">
import api from '@/api/system/user';
import { UserQuery, UserVO } from '@/api/system/user/types';
-import { DeptVO } from '@/api/system/dept/types';
+import { DeptTreeVO, DeptVO } from '@/api/system/dept/types';
import { VxeTableInstance } from 'vxe-table';
import useDialog from '@/hooks/useDialog';
interface PropType {
- modelValue?: UserVO[];
+ modelValue?: UserVO[] | UserVO | undefined;
+ multiple?: boolean;
+ data?: string | number | (string | number)[] | undefined;
}
const prop = withDefaults(defineProps<PropType>(), {
- modelValue: () => []
+ multiple: true,
+ modelValue: undefined,
+ data: undefined
});
-const emit = defineEmits(['update:modelValue']);
+const emit = defineEmits(['update:modelValue', 'confirmCallBack']);
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
-
-const userIds = computed(() => prop.modelValue.map((item) => item.userId as string));
const userList = ref<UserVO[]>();
const loading = ref(true);
@@ -130,7 +125,7 @@
const total = ref(0);
const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
const deptName = ref('');
-const deptOptions = ref<DeptVO[]>([]);
+const deptOptions = ref<DeptTreeVO[]>([]);
const selectUserList = ref<UserVO[]>([]);
const deptTreeRef = ref<ElTreeInstance>();
@@ -151,11 +146,8 @@
roleId: ''
});
-/** 閫氳繃鏉′欢杩囨护鑺傜偣 */
-const filterNode = (value: string, data: any) => {
- if (!value) return true;
- return data.label.indexOf(value) !== -1;
-};
+const defaultSelectUserIds = computed(() => computedIds(prop.data));
+
/** 鏍规嵁鍚嶇О绛涢�夐儴闂ㄦ爲 */
watchEffect(
() => {
@@ -167,8 +159,28 @@
);
const confirm = () => {
- emit('update:modelValue', [...selectUserList.value]);
+ emit('update:modelValue', selectUserList.value);
+ emit('confirmCallBack', selectUserList.value);
userDialog.closeDialog();
+};
+
+const computedIds = (data) => {
+ if (data instanceof Array) {
+ return data.map(item => String(item));
+ } else if (typeof data === 'string') {
+ return data.split(',');
+ } else if (typeof data === 'number') {
+ return [data];
+ } else {
+ console.warn('<UserSelect> The data type of data should be array or string or number, but I received other');
+ return [];
+ }
+};
+
+/** 閫氳繃鏉′欢杩囨护鑺傜偣 */
+const filterNode = (value: string, data: any) => {
+ if (!value) return true;
+ return data.label.indexOf(value) !== -1;
};
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
@@ -186,6 +198,14 @@
total.value = res.total;
};
+const pageList = async () => {
+ await getList();
+ const users = userList.value.filter((item) => {
+ return selectUserList.value.some((user) => user.userId === item.userId);
+ });
+ await tableRef.value.setCheckboxRow(users, true);
+};
+
/** 鑺傜偣鍗曞嚮浜嬩欢 */
const handleNodeClick = (data: DeptVO) => {
queryParams.value.deptId = data.id;
@@ -198,16 +218,20 @@
getList();
};
/** 閲嶇疆鎸夐挳鎿嶄綔 */
-const resetQuery = () => {
+const resetQuery = (refresh = true) => {
dateRange.value = ['', ''];
queryFormRef.value?.resetFields();
queryParams.value.pageNum = 1;
queryParams.value.deptId = undefined;
deptTreeRef.value?.setCurrentKey(undefined);
- handleQuery();
+ refresh && handleQuery();
};
const handleCheckboxChange = (checked) => {
+ if (!prop.multiple && checked.checked) {
+ tableRef.value.setCheckboxRow(selectUserList.value, false);
+ selectUserList.value = [];
+ }
const row = checked.row;
if (checked.checked) {
selectUserList.value.push(row);
@@ -234,23 +258,44 @@
const handleCloseTag = (user: UserVO) => {
const userId = user.userId;
+ // 浣跨敤split鍒犻櫎鐢ㄦ埛
const index = selectUserList.value.findIndex((item) => item.userId === userId);
const rows = selectUserList.value[index];
tableRef.value?.setCheckboxRow(rows, false);
selectUserList.value.splice(index, 1);
};
-watch(
- () => prop.modelValue,
- (newVal, oldValue) => {
- Object.assign(selectUserList.value, newVal);
- },
- { deep: true }
-);
-onMounted(() => {
- getTreeSelect();
- getList();
-});
+const initSelectUser = async () => {
+ if (defaultSelectUserIds.value.length > 0) {
+ const { data } = await api.optionSelect(defaultSelectUserIds.value);
+ selectUserList.value = data;
+ const users = userList.value.filter((item) => {
+ return defaultSelectUserIds.value.includes(String(item.userId));
+ });
+ await nextTick(() => {
+ tableRef.value.setCheckboxRow(users, true);
+ });
+ }
+};
+const close = () => {
+ userDialog.closeDialog();
+};
+
+watch(
+ () => userDialog.visible.value,
+ async (newValue: boolean) => {
+ if (newValue) {
+ await getTreeSelect(); // 鍒濆鍖栭儴闂ㄦ暟鎹�
+ await getList(); // 鍒濆鍖栧垪琛ㄦ暟鎹�
+ await initSelectUser();
+ } else {
+ tableRef.value.clearCheckboxReserve();
+ tableRef.value.clearCheckboxRow();
+ resetQuery(false);
+ selectUserList.value = [];
+ }
+ }
+);
defineExpose({
open: userDialog.openDialog,
--
Gitblit v1.9.3