Browse Source

Merge pull request #303 from jerry-f/dev

fix: jfrefreshgrid 函数第二个参数应该是个数组
master
mengshukeji 5 years ago
committed by GitHub
parent
commit
d68ac01961
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 19
      src/global/api.js

19
src/global/api.js

@ -348,12 +348,9 @@ export function setCellFormat(row, column, attr, value, options = {}) {
} else { } else {
cellData[attr] = value; cellData[attr] = value;
} }
// refresh // refresh
jfrefreshgrid(targetSheetData, { jfrefreshgrid(data, [{ "row": [row, row], "column": [column, column] }]);
row: [row],
column: [column]
})
if (success && typeof success === 'function') { if (success && typeof success === 'function') {
success(cellData); success(cellData);
@ -1480,7 +1477,7 @@ export function getRangeAxis() {
let result = []; let result = [];
let rangeArr = Store.luckysheet_select_save; let rangeArr = Store.luckysheet_select_save;
let sheetIndex = Store.currentSheetIndex; let sheetIndex = Store.currentSheetIndex;
rangeArr.forEach(ele=>{ rangeArr.forEach(ele=>{
let axisText = getRangetxt(sheetIndex, {column:ele.column,row:ele.row}); let axisText = getRangetxt(sheetIndex, {column:ele.column,row:ele.row});
result.push(axisText); result.push(axisText);
@ -5424,7 +5421,7 @@ export function getAllSheets() {
delete item.load; delete item.load;
delete item.freezen; delete item.freezen;
}) })
return data; return data;
@ -5926,12 +5923,12 @@ export function toJson(){
* @param {String} txt 范围字符串 * @param {String} txt 范围字符串
*/ */
export function getRangeByTxt(txt){ export function getRangeByTxt(txt){
// 默认取当前第一个范围 // 默认取当前第一个范围
if(txt == null){ if(txt == null){
return { return {
column:Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1].column, column:Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1].column,
row:Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1].row row:Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1].row
} }
} }
@ -5949,7 +5946,7 @@ export function getRangeByTxt(txt){
* @param {Object | Array} range 范围数组 * @param {Object | Array} range 范围数组
*/ */
export function getTxtByRange(range=Store.luckysheet_select_save){ export function getTxtByRange(range=Store.luckysheet_select_save){
// 单个范围 // 单个范围
if(getObjType(range) === 'object'){ if(getObjType(range) === 'object'){
range = [range]; range = [range];

Loading…
Cancel
Save