From fa359cbda0d46b8e2f2d43f779a0dced41ad761f Mon Sep 17 00:00:00 2001
From: zolay <34293221+sjlei@users.noreply.github.com>
Date: Tue, 4 Oct 2022 22:51:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=96=B5=E5=96=B5=E5=B8=AE?=
 =?UTF-8?q?=E5=8A=A9=E8=AE=BE=E7=BD=AE`theme`=E4=B8=8D=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=20(#204)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/help/theme.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/help/theme.js b/apps/help/theme.js
index 9234e03b..df095526 100644
--- a/apps/help/theme.js
+++ b/apps/help/theme.js
@@ -33,7 +33,7 @@ let Theme = {
     }
   },
   async getThemeData (diyStyle, sysStyle) {
-    let helpConfig = lodash.extend({}, diyStyle, sysStyle)
+    let helpConfig = lodash.extend({}, sysStyle, diyStyle)
     let colCount = Math.min(5, Math.max(parseInt(helpConfig?.colCount) || 3, 2))
     let colWidth = Math.min(500, Math.max(100, parseInt(helpConfig?.colWidth) || 265))
     let width = Math.min(2500, Math.max(800, colCount * colWidth + 30))