Browse Source

fix(bug): getRangeJson

fix getRangeJson
master
mengshukeji 5 years ago
parent
commit
b2027b84b9
  1. 2
      docs/guide/api.md
  2. 2
      docs/zh/guide/README.md
  3. 2
      docs/zh/guide/api.md
  4. 15
      src/global/api.js

2
docs/guide/api.md

@ -1220,7 +1220,7 @@ Use note:
} }
] ]
] ]
luckysheet.setRangeValue(data) luckysheet.setRangeValue(data,{range:"A1:B2"})
``` ```
------------ ------------

2
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/)
## 特性 ## 特性

2
docs/zh/guide/api.md

@ -1201,7 +1201,7 @@ Luckysheet针对常用的数据操作需求,开放了主要功能的API,开
} }
] ]
] ]
luckysheet.setRangeValue(data) luckysheet.setRangeValue(data,{range:"A1:B2"})
``` ```
------------ ------------

15
src/global/api.js

@ -2186,7 +2186,7 @@ export function getRangeArray(dimensional, options = {}) {
* @param {Number} options.order 工作表索引默认值为当前工作表索引 * @param {Number} options.order 工作表索引默认值为当前工作表索引
*/ */
export function getRangeJson(isFirstRowTitle, options = {}) { export function getRangeJson(isFirstRowTitle, options = {}) {
let curRange = Store.luckysheet_select_save; let curRange = Store.luckysheet_select_save[0];
let curSheetOrder = getSheetIndex(Store.currentSheetIndex); let curSheetOrder = getSheetIndex(Store.currentSheetIndex);
let { let {
range = curRange, range = curRange,
@ -2211,10 +2211,10 @@ export function getRangeJson(isFirstRowTitle, options = {}) {
//复制范围内包含部分合并单元格,提示 //复制范围内包含部分合并单元格,提示
if(config["merge"] != null) { if(config["merge"] != null) {
let has_PartMC = false; let has_PartMC = false;
let r1 = range[0].row[0], let r1 = range.row[0],
r2 = range[0].row[1], r2 = range.row[1],
c1 = range[0].column[0], c1 = range.column[0],
c2 = range[0].column[1]; c2 = range.column[1];
has_PartMC = hasPartMC(config, r1, r2, c1, c2); has_PartMC = hasPartMC(config, r1, r2, c1, c2);
if(has_PartMC){ if(has_PartMC){
@ -2252,7 +2252,7 @@ export function getRangeJson(isFirstRowTitle, options = {}) {
} }
} }
} else { } else {
let st = range[0]["column"][0]; let st = range["column"][0];
for (let r = 0; r < getdata.length; r++) { for (let r = 0; r < getdata.length; r++) {
let obj = {}; let obj = {};
for (let c = 0; c < getdata[0].length; c++) { for (let c = 0; c < getdata[0].length; c++) {
@ -2261,7 +2261,8 @@ export function getRangeJson(isFirstRowTitle, options = {}) {
arr.push(obj); arr.push(obj);
} }
} }
selection.copybyformat(new Event(), JSON.stringify(arr)); // selection.copybyformat(new Event('click'), JSON.stringify(arr));
return arr;
} }
/** /**

Loading…
Cancel
Save