Merge branch 'dev' into pr@dev_eslint_auto_fix

backend/src/main/java/io/dataease/commons/utils/ExcelUtils.java

@@ -68,6 +68,9 @@ public class ExcelUtils {
         if (StringUtils.isNotBlank(folderId)) {
             folderPath = BASE_ROOT + folderId + "/";
         }
+
+        folderPath += Thread.currentThread().getId() + "/";
+
         if (!FileUtil.exist(folderPath)) {
             FileUtil.mkdir(folderPath);
         }

backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java

@@ -64,7 +64,10 @@ public class ViewExportExcel {
         Map map = gson.fromJson(panelStyle, Map.class);
         Map panelMap = (LinkedTreeMap) map.get("panel");
         double resultCount = Double.parseDouble(panelMap.get("resultCount").toString());
-        String resultMode = panelMap.get("resultMode").toString();
+        String resultMode = null;
+        if (ObjectUtils.isNotEmpty(panelMap.get("resultMode"))) {
+            resultMode = panelMap.get("resultMode").toString();
+        }
 
         Map<String, ChartExtRequest> result = new HashMap<>();
         Map<String, List<ChartExtFilterRequest>> panelFilters = justView ? FilterBuildTemplate.buildFilters(components) : FilterBuildTemplate.buildEmpty(components);

frontend/src/components/canvas/utils/style.js

@@ -361,7 +361,7 @@ export function adaptCurTheme(customStyle, customAttr, chartType) {
     }
   }
   customAttr['color'] = { ...canvasStyle.chartInfo.chartColor }
-  customStyle['text'] = { ...canvasStyle.chartInfo.chartTitle, title: customStyle['text']['title'], show: customStyle['text']['show'] }
+  customStyle['text'] = { ...canvasStyle.chartInfo.chartTitle, title: customStyle['text']['title'], show: customStyle['text']['show'], remarkShow: customStyle['text']['remarkShow'], remark: customStyle['text']['remark'] }
   if (customStyle.background) {
     delete customStyle.background
   }

frontend/src/views/chart/chart/chart.js

@@ -211,7 +211,7 @@ export const DEFAULT_TITLE_STYLE_DARK = {
   isBolder: true,
   remarkShow: false,
   remark: '',
-  remarkBackgroundColor: '#ffffffff',
+  remarkBackgroundColor: '#5A5C62',
   fontFamily: 'Microsoft YaHei',
   letterSpace: '0',
   fontShadow: false

frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue

@@ -194,6 +194,7 @@
     >
       <remark-editor
         :remark="titleForm.remark"
+        :background="titleForm.remarkBackgroundColor"
         @onRemarkChange="onRemarkChange"
       />
       <div

frontend/src/views/chart/components/component-style/dialog/RemarkEditor.vue

@@ -1,15 +1,13 @@
 <template>
   <div
     style="max-height: 50vh;overflow-y: auto;"
-    :style="customStyle"
+    :style="commonStyle"
   >
-    <div :style="commonStyle">
-      <Editor
-        v-model="content"
-        style="width: 100%;height: 100%"
-        :init="init"
-      />
-    </div>
+    <Editor
+      v-model="content"
+      style="width: 100%;height: 100%"
+      :init="init"
+    />
   </div>
 </template>
 
@@ -30,6 +28,10 @@ export default {
       type: String,
       required: true
     },
+    background: {
+      type: String,
+      required: false
+    },
     showTable: {
       type: Boolean,
       default: true
@@ -92,14 +94,9 @@ export default {
       return style
     },
     commonStyle() {
-      const style = {
-        width: '100%',
-        height: '100%'
+      return {
+        background: this.background
       }
-      if (this.curComponent.commonBackground && this.curComponent.commonBackground.backgroundColorSelect) {
-        style['background-color'] = hexColorToRGBA(this.curComponent.commonBackground.color, this.curComponent.commonBackground.alpha)
-      }
-      return style
     },
     ...
     mapState([

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

@@ -39,6 +39,7 @@ export default {
   max-height: 200px;
   overflow-y: auto;
   padding: 10px;
+  color: #000000;
   border-radius: 4px;
 }
 ::-webkit-scrollbar {