diff --git a/default.aproj b/default.aproj index 9142e6c..b052f0f 100644 --- a/default.aproj +++ b/default.aproj @@ -1,5 +1,5 @@  - + diff --git a/main.aardio b/main.aardio index 41f9174..eff4414 100644 --- a/main.aardio +++ b/main.aardio @@ -336,6 +336,7 @@ mainForm.popmenuRight.add('向右插入一列',function(id){ mainForm.popmenuRight.add('删除列',function(id){ var curSelection = mainForm.g_flexcell.selection(); //TODO + mainForm.msgbox("暂无删除列功能--TODO"); curSelection.release(); mainForm.release(); } ) @@ -386,8 +387,8 @@ var accelerator = win.ui.accelerator({ research_flag = true; searchNextContent = function(data, firstRow, firstCol, lastRow, lastCol, isRangeSearch, selFirstRow, selFirstCol, searchContent, isCellMatching){ + console.dump(firstRow, firstCol, lastRow, lastCol, isRangeSearch, selFirstRow, selFirstCol, searchContent); if(isRangeSearch){// 从一个范围开始搜索 - //console.dump("从一个范围开始搜索"); var tempRow = firstRow; var tempCol = firstCol; firstRow = pre_searched_row != null and research_flag ? pre_searched_row : firstRow; @@ -427,6 +428,8 @@ searchNextContent = function(data, firstRow, firstCol, lastRow, lastCol, isRange // 搜不到了,重头搜索 if(research_flag){ research_flag = false; + pre_searched_row = null; + pre_searched_col = null; row, col = searchNextContent(data, selFirstRow, selFirstCol, lastRow, lastCol, isRangeSearch, selFirstRow, selFirstCol, searchContent, isCellMatching); return row, col; }