From 2f8e8c7afb1682515c2468152013d43116fa22ae Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Sat, 8 Oct 2022 11:19:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E8=A7=86=E5=9B=BE=E6=98=8E=E7=BB=86=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E4=B8=BAxlsx=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/panel/PanelGroupService.java     | 2 +-
 .../src/components/canvas/custom-component/UserViewDialog.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index c5b4ee8b67..f8893feacb 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/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();
diff --git a/frontend/src/components/canvas/custom-component/UserViewDialog.vue b/frontend/src/components/canvas/custom-component/UserViewDialog.vue
index 7cd0701bb3..e8026fb260 100644
--- a/frontend/src/components/canvas/custom-component/UserViewDialog.vue
+++ b/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)

From fb6309d85a99f184b1cc4b2bbd831a7c32d30d56 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Sat, 8 Oct 2022 11:46:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF-=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8C=89=E9=92=AE):=20=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B7=9F=E9=9A=8F=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/widget/DeWidget/DeButton.vue   | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/widget/DeWidget/DeButton.vue b/frontend/src/components/widget/DeWidget/DeButton.vue
index 055b9a0fcf..0eb1680d25 100644
--- a/frontend/src/components/widget/DeWidget/DeButton.vue
+++ b/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>