diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js index 5e82a034d0..626bf09c77 100644 --- a/frontend/desktop/src/config/i18n/cn.js +++ b/frontend/desktop/src/config/i18n/cn.js @@ -1436,7 +1436,7 @@ const cn = { '留在此页': '留在此页', '直接离开': '直接离开', '流程名': '流程名', - 'ID/流程名称/标签/更新人/创建人/子流程更新': 'ID/流程名称/标签/更新人/创建人/子流程更新', + 'ID/流程名称/标签/更新人/创建人/子流程更新/执行代理人': 'ID/流程名称/标签/更新人/创建人/子流程更新/执行代理人', 'ID/流程名/创建人/更新人': 'ID/流程名/创建人/更新人', '任务名': '任务名', 'task_任务名': '任务名', diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js index 8cd2277f51..33bfaea673 100644 --- a/frontend/desktop/src/config/i18n/en.js +++ b/frontend/desktop/src/config/i18n/en.js @@ -1474,7 +1474,7 @@ const en = { '留在此页': 'Stay on this page', '直接离开': 'Just leave', '流程名': 'Flow Name', - 'ID/流程名称/标签/更新人/创建人/子流程更新': 'ID/Flow Name/Tags/Modified By/Created By/Subflow Changed', + 'ID/流程名称/标签/更新人/创建人/子流程更新/执行代理人': 'ID/Flow Name/Tags/Modified By/Created By/Subflow Changed/Representative', 'ID/流程名/创建人/更新人': 'ID/Flow Name/Created By/Modified By', '任务名': 'Task Name', 'task_任务名': 'Name', diff --git a/frontend/desktop/src/pages/template/TemplateList/projectTplList.vue b/frontend/desktop/src/pages/template/TemplateList/projectTplList.vue index 965e31517c..e795538f05 100644 --- a/frontend/desktop/src/pages/template/TemplateList/projectTplList.vue +++ b/frontend/desktop/src/pages/template/TemplateList/projectTplList.vue @@ -69,7 +69,7 @@ @@ -455,6 +455,10 @@ { id: 'editor', name: i18n.t('更新人') + }, + { + id: 'executor_proxy', + name: i18n.t('执行代理人') } ] @@ -498,6 +502,11 @@ label: i18n.t('分类'), min_width: 180 }, + { + id: 'executor_proxy', + label: i18n.t('执行代理人'), + width: 120 + }, { id: 'creator_name', label: i18n.t('创建人'), @@ -537,7 +546,8 @@ editor = '', flowName = '', label_ids = '', - template_id = '' + template_id = '', + executor_proxy = '' } = this.$route.query const searchList = [ ...SEARCH_LIST, @@ -624,7 +634,8 @@ edit_time: edit_time ? edit_time.split(',') : ['', ''], label_ids: label_ids ? label_ids.split(',') : [], flowName, - template_id + template_id, + executor_proxy }, isInit: true, // 避免default-sort在初始化时去触发table的sort-change事件 totalPage: 1, @@ -819,7 +830,7 @@ } }, getQueryData () { - const { subprocessUpdateVal, creator, create_time, edit_time, flowName, label_ids, template_id, editor } = this.requestData + const { subprocessUpdateVal, creator, create_time, edit_time, flowName, label_ids, template_id, editor, executor_proxy } = this.requestData /** * 无子流程 has_subprocess=false @@ -841,7 +852,8 @@ project__id: this.project_id, new: true, id__in: tplIds, - pipeline_template__editor: editor || undefined + pipeline_template__editor: editor || undefined, + executor_proxy } const keys = ['edit_time', '-edit_time', 'create_time', '-create_time'] if (keys.includes(this.ordering)) { @@ -1478,7 +1490,7 @@ }, updateUrl () { const { current, limit } = this.pagination - const { category, create_time, edit_time, subprocessUpdateVal, creator, label_ids, flowName, template_id, editor } = this.requestData + const { category, create_time, edit_time, subprocessUpdateVal, creator, label_ids, flowName, template_id, editor, executor_proxy } = this.requestData const filterObj = { limit, category, @@ -1490,7 +1502,8 @@ label_ids: label_ids && label_ids.length ? label_ids.join(',') : '', flowName: flowName, template_id, - editor + editor, + executor_proxy } const query = {} Object.keys(filterObj).forEach(key => {