From 6e04641016f52b3ac2640c1f61ad3f007a17c09a Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cxte.com.cn>
Date: Thu, 2 Feb 2023 18:53:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/GridSettings.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index a6fed78..5fe5153 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -136,8 +136,8 @@ export default defineComponent({
     }
     const use_server_config = () => {
       let server_conf = JSON.parse($store.state.fusion_configuration).options
-      model[0] = Number(server_conf.blending_grids_row)
-      model[1] = Number(server_conf.blending_grids_column)
+      model[0] = server_conf.blending_grids_row ? Number(server_conf.blending_grids_row) : 20;
+      model[1] = server_conf.blending_grids_column ? Number(server_conf.blending_grids_column) : 40;
       color[0] = server_conf.blending_grids_line_color
 
       RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true

From e388f61a9ce1aa2d2132f4a46c623eecf32a98ae Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cxte.com.cn>
Date: Thu, 2 Feb 2023 19:10:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en-US/index.ts | 2 +-
 src/i18n/zh-CN/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index e097f76..59a8084 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -444,6 +444,6 @@ export default {
   "debugging":"debugging",
   "disable_blending":"disable blending",
   "disable_clip":"disable clip",
-  "show_mask":"show desktop",
+  "show_mask":"hide desktop",
   "save_bmp":"save bmp"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index a916e4d..49d81a1 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -713,6 +713,6 @@ export default {
   "debugging":"调试",
   "disable_blending":"禁用混合",
   "disable_clip":"禁用裁剪",
-  "show_mask":"显示桌面",
+  "show_mask":"隐藏桌面",
   "save_bmp":"保存BMP"
 };