From 444d7c52acdf650b3d6fd5e3cd682519ee89a440 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 17 Jan 2023 17:38:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20API=E6=95=B0=E6=8D=AE=E6=BA=90=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=BE=93=E5=85=A5jsonpath?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/provider/datasource/ApiProvider.java   | 2 +-
 frontend/src/views/system/datasource/DsConfiguration.vue    | 6 +++++-
 2 files changed, 6 insertions(+), 2 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 3b5d621fd4..ef03f69ea0 100644
--- a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
+++ b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
@@ -407,7 +407,7 @@ public class ApiProvider extends Provider {
         List<String[]> dataList = new LinkedList<>();
         if(apiDefinition.isUseJsonPath()){
             List<LinkedHashMap> currentData = new ArrayList<>();
-            Object object = JsonPath.read(result, apiDefinition.getDataPath());
+            Object object = JsonPath.read(result, apiDefinition.getJsonPath());
             if (object instanceof List) {
                 currentData = (List<LinkedHashMap>) object;
             } else {
diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue
index e6f899599b..c11ba8ad46 100644
--- a/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -538,9 +538,9 @@
 
           <el-form-item
             :label="$t('datasource.isUseJsonPath')"
-            prop="url"
           >
             <el-input
+              :disabled="!apiItem.useJsonPath"
               v-model="apiItem.jsonPath"
               :placeholder="$t('datasource.jsonpath_info')"
               class="input-with-select"
@@ -1103,6 +1103,10 @@ export default {
           this.$message.error(i18n.t('datasource.has_repeat_name'))
           return
         }
+        if (this.apiItem.useJsonPath && !this.apiItem.jsonPath) {
+          this.$message.error(i18n.t('datasource.please_input_dataPath'))
+          return
+        }
         this.$refs.apiItemBasicInfo.validate((valid) => {
           if (valid) {
             const data = Base64.encode(JSON.stringify(this.apiItem))