From f203716f3152a777c303031b74ee0368d7466434 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 26 十一月 2024 15:29:06 +0800
Subject: [PATCH] update 优化 代码生成导入下拉框默认值处理
---
src/bpmn/panel/TaskPanel.vue | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/bpmn/panel/TaskPanel.vue b/src/bpmn/panel/TaskPanel.vue
index 9ece85f..a42de8a 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>
@@ -95,7 +95,7 @@
</div>
<el-form-item v-if="formData.allocationType === AllocationTypeEnum.SPECIFY && showConfig.specifyDesc" style="">
<el-radio-group v-model="formData.specifyDesc" class="ml-4">
- <el-radio v-for="item in SpecifyDesc" :key="item.id" :label="item.value" size="large">{{ item.label }}</el-radio>
+ <el-radio v-for="item in SpecifyDesc" :key="item.id" :value="item.value" size="large">{{ item.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-tab-pane> -->
@@ -243,8 +243,8 @@
import ExecutionListener from './property/ExecutionListener.vue';
import TaskListener from './property/TaskListener.vue';
import DueDate from './property/DueDate.vue';
-import { ModdleElement } from 'bpmn';
-import { TaskPanel } from 'bpmnDesign';
+import type { ModdleElement } from 'bpmn';
+import type { TaskPanel } from 'bpmnDesign';
import { AllocationTypeEnum, MultiInstanceTypeEnum, SpecifyDescEnum } from '@/enums/bpmn/IndexEnums';
import { UserVO } from '@/api/system/user/types';
import { RoleVO } from '@/api/system/role/types';
@@ -281,26 +281,24 @@
const roleSelectRef = ref<InstanceType<typeof RoleSelect>>();
const dueDateRef = ref<InstanceType<typeof DueDate>>();
-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