center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat: API数据源支持输入jsonpath

Browse Source
This commit is contained in:
taojinlong 2023-01-17 17:38:36 +08:00
parent cde7bae4a6
commit 444d7c52ac
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
View File

@ -407,7 +407,7 @@ public class ApiProvider extends Provider {
List<String[]> dataList = new LinkedList<>(); List<String[]> dataList = new LinkedList<>();
if(apiDefinition.isUseJsonPath()){ if(apiDefinition.isUseJsonPath()){
List<LinkedHashMap> currentData = new ArrayList<>(); List<LinkedHashMap> currentData = new ArrayList<>();
Object object = JsonPath.read(result, apiDefinition.getDataPath()); Object object = JsonPath.read(result, apiDefinition.getJsonPath());
if (object instanceof List) { if (object instanceof List) {
currentData = (List<LinkedHashMap>) object; currentData = (List<LinkedHashMap>) object;
} else { } else {

6
frontend/src/views/system/datasource/DsConfiguration.vue
View File

@ -538,9 +538,9 @@
<el-form-item <el-form-item
:label="$t('datasource.isUseJsonPath')" :label="$t('datasource.isUseJsonPath')"
prop="url"
> >
<el-input <el-input
:disabled="!apiItem.useJsonPath"
v-model="apiItem.jsonPath" v-model="apiItem.jsonPath"
:placeholder="$t('datasource.jsonpath_info')" :placeholder="$t('datasource.jsonpath_info')"
class="input-with-select" class="input-with-select"
@ -1103,6 +1103,10 @@ export default {
this.$message.error(i18n.t('datasource.has_repeat_name')) this.$message.error(i18n.t('datasource.has_repeat_name'))
return return
} }
if (this.apiItem.useJsonPath && !this.apiItem.jsonPath) {
this.$message.error(i18n.t('datasource.please_input_dataPath'))
return
}
this.$refs.apiItemBasicInfo.validate((valid) => { this.$refs.apiItemBasicInfo.validate((valid) => {
if (valid) { if (valid) {
const data = Base64.encode(JSON.stringify(this.apiItem)) const data = Base64.encode(JSON.stringify(this.apiItem))