Skip to content

Commit 46da7e2

Browse files
committed
【缺陷修复】BPM:流程设计器中,选择表达式时,不生效的情况
1 parent 4a829c7 commit 46da7e2

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

src/components/bpmnProcessDesigner/package/penal/listeners/ProcessListenerDialog.vue

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,35 +43,37 @@ import { CommonStatusEnum } from '@/utils/constants'
4343
/** BPM 流程 表单 */
4444
defineOptions({ name: 'ProcessListenerDialog' })
4545
46-
const { t } = useI18n() // 国际化
47-
const message = useMessage() // 消息弹窗
48-
4946
const dialogVisible = ref(false) // 弹窗的是否展示
5047
const loading = ref(true) // 列表的加载中
5148
const list = ref<ProcessListenerVO[]>([]) // 列表的数据
5249
const total = ref(0) // 列表的总页数
5350
const queryParams = reactive({
5451
pageNo: 1,
5552
pageSize: 10,
56-
type: undefined,
53+
type: '',
5754
status: CommonStatusEnum.ENABLE
5855
})
5956
6057
/** 打开弹窗 */
6158
const open = async (type: string) => {
59+
queryParams.pageNo = 1
60+
queryParams.type = type
61+
getList()
6262
dialogVisible.value = true
63+
}
64+
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
65+
66+
/** 查询列表 */
67+
const getList = async () => {
6368
loading.value = true
6469
try {
65-
queryParams.pageNo = 1
66-
queryParams.type = type
6770
const data = await ProcessListenerApi.getProcessListenerPage(queryParams)
6871
list.value = data.list
6972
total.value = data.total
7073
} finally {
7174
loading.value = false
7275
}
7376
}
74-
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
7577
7678
/** 提交表单 */
7779
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调

src/components/bpmnProcessDesigner/package/penal/task/task-components/ProcessExpressionDialog.vue

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,35 +28,37 @@ import { ProcessExpressionApi, ProcessExpressionVO } from '@/api/bpm/processExpr
2828
/** BPM 流程 表单 */
2929
defineOptions({ name: 'ProcessExpressionDialog' })
3030
31-
const { t } = useI18n() // 国际化
32-
const message = useMessage() // 消息弹窗
33-
3431
const dialogVisible = ref(false) // 弹窗的是否展示
3532
const loading = ref(true) // 列表的加载中
3633
const list = ref<ProcessExpressionVO[]>([]) // 列表的数据
3734
const total = ref(0) // 列表的总页数
3835
const queryParams = reactive({
3936
pageNo: 1,
4037
pageSize: 10,
41-
type: undefined,
38+
type: '',
4239
status: CommonStatusEnum.ENABLE
4340
})
4441
4542
/** 打开弹窗 */
46-
const open = async (type: string) => {
43+
const open = (type: string) => {
44+
queryParams.pageNo = 1
45+
queryParams.type = type
46+
getList()
4747
dialogVisible.value = true
48+
}
49+
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
50+
51+
/** 查询列表 */
52+
const getList = async () => {
4853
loading.value = true
4954
try {
50-
queryParams.pageNo = 1
51-
queryParams.type = type
5255
const data = await ProcessExpressionApi.getProcessExpressionPage(queryParams)
5356
list.value = data.list
5457
total.value = data.total
5558
} finally {
5659
loading.value = false
5760
}
5861
}
59-
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
6062
6163
/** 提交表单 */
6264
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调

src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ import * as PostApi from '@/api/system/post'
135135
import * as UserApi from '@/api/system/user'
136136
import * as UserGroupApi from '@/api/bpm/userGroup'
137137
import ProcessExpressionDialog from './ProcessExpressionDialog.vue'
138+
import { ProcessExpressionVO } from '@/api/bpm/processExpression'
138139
139140
defineOptions({ name: 'UserTask' })
140141
const props = defineProps({
@@ -197,8 +198,9 @@ const processExpressionDialogRef = ref()
197198
const openProcessExpressionDialog = async () => {
198199
processExpressionDialogRef.value.open()
199200
}
200-
const selectProcessExpression = (expression) => {
201+
const selectProcessExpression = (expression: ProcessExpressionVO) => {
201202
userTaskForm.value.candidateParam = [expression.expression]
203+
updateElementTask()
202204
}
203205
204206
watch(

0 commit comments

Comments
 (0)