Merge branch '3.1.5' of http://192.168.1.12:3000/maixinrong/measure into 3.1.5

Frames/ProjectManagerFme.pas

@@ -1419,21 +1419,23 @@ end;
 procedure TProjectManagerFrame.actnRenameUpdate(Sender: TObject);
 var
   Rec: TsdDataRecord;
-  bNet: Boolean;
+  bNet, bEnabled: Boolean;
 begin
   if Assigned(stdProjects.IDTree.Selected) and Assigned(stdProjects.IDTree.Selected.Rec) then
   begin
-    tobtnRenane.Enabled := True;
+    bEnabled := True;
     Rec := stdProjects.IDTree.Selected.Rec;
     bNet := G_IsCloud;
     if bNet then
     begin
-      tobtnRenane.Enabled := (Rec.ValueByName('Type').AsInteger = 1) and
+      bEnabled := (Rec.ValueByName('Type').AsInteger = 1) and
         (Rec.ValueByName('WebAuthorID').AsInteger = PHPWeb.UserID);
     end;
   end
   else
-    tobtnRenane.Enabled := False;
+    bEnabled := False;
+  if bEnabled <> TAction(Sender).Enabled then
+    TAction(Sender).Enabled := bEnabled;
 end;
 
 procedure TProjectManagerFrame.CheckBidName(AID: Integer; ANewBidName: string);

Units/MCacheTree.pas

@@ -844,7 +844,7 @@ function TGclCacheTree.AddNodeByB_Code(
   function FindParent: TGclCacheNode;
   begin
     Result := FLastNode;
-    while Assigned(Result) and (Result.B_Code <> '') and (Pos(Result.B_Code + '-', AB_Code) <> 1) do
+    while Assigned(Result) and (Result <> Root) and (Result.B_Code <> '') and (Pos(Result.B_Code + '-', AB_Code) <> 1) do
       Result := TGclCacheNode(Result.Parent);
   end;