rtgit/RTFormwork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.100.72.85:3000/rtgit/RTFormwork

Browse Source
This commit is contained in:
sgwp 2024-07-22 15:33:11 +08:00
commit 2d5d69eb25
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public10/ThreeFun/Fun/U_RTFun.pas
View File

@ -1738,6 +1738,14 @@ begin
Result := Result + 'and ' + Controls[i].Name + '=' + quotedStr(Trim(TComboBox(Controls[i]).Text)) Result := Result + 'and ' + Controls[i].Name + '=' + quotedStr(Trim(TComboBox(Controls[i]).Text))
else if Controls[i].Tag = LikeTag then else if Controls[i].Tag = LikeTag then
Result := Result + 'and ' + Controls[i].Name + ' like ' + quotedStr('%' + Trim(TComboBox(Controls[i]).Text) + '%'); Result := Result + 'and ' + Controls[i].Name + ' like ' + quotedStr('%' + Trim(TComboBox(Controls[i]).Text) + '%');
end
else if Controls[i] is TcxComboBox then
begin
if Trim(TcxComboBox(Controls[i]).Text) <> '' then
if Controls[i].Tag = EquTag then
Result := Result + 'and ' + Controls[i].Name + '=' + quotedStr(Trim(TcxComboBox(Controls[i]).Text))
else if Controls[i].Tag = LikeTag then
Result := Result + 'and ' + Controls[i].Name + ' like ' + quotedStr('%' + Trim(TcxComboBox(Controls[i]).Text) + '%');
end; end;
end; end;
end; end;
@ -2545,7 +2553,7 @@ begin
finally finally
mADOTmp.close; mADOTmp.close;
mADOTmp.Free; mADOTmp.Free;
cxGrid.EndUpdate() ; cxGrid.EndUpdate();
end; end;
end; end;
@ -2571,7 +2579,7 @@ begin
mGridName := cxGrid.GetParentComponent.Name + '.' + cxGrid.name; mGridName := cxGrid.GetParentComponent.Name + '.' + cxGrid.name;
try try
cxGrid.BeginUpdate(); cxGrid.BeginUpdate();
mADOTmp := TADOQuery.Create(nil); mADOTmp := TADOQuery.Create(nil);
mADOTmp.ConnectionString := DConString; mADOTmp.ConnectionString := DConString;
///////////////////////////////////////// /////////////////////////////////////////
@ -2654,7 +2662,7 @@ begin
finally finally
mADOTmp.close; mADOTmp.close;
mADOTmp.Free; mADOTmp.Free;
cxGrid.EndUpdate ; cxGrid.EndUpdate;
end; end;
end; end;