From dd5ce34902d4ada62f1f5fd69b7a68e479578fff Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Thu, 22 Sep 2022 11:25:31 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E9=A2=84=E8=A7=88=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/add/AddApi.vue | 2 +- frontend/src/views/dataset/add/AddDB.vue | 2 +- frontend/src/views/dataset/add/AddSQL.vue | 36 ++++++++++--------- frontend/src/views/dataset/add/AddUnion.vue | 2 +- .../views/dataset/add/union/UnionPreview.vue | 25 +++++++++++-- frontend/src/views/dataset/group/Group.vue | 1 - 6 files changed, 45 insertions(+), 23 deletions(-) diff --git a/frontend/src/views/dataset/add/AddApi.vue b/frontend/src/views/dataset/add/AddApi.vue index 6a2c651051..dfa2afb486 100644 --- a/frontend/src/views/dataset/add/AddApi.vue +++ b/frontend/src/views/dataset/add/AddApi.vue @@ -281,7 +281,7 @@ export default { const that = this setTimeout(function() { const currentHeight = document.documentElement.clientHeight - that.height = currentHeight - 195 - 54 + that.height = currentHeight - 56 - 64 - 75 - 32 - 24 - 16 - 10 }, 10) }, setActiveName({ name, datasourceId, enableCheck }) { diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue index 06d5c82607..abb2110b63 100644 --- a/frontend/src/views/dataset/add/AddDB.vue +++ b/frontend/src/views/dataset/add/AddDB.vue @@ -312,7 +312,7 @@ export default { const that = this setTimeout(function () { const currentHeight = document.documentElement.clientHeight - that.height = currentHeight - 195 - 54 + that.height = currentHeight - 56 - 64 - 75 - 32 - 24 - 16 - 10 }, 10) }, setActiveName({ name, datasourceId, enableCheck }) { diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue index 8fad55ec00..7e237a1848 100644 --- a/frontend/src/views/dataset/add/AddSQL.vue +++ b/frontend/src/views/dataset/add/AddSQL.vue @@ -371,7 +371,7 @@ import 'codemirror/addon/hint/sql-hint' import 'codemirror/addon/hint/show-hint' import { engineMode } from '@/api/system/engine' import msgCfm from '@/components/msgCfm/index' - +import _ from 'lodash' export default { name: 'AddSQL', components: { codemirror }, @@ -488,6 +488,11 @@ export default { handler: function () { this.initTableInfo() } + }, + sqlHeight: { + handler: function () { + this.calHeight() + } } }, mounted() { @@ -560,14 +565,11 @@ export default { this.tableData = response.data }) }, - calHeight() { - const that = this - setTimeout(function () { - const currentHeight = document.documentElement.clientHeight - that.height = - currentHeight - 56 - 30 - 26 - 25 - 43 - 160 - 10 - 37 - 20 - 10 - 16 - }, 10) - }, + calHeight: _.debounce(function() { + const sqlHeight = Math.max(this.sqlHeight, 248) + const currentHeight = document.documentElement.clientHeight + this.height = currentHeight - sqlHeight - 56 - 54 - 36 - 64 + }, 200), initDataSource() { listDatasource().then((response) => { this.options = response.data.filter((item) => item.type !== 'api') @@ -636,7 +638,7 @@ export default { return } this.parseVariable() - this.loading = true; + this.loading = true const table = { id: this.param.tableId, name: this.param.name, @@ -651,12 +653,14 @@ export default { isBase64Encryption: true }) } - post('/dataset/table/update', table).then((response) => { - this.openMessageSuccess('deDataset.set_saved_successfully') - this.cancel() - }).finally(() => { - this.loading = false; - }) + post('/dataset/table/update', table) + .then((response) => { + this.openMessageSuccess('deDataset.set_saved_successfully') + this.cancel() + }) + .finally(() => { + this.loading = false + }) }, cancel() { diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue index 29b2d09951..5cfd6c541f 100644 --- a/frontend/src/views/dataset/add/AddUnion.vue +++ b/frontend/src/views/dataset/add/AddUnion.vue @@ -41,7 +41,7 @@ }} - + @@ -22,6 +22,7 @@ + + diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index e44b1daa2b..61dd8a8ca0 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -757,6 +757,7 @@ @onChangeSplitForm="onChangeSplitForm" @onTextChange="onTextChange" @onLegendChange="onLegendChange" + @onMarginChange="onMarginChange" @onChangeBackgroundForm="onChangeBackgroundForm" /> @@ -1999,6 +2000,10 @@ export default { this.view.customStyle.legend = val this.calcStyle() }, + onMarginChange(val) { + this.view.customStyle.margin = val + this.calcStyle() + }, onLabelChange(val) { this.view.customAttr.label = val diff --git a/frontend/src/views/chart/view/ChartStyle.vue b/frontend/src/views/chart/view/ChartStyle.vue index 77894e2236..8e41267a75 100644 --- a/frontend/src/views/chart/view/ChartStyle.vue +++ b/frontend/src/views/chart/view/ChartStyle.vue @@ -260,6 +260,21 @@ @onChangeBackgroundForm="onChangeBackgroundForm($event,'background-color-selector')" /> + + + + @@ -284,6 +299,7 @@ import YAxisExtSelectorAntV from '@/views/chart/components/component-style/YAxis import TitleSelector from '@/views/chart/components/component-style/TitleSelector' import TitleSelectorAntV from '@/views/chart/components/component-style/TitleSelectorAntV' import LegendSelector from '@/views/chart/components/component-style/LegendSelector' +import MarginSelector from '@/views/chart/components/component-style/MarginSelector' import LegendSelectorAntV from '@/views/chart/components/component-style/LegendSelectorAntV' import BackgroundColorSelector from '@/views/chart/components/component-style/BackgroundColorSelector' import SplitSelector from '@/views/chart/components/component-style/SplitSelector' @@ -314,6 +330,7 @@ export default { SizeSelectorAntV, SizeSelector, ColorSelector, + MarginSelector, PluginCom }, props: { @@ -432,6 +449,10 @@ export default { val['propertyName'] = propertyName this.$emit('onLegendChange', val) }, + onMarginChange(val, propertyName) { + val['propertyName'] = propertyName + this.$emit('onMarginChange', val) + }, onChangeBackgroundForm(val, propertyName) { val['propertyName'] = propertyName this.$emit('onChangeBackgroundForm', val) From d90a49716c60ad7f3be253e82ea8738b5d3c4244 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Thu, 22 Sep 2022 14:57:38 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=E6=8F=92=E4=BB=B6=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=20=E8=A1=A8=E6=A0=BC=E8=AE=B0=E5=BF=86select?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/gridTable/index.vue | 4 +++- frontend/src/lang/en.js | 2 +- frontend/src/styles/index.scss | 8 ++++++++ frontend/src/views/system/task/DatasetTaskList.vue | 14 +++++++++++--- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/gridTable/index.vue b/frontend/src/components/gridTable/index.vue index ab75046091..178f927aa7 100644 --- a/frontend/src/components/gridTable/index.vue +++ b/frontend/src/components/gridTable/index.vue @@ -25,7 +25,6 @@ \ No newline at end of file From 4693f78671d262c40bc5e0148b137dffe9ad7c46 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 22 Sep 2022 17:17:39 +0800 Subject: [PATCH 7/9] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/DataSetTableController.java | 12 +++++++----- .../service/dataset/DataSetTableService.java | 17 +++++++++++------ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java index aca169acb0..e2afd79b56 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java @@ -23,6 +23,8 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -44,8 +46,8 @@ public class DataSetTableController { }, logical = Logical.AND) @ApiOperation("批量保存") @PostMapping("batchAdd") - public void batchAdd(@RequestBody List datasetTable) throws Exception { - dataSetTableService.batchInsert(datasetTable); + public List batchAdd(@RequestBody List datasetTable) throws Exception { + return dataSetTableService.batchInsert(datasetTable); } @DePermissions(value = { @@ -55,11 +57,11 @@ public class DataSetTableController { }, logical = Logical.AND) @ApiOperation("更新") @PostMapping("update") - public void save(@RequestBody DataSetTableRequest datasetTable) throws Exception { + public List save(@RequestBody DataSetTableRequest datasetTable) throws Exception { if (datasetTable.getType().equalsIgnoreCase("excel")) { - dataSetTableService.saveExcel(datasetTable); + return dataSetTableService.saveExcel(datasetTable); } else { - dataSetTableService.save(datasetTable); + return Collections.singletonList(dataSetTableService.save(datasetTable)); } } diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 7835eada20..d97a57efdf 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -145,16 +145,18 @@ public class DataSetTableService { private static Logger logger = LoggerFactory.getLogger(ClassloaderResponsity.class); @DeCleaner(value = DePermissionType.DATASET, key = "sceneId") - public void batchInsert(List datasetTable) throws Exception { + public List batchInsert(List datasetTable) throws Exception { // 保存之前校验table名称 checkNames(datasetTable); + List list = new ArrayList<>(); for (DataSetTableRequest table : datasetTable) { - save(table); + list.add(save(table)); // 清理权限缓存 CacheUtils.removeAll(AuthConstants.USER_DATASET_NAME); CacheUtils.removeAll(AuthConstants.ROLE_DATASET_NAME); CacheUtils.removeAll(AuthConstants.DEPT_DATASET_NAME); } + return list; } private void extractData(DataSetTableRequest datasetTable) throws Exception { @@ -176,10 +178,11 @@ public class DataSetTableService { @Transactional(propagation = Propagation.NOT_SUPPORTED) @DeCleaner(value = DePermissionType.DATASET, key = "sceneId") - public void saveExcel(DataSetTableRequest datasetTable) throws Exception { + public List saveExcel(DataSetTableRequest datasetTable) throws Exception { List datasetIdList = new ArrayList<>(); if (StringUtils.isEmpty(datasetTable.getId())) { + List list = new ArrayList<>(); if (datasetTable.isMergeSheet()) { Map> map = datasetTable.getSheets().stream() .collect(Collectors.groupingBy(ExcelSheetData::getFieldsMd5)); @@ -208,6 +211,7 @@ public class DataSetTableService { sysAuthService.copyAuth(sheetTable.getId(), SysAuthConstants.AUTH_SOURCE_TYPE_DATASET); saveExcelTableField(sheetTable.getId(), excelSheetDataList.get(0).getFields(), true); datasetIdList.add(sheetTable.getId()); + list.add(sheetTable); DeLogUtils.save(SysLogConstants.OPERATE_TYPE.CREATE, SysLogConstants.SOURCE_TYPE.DATASET, datasetTable.getId(), datasetTable.getSceneId(), null, null); } datasetIdList.forEach(datasetId -> { @@ -239,16 +243,16 @@ public class DataSetTableService { sysAuthService.copyAuth(sheetTable.getId(), SysAuthConstants.AUTH_SOURCE_TYPE_DATASET); saveExcelTableField(sheetTable.getId(), sheet.getFields(), true); datasetIdList.add(sheetTable.getId()); + list.add(sheetTable); DeLogUtils.save(SysLogConstants.OPERATE_TYPE.MODIFY, SysLogConstants.SOURCE_TYPE.DATASET, datasetTable.getId(), datasetTable.getSceneId(), null, null); } datasetIdList.forEach(datasetId -> { commonThreadPool.addTask(() -> extractDataService.extractExcelData(datasetId, "all_scope", "初始导入", null, datasetIdList)); }); - - } - return; + + return list; } List excelSheetDataList = new ArrayList<>(); @@ -287,6 +291,7 @@ public class DataSetTableService { null, Arrays.asList(datasetTable.getId()))); } DeLogUtils.save(SysLogConstants.OPERATE_TYPE.MODIFY, SysLogConstants.SOURCE_TYPE.DATASET, datasetTable.getId(), datasetTable.getSceneId(), null, null); + return Collections.singletonList(datasetTable); } @DeCleaner(value = DePermissionType.DATASET, key = "sceneId") From 6506ce9d7cdda7950494a692f9ac5ff3e08c9fe3 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 22 Sep 2022 17:24:23 +0800 Subject: [PATCH 8/9] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/controller/dataset/DataSetTableController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java index e2afd79b56..8c36e7f45b 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; From ffc82716113350023566b73f59d0211118ee4b5c Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Fri, 23 Sep 2022 11:17:18 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=20=E8=BF=94=E5=9B=9E=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=20=E6=95=B0=E6=8D=AE=E6=BA=90bug=20?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=88=87=E6=8D=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.vue | 2 +- frontend/src/views/dataset/add/AddApi.vue | 13 ++-- frontend/src/views/dataset/add/AddDB.vue | 14 ++-- frontend/src/views/dataset/add/AddExcel.vue | 16 ++-- frontend/src/views/dataset/add/AddSQL.vue | 10 +-- frontend/src/views/dataset/add/AddUnion.vue | 7 +- frontend/src/views/dataset/add/cancelMix.js | 19 +++++ frontend/src/views/dataset/group/Group.vue | 31 ++++++-- .../src/views/system/datasource/dsTable.vue | 78 +++++-------------- 9 files changed, 88 insertions(+), 102 deletions(-) create mode 100644 frontend/src/views/dataset/add/cancelMix.js diff --git a/frontend/src/App.vue b/frontend/src/App.vue index a0dbbb58fb..08daceb3a4 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -3,7 +3,7 @@ - + diff --git a/frontend/src/views/dataset/add/AddApi.vue b/frontend/src/views/dataset/add/AddApi.vue index dfa2afb486..bc36beabc7 100644 --- a/frontend/src/views/dataset/add/AddApi.vue +++ b/frontend/src/views/dataset/add/AddApi.vue @@ -1,9 +1,9 @@