fix #1 默认情况下,带英文冒号的字串搜索不到
This commit is contained in:
parent
2e416232b1
commit
5fe1352ed6
|
@ -130,7 +130,7 @@ class TeMenu{
|
||||||
[9] = {
|
[9] = {
|
||||||
tips = "txt 导出 Sqlite3";
|
tips = "txt 导出 Sqlite3";
|
||||||
text = '\uE612';
|
text = '\uE612';
|
||||||
font = LOGFONT(h=this.ico_size;name='iconfont');
|
font = LOGFONT(h=this.ico_size+5;name='iconfont');
|
||||||
style = {
|
style = {
|
||||||
background={};
|
background={};
|
||||||
foreground={};
|
foreground={};
|
||||||
|
@ -144,7 +144,7 @@ class TeMenu{
|
||||||
[10] = {
|
[10] = {
|
||||||
tips = "Sqlite3 导出 txt";
|
tips = "Sqlite3 导出 txt";
|
||||||
text = '\uE612';
|
text = '\uE612';
|
||||||
font = LOGFONT(h=this.ico_size;name='iconfont');
|
font = LOGFONT(h=this.ico_size+5;name='iconfont');
|
||||||
style = {
|
style = {
|
||||||
background={};
|
background={};
|
||||||
foreground={};
|
foreground={};
|
||||||
|
|
20
main.aardio
20
main.aardio
|
@ -10,11 +10,11 @@ import flexcell;
|
||||||
import teUtils;
|
import teUtils;
|
||||||
import teMenu;
|
import teMenu;
|
||||||
/*DSG{{*/
|
/*DSG{{*/
|
||||||
var mainForm = win.form(text="TabEditor++";right=1399;bottom=799;bgcolor=16777215)
|
var mainForm = win.form(text="TabEditor++";right=1399;bottom=799;bgcolor=16777215;)
|
||||||
mainForm.add(
|
mainForm.add(
|
||||||
custom={cls="custom";text="自定义控件";left=5;top=36;right=1395;bottom=772;ah=1;aw=1;bgcolor=12639424;db=1;dl=1;dr=1;dt=1;z=2};
|
custom={cls="custom";text="自定义控件";left=0;top=36;right=1400;bottom=800;ah=1;aw=1;bgcolor=12639424;db=1;dl=1;dr=1;dt=1;z=2;};
|
||||||
plus={cls="plus";left=5;top=0;right=1395;bottom=36;bgcolor=16777215;border={left=1;top=1;right=1;color=-6250332};clipBk=false;clipch=1;dl=1;dr=1;dt=1;font=LOGFONT(h=-18);forecolor=16777215;notify=1;repeat="stretch";z=1};
|
plus={cls="plus";left=0;top=0;right=1400;bottom=36;bgcolor=16777215;border={left=1;top=1;right=1;color=-6250332;};clipBk=false;clipch=1;dl=1;dr=1;dt=1;font=LOGFONT(h=-18);forecolor=16777215;notify=1;repeat="stretch";z=1;};
|
||||||
plusBottom={cls="plus";left=5;top=772;right=1395;bottom=800;align="left";textPadding={left=10;right=10};z=3}
|
|
||||||
)
|
)
|
||||||
/*}}*/
|
/*}}*/
|
||||||
|
|
||||||
|
@ -260,7 +260,7 @@ g_teMenus.exportTxt = function(ctrl){
|
||||||
//menu-关于
|
//menu-关于
|
||||||
g_teMenus.showAbout = function(ctrl){
|
g_teMenus.showAbout = function(ctrl){
|
||||||
return function(){
|
return function(){
|
||||||
//mainForm.g_flexcell.AboutBox();
|
mainForm.g_flexcell.AboutBox();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -406,6 +406,9 @@ searchNextContent = function(data, firstRow, firstCol, lastRow, lastCol, isRange
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
var currStr = v[v2];
|
var currStr = v[v2];
|
||||||
|
if(#currStr == 0 and #searchContent != 0){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if(!isCaseSensitive){
|
if(!isCaseSensitive){
|
||||||
currStr = string.lower(currStr);
|
currStr = string.lower(currStr);
|
||||||
searchContent = string.lower(searchContent);
|
searchContent = string.lower(searchContent);
|
||||||
|
@ -419,7 +422,7 @@ searchNextContent = function(data, firstRow, firstCol, lastRow, lastCol, isRange
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if(string.find(currStr, searchContent)){
|
if(string.find(currStr, searchContent) or currStr == searchContent){
|
||||||
research_flag = true;
|
research_flag = true;
|
||||||
pre_searched_row = i;
|
pre_searched_row = i;
|
||||||
pre_searched_col = i2;
|
pre_searched_col = i2;
|
||||||
|
@ -453,6 +456,9 @@ searchNextContent = function(data, firstRow, firstCol, lastRow, lastCol, isRange
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
var currStr = v[v2];
|
var currStr = v[v2];
|
||||||
|
if(#currStr == 0 and #searchContent != 0){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if(!isCaseSensitive){
|
if(!isCaseSensitive){
|
||||||
currStr = string.lower(currStr);
|
currStr = string.lower(currStr);
|
||||||
searchContent = string.lower(searchContent);
|
searchContent = string.lower(searchContent);
|
||||||
|
@ -464,7 +470,7 @@ searchNextContent = function(data, firstRow, firstCol, lastRow, lastCol, isRange
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if(string.find(currStr, searchContent)){
|
if(string.find(currStr, searchContent) or currStr == searchContent){
|
||||||
research_flag = true;
|
research_flag = true;
|
||||||
return i, i2;
|
return i, i2;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user