public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-17 04:51:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: API数据源参数重名

Browse Source
This commit is contained in:
taojinlong
2025-09-10 16:31:27 +08:00
parent 2fe28d04de
commit aaa77f1a5e
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java
View File

@@ -297,7 +297,7 @@ public class ApiUtils {
for (ApiDefinition definition : paramsList) {
for (int i = 0; i < definition.getFields().size(); i++) {
TableField field = definition.getFields().get(i);
if (field.getOriginName().equalsIgnoreCase(param)) {
if (field.getName().equalsIgnoreCase(param)) {
String resultStr = execHttpRequest(true, definition, definition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), paramsList);
List<String[]> dataList = fetchResult(resultStr, definition);
if (dataList.size() > 0) {
@@ -372,7 +372,7 @@ public class ApiUtils {
for (ApiDefinition definition : paramsList) {
for (int i = 0; i < definition.getFields().size(); i++) {
TableField field = definition.getFields().get(i);
if (field.getOriginName().equalsIgnoreCase(param)) {
if (field.getName().equalsIgnoreCase(param)) {
String resultStr = execHttpRequest(false, definition, definition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), paramsList);
List<String[]> dataList = fetchResult(resultStr, definition);
if (dataList.size() > 0) {
@@ -413,7 +413,7 @@ public class ApiUtils {
for (ApiDefinition definition : paramsList) {
for (int i = 0; i < definition.getFields().size(); i++) {
TableField field = definition.getFields().get(i);
if (field.getOriginName().equalsIgnoreCase(param)) {
if (field.getName().equalsIgnoreCase(param)) {
String resultStr = execHttpRequest(false, definition, definition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), paramsList);
List<String[]> dataList = fetchResult(resultStr, definition);
if (dataList.size() > 0) {
@@ -443,7 +443,7 @@ public class ApiUtils {
for (ApiDefinition definition : paramsList) {
for (int i = 0; i < definition.getFields().size(); i++) {
TableField field = definition.getFields().get(i);
if (field.getOriginName().equalsIgnoreCase(param)) {
if (field.getName().equalsIgnoreCase(param)) {
String resultStr = execHttpRequest(false, definition, definition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 10 : apiDefinition.getApiQueryTimeout(), paramsList);
List<String[]> dataList = fetchResult(resultStr, definition);
if (dataList.size() > 0) {
@@ -825,7 +825,7 @@ public class ApiUtils {
String[] row = new String[apiDefinition.getFields().size()];
int i = 0;
for (TableField field : apiDefinition.getFields()) {
row[i] = Optional.ofNullable(data.get(field.getOriginName())).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " ");
row[i] = Optional.ofNullable(data.get(field.getName())).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " ");
i++;
}
dataList.add(row);

6
core/core-frontend/src/views/visualized/data/datasource/form/ApiKeyValue.vue
View File

@@ -172,9 +172,9 @@ const timeFunLists = [
>
<el-option
v-for="item in valueList"
:key="item.originName"
:key="item.name"
:label="item.name"
:value="item.originName"
:value="item.name"
/>
</el-select>
<el-select
@@ -184,7 +184,7 @@ const timeFunLists = [
>
<el-option
v-for="item in timeFunLists"
:key="item.originName"
:key="item.value"
:label="item.label"
:value="item.value"
/>

6
core/core-frontend/src/views/visualized/data/datasource/form/ApiVariable.vue
View File

@@ -214,9 +214,9 @@ const timeFunLists = [
>
<el-option
v-for="item in valueList"
:key="item.originName"
:key="item.name"
:label="item.name"
:value="item.originName"
:value="item.name"
/>
</el-select>
<el-select
@@ -226,7 +226,7 @@ const timeFunLists = [
>
<el-option
v-for="item in timeFunLists"
:key="item.originName"
:key="item.value"
:label="item.label"
:value="item.value"
/>