From b8cfb904b6fd507559d8362d247076d9cf10dbca Mon Sep 17 00:00:00 2001 From: Wangjiahao <1522128093@qq.com> Date: Tue, 23 May 2023 18:44:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=AE=98=E6=96=B9=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=85=A5=E5=90=8E=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E4=BD=BF=E7=94=A8=E5=AE=98=E6=96=B9=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/view/ChartEdit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index ffc2c303ee..c3cff472f6 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -2952,7 +2952,7 @@ export default { // 更换数据集 changeChart() { - const optType = this.view.tableId === this.changeTable.id ? 'same' : 'change' + const optType = this.view.tableId === this.changeTable.id && this.view.dataFrom!=='template' ? 'same' : 'change' // 更换数据集后清空视图字段，并重新请求数据；否则没有操作 if (optType === 'change') { this.view.dataFrom = 'dataset' From bd2b587d47b3a17392246f2b691ef01859ae9ea7 Mon Sep 17 00:00:00 2001 From: Wangjiahao <1522128093@qq.com> Date: Tue, 23 May 2023 20:29:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BD=8D=E7=BD=AE=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E4=B8=8E=E7=9B=AE=E6=A0=87=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/store/copy.js | 4 ++-- frontend/src/components/canvas/utils/style.js | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/canvas/store/copy.js b/frontend/src/components/canvas/store/copy.js index 08c8bef204..bdeadc74bf 100644 --- a/frontend/src/components/canvas/store/copy.js +++ b/frontend/src/components/canvas/store/copy.js @@ -150,13 +150,13 @@ export default { } }) chartBatchCopy({ 'sourceAndTargetIds': sourceAndTargetIds }, state.panel.panelInfo.id).then((rsp) => { - needAdaptor && adaptCurThemeCommonStyle(newCop) + needAdaptor && adaptCurThemeCommonStyle(newCop,'copy') store.commit('addComponent', { component: newCop }) }) } else { const newCop = deepCopy(data) newCop.id = uuid.v1() - needAdaptor && adaptCurThemeCommonStyle(newCop) + needAdaptor && adaptCurThemeCommonStyle(newCop,'copy') store.commit('addComponent', { component: newCop }) } if (state.isCut) { diff --git a/frontend/src/components/canvas/utils/style.js b/frontend/src/components/canvas/utils/style.js index 84d3f7c5b4..1d1ac320e8 100644 --- a/frontend/src/components/canvas/utils/style.js +++ b/frontend/src/components/canvas/utils/style.js @@ -375,7 +375,7 @@ export function adaptCurTheme(customStyle, customAttr, chartType) { } } -export function adaptCurThemeCommonStyle(component) { +export function adaptCurThemeCommonStyle(component,adaptFrom = 'them') { const commonStyle = store.state.canvasStyleData.chartInfo.chartCommonStyle for (const key in commonStyle) { Vue.set(component.commonBackground, key, commonStyle[key]) @@ -383,8 +383,10 @@ export function adaptCurThemeCommonStyle(component) { if (isFilterComponent(component.component)) { const filterStyle = store.state.canvasStyleData.chartInfo.filterStyle for (const styleKey in filterStyle) { - // 位置属性不修改 - if (styleKey !== 'horizontal' && styleKey !== 'vertical') { + if(adaptFrom === 'copy'){ + Vue.set(component.style, styleKey, filterStyle[styleKey]) + }else if (adaptFrom === 'them' && styleKey !== 'horizontal' && styleKey !== 'vertical') { + // 主题变化位置属性不修改 Vue.set(component.style, styleKey, filterStyle[styleKey]) } } From c4addac4aa987539e76f92e0e9e33fdfa88d9d17 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Wed, 24 May 2023 10:51:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE-=E8=A1=A8=E6=A0=BC):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC=E5=BA=8F=E5=8F=B7?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E6=A0=B7=E5=BC=8F=E6=97=A0=E6=B3=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.tapd.cn/55578866/bugtrace/bugs/view/1155578866001026324 --- frontend/src/views/chart/chart/common/common_table.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/frontend/src/views/chart/chart/common/common_table.js b/frontend/src/views/chart/chart/common/common_table.js index 5d50469234..8dc87a9345 100644 --- a/frontend/src/views/chart/chart/common/common_table.js +++ b/frontend/src/views/chart/chart/common/common_table.js @@ -62,6 +62,11 @@ export function getCustomTheme(chart) { fill: DEFAULT_COLOR_CASE.tableHeaderFontColor, fontSize: DEFAULT_SIZE.tableTitleFontSize, textAlign: headerAlign + }, + seriesText: { + fill: DEFAULT_COLOR_CASE.tableItemBgColor, + fontSize: DEFAULT_SIZE.tableItemFontSize, + textAlign: itemAlign } }, colCell: { @@ -140,6 +145,7 @@ export function getCustomTheme(chart) { theme.rowCell.bolderText.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor theme.rowCell.text.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor theme.rowCell.measureText.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor + theme.rowCell.seriesText.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor } else { theme.rowCell.cell.backgroundColor = i_c // 这个参数其实只对开启序号列的行头生效 theme.rowCell.cell.horizontalBorderColor = i_c @@ -147,6 +153,7 @@ export function getCustomTheme(chart) { theme.rowCell.bolderText.fill = c.tableFontColor theme.rowCell.text.fill = c.tableFontColor theme.rowCell.measureText.fill = c.tableFontColor + theme.rowCell.seriesText.fill = c.tableFontColor } theme.colCell.cell.backgroundColor = h_c @@ -187,6 +194,8 @@ export function getCustomTheme(chart) { theme.rowCell.text.textAlign = h_a theme.rowCell.measureText.fontSize = parseInt(s.tableTitleFontSize) theme.rowCell.measureText.textAlign = h_a + theme.rowCell.seriesText.fontSize = parseInt(s.tableTitleFontSize) + theme.rowCell.seriesText.textAlign = h_a } else { // 序号列的数字单元格内容样式使用指标的内容样式而不是表头的内容样式 theme.rowCell.bolderText.fontSize = parseInt(s.tableItemFontSize) @@ -195,6 +204,8 @@ export function getCustomTheme(chart) { theme.rowCell.text.textAlign = i_a theme.rowCell.measureText.fontSize = parseInt(s.tableItemFontSize) theme.rowCell.measureText.textAlign = i_a + theme.rowCell.seriesText.fontSize = parseInt(s.tableItemFontSize) + theme.rowCell.seriesText.textAlign = i_a } theme.rowCell.seriesNumberWidth = parseInt(s.tableColumnWidth) From c08ad76bafb4145fa378213e15d0eda5da58744b Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 24 May 2023 12:35:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E6=89=A7=E8=A1=8C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/DataSetTableTaskLogService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java index 6b6fe46f60..a0d2a66584 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java @@ -156,6 +156,12 @@ public class DataSetTableTaskLogService { entity2.setOperator("eq"); entity2.setValue("1"); conditionEntities.add(entity2); + conditionEntities = conditionEntities.stream().map(conditionEntity -> { + if(conditionEntity.getField().equals("dataset_table_task.last_exec_status")){ + conditionEntity.setField("dataset_table_task_log.status"); + } + return conditionEntity; + }).collect(Collectors.toList()); request.setConditions(conditionEntities); GridExample gridExample = request.convertExample();