Merge branch 'dev' into v1.18

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();

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) {

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])
       }
     }

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)
 

frontend/src/views/chart/view/ChartEdit.vue

@@ -2953,7 +2953,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'