From 43cb0b854e94ba7fafd3d7e2ba5763d91bc140a7 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 21 Jul 2022 17:34:42 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E6=BA=90):=20API=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=8F=8A=E7=BB=84=E5=90=88=E5=A4=9A=E5=B1=82=E7=BA=A7=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../provider/datasource/ApiProvider.java      |  28 ++---
 .../system/datasource/DsConfiguration.vue     | 103 ++++++++++--------
 2 files changed, 74 insertions(+), 57 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
index 6c26d8b357..1afd3adc47 100644
--- a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
+++ b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
@@ -209,30 +209,28 @@ public class ApiProvider extends Provider {
             for (String s : jsonObject.keySet()) {
                 String value = jsonObject.getString(s);
                 if (StringUtils.isNotEmpty(value) && value.startsWith("[")) {
-                    rootPath = rootPath + "." + s;
                     JSONArray jsonArray = JSONObject.parseArray(jsonObject.getString(s));
                     List<JSONObject> children = new ArrayList<>();
                     for (Object o : jsonArray) {
-                        handleStr(apiDefinition, o.toString(), children, rootPath + "[*]");
+                        handleStr(apiDefinition, o.toString(), children, rootPath + "." + s + "[*]");
                     }
                     JSONObject o = new JSONObject();
                     o.put("children", children);
                     o.put("childrenDataType", "LIST");
-                    o.put("jsonPath", rootPath);
+                    o.put("jsonPath", rootPath + "." + s);
                     setProperty(apiDefinition, o, s);
-                    if (!hasItem(objects, o, null)) {
+                    if (!hasItem(apiDefinition, objects, o, null)) {
                         objects.add(o);
                     }
                 } else if (StringUtils.isNotEmpty(value) && value.startsWith("{")) {
                     List<JSONObject> children = new ArrayList<>();
-                    rootPath = rootPath + "." + s;
-                    handleStr(apiDefinition, jsonObject.getString(s), children, rootPath);
+                    handleStr(apiDefinition, jsonObject.getString(s), children, rootPath + "." + s);
                     JSONObject o = new JSONObject();
                     o.put("children", children);
                     o.put("childrenDataType", "OBJECT");
-                    o.put("jsonPath", rootPath);
+                    o.put("jsonPath", rootPath + "." + s);
                     setProperty(apiDefinition, o, s);
-                    if (!hasItem(objects, o, null)) {
+                    if (!hasItem(apiDefinition, objects, o, null)) {
                         objects.add(o);
                     }
                 } else {
@@ -240,7 +238,7 @@ public class ApiProvider extends Provider {
                     o.put("children", null);
                     o.put("jsonPath", rootPath + "." + s);
                     setProperty(apiDefinition, o, s);
-                    if (!hasItem(objects, o, StringUtils.isNotEmpty(jsonObject.getString(s))? jsonObject.getString(s) : "")) {
+                    if (!hasItem(apiDefinition, objects, o, StringUtils.isNotEmpty(jsonObject.getString(s))? jsonObject.getString(s) : "")) {
                         JSONArray array = new JSONArray();
                         array.add(StringUtils.isNotEmpty(jsonObject.getString(s))? jsonObject.getString(s) : "");
                         o.put("value", array);
@@ -272,17 +270,19 @@ public class ApiProvider extends Provider {
 
     }
 
-    static private boolean hasItem(List<JSONObject> objects, JSONObject o, String value) {
+    static private boolean hasItem(ApiDefinition apiDefinition, List<JSONObject> objects, JSONObject item, String value) {
         boolean has = false;
         for (JSONObject object : objects) {
-
             JSONObject jsonObject = JSONObject.parseObject(object.toJSONString());
             jsonObject.remove("value");
             jsonObject.remove("id");
-            if (Md5Utils.md5(jsonObject.toString()).equals(Md5Utils.md5(o.toString()))) {
+            jsonObject.remove("children");
+            JSONObject  o = JSONObject.parseObject(item.toJSONString());
+            o.remove("children");
+            if (object.getString("jsonPath").equals(item.getString("jsonPath")) ) {
                 has = true;
-                if(value != null){
-                    JSONArray array = object.getJSONArray("value");
+                JSONArray array = object.getJSONArray("value");
+                if(value != null && array.size() < apiDefinition.getPreviewNum()){
                     array.add(value);
                     object.put("value", array);
                 }
diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue
index c92aaac26c..a63f32b8a6 100644
--- a/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -13,14 +13,14 @@
         >
           <el-form-item v-if="form.type == 'api'" :label="$t('datasource.data_table')">
             <el-col>
-              <el-button size="mini" icon="el-icon-plus" type="text" @click="addApiItem(undefined)"/>
+              <el-button size="mini" icon="el-icon-plus" type="text" @click="addApiItem(undefined)" />
               <el-table :data="form.apiConfiguration" class="my_table" max-height="300" height="300">
                 <el-table-column prop="name" :label="$t('datasource.data_table_name')" width="150"
-                                 show-overflow-tooltip></el-table-column>
+                                 show-overflow-tooltip />
                 <el-table-column prop="method" :label="$t('datasource.method')" width="150"
-                                 show-overflow-tooltip></el-table-column>
+                                 show-overflow-tooltip />
                 <el-table-column prop="url" :label="$t('datasource.url')" width="150"
-                                 show-overflow-tooltip></el-table-column>
+                                 show-overflow-tooltip />
                 <el-table-column prop="status" :label="$t('commons.status')" width="150">
                   <template slot-scope="scope">
                   <span v-if="scope.row.status === 'Success'" style="color: green">
@@ -84,10 +84,10 @@
                        :rules="rule">
                 <p class="tip">{{ $t('datasource.column_info') }} </p>
 
-                <el-table :data="apiItem.jsonFields" style="width: 100%;" row-key="id">
-                  <el-table-column prop="date" label="" width="255">
+                <el-table :data="apiItem.jsonFields" style="width: 100%;" row-key="jsonPath">
+                  <el-table-column prop="originName" label="" width="255">
                     <template slot-scope="scope">
-                      <el-checkbox v-model="scope.row.checked" :key="scope.row.id"
+                      <el-checkbox v-model="scope.row.checked" :key="scope.row.jsonPath"
                                    @change="handleCheckAllChange(scope.row)">
                         {{ scope.row.originName }}
                       </el-checkbox>
@@ -458,19 +458,31 @@ export default {
           authManager: {}
         },
         fields: [],
-        jsonFields: [],
-        maxPreviewNum: ''
+        jsonFields: [
+          {
+            "deType":0,
+            "size":65535,
+            "children":null,
+            "name":"comments",
+            "checked":false,
+            "extField":0,
+            "jsonPath":"$[*].comments",
+            "type":"STRING",
+            "originName":"comments",
+            "deExtractType":0
+          }
+        ]
       },
-      reqOptions: [{id: 'GET', label: 'GET'}, {id: 'POST', label: 'POST'}],
+      reqOptions: [{ id: 'GET', label: 'GET'}, {id: 'POST', label: 'POST' }],
       loading: false,
-      responseData: {type: 'HTTP', responseResult: {}, subRequestResults: []},
+      responseData: { type: 'HTTP', responseResult: {}, subRequestResults: [] },
       api_step2_active_name: 'first',
       fieldTypes: [
-        {label: this.$t('dataset.text'), value: 0},
-        {label: this.$t('dataset.time'), value: 1},
-        {label: this.$t('dataset.value'), value: 2},
-        {label: this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')', value: 3},
-        {label: this.$t('dataset.location'), value: 5}
+        { label: this.$t('dataset.text'), value: 0 },
+        { label: this.$t('dataset.time'), value: 1 },
+        { label: this.$t('dataset.value'), value: 2 },
+        { label: this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')', value: 3 },
+        { label: this.$t('dataset.location'), value: 5 }
       ],
       height: 500,
       disabledNext: false,
@@ -483,10 +495,10 @@ export default {
           label: 'Kerberos'
         }],
       fieldOptions: [
-        {label: this.$t('dataset.text'), value: 0},
-        {label: this.$t('dataset.value'), value: 2},
-        {label: this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')', value: 3},
-      ],
+        { label: this.$t('dataset.text'), value: 0 },
+        { label: this.$t('dataset.value'), value: 2 },
+        { label: this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')', value: 3 }
+      ]
     }
   },
   created() {
@@ -517,7 +529,7 @@ export default {
             }
           })
         } else {
-          let index = this.form.apiConfiguration.indexOf(this.apiItem)
+          const index = this.form.apiConfiguration.indexOf(this.apiItem)
           for (let i = 0; i < this.form.apiConfiguration.length; i++) {
             if (i !== index && this.form.apiConfiguration[i].name === this.apiItem.name) {
               hasRepeatName = true
@@ -540,8 +552,8 @@ export default {
               this.$success(i18n.t('commons.success'))
               this.active++
               this.apiItem.jsonFields = res.data.jsonFields
-              this.apiItem.maxPreviewNum = res.data.maxPreviewNum
-              this.handleFiledChange();
+              this.apiItem.fields = []
+              this.handleFiledChange()
               this.previewData()
             }).catch(res => {
               this.loading = false
@@ -588,43 +600,48 @@ export default {
       this.form.apiConfiguration.splice(this.form.apiConfiguration.indexOf(item), 1)
     },
     handleCheckAllChange(row) {
+      console.log(row)
       this.handleCheckChange(row)
+      this.apiItem.fields = []
       this.handleFiledChange()
       this.previewData()
     },
     handleFiledChange(data) {
-      this.apiItem.fields = []
-      let jsonField = data === undefined ? this.apiItem.jsonFields : data;
-      jsonField.forEach((item) => {
-        if (item.checked && item.children === null) {
-          this.apiItem.fields.push(item)
+      let jsonField = data === undefined ? this.apiItem.jsonFields : data
+      for(var i=0;i< jsonField.length;i++) {
+        if (jsonField[i].checked && jsonField[i].children === null) {
+          this.apiItem.fields.push(jsonField[i])
         }
-        if (item.children !== null) {
-          this.handleFiledChange(item.children)
+        if (jsonField[i].children !== null) {
+          this.handleFiledChange(jsonField[i].children)
         }
-      })
+      }
     },
     previewData() {
-      let datas = [];
-      for (let i = 0; i < this.apiItem.maxPreviewNum; i++) {
-        datas.push({})
-      }
-
-      for (let i = 0; i < this.apiItem.fields.length; i++) {
-        for (let j = 0; j < this.apiItem.fields[i].value.length; j++) {
-          this.$set(datas[j], this.apiItem.fields[i].name , this.apiItem.fields[i].value[j]);
+      let datas = []
+      let maxPreviewNum = 0
+      for (let j = 0; j < this.apiItem.fields.length; j++) {
+        if (this.apiItem.fields[j].value && this.apiItem.fields[j].value.length > maxPreviewNum) {
+          maxPreviewNum = this.apiItem.fields[j].value.length
         }
       }
-      this.$refs.plxTable.reloadData(datas)
+      for (let i = 0; i < maxPreviewNum; i++) {
+        datas.push({})
+      }
+      for (let i = 0; i < this.apiItem.fields.length; i++) {
+        for (let j = 0; j < this.apiItem.fields[i].value.length; j++) {
+          this.$set(datas[j], this.apiItem.fields[i].name, this.apiItem.fields[i].value[j]);
+        }
+        this.$refs.plxTable.reloadData(datas)
+      }
     },
     handleCheckChange(node) {
       if (node.children !== null) {
         node.children.forEach((item) => {
-          item.checked = node.checked;
+          item.checked = node.checked
           this.handleCheckChange(item)
-        });
+        })
       }
-
     },
     fieldNameChange(row) {
       this.previewData()