From dfb3c82dcd72a115b6cf95d77ef79ed247567ece Mon Sep 17 00:00:00 2001 From: Crimson Date: Wed, 19 Jun 2024 20:14:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E5=86=85=E7=BB=93=E6=9E=9C=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E4=BC=9A=E5=BE=AA=E7=8E=AF=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=88=B0=E8=AF=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- default.aproj | 2 +- main.aardio | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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; }