Merge pull request #1255 from hanshuaikang/feature/develop_by_han

feat: 审批节点的配置改到extras里面存储
TencentBlueKing · Jan 8, 2024 · 191ed19 · 191ed19
2 parents c29b58f + 3937580
commit 191ed19
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/frontend/pc/src/views/processManagement/processDesign/nodeConfigue/ApprovalNode.vue b/frontend/pc/src/views/processManagement/processDesign/nodeConfigue/ApprovalNode.vue
@@ -488,7 +488,7 @@
         }
         this.formInfo.is_sequential = this.configur.is_sequential;
         this.formInfo.is_allow_skip = this.configur.is_allow_skip;
-        this.formInfo.enable_terminate_ticket_when_rejected = this.configur.enable_terminate_ticket_when_rejected;
+        this.formInfo.enable_terminate_ticket_when_rejected = this.configur.extras.enable_terminate_ticket_when_rejected;
         this.formInfo.processors = this.configur.processors ? this.configur.processors.split(',') : [];
         this.formInfo.ticket_type = this.configur.extras.ticket_status ? this.configur.extras.ticket_status.type : 'keep';
         this.formInfo.ticket_key = this.configur.extras.ticket_status ? this.configur.extras.ticket_status.name : '';
@@ -634,7 +634,6 @@
           }
           // 处理人异常时
           params.is_allow_skip = this.formInfo.is_allow_skip;
-          params.enable_terminate_ticket_when_rejected = this.formInfo.enable_terminate_ticket_when_rejected;
           if (this.$refs.delivers) {
             const data = this.$refs.delivers.getValue();
             params.delivers_type = data.type;
@@ -647,6 +646,7 @@
           params.can_deliver = this.formInfo.can_deliver;
           params.ticket_type = this.formInfo.ticket_type;
           params.extras = {
+            enable_terminate_ticket_when_rejected: this.formInfo.enable_terminate_ticket_when_rejected,
             ticket_status: {
               name: this.formInfo.ticket_key,
               type: this.formInfo.ticket_type,

diff --git a/itsm/pipeline_plugins/components/collections/itsm_sign.py b/itsm/pipeline_plugins/components/collections/itsm_sign.py
@@ -119,7 +119,7 @@ def schedule(self, data, parent_data, callback_data=None):
                     self.do_before_exit(ticket, state_id, operator)
                     if key_value[
                         code_key[NODE_APPROVE_RESULT]
-                    ] == "false" and state.get(
+                    ] == "false" and state.get("extras", {}).get(
                         "enable_terminate_ticket_when_rejected", False
                     ):
                         logger.info(