feat:修改http数据集动态参数配置

data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue

@@ -257,7 +257,10 @@
                     </el-col>
                   </el-row>
                   <el-row>
-                    <el-col :span="24">
+                    <el-col
+                      :span="12"
+                      :offset="6"
+                    >
                       <div
                         class="add-btn"
                         @click="addHeader"
@@ -327,7 +330,10 @@
                     </el-col>
                   </el-row>
                   <el-row>
-                    <el-col :span="24">
+                    <el-col
+                      :span="12"
+                      :offset="6"
+                    >
                       <div
                         class="add-btn"
                         @click="addParam"
@@ -517,10 +523,9 @@
           <el-table
             align="center"
             :data="dataPreviewList"
-            max-height="400"
+            max-height="300"
             :border="true"
-            height="500px"
-            class="bs-el-table bs-scrollbar"
+            class="bs-el-table bs-scrollba preview-table"
           >
             <el-table-column
               v-for="(value, key) in dataPreviewList[0]"
@@ -615,7 +620,9 @@
       <ParamsSettingDialog
         ref="paramsSettingDialog"
         :params-list="dataForm.config.paramsList"
+        :newParamsList="newParamsList"
         @saveParams="saveParams"
+        @saveNewParams="saveNewParams"
         @getData="getData"
       />
       <OutputFieldDialog
