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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
ulleo 2023-11-22 14:25:39 +08:00
commit eb25dfb58b
9 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/backend/pom.xml
View File

@ -99,6 +99,17 @@
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>5.3.1</version>
<exclusions>
<exclusion>
<artifactId>jsqlparser</artifactId>
<groupId>com.github.jsqlparser</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.jsqlparser</groupId>
<artifactId>jsqlparser</artifactId>
<version>4.6</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>

2
core/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java
View File

@ -17,7 +17,7 @@ public class ApiDefinition {
private List<DatasetTableFieldDTO> fields;
private ApiDefinitionRequest request;
private String dataPath;
private Integer queryTimeout;
private Integer apiQueryTimeout = 30;
private String status;
private List<Map<String,String>> data = new ArrayList<>();
private List<JSONObject> jsonFields = new ArrayList<>();

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

@ -40,7 +40,7 @@ public class ApiProvider extends Provider {
@Override
public List<String[]> getData(DatasourceRequest datasourceRequest) throws Exception {
ApiDefinition apiDefinition = checkApiDefinition(datasourceRequest);
String response = execHttpRequest(apiDefinition, apiDefinition.getQueryTimeout() == null || apiDefinition.getQueryTimeout()<=0 ? 30 : apiDefinition.getQueryTimeout());
String response = execHttpRequest(apiDefinition, apiDefinition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout()<=0 ? 30 : apiDefinition.getApiQueryTimeout());
return fetchResult(response, apiDefinition);
}
@ -68,7 +68,7 @@ public class ApiProvider extends Provider {
List<String[]> dataList = new ArrayList<>();
List<TableField> fieldList = new ArrayList<>();
ApiDefinition apiDefinition = checkApiDefinition(datasourceRequest);
String response = execHttpRequest(apiDefinition, apiDefinition.getQueryTimeout() == null || apiDefinition.getQueryTimeout()<=0 ? 30 : apiDefinition.getQueryTimeout());
String response = execHttpRequest(apiDefinition, apiDefinition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout()<=0 ? 30 : apiDefinition.getApiQueryTimeout());
fieldList = getTableFields(apiDefinition);
result.put("fieldList", fieldList);

3
core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
View File

@ -97,7 +97,8 @@ public class JdbcProvider extends DefaultJdbcProvider {
}
String schemaPattern = "%";
if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.oracle.name())) {
schemaPattern = databaseMetaData.getUserName();
OracleConfiguration oracleConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfiguration.class);
schemaPattern = oracleConfiguration.getSchema();
}
ResultSet resultSet = databaseMetaData.getColumns(null, schemaPattern, tableNamePattern, "%");
while (resultSet.next()) {

5
core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -2865,9 +2865,8 @@ public class DataSetTableService {
visitBinaryExpression(likeExpression,
(likeExpression.isNot() ? " NOT" : "") + (likeExpression.isCaseInsensitive() ? " ILIKE " : " LIKE "));
String escape = likeExpression.getEscape();
if (escape != null) {
buffer.append(" ESCAPE '").append(escape).append('\'');
if (likeExpression.getEscape() != null) {
buffer.append(" ESCAPE '").append(likeExpression.getEscape()).append('\'');
}
}

3
core/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
View File

@ -82,12 +82,13 @@ public class DataSetTableTaskService {
}
datasetTableTaskMapper.insert(datasetTableTask);
} else {
datasetTableTask.setStatus(TaskStatus.Underway.name());
datasetTableTask.setStatus(null);
datasetTableTask.setLastExecTime(null);
datasetTableTask.setLastExecStatus(null);
datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask);
}
scheduleService.deleteSchedule(datasetTableTask);
scheduleService.addSchedule(datasetTableTask);
// simple

2
core/frontend/src/views/system/datasource/DsAppForm.vue
View File

@ -566,7 +566,7 @@ export default {
this.tData.forEach(item => {
if (item.id === this.form.type) {
item.children.forEach(child => {
if (this.formType === 'modify' && child.id === this.form.id) {
if (child.id === this.form.id) {
return
}
const configuration = JSON.parse(child.configuration)

8
core/frontend/src/views/system/datasource/DsConfiguration.vue
View File

@ -530,7 +530,7 @@
prop="apiQueryTimeout"
>
<el-input
v-model="apiItem.queryTimeout"
v-model="apiItem.apiQueryTimeout"
autocomplete="off"
type="number"
:min="0"
@ -855,7 +855,7 @@ export default {
acquireIncrement: 5,
idleConnectionTestPeriod: 5,
connectTimeout: 5,
queryTimeout: 30
apiQueryTimeout: 30
},
apiConfiguration: []
}
@ -1022,7 +1022,7 @@ export default {
name: '',
url: '',
method: 'GET',
queryTimeout: 30,
apiQueryTimeout: 30,
request: {
headers: [{}],
arguments: [],
@ -1040,7 +1040,7 @@ export default {
url: '',
method: 'GET',
dataPath: '',
queryTimeout: 30,
apiQueryTimeout: 30,
request: {
headers: [],
arguments: [],

2
core/frontend/src/views/system/datasource/DsFormContent.vue
View File

@ -886,7 +886,7 @@ export default {
this.tData.forEach((item) => {
if (item.id === this.form.type) {
item.children.forEach((child) => {
if (this.formType === 'modify' && child.id === this.form.id) {
if (child.id === this.form.id) {
return
}
const configuration = JSON.parse(child.configuration)