diff --git a/frontend/pc/src/i18n/lang/en.js b/frontend/pc/src/i18n/lang/en.js index f07dc155..43220b47 100644 --- a/frontend/pc/src/i18n/lang/en.js +++ b/frontend/pc/src/i18n/lang/en.js @@ -2645,6 +2645,7 @@ export const m = { '人都会收到单据代办通知,是否继续?如有疑问请咨询ITSM系统管理员。': 'Everyone will receive a notice of document agency. Do you want to continue? If in doubt, consult your ITSM system administrator.', 当前节点未设置节点描述: 'The node description is not set for the current node', 单据触发器: 'Ticket Trigger', + 线条触发器: 'Transition Trigger', 节点: 'Node', 名称: 'Name', 设置为全局变量: 'Set as a global variable', diff --git a/frontend/pc/src/i18n/lang/zh.js b/frontend/pc/src/i18n/lang/zh.js index 470d3ff7..6b64cd0f 100644 --- a/frontend/pc/src/i18n/lang/zh.js +++ b/frontend/pc/src/i18n/lang/zh.js @@ -2714,6 +2714,7 @@ export const m = { '人都会收到单据代办通知,是否继续?如有疑问请咨询ITSM系统管理员。': '人都会收到单据代办通知,是否继续?如有疑问请咨询ITSM系统管理员。', 当前节点未设置节点描述: '当前节点未设置节点描述', 单据触发器: '单据触发器', + 线条触发器: '线条触发器', 节点: '节点', 名称: '名称', 设置为全局变量: '设置为全局变量', diff --git a/frontend/pc/src/views/ticket/details/taskInfo/taskHistory.vue b/frontend/pc/src/views/ticket/details/taskInfo/taskHistory.vue index 93bee9f8..1bf1b858 100644 --- a/frontend/pc/src/views/ticket/details/taskInfo/taskHistory.vue +++ b/frontend/pc/src/views/ticket/details/taskInfo/taskHistory.vue @@ -123,6 +123,56 @@ + + {{$t(`m['线条触发器']`)}} +
+ + + + + + + + + + + + + +
+ + +
+
+
+
@@ -182,6 +232,7 @@ id: '', }, ticketAction: [], + transitionAction: [], nodeActions: [], nodeIdMap: {}, listError: false, @@ -216,6 +267,7 @@ // this.historyList = res.data.filter(item => item.status === 'FAILED' || item.status === 'SUCCEED'); // 单据触发器 this.ticketAction = res.data.ticket_actions.filter(item => item.status === 'FAILED' || item.status === 'SUCCEED'); + this.transitionAction = res.data.transition.filter(item => item.status === 'FAILED' || item.status === 'SUCCEED'); // 节点触发器 this.nodeIdMap = res.data.state_map; this.nodeActions = Object.keys(res.data.state).map(state => { diff --git a/itsm/ticket/views/ticket.py b/itsm/ticket/views/ticket.py index f8370c48..c00130b4 100644 --- a/itsm/ticket/views/ticket.py +++ b/itsm/ticket/views/ticket.py @@ -1080,12 +1080,15 @@ def trigger_actions_group(self, request, *args, **kwargs): # 分组 ticket_actions = [] state_actions = {} + transition_actions = [] state_map = {} for item in actions: if item["signal_type"] == "STATE": state_actions.setdefault(item["sender"], []).append(item) if item["signal_type"] == "FLOW": ticket_actions.append(item) + if item["signal_type"] == "TRANSITION": + transition_actions.append(item) for state_id in state_actions.keys(): state_map[state_id] = instance.state(state_id)["name"] @@ -1094,6 +1097,7 @@ def trigger_actions_group(self, request, *args, **kwargs): { "state": state_actions, "ticket_actions": ticket_actions, + "transition": transition_actions, "state_map": state_map, } ) diff --git a/requirements.txt b/requirements.txt index 1670fe43..c16f5388 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ # 请确保指定的包和版本号,可通过pip安装 # blueapps requirement -Django==3.2.4 +Django==3.2.13 PyMySQL==0.6.7 mysqlclient==2.0.3 MarkupSafe==1.1.1