From ed66231d19ec5b0614b05c0ab8953e5d767dd9f1 Mon Sep 17 00:00:00 2001 From: dap <dap@qq.com> Date: 星期三, 15 五月 2024 11:35:02 +0800 Subject: [PATCH] Merge branch 'dev' of https://gitee.com/JavaLionLi/plus-ui into dev --- src/bpmn/panel/TaskPanel.vue | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/bpmn/panel/TaskPanel.vue b/src/bpmn/panel/TaskPanel.vue index 253d3f9..bc037ee 100644 --- a/src/bpmn/panel/TaskPanel.vue +++ b/src/bpmn/panel/TaskPanel.vue @@ -50,7 +50,7 @@ <el-tabs tab-position="left" class="demo-tabs"> <el-tab-pane label="韬唤瀛樺偍"> <el-form-item label="鍒嗛厤浜哄憳"> - <el-input v-model="formData.assignee"> + <el-input v-model="formData.assignee" @blur="blurAssignee(formData.assignee)"> <template #append> <el-button icon="Search" type="primary" @click="openSingleUserSelect" /> </template> @@ -283,24 +283,23 @@ const isMultiple = ref(true); const openUserSelect = () => { - if (!formData.value.candidateUsers) { - formData.value.candidateUsers = '-1'; - } userSelectRef.value.open(); }; const openSingleUserSelect = () => { + if (formData.value.assignee.includes('$')) { + formData.value.assignee = ''; + } singleUserSelectRef.value.open(); }; const openRoleSelect = () => { - if (!formData.value.candidateGroups) { - formData.value.candidateGroups = '-1'; - } roleSelectRef.value.open(); }; const openDueDate = (e) => { dueDateRef.value.openDialog(); }; - +const blurAssignee = (assignee) => { + updateProperties({ 'flowable:assignee': assignee ? assignee : undefined }); +}; const singleUserSelectCallBack = (data: UserVO[]) => { const user: UserVO = data.length !== 0 ? data[0] : undefined; updateProperties({ 'flowable:assignee': user?.userId }); -- Gitblit v1.9.3