From 9949277310de8793d3b4589756b6a64417c82e4b Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Mon, 7 Aug 2023 11:08:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:http=E6=95=B0=E6=8D=AE=E9=9B=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=BE=93=E5=87=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/DataSetManagement/src/HttpEditForm.vue |  2 +-
 data-room-ui/packages/js/mixins/commonMixins.js     | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue b/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
index 385f7580..bafc32d3 100644
--- a/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
@@ -1115,7 +1115,7 @@ export default {
           this.dataPreviewList = res && Array.isArray(res) ? res : [{ ...res }]
           // 获取数据后更新输出字段
           console.log(res)
-          this.updateOoutputFieldList(res?.data)
+          this.updateOoutputFieldList(this.dataPreviewList)
           this.$message.success('解析并执行成功')
         })
       } else {
diff --git a/data-room-ui/packages/js/mixins/commonMixins.js b/data-room-ui/packages/js/mixins/commonMixins.js
index a297cda1..26ddc205 100644
--- a/data-room-ui/packages/js/mixins/commonMixins.js
+++ b/data-room-ui/packages/js/mixins/commonMixins.js
@@ -77,6 +77,7 @@ export default {
           if (res.executionByFrontend) {
             if (res.data.datasetType === 'http') {
               _res = await axiosFormatting(res.data)
+              _res = this.httpDataFormatting(res, _res)
             }
             if (res.data.datasetType === 'js') {
               try {
@@ -123,6 +124,7 @@ export default {
           if (res.executionByFrontend) {
             if (res.data.datasetType === 'http') {
               _res = await axiosFormatting(res.data)
+              _res = this.httpDataFormatting(res, _res)
             }
             if (res.data.datasetType === 'js') {
               try {
@@ -154,6 +156,17 @@ export default {
         })
       })
     },
+    // http前台代理需要对返回的数据进行重新组装
+    httpDataFormatting (chartRes, httpRes) {
+      let result = {}
+      result = {
+        columnData: chartRes.columnData,
+        data: httpRes,
+        success: chartRes.success
+
+      }
+      return result
+    },
     dataFormatting (config, data) {
       // 覆盖
     },