From b2027b84b9eed72f5d30d08a041334ab31ff305c Mon Sep 17 00:00:00 2001 From: mengshukeji Date: Fri, 18 Dec 2020 13:58:38 +0800 Subject: [PATCH 1/3] fix(bug): getRangeJson fix getRangeJson --- docs/guide/api.md | 2 +- docs/zh/guide/README.md | 2 +- docs/zh/guide/api.md | 2 +- src/global/api.js | 15 ++++++++------- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/docs/guide/api.md b/docs/guide/api.md index 334b137..5793a08 100644 --- a/docs/guide/api.md +++ b/docs/guide/api.md @@ -1220,7 +1220,7 @@ Use note: } ] ] - luckysheet.setRangeValue(data) + luckysheet.setRangeValue(data,{range:"A1:B2"}) ``` ------------ diff --git a/docs/zh/guide/README.md b/docs/zh/guide/README.md index ecc49a2..2996a7b 100644 --- a/docs/zh/guide/README.md +++ b/docs/zh/guide/README.md @@ -10,7 +10,7 @@ Luckysheet ，一款纯前端类似excel的在线表格，功能强大、配置 ## 在线案例 -- [协同编辑Demo](http://luckysheet.lashuju.com/demo/)（注意：官方Java后台待整理后也会开源，采用OT算法。请大家别操作频繁，防止搞崩服务器） +- [协同编辑Demo](http://luckysheet.lashuju.com/demo/) ## 特性 diff --git a/docs/zh/guide/api.md b/docs/zh/guide/api.md index 2b3796e..54377e0 100644 --- a/docs/zh/guide/api.md +++ b/docs/zh/guide/api.md @@ -1201,7 +1201,7 @@ Luckysheet针对常用的数据操作需求，开放了主要功能的API，开 } ] ] - luckysheet.setRangeValue(data) + luckysheet.setRangeValue(data,{range:"A1:B2"}) ``` ------------ diff --git a/src/global/api.js b/src/global/api.js index cd466e7..2f5fd52 100644 --- a/src/global/api.js +++ b/src/global/api.js @@ -2186,7 +2186,7 @@ export function getRangeArray(dimensional, options = {}) { * @param {Number} options.order 工作表索引；默认值为当前工作表索引 */ export function getRangeJson(isFirstRowTitle, options = {}) { - let curRange = Store.luckysheet_select_save; + let curRange = Store.luckysheet_select_save[0]; let curSheetOrder = getSheetIndex(Store.currentSheetIndex); let { range = curRange, @@ -2211,10 +2211,10 @@ export function getRangeJson(isFirstRowTitle, options = {}) { //复制范围内包含部分合并单元格，提示 if(config["merge"] != null) { let has_PartMC = false; - let r1 = range[0].row[0], - r2 = range[0].row[1], - c1 = range[0].column[0], - c2 = range[0].column[1]; + let r1 = range.row[0], + r2 = range.row[1], + c1 = range.column[0], + c2 = range.column[1]; has_PartMC = hasPartMC(config, r1, r2, c1, c2); if(has_PartMC){ @@ -2252,7 +2252,7 @@ export function getRangeJson(isFirstRowTitle, options = {}) { } } } else { - let st = range[0]["column"][0]; + let st = range["column"][0]; for (let r = 0; r < getdata.length; r++) { let obj = {}; for (let c = 0; c < getdata[0].length; c++) { @@ -2261,7 +2261,8 @@ export function getRangeJson(isFirstRowTitle, options = {}) { arr.push(obj); } } - selection.copybyformat(new Event(), JSON.stringify(arr)); + // selection.copybyformat(new Event('click'), JSON.stringify(arr)); + return arr; } /** From 1580ad57633773760add3af884850a73c0a4d346 Mon Sep 17 00:00:00 2001 From: dushusir <1414556676@qq.com> Date: Fri, 18 Dec 2020 15:13:09 +0800 Subject: [PATCH 2/3] fix(sheetactive): sheetActive bug sheetActive hook function --- src/controllers/sheetmanage.js | 5 ++--- src/index.html | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js index d02a790..ec4536c 100644 --- a/src/controllers/sheetmanage.js +++ b/src/controllers/sheetmanage.js @@ -1135,7 +1135,8 @@ const sheetmanage = { server.multipleIndex = 0; } - + // 钩子函数 + method.createHookFunction('sheetActivate', index, isPivotInitial, isNewSheet); $('#luckysheet-filter-selected-sheet' + Store.currentSheetIndex + ', #luckysheet-filter-options-sheet' + Store.currentSheetIndex).hide(); $('#luckysheet-filter-selected-sheet' + index + ', #luckysheet-filter-options-sheet' + index).show(); @@ -1454,8 +1455,6 @@ const sheetmanage = { return null; }, changeSheetExec: function(index, isPivotInitial, isNewSheet) { - // 钩子函数 - method.createHookFunction('sheetActivate', index, isPivotInitial, isNewSheet); let $sheet = $("#luckysheet-sheets-item" + index); diff --git a/src/index.html b/src/index.html index 5aa0287..d463da7 100644 --- a/src/index.html +++ b/src/index.html @@ -136,7 +136,7 @@ // console.info('cellUpdated',r,c,oldValue, newValue, isRefresh) }, sheetActivate:function(index, isPivotInitial, isNewSheet){ - console.info('sheetActive-----',index, isPivotInitial, isNewSheet) + // console.info(index, isPivotInitial, isNewSheet) }, rangeSelect:function(index, sheet){ // console.info(index, sheet) From 4c012bc43f01da097e0e580147b61a8df94f3083 Mon Sep 17 00:00:00 2001 From: dushusir <1414556676@qq.com> Date: Fri, 18 Dec 2020 15:13:35 +0800 Subject: [PATCH 3/3] 2.1.11 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aeb6827..5f0cdbe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "luckysheet", - "version": "2.1.10", + "version": "2.1.11", "main": "dist/luckysheet.cjs.js", "module": "dist/luckysheet.esm.js", "browser": "dist/luckysheet.umd.js",