From e3494c99cf2d7572d7d543ecdcda9f212c66f46c Mon Sep 17 00:00:00 2001
From: jkpete <1031139173@qq.com>
Date: Mon, 23 Jun 2025 15:39:27 +0800
Subject: [PATCH] fixed data

---
 .../Templete/Godot/Dialog/EGodotEditDialog.cs |  2 -
 .../Templete/Godot/UI/EGodotSaveTable.cs      | 41 +------------------
 .../Templete/Godot/UI/EGodotTable.cs          | 17 ++++----
 .../Templete/Godot/UI/EGodotTableRowData.cs   |  8 +++-
 4 files changed, 15 insertions(+), 53 deletions(-)

diff --git a/addons/EGFramework/Module/GenerateTools/Templete/Godot/Dialog/EGodotEditDialog.cs b/addons/EGFramework/Module/GenerateTools/Templete/Godot/Dialog/EGodotEditDialog.cs
index c48c72a..e74e462 100644
--- a/addons/EGFramework/Module/GenerateTools/Templete/Godot/Dialog/EGodotEditDialog.cs
+++ b/addons/EGFramework/Module/GenerateTools/Templete/Godot/Dialog/EGodotEditDialog.cs
@@ -57,8 +57,6 @@ namespace EGFramework.UI
             foreach (EGodotEditParam paramUI in ParamUIs)
             {
                 EditCache.Add(paramUI.GetKey(), paramUI.GetValue());
-                
-                GD.Print(paramUI.GetValue());
             }
             try
             {
diff --git a/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotSaveTable.cs b/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotSaveTable.cs
index cc7eb0d..918df6c 100644
--- a/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotSaveTable.cs
+++ b/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotSaveTable.cs
@@ -3,48 +3,9 @@ using Godot;
 
 namespace EGFramework.UI
 {
-    public partial class EGodotSaveTable : VBoxContainer, IEGFramework
+    public partial class EGodotSaveTable : EGodotTable, IEGFramework
     {
-        public HBoxContainer FunctionContainer { set; get; }
-        public HBoxContainer TitleContainer { set; get; }
-        public VBoxContainer RowDataContainer { set; get; }
-        public HBoxContainer PageContainer { set; get; }
-
         public IEGSaveData SaveData { set; get; }
         public Dictionary<string, string> TitleList { set; get; } = new Dictionary<string, string>();
-        private EGodotTablePageAdapter PageAdapter { set; get; }
-        private bool IsSearched { set; get; }
-
-        /// <summary>
-        /// The max data count for one page.
-        /// </summary>
-        /// <value></value>
-        [Export]
-        public int PageLimit { set; get; } = 10;
-        /// <summary>
-        /// Height mininum for RowDataContainer.
-        /// </summary>
-        /// <value></value>
-        [Export]
-        public int MinHeight { set; get; }
-
-        public void InitData<T>(IEGSaveData saveData, string key) where T : new()
-        {
-            int count = saveData.GetDataCount(key);
-            if (PageAdapter == null)
-            {
-                PageAdapter = new EGodotTablePageAdapter(count, PageLimit);
-            }
-            else
-            {
-                PageAdapter.Reload(count, PageLimit);
-            }
-
-        }
-        public void InitReadOnlyData<T>(IEGSaveDataReadOnly saveData, string key) where T : new()
-        {
-
-        }
-        
     }
 }
\ No newline at end of file
diff --git a/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotTable.cs b/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotTable.cs
index df1a431..a960e5c 100644
--- a/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotTable.cs
+++ b/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotTable.cs
@@ -18,18 +18,15 @@ namespace EGFramework.UI
         public ScrollContainer RowDataScroll { set; get; }
         public BoxContainer PageContainer { set; get; }
 
-        public IEGSaveData SaveData { set; get; }
-        public Dictionary<string, string> TitleList { set; get; } = new Dictionary<string, string>();
-
         public Color MainColor { set; get; } = new Color();
         public Color MinorColor { set; get; } = new Color();
 
-        private EGodotTablePageAdapter PageAdapter { set; get; }
-        private bool IsSearched { set; get; }
-        private EasyEvent OnPageChanged { set; get; } = new EasyEvent();
-        private IUnRegister PageChangedRealease { set; get; }
+        protected EGodotTablePageAdapter PageAdapter { set; get; }
+        protected bool IsSearched { set; get; }
+        protected EasyEvent OnPageChanged { set; get; } = new EasyEvent();
+        protected IUnRegister PageChangedRealease { set; get; }
 
-        private List<Dictionary<string, object>> TableData { set; get; }
+        protected List<Dictionary<string, object>> TableData { set; get; }
 
         /// <summary>
         /// The max data count for one page.
@@ -172,6 +169,8 @@ namespace EGFramework.UI
                 inputPage.MinValue = 1;
                 inputPage.MaxValue = PageAdapter.MaxPage;
                 inputPage.Alignment = HorizontalAlignment.Center;
+                inputPage.Connect("value_changed", Callable.From<int>(ToPage));
+
                 Label labelPage = PageContainer.CreateNode<Label>("page");
                 labelPage.Text = "page";
 
@@ -232,7 +231,7 @@ namespace EGFramework.UI
         }
         public void ToPage(int pageId)
         {
-            if (pageId > 1 && this.PageAdapter.CurrentPage < pageId)
+            if (pageId >= 1 && pageId <= this.PageAdapter.MaxPage)
             {
                 this.PageAdapter.CurrentPage = pageId;
                 OnPageChanged.Invoke();
diff --git a/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotTableRowData.cs b/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotTableRowData.cs
index e42e7ee..82a1886 100644
--- a/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotTableRowData.cs
+++ b/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotTableRowData.cs
@@ -32,7 +32,7 @@ namespace EGFramework.UI{
             Operate.AddChild(Delete);
             Modify.Connect("pressed", Callable.From(OnEdit));
             Delete.Connect("pressed", Callable.From(OnDelete.Invoke));
-            this.CustomMinimumSize = new Vector2(0,32);
+            this.CustomMinimumSize = new Vector2(0, 32);
         }
         public void OnEdit(){
             if(Data == null){
@@ -43,7 +43,11 @@ namespace EGFramework.UI{
 
         public virtual void OnDataEdit(Dictionary<string, object> e)
         {
-            this.Data = e;
+            foreach (var pair in e)
+            {
+                this.Data[pair.Key] = pair.Value;
+            }
+            // this.Data = e;
             this.RefreshData();
         }