Merge pull request #3339 from hLinx/feature_3.11

feat: api 协议变更 #3333
TencentBlueKing · Dec 17, 2024 · faf0b8b · faf0b8b
2 parents 2059433 + 8473ed1
commit faf0b8b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/frontend/src/domain/source/task-execute.js b/src/frontend/src/domain/source/task-execute.js
@@ -190,7 +190,9 @@ class TaskExecute extends ModuleBase {
   getStepVariables(params) {
     const realParams = { ...params };
     delete realParams.stepInstanceId;
-    return Request.get(`${this.path}/step-execution-result/step/${params.stepInstanceId}/variables`, {
+    delete realParams.executeObjectType;
+    delete realParams.executeObjectResourceId;
+    return Request.get(`${this.path}/taskInstance/${params.taskInstanceId}/stepInstance/${params.stepInstanceId}/executeObject/${params.executeObjectType}/${params.executeObjectResourceId}/variables`, {
       params: realParams,
     });
   }

diff --git a/...iews/executive-history/step-detail/components/execution-info/components/variable-view.vue b/...iews/executive-history/step-detail/components/execution-info/components/variable-view.vue
@@ -65,10 +65,18 @@
     inheritAttrs: false,
     props: {
       name: String,
+      taskInstanceId: {
+        type: Number,
+        required: true,
+      },
       stepInstanceId: {
         type: Number,
         required: true,
       },
+      taskExecuteDetail: {
+        type: Object,
+        required: true,
+      },
     },
     data() {
       return {
@@ -89,7 +97,10 @@
       fetchStepVariables() {
         this.isLoading = true;
         TaskExecuteService.fetchStepVariables({
+          taskInstanceId: this.taskInstanceId,
           stepInstanceId: this.stepInstanceId,
+          executeObjectType: this.taskExecuteDetail.executeObject.type,
+          executeObjectResourceId: this.taskExecuteDetail.executeObject.executeObjectResourceId,
         }).then((data) => {
           this.variableList = Object.freeze(data);
         })