Skip to content

Commit f567045

Browse files
ywywZhounormal-wls
authored andcommitted
fix: 流程列表支持过滤和展示执行代理人 #7533
# Reviewed, transaction id: 15296
1 parent 9c4b4d8 commit f567045

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

frontend/desktop/src/config/i18n/cn.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1436,7 +1436,7 @@ const cn = {
14361436
'留在此页': '留在此页',
14371437
'直接离开': '直接离开',
14381438
'流程名': '流程名',
1439-
'ID/流程名称/标签/更新人/创建人/子流程更新': 'ID/流程名称/标签/更新人/创建人/子流程更新',
1439+
'ID/流程名称/标签/更新人/创建人/子流程更新/执行代理人': 'ID/流程名称/标签/更新人/创建人/子流程更新/执行代理人',
14401440
'ID/流程名/创建人/更新人': 'ID/流程名/创建人/更新人',
14411441
'任务名': '任务名',
14421442
'task_任务名': '任务名',

frontend/desktop/src/config/i18n/en.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1474,7 +1474,7 @@ const en = {
14741474
'留在此页': 'Stay on this page',
14751475
'直接离开': 'Just leave',
14761476
'流程名': 'Flow Name',
1477-
'ID/流程名称/标签/更新人/创建人/子流程更新': 'ID/Flow Name/Tags/Modified By/Created By/Subflow Changed',
1477+
'ID/流程名称/标签/更新人/创建人/子流程更新/执行代理人': 'ID/Flow Name/Tags/Modified By/Created By/Subflow Changed/Representative',
14781478
'ID/流程名/创建人/更新人': 'ID/Flow Name/Created By/Modified By',
14791479
'任务名': 'Task Name',
14801480
'task_任务名': 'Name',

frontend/desktop/src/pages/template/TemplateList/projectTplList.vue

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<search-select
7070
ref="searchSelect"
7171
id="templateList"
72-
:placeholder="$t('ID/流程名称/标签/更新人/创建人/子流程更新')"
72+
:placeholder="$t('ID/流程名称/标签/更新人/创建人/子流程更新/执行代理人')"
7373
v-model="searchSelectValue"
7474
:search-list="searchList"
7575
@change="handleSearchValueChange">
@@ -455,6 +455,10 @@
455455
{
456456
id: 'editor',
457457
name: i18n.t('更新人')
458+
},
459+
{
460+
id: 'executor_proxy',
461+
name: i18n.t('执行代理人')
458462
}
459463
]
460464
@@ -498,6 +502,11 @@
498502
label: i18n.t('分类'),
499503
min_width: 180
500504
},
505+
{
506+
id: 'executor_proxy',
507+
label: i18n.t('执行代理人'),
508+
width: 120
509+
},
501510
{
502511
id: 'creator_name',
503512
label: i18n.t('创建人'),
@@ -537,7 +546,8 @@
537546
editor = '',
538547
flowName = '',
539548
label_ids = '',
540-
template_id = ''
549+
template_id = '',
550+
executor_proxy = ''
541551
} = this.$route.query
542552
const searchList = [
543553
...SEARCH_LIST,
@@ -624,7 +634,8 @@
624634
edit_time: edit_time ? edit_time.split(',') : ['', ''],
625635
label_ids: label_ids ? label_ids.split(',') : [],
626636
flowName,
627-
template_id
637+
template_id,
638+
executor_proxy
628639
},
629640
isInit: true, // 避免default-sort在初始化时去触发table的sort-change事件
630641
totalPage: 1,
@@ -819,7 +830,7 @@
819830
}
820831
},
821832
getQueryData () {
822-
const { subprocessUpdateVal, creator, create_time, edit_time, flowName, label_ids, template_id, editor } = this.requestData
833+
const { subprocessUpdateVal, creator, create_time, edit_time, flowName, label_ids, template_id, editor, executor_proxy } = this.requestData
823834
824835
/**
825836
* 无子流程 has_subprocess=false
@@ -841,7 +852,8 @@
841852
project__id: this.project_id,
842853
new: true,
843854
id__in: tplIds,
844-
pipeline_template__editor: editor || undefined
855+
pipeline_template__editor: editor || undefined,
856+
executor_proxy
845857
}
846858
const keys = ['edit_time', '-edit_time', 'create_time', '-create_time']
847859
if (keys.includes(this.ordering)) {
@@ -1478,7 +1490,7 @@
14781490
},
14791491
updateUrl () {
14801492
const { current, limit } = this.pagination
1481-
const { category, create_time, edit_time, subprocessUpdateVal, creator, label_ids, flowName, template_id, editor } = this.requestData
1493+
const { category, create_time, edit_time, subprocessUpdateVal, creator, label_ids, flowName, template_id, editor, executor_proxy } = this.requestData
14821494
const filterObj = {
14831495
limit,
14841496
category,
@@ -1490,7 +1502,8 @@
14901502
label_ids: label_ids && label_ids.length ? label_ids.join(',') : '',
14911503
flowName: flowName,
14921504
template_id,
1493-
editor
1505+
editor,
1506+
executor_proxy
14941507
}
14951508
const query = {}
14961509
Object.keys(filterObj).forEach(key => {

0 commit comments

Comments
 (0)