From 3eb11f8e4dc76a74ddb5a29dbe171f53ea821b08 Mon Sep 17 00:00:00 2001 From: flowerField Date: Thu, 4 Feb 2021 14:26:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8D=8F=E4=BD=9C=E9=97=AE?= =?UTF-8?q?=E9=A2=98(=E9=85=8D=E7=BD=AE=E7=AD=89)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/server.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/controllers/server.js b/src/controllers/server.js index 813fc50..5eb9fbe 100644 --- a/src/controllers/server.js +++ b/src/controllers/server.js @@ -427,9 +427,21 @@ const server = { file["config"][k] = {}; } - for(let key in value){ - file["config"][k][key] = value[key]; - } + // for(let key in value){ + // file["config"][k][key] = value[key]; + // } + + // ⚠️ 上面的处理方式会导致部分配置项被遗漏，以致协同编辑的时候多视图出现不一致的情况，调整处理的策略为直接替换配置项： + // 可能的配置项为： + // columnlen: {0: 65, 1: 186, 2: 52} + // customHeight: {0: 1, 5: 1, 6: 1} + // customWidth: {0: 1, 1: 1, 2: 1} + // merge: {2_1: {…}, 4_2: {…}, 6_2: {…}} + // rowlen: {0: 19, 5: 93, 6: 117} + if(value && (typeof value == "object")){ + file["config"][k] = value; + } + } if(index == Store.currentSheetIndex){//更新数据为当前表格数据