diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue index f594b57..0da8ea9 100644 --- a/src/components/FusionSettings/GridSettings.vue +++ b/src/components/FusionSettings/GridSettings.vue @@ -166,8 +166,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 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" };