Merge branch 'dev' into pr@dev_dataset_bugfix

backend/src/main/java/io/dataease/service/panel/PanelGroupService.java

@@ -664,7 +664,7 @@ public class PanelGroupService {
             }
             response.setContentType("application/vnd.ms-excel");
             //文件名称
-            response.setHeader("Content-disposition", "attachment;filename=" + request.getViewName() + ".xls");
+            response.setHeader("Content-disposition", "attachment;filename=" + request.getViewName() + ".xlsx");
             wb.write(outputStream);
             outputStream.flush();
             outputStream.close();

frontend/src/components/canvas/custom-component/UserViewDialog.vue

@@ -61,7 +61,7 @@ export default {
       type: String,
       default: 'details'
     }
-    
+
   },
   data() {
     return {
@@ -231,7 +231,7 @@ export default {
         const link = document.createElement('a')
         link.style.display = 'none'
         link.href = URL.createObjectURL(blob)
-        link.download = excelName + '.xls' // 下载的文件名
+        link.download = excelName + '.xlsx' // 下载的文件名
         document.body.appendChild(link)
         link.click()
         document.body.removeChild(link)

frontend/src/components/widget/DeWidget/DeButton.vue

@@ -6,7 +6,7 @@
     :round="element.options.attrs.round"
     :plain="element.options.attrs.plain"
     :size="size"
-    class="de-search-button"
+    :class="'de-search-button' + (useDarkClass ? ' dark-search-button' : '')"
     @click="triggerSearch"
   >
     {{ element.options.value }}
@@ -15,6 +15,7 @@
 
 <script>
 import bus from '@/utils/bus'
+import { mapState } from 'vuex'
 export default {
 
   props: {
@@ -28,12 +29,28 @@ export default {
     },
     size: String
   },
+
   data() {
     return {
       operator: 'eq',
       values: null
     }
   },
+  computed: {
+    useDarkClass() {
+      if (this.canvasStyleData.openCommonStyle && this.canvasStyleData.panel.backgroundType === 'color') {
+        const themeColor = this.canvasStyleData.panel.themeColor
+        if (themeColor !== 'light') {
+          return true
+        }
+      }
+      return false
+    },
+    ...mapState([
+      'canvasStyleData'
+    ])
+
+  },
   created() {
   },
   methods: {
@@ -49,4 +66,14 @@ export default {
   height: 100%;
   width: 100%;
 }
+.dark-search-button {
+  color: #21333B !important;
+  background-color: #2681FF !important;
+  border-color: #2681FF !important;
+  &:hover {
+    background: rgb(81, 154, 255) !important;
+    border-color: rgb(81, 154, 255) !important;
+    color: #21333B !important;
+  }
+}
 </style>