From 3205732fdf9e6febde2a10643c0e5d5cba2aeff5 Mon Sep 17 00:00:00 2001
From: JianjunLiu <cqljj123@126.com>
Date: Tue, 21 Mar 2023 10:06:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化标签关闭
---
 designer/utslcodeeditor.tsf | 99 ++++++++++++++++++++++++++-----------
 1 file changed, 71 insertions(+), 28 deletions(-)

diff --git a/designer/utslcodeeditor.tsf b/designer/utslcodeeditor.tsf
index f869753..8df3585 100644
--- a/designer/utslcodeeditor.tsf
+++ b/designer/utslcodeeditor.tsf
@@ -258,7 +258,12 @@ type TPage=class(TCustomControl) //
                 begin
                     CallSelChanged();
                 end
-            end
+            end else 
+            if idx<FItemIndex then 
+            begin
+                FItemIndex := FItemIndex-1;
+                FCurrentItem := FPageItems[FItemIndex];
+            end 
             InValidateRect(nil,false);
         end
     end
@@ -1773,7 +1778,7 @@ type TEditer=class(TCustomcontrol) //
         FListPages.Visible := false;
         ////////////////////////////
         FPageMenu := new TPopUpMenu(self);
-        for i,v in array("¹Ø±Õ","¹Ø±ÕÆäËû±êÇ©","¸´ÖÆÎļþÃû","¸´ÖÆÎļþÈ«Ãû","ÖØмÓÔØ","´ò¿ªÄ¿Â¼","Áí´æΪ") do
+        for i,v in array("¹Ø±Õ","¹Ø±ÕÆäËû±êÇ©","¹Ø±Õ×ó²àËùÓÐ","¹Ø±ÕÓÒ²àËùÓÐ","¸´ÖÆÎļþÃû","¸´ÖÆÎļþÈ«Ãû","ÖØмÓÔØ","´ò¿ªÄ¿Â¼","Áí´æΪ") do
         begin
             mi := new TMenu(self);
             mi.Caption := v;
@@ -1956,6 +1961,7 @@ type TEditer=class(TCustomcontrol) //
     begin
         return FPageEditer.pageitemcount;
     end 
+
     function CloseAllPageItems(it);
     begin
         its := FPageEditer.PageItems;
@@ -2311,6 +2317,34 @@ type TEditer=class(TCustomcontrol) //
         end
         EditerCaretChanged(it.FEditer,nil);
     end
+    function docloseapageitem(it);
+    begin
+        if it.fisnewfile then  //µ¥¶À´¦Àíн¨¹Ø±Õ
+        begin 
+            f := it.OrigScriptPath;
+            DeletePageItem(it);
+            if fileexists("",f) then filedelete("",f);                    
+            return ;
+        end 
+        if JudgeItemState(it)then return;
+        if it.FEditer.ChangedFlag then
+        begin
+            mr := MessageboxA(format("ÊÇ·ñ±£´æ:%s",it.OrigScriptPath),"Ìáʾ",3,self);
+            if mr=IDYES then
+            begin
+                if SavePageItem(it)=0 then
+                begin
+                    it.FEditer.ChangedFlag := true;
+                    return 0;
+                end
+            end else
+            if mr=IDCANCEL then
+            begin
+                return;
+            end
+        end
+        DeletePageItem(it);
+    end 
     function PageMenuClick(o,e);
     begin
         it := GetCurrentItem();
@@ -2318,33 +2352,42 @@ type TEditer=class(TCustomcontrol) //
         case o.Caption of
             "¹Ø±Õ":
             begin
-                if it.fisnewfile then  //µ¥¶À´¦Àíн¨¹Ø±Õ
-                begin 
-                    f := it.OrigScriptPath;
-                    DeletePageItem(it);
-                    if fileexists("",f) then filedelete("",f);
-                    
-                    return ;
-                end 
-                if JudgeItemState(it)then return;
-                if it.FEditer.ChangedFlag then
-                begin
-                    mr := MessageboxA(format("ÊÇ·ñ±£´æ:%s",it.OrigScriptPath),"Ìáʾ",3,self);
-                    if mr=IDYES then
-                    begin
-                        if SavePageItem(it)=0 then
-                        begin
-                            it.FEditer.ChangedFlag := true;
-                            return 0;
-                        end
-                    end else
-                    if mr=IDCANCEL then
-                    begin
-                        return;
-                    end
-                end
-                DeletePageItem(it);
+                docloseapageitem(it);    
             end
+            "¹Ø±Õ×ó²àËùÓÐ":
+            begin
+                its := GetAllPageItems();
+                itss := array();
+                for i := 0 to its.Length()-1 do   
+                begin
+                    iti := its[i];
+                    if iti=it then break ;
+                    itss[i] := iti;
+                end  
+                for i,iti in itss  do 
+                begin
+                    docloseapageitem(iti);  
+                end 
+            end 
+            "¹Ø±ÕÓÒ²àËùÓÐ":
+            begin
+                dodel := 0;
+                its := GetAllPageItems();
+                itss := array();
+                for i := 0 to its.Length()-1 do   
+                begin
+                    itss[i] := its[i];
+                end  
+                for i,iti in itss do 
+                begin                    
+                    if dodel then docloseapageitem(iti);  
+                    if iti=it then 
+                    begin
+                        dodel := 1;
+                    end ;
+                      
+                end  
+            end 
             "¹Ø±ÕÆäËû±êÇ©":
             begin
                 Cit := it;