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 TitleList { set; get; } = new Dictionary(); - private EGodotTablePageAdapter PageAdapter { set; get; } - private bool IsSearched { set; get; } - - /// - /// The max data count for one page. - /// - /// - [Export] - public int PageLimit { set; get; } = 10; - /// - /// Height mininum for RowDataContainer. - /// - /// - [Export] - public int MinHeight { set; get; } - - public void InitData(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(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 TitleList { set; get; } = new Dictionary(); - 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> TableData { set; get; } + protected List> TableData { set; get; } /// /// 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(ToPage)); + Label labelPage = PageContainer.CreateNode