@@ -704,6 +711,7 @@ export default {
       }
     }
     return {
+      newParamsList: [], // 存放临时的动态参数值
       activeName: 'head',
       options: [{
         value: 'string',
@@ -811,6 +819,7 @@ export default {
           this.dataForm = { id, name, typeId, remark, datasetType, moduleCode, editable, sourceId, config: { ...config } }
           this.fieldDesc = fieldDesc
           this.outputFieldList = fieldList
+          this.newParamsList = _.cloneDeep(paramsList)
           this.codemirrorOption.mode = this.dataForm.config.requestType === 'frontend' ? 'text/javascript' : 'text/x-groovy'
           // this.replaceParams(paramsList)
           this.scriptExecute(true)
@@ -899,8 +908,13 @@ export default {
       this.dataForm.config.params.splice(index, 1)
     },
     saveParams (val) {
+      debugger
       this.dataForm.config.paramsList = val
     },
+    saveNewParams (val) {
+      console.log(val)
+      this.newParamsList = val
+    },
     // 取消操作
     // cancelField () {
     //   this.structurePreviewListCopy = cloneDeep(this.outputFieldList)
@@ -1005,19 +1019,22 @@ export default {
       // 如果动态参数未配置，则直接打开配置弹窗
       // const flag = this.dataForm.config.paramsList.some(item => !item.value)
       // 每次执行时只要有动态参数就会打开参数配置的弹窗进行设置
-      this.$refs.paramsSettingDialog.open()
+      if (this.dataForm.config.paramsList && this.dataForm.config.paramsList.length) {
+        this.$refs.paramsSettingDialog.open(true)
+      } else {
+        this.getData()
+      }
     },
     // 调接口
     getData () {
       // 如果是前端代理，则自行组装接口及参数并调接口
       if (this.dataForm.config.requestType === 'frontend') {
         // this.replaceParams(this.dataForm.config.paramsList)
-        axiosFormatting({ ...this.dataForm.config }).then((res) => {
-          const { resp, response } = res
+        axiosFormatting({ ...this.dataForm.config, paramsList: this.newParamsList }).then((res) => {
           // this.dataPreviewList = res.data && Array.isArray(res.data) ? res.data : []
           this.dataPreviewList = [{}]
-          for (const item in response.data) {
-            this.dataPreviewList[0][item] = response.data[item]
+          for (const item in res) {
+            this.dataPreviewList[0][item] = res[item]
           }
           // 获取数据后更新输出字段
           this.updateOoutputFieldList(this.dataPreviewList)
@@ -1246,13 +1263,13 @@ export default {
   }
 }
 
-::v-deep .bs-table-box.is-Edit .el-table {
-  max-height: unset !important;
-
-  .el-table__body-wrapper {
-    max-height: unset !important;
-  }
-}
+//::v-deep .bs-table-box.is-Edit .el-table {
+//  max-height: unset !important;
+//
+//  .el-table__body-wrapper {
+//    max-height: unset !important;
+//  }
+//}
 
 .bs-table-box {
   padding: 0;
@@ -1283,4 +1300,7 @@ export default {
     cursor: pointer;
   }
 }
+.preview-table{
+  max-height: 300px!important;
+}
 </style>

data-room-ui/packages/DataSetManagement/src/JsComponents/ParamsSettingDialog.vue

@@ -12,7 +12,7 @@
       <div class="bs-table-box">
         <el-table
           ref="singleTable"
-          :data="paramsList"
+          :data="params"
           :border="true"
           align="center"
           class="bs-el-table"
@@ -112,32 +112,32 @@
               />
             </template>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            label="操作"-->
-<!--            width="105"-->
-<!--            align="center"-->
-<!--          >-->
-<!--            <template slot="header">-->
-<!--              <el-button-->
-<!--                icon="el-icon-plus"-->
-<!--                type="text"-->
-<!--                class="no-border"-->
-<!--                @click="addParam"-->
-<!--              >-->
-<!--                添加-->
-<!--              </el-button>-->
-<!--            </template>-->
-<!--            <template slot-scope="scope">-->
-<!--              <el-button-->
-<!--                type="text"-->
-<!--                style="color: #e47470;"-->
-<!--                class="no-border"-->
-<!--                @click="delRow(scope.$index)"-->
-<!--              >-->
-<!--                删除-->
-<!--              </el-button>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="操作"-->
+          <!--            width="105"-->
+          <!--            align="center"-->
+          <!--          >-->
+          <!--            <template slot="header">-->
+          <!--              <el-button-->
+          <!--                icon="el-icon-plus"-->
+          <!--                type="text"-->
+          <!--                class="no-border"-->
+          <!--                @click="addParam"-->
+          <!--              >-->
+          <!--                添加-->
+          <!--              </el-button>-->
+          <!--            </template>-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-button-->
+          <!--                type="text"-->
+          <!--                style="color: #e47470;"-->
+          <!--                class="no-border"-->
+          <!--                @click="delRow(scope.$index)"-->
+          <!--              >-->
+          <!--                删除-->
+          <!--              </el-button>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
         </el-table>
       </div>
       <span
@@ -169,15 +169,27 @@ export default {
     paramsList: {
       type: Array,
       default: () => []
+    },
+    newParamsList: {
+      type: Array,
+      default: () => []
     }
   },
   data () {
     return {
+      params: [],
+      isUpdate: false,
       dialogVisible: false
     }
   },
   methods: {
-    open () {
+    open (isUpdate = false) {
+      if (isUpdate) {
+        this.params = cloneDeep(this.newParamsList)
+      } else {
+        this.params = cloneDeep(this.paramsList)
+      }
+      this.isUpdate = isUpdate
       this.dialogVisible = true
     },
     close () {
@@ -186,21 +198,8 @@ export default {
     handleClose () {
       this.dialogVisible = false
     },
-    addParam () {
-      this.paramsList.push({
-        name: '',
-        type: '',
-        value: '',
-        status: 1,
-        require: 0,
-        remark: ''
-      })
-    },
-    delRow (index) {
-      this.paramsList.splice(index, 1)
-    },
     checkParamsName (value) {
-      const checkList = this.paramsList.filter(item => item.fieldName === value.name)
+      const checkList = this.params.filter(item => item.fieldName === value.name)
       if (checkList.length) {
         this.$message.warning('参数名称不可以与字段名相同！')
         value.name = ''
@@ -210,7 +209,12 @@ export default {
       this.dialogVisible = false
     },
     confirm () {
-      this.$emit('saveParams', cloneDeep(this.paramsList))
+      if (!this.isUpdate) {
+        this.$emit('saveParams', cloneDeep(this.params))
+      } else {
+        console.log(this.params)
+        this.$emit('saveNewParams', cloneDeep(this.params))
+      }
       this.$emit('getData')
       this.dialogVisible = false
     }

data-room-ui/packages/js/mixins/commonMixins.js

@@ -77,7 +77,6 @@ export default {
           if (res.executionByFrontend) {
             if (res.data.datasetType === 'http') {
               _res = await axiosFormatting(res.data)
-              _res = _res.resp
             }
             if (res.data.datasetType === 'js') {
               try {
@@ -124,7 +123,6 @@ export default {
           if (res.executionByFrontend) {
             if (res.data.datasetType === 'http') {
               _res = await axiosFormatting(res.data)
-              _res = _res.resp
             }
             if (res.data.datasetType === 'js') {
               try {

data-room-ui/packages/js/utils/httpParamsFormatting.js

@@ -40,11 +40,9 @@ export default function axiosFormatting (customConfig) {
       const getResp = new Function('response', newCustomConfig.responseScript)
       const resp = getResp(response)
       console.log('resp', resp)
-      return Promise.resolve({ resp, response })
+      return Promise.resolve(resp)
     } else {
-      console.log(response.data)
-      const resp = response
-      return Promise.resolve({ resp, response })
+      return Promise.resolve(response.data)
     }
   })
   const body = {}