From 1381ebd2cdb3bb71057bbd028d16ade3a57225ef Mon Sep 17 00:00:00 2001 From: ulleo Date: Thu, 7 Sep 2023 13:41:57 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20[Echarts=E5=8A=A8=E6=80=81=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=9B=BE]=20=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=80=89=E9=A1=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/selector/TooltipSelector.vue | 3 +++ .../view/official/impl/RaceBarService.java | 6 +++--- .../src/components/selector/TooltipSelector.vue | 17 ++++++++++++++++- .../src/components/selector/TooltipSelector.vue | 3 +++ 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelector.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelector.vue index c59e0f6185..2461555af5 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelector.vue +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelector.vue @@ -122,6 +122,9 @@ export default { .form-item>>>.el-form-item__label{ font-size: 12px; } +.form-item ::v-deep .el-form-item__label { + font-size: 12px; +} .el-select-dropdown__item{ padding: 0 20px; } diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java b/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java index 4cc2e91127..0f05beb350 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java @@ -40,9 +40,9 @@ public class RaceBarService extends ViewPluginService { private static final Map VIEW_STYLE_PROPERTY_INNER = new HashMap<>(); static { - VIEW_STYLE_PROPERTY_INNER.put("color-selector", new String[]{"value", "alpha"}); - VIEW_STYLE_PROPERTY_INNER.put("label-selector", new String[]{"show", "fontSize", "color", "position", "formatter"}); - VIEW_STYLE_PROPERTY_INNER.put("tooltip-selector", new String[]{"show", "textStyle", "formatter"}); + VIEW_STYLE_PROPERTY_INNER.put("color-selector", new String[]{"value"}); + VIEW_STYLE_PROPERTY_INNER.put("label-selector", new String[]{"show", "fontSize", "color", "position"}); + VIEW_STYLE_PROPERTY_INNER.put("tooltip-selector", new String[]{"show", "textStyle", }); VIEW_STYLE_PROPERTY_INNER.put("title-selector", new String[]{"show", "title", "fontSize", "color", "hPosition", "vPosition", "isItalic", "isBolder"}); } diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/selector/TooltipSelector.vue b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/selector/TooltipSelector.vue index bba74bfd46..bb93c0abcb 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/selector/TooltipSelector.vue +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/selector/TooltipSelector.vue @@ -17,6 +17,17 @@ + + + + Date: Thu, 7 Sep 2023 16:30:12 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DTab=E7=BB=84=E4=BB=B6=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E8=AE=BE=E7=BD=AE=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20#5795?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frontend/src/components/canvas/customComponent/UserView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue index cb148278fb..14920df1e4 100644 --- a/core/frontend/src/components/canvas/customComponent/UserView.vue +++ b/core/frontend/src/components/canvas/customComponent/UserView.vue @@ -361,7 +361,7 @@ export default { computed: { // 首次加载且非编辑状态新复制的视图，使用外部filter initLoad() { - return !(this.isEdit && this.currentCanvasNewId.includes(this.element.id)) && this.isFirstLoad && this.canvasId === 'canvas-main' + return !(this.isEdit && this.currentCanvasNewId.includes(this.element.id)) && this.isFirstLoad }, scaleCoefficient() { if (this.terminal === 'pc' && !this.mobileLayoutStatus) { From a3799cd56821ebb3b4dd42618cdf395fee2c1077 Mon Sep 17 00:00:00 2001 From: ulleo Date: Thu, 7 Sep 2023 16:42:04 +0800 Subject: [PATCH 4/9] =?UTF-8?q?feat:=20[Echarts=E5=8A=A8=E6=80=81=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=9B=BE]=20=E9=9A=90=E8=97=8F=E2=80=9C=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E8=AE=BE=E7=BD=AE/=E8=B7=B3=E8=BD=AC=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E2=80=9D=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/editor/SettingMenu.vue | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/core/frontend/src/components/canvas/components/editor/SettingMenu.vue b/core/frontend/src/components/canvas/components/editor/SettingMenu.vue index 797dcb83e8..7b06044173 100644 --- a/core/frontend/src/components/canvas/components/editor/SettingMenu.vue +++ b/core/frontend/src/components/canvas/components/editor/SettingMenu.vue @@ -5,7 +5,7 @@ trigger="click" @mouseup="handleMouseUp" > - + {{ $t('panel.copy') }} (+ D Control + D) + >{{ $t('panel.copy') }} (+ D Control + D) - {{ $t('panel.level') }} + {{ $t('panel.level') }} {{ $t('panel.hyperlinks') }} + >{{ $t('panel.hyperlinks') }} - + {{ $t('panel.position_adjust') }} @@ -180,7 +179,7 @@ import TabCarouselDialog from '@/components/canvas/components/editor/TabCarousel import CustomTabsSort from '@/components/widget/deWidget/CustomTabsSort' export default { - components: { CustomTabsSort, HyperlinksDialog,TabCarouselDialog }, + components: { CustomTabsSort, HyperlinksDialog, TabCarouselDialog }, data() { return { tabCarouselVisible: false, @@ -193,7 +192,8 @@ export default { 'text', 'label', 'flow-map', - 'bidirectional-bar' + 'bidirectional-bar', + 'race-bar' ], linkageExcludeViewType: [ 'richTextView', @@ -202,7 +202,8 @@ export default { 'text', 'label', 'flow-map', - 'bidirectional-bar' + 'bidirectional-bar', + 'race-bar' ], copyData: null, hyperlinksSetVisible: false, From 9341bc500781e632b8c03a0526ecc26f4ddbc4ff Mon Sep 17 00:00:00 2001 From: fit2cloudrd Date: Thu, 7 Sep 2023 16:50:51 +0800 Subject: [PATCH 5/9] Update V57__1.18-table-desc-update.sql --- .../main/resources/db/migration/V57__1.18-table-desc-update.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/core/backend/src/main/resources/db/migration/V57__1.18-table-desc-update.sql b/core/backend/src/main/resources/db/migration/V57__1.18-table-desc-update.sql index 11953b83c9..1c2f44bb18 100644 --- a/core/backend/src/main/resources/db/migration/V57__1.18-table-desc-update.sql +++ b/core/backend/src/main/resources/db/migration/V57__1.18-table-desc-update.sql @@ -47,7 +47,6 @@ ALTER TABLE `demo_stny_carbon_emission_trend` COMMENT = '官方示例模板数 ALTER TABLE `demo_stny_disposable_energy` COMMENT = '官方示例模板数据（双碳及能源情况概览）'; ALTER TABLE `demo_stny_energy_consumption_proportion` COMMENT = '官方示例模板数据（双碳及能源情况概览）'; ALTER TABLE `demo_stny_energy_consumption_total` COMMENT = '官方示例模板数据（双碳及能源情况概览）'; -ALTER TABLE `demo_stny_province_city_ index` COMMENT = '官方示例模板数据（双碳及能源情况概览）'; ALTER TABLE `de_engine` COMMENT = '引擎设置表'; ALTER TABLE `file_content` COMMENT = '文件内容表'; ALTER TABLE `file_metadata` COMMENT = '文件基础信息表'; From bf3c6d5babd449e4e57cd1ed417ddaf1a0e34759 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 7 Sep 2023 17:06:43 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=B8=AD=E5=AD=98=E5=9C=A8=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=95=B0=E6=8D=AE=E9=9B=86=E6=97=B6=EF=BC=8C=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E5=AF=BC=E5=85=A5=E4=BC=9A=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20#5892?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel/PanelAppTemplateService.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java b/core/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java index 22559c6833..c0feaeb2b6 100644 --- a/core/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java +++ b/core/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java @@ -314,7 +314,8 @@ public class PanelAppTemplateService { for (ChartViewWithBLOBs chartView : chartViewsInfo) { String oldViewId = chartView.getId(); // 替换datasetId - chartView.setTableId(datasetsRealMap.get(chartView.getTableId())); + String newTableId = datasetsRealMap.get(chartView.getTableId()); + chartView.setTableId(StringUtils.isEmpty(newTableId) ? " " : newTableId); datasetsRealMap.forEach((k, v) -> { chartView.setXAxis(chartView.getXAxis().replaceAll(k, v)); chartView.setXAxisExt(chartView.getXAxisExt().replaceAll(k, v)); @@ -423,12 +424,12 @@ public class PanelAppTemplateService { } @Transactional(rollbackFor = Exception.class) - public Map applyLinkJumps(List linkJumps, Map chartViewsRealMap, String newPanelId) { - Map linkJumpIdMap = new HashMap<>(); - if(!CollectionUtils.isEmpty(linkJumps)){ - for(PanelLinkJump linkJump :linkJumps){ + public Map applyLinkJumps(List linkJumps, Map chartViewsRealMap, String newPanelId) { + Map linkJumpIdMap = new HashMap<>(); + if (!CollectionUtils.isEmpty(linkJumps)) { + for (PanelLinkJump linkJump : linkJumps) { String newLinkJumpId = UUIDUtil.getUUIDAsString(); - linkJumpIdMap.put(linkJump.getId(),newLinkJumpId); + linkJumpIdMap.put(linkJump.getId(), newLinkJumpId); linkJump.setId(newLinkJumpId); linkJump.setSourcePanelId(newPanelId); linkJump.setSourceViewId(chartViewsRealMap.get(linkJump.getSourceViewId())); @@ -440,8 +441,8 @@ public class PanelAppTemplateService { @Transactional(rollbackFor = Exception.class) public void applyLinkJumpInfos(List linkJumpInfos, Map linkJumpIdMap, Map datasetFieldsRealMap) { - if(!CollectionUtils.isEmpty(linkJumpInfos)){ - for(PanelLinkJumpInfo linkJumpInfo :linkJumpInfos){ + if (!CollectionUtils.isEmpty(linkJumpInfos)) { + for (PanelLinkJumpInfo linkJumpInfo : linkJumpInfos) { String newLinkJumpInfoId = UUIDUtil.getUUIDAsString(); linkJumpInfo.setId(newLinkJumpInfoId); linkJumpInfo.setLinkJumpId(linkJumpIdMap.get(linkJumpInfo.getLinkJumpId())); @@ -455,12 +456,12 @@ public class PanelAppTemplateService { } @Transactional(rollbackFor = Exception.class) - public Map applyLinkages(List linkages, Map chartViewsRealMap, String newPanelId) { - Map linkageIdMap = new HashMap<>(); - if(!CollectionUtils.isEmpty(linkages)){ - for(PanelViewLinkage linkage :linkages){ + public Map applyLinkages(List linkages, Map chartViewsRealMap, String newPanelId) { + Map linkageIdMap = new HashMap<>(); + if (!CollectionUtils.isEmpty(linkages)) { + for (PanelViewLinkage linkage : linkages) { String newId = UUIDUtil.getUUIDAsString(); - linkageIdMap.put(linkage.getId(),newId); + linkageIdMap.put(linkage.getId(), newId); linkage.setId(newId); linkage.setPanelId(newPanelId); linkage.setSourceViewId(chartViewsRealMap.get(linkage.getSourceViewId())); @@ -473,8 +474,8 @@ public class PanelAppTemplateService { @Transactional(rollbackFor = Exception.class) public void applyLinkageFields(List linkageFields, Map linkageIdMap, Map datasetFieldsRealMap) { - if(!CollectionUtils.isEmpty(linkageFields)){ - for(PanelViewLinkageField linkageField :linkageFields){ + if (!CollectionUtils.isEmpty(linkageFields)) { + for (PanelViewLinkageField linkageField : linkageFields) { String newId = UUIDUtil.getUUIDAsString(); linkageField.setId(newId); linkageField.setLinkageId(linkageIdMap.get(linkageField.getLinkageId())); From 752561e74c7c4ec37f327d32334a43b798a8dc6d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 7 Sep 2023 17:09:40 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E6=A0=91=E5=BD=A2=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/query/sqlserver/SqlserverQueryProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java index b9d8acf5c5..bd2363ba1c 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java @@ -1149,7 +1149,7 @@ public class SqlserverQueryProvider extends QueryProvider { String whereValue = ""; if (StringUtils.containsIgnoreCase(request.getOperator(), "in")) { - if(request.getDatasetTableField().getType().equalsIgnoreCase("NVARCHAR")) { + if(request.getDatasetTableField() != null && request.getDatasetTableField().getType().equalsIgnoreCase("NVARCHAR")) { whereValue = "(" + value.stream().map(str -> { return "N" + "'" + str + "'"; }).collect(Collectors.joining(",")) + ")"; @@ -1171,7 +1171,7 @@ public class SqlserverQueryProvider extends QueryProvider { } } else { - if(request.getDatasetTableField().getType().equalsIgnoreCase("NVARCHAR")){ + if(request.getDatasetTableField() != null && request.getDatasetTableField().getType().equalsIgnoreCase("NVARCHAR")){ whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE_CH, value.get(0)); }else { whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value.get(0)); From c04d0cfacb670f44ce9d3045add61db38da4e44e Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 7 Sep 2023 17:14:53 +0800 Subject: [PATCH 8/9] =?UTF-8?q?style(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E6=97=B6=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20#5526?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/components/canvas/components/Toolbar.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/core/frontend/src/components/canvas/components/Toolbar.vue b/core/frontend/src/components/canvas/components/Toolbar.vue index 3477647db4..47147343d3 100644 --- a/core/frontend/src/components/canvas/components/Toolbar.vue +++ b/core/frontend/src/components/canvas/components/Toolbar.vue @@ -34,6 +34,7 @@ {{ $t('commons.confirm') }} From 19e7e1a127c094f1de7084e6a837a70779949a36 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 7 Sep 2023 17:59:32 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E7=A7=BB=E5=8A=A8=E5=8F=AF=E4=BB=A5=E9=87=8D=E5=90=8D?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/DataSetGroupService.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java index 0b89a6ce6b..66ee21281a 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java @@ -152,9 +152,6 @@ public class DataSetGroupService { if (StringUtils.isNotEmpty(datasetGroup.getId())) { criteria.andIdNotEqualTo(datasetGroup.getId()); } - if (ObjectUtils.isNotEmpty(datasetGroup.getLevel())) { - criteria.andLevelEqualTo(datasetGroup.getLevel()); - } List list = datasetGroupMapper.selectByExample(datasetGroupExample); if (list.size() > 0) { throw new RuntimeException(Translator.get("I18N_DATASET_GROUP_EXIST"));