From 99cfc74ef2e8292f1e76c60ad67dca9a4d21ab80 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 2 Mar 2022 18:57:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/add/AddUnion.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue index 5d73a9ae08..c0735caf31 100644 --- a/frontend/src/views/dataset/add/AddUnion.vue +++ b/frontend/src/views/dataset/add/AddUnion.vue @@ -185,7 +185,7 @@ export default { mode: this.dataset[0].currentDs.mode, info: '{"union":' + JSON.stringify(this.dataset) + '}' } - post('/dataset/table/updateUnion', table).then(response => { + post('/dataset/table/update', table).then(response => { this.$emit('saveSuccess', table) this.cancel() }) From d7a52c28e6536abf2e8f73fd5f2208f19d8d8ff1 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 2 Mar 2022 20:46:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20mysql=20=E6=94=AF=E6=8C=81=E8=A7=86?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/provider/datasource/JdbcProvider.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index 7960d4b1ed..1c8cd2a827 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -606,7 +606,7 @@ public class JdbcProvider extends DatasourceProvider { case mysql: case mariadb: JdbcConfiguration jdbcConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), JdbcConfiguration.class); - return String.format("SELECT TABLE_NAME,TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_SCHEMA = '%s' ;", jdbcConfiguration.getDataBase()); + return String.format("SELECT TABLE_NAME,TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '%s' ;", jdbcConfiguration.getDataBase()); case de_doris: case ds_doris: case hive: @@ -658,8 +658,6 @@ public class JdbcProvider extends DatasourceProvider { case mariadb: case de_doris: case ds_doris: - JdbcConfiguration jdbcConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), JdbcConfiguration.class); - return String.format("SELECT TABLE_NAME,'' FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '%s' ;", jdbcConfiguration.getDataBase()); case ck: return null; case sqlServer: From 3df9a404ec00528b956d69fcad4446ea55b70783 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 2 Mar 2022 21:32:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/src/common/js/request/index.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/mobile/src/common/js/request/index.js b/mobile/src/common/js/request/index.js index 904452cfa4..075b89dbea 100644 --- a/mobile/src/common/js/request/index.js +++ b/mobile/src/common/js/request/index.js @@ -1,6 +1,6 @@ import axios from 'axios' import Config from '@/settings' -import { getToken, setToken, setUserInfo } from '@/common/utils' +import { getToken, setToken, setUserInfo, parseLanguage } from '@/common/utils' const TokenKey = Config.TokenKey const RefreshTokenKey = Config.RefreshTokenKey const white_list = Config.WHITE_LIST @@ -15,6 +15,17 @@ let service = axios.create({ // request interceptor service.interceptors.request.use( config => { + + let lang = parseLanguage() || uni.getLocale() + if (lang === 'en') { + config.headers['Accept-Language'] = 'en-US' + }else if(lang === 'zh-Hant'){ + config.headers['Accept-Language'] = 'zh-TW' + }else { + config.headers['Accept-Language'] = 'zh-CN' + } + + if (white_list.includes(config.url)) { return config } From 3f889ab62db4faf3d7a9ebea013fa7eeceda8962 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 2 Mar 2022 22:15:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=20api=20=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dataset/DataSetTableUnionController.java | 9 +++++---- frontend/src/views/dataset/data/UnionView.vue | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java index fd981b1fc1..c9f401e47f 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java @@ -26,17 +26,18 @@ public class DataSetTableUnionController { @Resource private DataSetTableUnionService dataSetTableUnionService; + @DePermission(type = DePermissionType.DATASET, value = "sourceTableId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) @ApiOperation("保存") @PostMapping("save") public DatasetTableUnion save(@RequestBody DatasetTableUnion datasetTableUnion) { return dataSetTableUnionService.save(datasetTableUnion); } - @DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) + @DePermission(type = DePermissionType.DATASET, value = "sourceTableId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) @ApiOperation("删除") - @PostMapping("delete/{id}") - public void delete(@PathVariable String id) { - dataSetTableUnionService.delete(id); + @PostMapping("delete") + public void delete(@RequestBody DatasetTableUnion datasetTableUnion) { + dataSetTableUnionService.delete(datasetTableUnion.getId()); } @DePermission(type = DePermissionType.DATASET) diff --git a/frontend/src/views/dataset/data/UnionView.vue b/frontend/src/views/dataset/data/UnionView.vue index 6861d36ce8..c117d87893 100644 --- a/frontend/src/views/dataset/data/UnionView.vue +++ b/frontend/src/views/dataset/data/UnionView.vue @@ -287,7 +287,7 @@ export default { cancelButtonText: this.$t('dataset.cancel'), type: 'warning' }).then(() => { - post('dataset/union/delete/' + item.id, {}).then(response => { + post('dataset/union/delete', item).then(response => { this.$message({ type: 'success', message: this.$t('dataset.delete_success'),