From: Peter T. <pe...@us...> - 2002-10-27 11:33:59
|
Update of /cvsroot/jvcl/jvcl/source In directory usw-pr-cvs1:/tmp/cvs-serv9913/source Modified Files: JvDBTreeView.pas Log Message: Mantis #353,#354 and #356 Index: JvDBTreeView.pas =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvDBTreeView.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvDBTreeView.pas 27 Aug 2002 19:56:42 -0000 1.1 --- JvDBTreeView.pas 27 Oct 2002 11:33:55 -0000 1.2 *************** *** 151,155 **** --- 151,160 ---- property DataLink: TJvDBTreeViewDataLink read FDataLink; property MasterField: string read FMasterField write SetMasterField; + // alias for MasterField + property ParentField:string read FMasterField write SetMasterField; property DetailField: string read FDetailField write SetDetailField; + // alias for DetailField + property KeyField: string read FDetailField write SetDetailField; + property ItemField: string read FItemField write SetItemField; property IconField: string read FIconField write SetIconField; *************** *** 438,443 **** procedure TCustomJvDBTreeView.SetMasterField(Value: String); begin ! if ValidField(Value, [ftSmallInt, ftInteger, ftWord, ftString]) then ! FMasterField := Value else Warning(SMasterFieldError); --- 443,451 ---- procedure TCustomJvDBTreeView.SetMasterField(Value: String); begin ! if ValidField(Value, [ftSmallInt, ftInteger, ftAutoInc, ftWord, ftString]) then ! begin ! FMasterField := Value; ! RefreshChild(nil); ! end else Warning(SMasterFieldError); *************** *** 446,451 **** procedure TCustomJvDBTreeView.SetDetailField(Value: String); begin ! if ValidField(Value, [ftSmallInt, ftInteger, ftWord, ftString]) then ! FDetailField := Value else Warning(SDetailFieldError); --- 454,462 ---- procedure TCustomJvDBTreeView.SetDetailField(Value: String); begin ! if ValidField(Value, [ftSmallInt, ftInteger, ftAutoInc, ftWord, ftString]) then ! begin ! FDetailField := Value; ! RefreshChild(nil); ! end else Warning(SDetailFieldError); *************** *** 454,459 **** procedure TCustomJvDBTreeView.SetItemField(Value: String); begin ! if ValidField(Value, [ftString, ftMemo, ftSmallInt, ftInteger, ftWord, ftBoolean, ftFloat, ftCurrency, ftDate, ftTime, ftDateTime]) then ! FItemField := Value else Warning(SItemFieldError); --- 465,473 ---- procedure TCustomJvDBTreeView.SetItemField(Value: String); begin ! if ValidField(Value, [ftString, ftMemo, ftSmallInt, ftInteger, ftAutoInc, ftWord, ftBoolean, ftFloat, ftCurrency, ftDate, ftTime, ftDateTime]) then ! begin ! FItemField := Value; ! RefreshChild(nil); ! end else Warning(SItemFieldError); *************** *** 462,467 **** procedure TCustomJvDBTreeView.SetIconField(Value: String); begin ! if ValidField(Value, [ftSmallInt, ftInteger, ftWord]) then ! FIconField := Value else Warning(SIconFieldError); --- 476,484 ---- procedure TCustomJvDBTreeView.SetIconField(Value: String); begin ! if ValidField(Value, [ftSmallInt, ftAutoInc, ftInteger, ftWord]) then ! begin ! FIconField := Value; ! RefreshChild(nil); ! end else Warning(SIconFieldError); *************** *** 742,746 **** Node := FindNode(V); if Node <> nil then begin ! {ðàñêðûòü âñå âåòêè îò íàéäåííîé äî íóæíîé} //.. Node.Expand(false); --- 759,763 ---- Node := FindNode(V); if Node <> nil then begin ! // {ðàñêðûòü âñå âåòêè îò íàéäåííîé äî íóæíîé} //.. Node.Expand(false); *************** *** 751,755 **** Result := FindNode(AMasterValue); end else begin ! {äîáàâèòü â ìàññèâ ðîäèòåëåé} inc(i); VarArrayRedim(Parents, i); --- 768,772 ---- Result := FindNode(AMasterValue); end else begin ! // {äîáàâèòü â ìàññèâ ðîäèòåëåé} inc(i); VarArrayRedim(Parents, i); *************** *** 768,772 **** Node, ParentNode : TJvDBTreeNode; begin ! {åñëè òåêóùàÿ çàïèñü îòñóòñòâóåò â äåðåâå, íî äîëæíà áûòü â íåì, òî äîáàâèòü} Node := FindNode(FDataLink.DataSet[FMasterField]); if (Node = nil) then begin --- 785,789 ---- Node, ParentNode : TJvDBTreeNode; begin ! // {åñëè òåêóùàÿ çàïèñü îòñóòñòâóåò â äåðåâå, íî äîëæíà áûòü â íåì, òî äîáàâèòü} Node := FindNode(FDataLink.DataSet[FMasterField]); if (Node = nil) then begin *************** *** 790,794 **** end; end; ! end; end; var --- 807,811 ---- end; end; ! end; end; var *************** *** 806,810 **** DisableControls; try ! {*** óäàëèòü èç äåðåâà óäàëåííûå çàïèñè} repeat AllChecked := true; --- 823,827 ---- DisableControls; try ! // {*** óäàëèòü èç äåðåâà óäàëåííûå çàïèñè} repeat AllChecked := true; *************** *** 818,822 **** until AllChecked; {###} ! {*** äîáàâèòü íîâûå} First; while not Eof do begin --- 835,839 ---- until AllChecked; {###} ! // {*** äîáàâèòü íîâûå} First; while not Eof do begin *************** *** 824,828 **** Next; end; ! {###} finally GotoBookmark(BK); --- 841,845 ---- Next; end; ! {###} finally GotoBookmark(BK); *************** *** 858,862 **** if (RecCount = -1) or (RecCount <> oldRecCount) then UpdateTree; ! oldRecCount := RecCount; end; dsInsert : oldRecCount := -1; { TQuery don't change RecordCount value after insert new record } --- 875,879 ---- if (RecCount = -1) or (RecCount <> oldRecCount) then UpdateTree; ! oldRecCount := RecCount; end; dsInsert : oldRecCount := -1; { TQuery don't change RecordCount value after insert new record } *************** *** 1022,1027 **** end; Result.Selected := Select; ! Result.Selected := Select; {ýòà ñòðîêà î÷åíü íóæíà, íó íå ïîíèìàåò îí ñ ïåðâîãî ðàçà} ! finally dec(FUpdateLock); end; --- 1039,1044 ---- end; Result.Selected := Select; ! Result.Selected := Select; // {ýòà ñòðîêà î÷åíü íóæíà, íó íå ïîíèìàåò îí ñ ïåðâîãî ðàçà} ! finally dec(FUpdateLock); end; |