diff --git a/backend/pom.xml b/backend/pom.xml index 76666a7..919e878 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -18,7 +18,6 @@ 20.1.0 3.12.1 - org.springframework.boot @@ -398,21 +397,20 @@ - - - pentaho-public - Pentaho Public - http://nexus.pentaho.org/content/groups/omni - - true - always - - - true - always - - + + pentaho-public + Pentaho Public + http://nexus.pentaho.org/content/groups/omni + + true + always + + + true + always + + diff --git a/backend/src/main/java/com/ipsos/datasource/controller/DatasourceController.java b/backend/src/main/java/com/ipsos/datasource/controller/DatasourceController.java index ac61d7b..e744b32 100644 --- a/backend/src/main/java/com/ipsos/datasource/controller/DatasourceController.java +++ b/backend/src/main/java/com/ipsos/datasource/controller/DatasourceController.java @@ -94,7 +94,7 @@ public class DatasourceController { @ApiOperation("查询表字段") @PostMapping("/getData/{tableName}/{fetchSize}") public Map getData(@RequestBody Datasource datasource, @PathVariable String tableName, @PathVariable Integer fetchSize) throws Exception { - return datasourceService.getDataByDatasource(datasource, tableName, fetchSize); + return datasourceService.getDataByDatasource(datasource, tableName, 0, fetchSize); } @ApiIgnore diff --git a/backend/src/main/java/com/ipsos/datasource/service/DatasourceService.java b/backend/src/main/java/com/ipsos/datasource/service/DatasourceService.java index ee298dd..bd4eef3 100644 --- a/backend/src/main/java/com/ipsos/datasource/service/DatasourceService.java +++ b/backend/src/main/java/com/ipsos/datasource/service/DatasourceService.java @@ -263,15 +263,12 @@ public class DatasourceService { return datasourceProvider.fetchResultField(datasourceRequest); } - public Map getDataByDatasource(Datasource datasource, String tableName, Integer fetchSize) throws Exception { + public Map getDataByDatasource(Datasource datasource, String tableName, Integer offset, Integer fetchSize) throws Exception { DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(datasource); QueryProvider qp = ProviderFactory.getQueryProvider(datasource.getType()); - datasourceRequest.setQuery(qp.convertTableToSql(tableName, datasource)); - datasourceRequest.setFetchSize(fetchSize); - datasourceRequest.setPageable(true); - datasourceRequest.setPreviewData(true); + datasourceRequest.setQuery(qp.createSQLPreview(qp.convertTableToSql(tableName, datasource), null, offset, fetchSize)); return datasourceProvider.fetchResultAndField(datasourceRequest); } diff --git a/backend/src/main/java/com/ipsos/provider/QueryProvider.java b/backend/src/main/java/com/ipsos/provider/QueryProvider.java index 373ae49..10f5629 100644 --- a/backend/src/main/java/com/ipsos/provider/QueryProvider.java +++ b/backend/src/main/java/com/ipsos/provider/QueryProvider.java @@ -7,6 +7,7 @@ import com.ipsos.datasource.dto.JdbcConfiguration; import com.ipsos.dto.chart.ChartCustomFilterDTO; import com.ipsos.dto.chart.ChartViewFieldDTO; import com.ipsos.dto.sqlObj.SQLObj; +import com.ipsos.provider.mysql.MySQLConstants; import com.ipsos.provider.pg.PgConstants; import com.ipsos.base.domain.DatasetTableField; @@ -22,6 +23,8 @@ public abstract class QueryProvider { public abstract String createSQLPreview(String sql, String orderBy); + public abstract String createSQLPreview(String sql, String orderBy, Integer offset, Integer limit); + public abstract String createQuerySQL(String table, List fields, boolean isGroup, Datasource ds); public abstract String createQuerySQLAsTmp(String sql, List fields, boolean isGroup); diff --git a/backend/src/main/java/com/ipsos/provider/ck/CKQueryProvider.java b/backend/src/main/java/com/ipsos/provider/ck/CKQueryProvider.java index b1c3053..c8db636 100644 --- a/backend/src/main/java/com/ipsos/provider/ck/CKQueryProvider.java +++ b/backend/src/main/java/com/ipsos/provider/ck/CKQueryProvider.java @@ -101,7 +101,12 @@ public class CKQueryProvider extends QueryProvider { @Override public String createSQLPreview(String sql, String orderBy) { - return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp " + " LIMIT 0,1000"; + return createSQLPreview(sql, orderBy, 0, 1000); + } + + @Override + public String createSQLPreview(String sql, String orderBy, Integer offset, Integer limit) { + return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp " + " LIMIT " + offset + "," + limit; } @Override diff --git a/backend/src/main/java/com/ipsos/provider/doris/DorisQueryProvider.java b/backend/src/main/java/com/ipsos/provider/doris/DorisQueryProvider.java index 15d9404..76cf1d2 100644 --- a/backend/src/main/java/com/ipsos/provider/doris/DorisQueryProvider.java +++ b/backend/src/main/java/com/ipsos/provider/doris/DorisQueryProvider.java @@ -73,7 +73,12 @@ public class DorisQueryProvider extends QueryProvider { @Override public String createSQLPreview(String sql, String orderBy) { - return "SELECT * FROM (" + sql + ") AS tmp ORDER BY " + orderBy + " LIMIT 0,1000"; + return createSQLPreview(sql, orderBy, 0, 1000); + } + + @Override + public String createSQLPreview(String sql, String orderBy, Integer offset, Integer limit) { + return "SELECT * FROM (" + sql + ") AS tmp ORDER BY " + orderBy + " LIMIT " + offset + "," + limit; } @Override diff --git a/backend/src/main/java/com/ipsos/provider/es/EsQueryProvider.java b/backend/src/main/java/com/ipsos/provider/es/EsQueryProvider.java index 243a93b..08a2353 100644 --- a/backend/src/main/java/com/ipsos/provider/es/EsQueryProvider.java +++ b/backend/src/main/java/com/ipsos/provider/es/EsQueryProvider.java @@ -105,7 +105,12 @@ public class EsQueryProvider extends QueryProvider { @Override public String createSQLPreview(String sql, String orderBy) { - return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp " + " LIMIT 1000"; + return createSQLPreview(sql, orderBy, 0, 1000); + } + + @Override + public String createSQLPreview(String sql, String orderBy, Integer offset, Integer limit) { + return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp " + " LIMIT " + limit; } @Override diff --git a/backend/src/main/java/com/ipsos/provider/mysql/MysqlQueryProvider.java b/backend/src/main/java/com/ipsos/provider/mysql/MysqlQueryProvider.java index 92f48be..d4e4cf7 100644 --- a/backend/src/main/java/com/ipsos/provider/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/com/ipsos/provider/mysql/MysqlQueryProvider.java @@ -73,7 +73,12 @@ public class MysqlQueryProvider extends QueryProvider { @Override public String createSQLPreview(String sql, String orderBy) { - return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp " + " LIMIT 0,1000"; + return createSQLPreview(sql, orderBy, 0, 1000); + } + + @Override + public String createSQLPreview(String sql, String orderBy, Integer offset, Integer limit) { + return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp " + " LIMIT " + offset + "," + limit; } @Override diff --git a/backend/src/main/java/com/ipsos/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/com/ipsos/provider/oracle/OracleQueryProvider.java index 8697ac9..9a26e46 100644 --- a/backend/src/main/java/com/ipsos/provider/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/com/ipsos/provider/oracle/OracleQueryProvider.java @@ -88,7 +88,12 @@ public class OracleQueryProvider extends QueryProvider { @Override public String createSQLPreview(String sql, String orderBy) { - return "SELECT * FROM (" + sqlFix(sql) + ") DE_TMP " + " WHERE rownum <= 1000"; + return createSQLPreview(sql, orderBy, 0, 1000); + } + + @Override + public String createSQLPreview(String sql, String orderBy, Integer offset, Integer limit) { + return "SELECT * FROM (" + sqlFix(sql) + ") DE_TMP " + " WHERE rownum <= " + limit; } @Override diff --git a/backend/src/main/java/com/ipsos/provider/pg/PgQueryProvider.java b/backend/src/main/java/com/ipsos/provider/pg/PgQueryProvider.java index 5eae63f..ea7f3a6 100644 --- a/backend/src/main/java/com/ipsos/provider/pg/PgQueryProvider.java +++ b/backend/src/main/java/com/ipsos/provider/pg/PgQueryProvider.java @@ -93,7 +93,12 @@ public class PgQueryProvider extends QueryProvider { @Override public String createSQLPreview(String sql, String orderBy) { - return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp " + " LIMIT 1000 offset 0"; + return createSQLPreview(sql, orderBy, 0, 1000); + } + + @Override + public String createSQLPreview(String sql, String orderBy, Integer offset, Integer limit) { + return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp " + " LIMIT " + limit + " offset " + offset; } @Override diff --git a/backend/src/main/java/com/ipsos/provider/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/com/ipsos/provider/sqlserver/SqlserverQueryProvider.java index 0b12846..a0214b4 100644 --- a/backend/src/main/java/com/ipsos/provider/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/com/ipsos/provider/sqlserver/SqlserverQueryProvider.java @@ -81,7 +81,12 @@ public class SqlserverQueryProvider extends QueryProvider { @Override public String createSQLPreview(String sql, String orderBy) { - return "SELECT top 1000 * FROM (" + sqlFix(sql) + ") AS tmp"; + return createSQLPreview(sql, orderBy, 0, 1000); + } + + @Override + public String createSQLPreview(String sql, String orderBy, Integer offset, Integer limit) { + return "SELECT top " + limit + " * FROM (" + sqlFix(sql) + ") AS tmp"; } @Override diff --git a/frontend/pom.xml b/frontend/pom.xml index ade2b40..aabafdf 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -31,6 +31,7 @@ install-node-and-yarn + http://nodejs.org/dist/ v15.12.0 v1.22.17 diff --git a/frontend/src/views/system/authority/authQuickConfig.vue b/frontend/src/views/system/authority/authQuickConfig.vue index 65c884e..848f482 100644 --- a/frontend/src/views/system/authority/authQuickConfig.vue +++ b/frontend/src/views/system/authority/authQuickConfig.vue @@ -1,192 +1,232 @@ diff --git a/frontend/src/views/system/authority/index.vue b/frontend/src/views/system/authority/index.vue index 8c83503..533509b 100644 --- a/frontend/src/views/system/authority/index.vue +++ b/frontend/src/views/system/authority/index.vue @@ -2,43 +2,39 @@ - {{ $t('auth.authConfig') }} + {{ $t("auth.authConfig") }} - - - - + + {{ $t("auth.authQuickConfig") }} + + - + diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue index aedce1e..453b9cf 100644 --- a/frontend/src/views/system/datasource/form.vue +++ b/frontend/src/views/system/datasource/form.vue @@ -8,14 +8,14 @@ {{ params && - params.id && - params.showModel && - params.showModel === 'show' && - !canEdit - ? $t('datasource.show_info') - : formType == 'add' - ? $t('datasource.create') - : $t('datasource.modify') + params.id && + params.showModel && + params.showModel === "show" && + !canEdit + ? $t("datasource.show_info") + : formType == "add" + ? $t("datasource.create") + : $t("datasource.modify") }}
@@ -28,10 +28,10 @@ size="small" :disabled=" params && - params.id && - params.showModel && - params.showModel === 'show' && - !canEdit + params.id && + params.showModel && + params.showModel === 'show' && + !canEdit " label-width="auto" label-position="right" @@ -49,7 +49,7 @@ class="select-width" :disabled=" formType == 'modify' || - (formType === 'add' && params && !!params.type) + (formType === 'add' && params && !!params.type) " @change="changeType()" > @@ -99,11 +99,13 @@ {{ $t('datasource.oracle_sid') }} + >{{ $t("datasource.oracle_sid") }} {{ $t('datasource.oracle_service_name') }} + >{{ $t("datasource.oracle_service_name") }} @@ -175,20 +177,20 @@ - {{ $t('datasource.get_schema') }} + {{ $t("datasource.get_schema") }} @@ -296,9 +298,11 @@ :label="$t('datasource.table_name')" > @@ -330,8 +334,8 @@ {{ - $t('dataset.text') + $t("dataset.text") }} {{ - $t('dataset.time') + $t("dataset.time") }} {{ - $t('dataset.value') + $t("dataset.value") }} {{ '(' + $t('dataset.float') + ')' }} + >{{ "(" + $t("dataset.float") + ")" }} ({{ scope.row.fieldType }}) @@ -418,7 +423,8 @@ : hasDataPermission('manage', params.privileges) " @click="validaDatasource" - >{{ $t('commons.validate') }} + >{{ $t("commons.validate") }} {{ $t('commons.save') }} + >{{ $t("commons.save") }}
@@ -454,168 +463,168 @@