To Be Continued

main
itjustworks1 2026-04-02 12:50:05 +10:00
parent 87bcd6176e
commit b169a275b4
26 changed files with 114 additions and 10 deletions

View File

@ -3,6 +3,7 @@
<component name="AvaloniaProject"> <component name="AvaloniaProject">
<option name="projectPerEditor"> <option name="projectPerEditor">
<map> <map>
<entry key="AvaloniaApplication14_Inventory_300326/App.axaml" value="AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj" />
<entry key="AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml" value="AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj" /> <entry key="AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml" value="AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj" />
</map> </map>
</option> </option>

View File

@ -11,5 +11,6 @@
<Application.Styles> <Application.Styles>
<FluentTheme /> <FluentTheme />
<StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
</Application.Styles> </Application.Styles>
</Application> </Application>

View File

@ -14,6 +14,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.3.4" /> <PackageReference Include="Avalonia" Version="11.3.4" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.4" />
<PackageReference Include="Avalonia.Desktop" Version="11.3.4"/> <PackageReference Include="Avalonia.Desktop" Version="11.3.4"/>
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.4"/> <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.4"/>
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.4"/> <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.4"/>

View File

@ -0,0 +1,7 @@
namespace AvaloniaApplication14_Inventory_300326.Models.Models;
public class Entity
{
public int Id {get; set;}
public string Name {get; set;}
}

View File

@ -1,4 +1,8 @@
using AvaloniaApplication14_Inventory_300326.Views; using System;
using System.Collections.ObjectModel;
using AvaloniaApplication14_Inventory_300326.Models.Models;
using AvaloniaApplication14_Inventory_300326.Views;
using CommunityToolkit.Mvvm.ComponentModel;
namespace AvaloniaApplication14_Inventory_300326.ViewModels; namespace AvaloniaApplication14_Inventory_300326.ViewModels;
@ -6,13 +10,44 @@ public partial class MainWindowViewModel : ViewModelBase
{ {
private MainWindow _currentWindow; private MainWindow _currentWindow;
[ObservableProperty] private ObservableCollection<Entity> _entities;
[ObservableProperty] private Entity _selectedEntity;
partial void OnEntitiesChanged(ObservableCollection<Entity> value)
{
Console.WriteLine("OnEntitiesChanged");
}
partial void OnSelectedEntityChanged(Entity value)
{
switch (value.Id)
{
case 0:
break;
case 1:
break;
case 2:
break;
}
}
public MainWindowViewModel() public MainWindowViewModel()
{ {
Entities = new();
Entities.Add(new Entity(){Id = 0, Name = "Техника"});
Entities.Add(new Entity(){Id = 1, Name = "Сотрудники"});
Entities.Add(new Entity(){Id = 2, Name = "Должности"});
SelectedEntity = Entities[0];
} }
public void SetScreen(MainWindow window) public void SetScreen(MainWindow window)
{ {
_currentWindow = window; _currentWindow = window;
Console.WriteLine(window);
} }
} }

View File

@ -11,7 +11,18 @@
<TabControl> <TabControl>
<TabItem Header="Справочники"> <TabItem Header="Справочники">
<StackPanel>
<ComboBox ItemsSource="{Binding Entities}" SelectedItem="{Binding SelectedEntity}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding Name}"></Label>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<ScrollViewer x:Name="ScrollViewerForDatagrid">
</ScrollViewer>
</StackPanel>
</TabItem> </TabItem>
<TabItem Header="Операции"> <TabItem Header="Операции">

View File

@ -7,6 +7,7 @@ public partial class MainWindow : Window
{ {
public MainWindow(MainWindowViewModel viewModel) public MainWindow(MainWindowViewModel viewModel)
{ {
DataContext = viewModel;
viewModel.SetScreen(this); viewModel.SetScreen(this);
InitializeComponent(); InitializeComponent();
} }

View File

@ -48,6 +48,10 @@
"target": "Package", "target": "Package",
"version": "[11.3.4, )" "version": "[11.3.4, )"
}, },
"Avalonia.Controls.DataGrid": {
"target": "Package",
"version": "[11.3.4, )"
},
"Avalonia.Desktop": { "Avalonia.Desktop": {
"target": "Package", "target": "Package",
"version": "[11.3.4, )" "version": "[11.3.4, )"

View File

@ -7,7 +7,7 @@
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/home/student/.nuget/packages/</NuGetPackageRoot> <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/home/student/.nuget/packages/</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/home/student/.nuget/packages/</NuGetPackageFolders> <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/home/student/.nuget/packages/</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle> <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">7.0.0</NuGetToolVersion> <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.14.0</NuGetToolVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="/home/student/.nuget/packages/" /> <SourceRoot Include="/home/student/.nuget/packages/" />

View File

@ -1,5 +1,6 @@
/home/student/.nuget/packages/avalonia/11.3.4/ref/net8.0/Avalonia.Base.dll /home/student/.nuget/packages/avalonia/11.3.4/ref/net8.0/Avalonia.Base.dll
/home/student/.nuget/packages/avalonia.controls.colorpicker/11.3.4/lib/net8.0/Avalonia.Controls.ColorPicker.dll /home/student/.nuget/packages/avalonia.controls.colorpicker/11.3.4/lib/net8.0/Avalonia.Controls.ColorPicker.dll
/home/student/.nuget/packages/avalonia.controls.datagrid/11.3.4/lib/net8.0/Avalonia.Controls.DataGrid.dll
/home/student/.nuget/packages/avalonia/11.3.4/ref/net8.0/Avalonia.Controls.dll /home/student/.nuget/packages/avalonia/11.3.4/ref/net8.0/Avalonia.Controls.dll
/home/student/.nuget/packages/avalonia/11.3.4/ref/net8.0/Avalonia.DesignerSupport.dll /home/student/.nuget/packages/avalonia/11.3.4/ref/net8.0/Avalonia.DesignerSupport.dll
/home/student/.nuget/packages/avalonia.desktop/11.3.4/lib/net8.0/Avalonia.Desktop.dll /home/student/.nuget/packages/avalonia.desktop/11.3.4/lib/net8.0/Avalonia.Desktop.dll

View File

@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("AvaloniaApplication14_Inventory_300326")] [assembly: System.Reflection.AssemblyCompanyAttribute("AvaloniaApplication14_Inventory_300326")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+71178c4e824838e3ca4a2d19b2b8e0b613ee19c6")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+87bcd6176eb43df17d7b079092cb9e1b53850c6e")]
[assembly: System.Reflection.AssemblyProductAttribute("AvaloniaApplication14_Inventory_300326")] [assembly: System.Reflection.AssemblyProductAttribute("AvaloniaApplication14_Inventory_300326")]
[assembly: System.Reflection.AssemblyTitleAttribute("AvaloniaApplication14_Inventory_300326")] [assembly: System.Reflection.AssemblyTitleAttribute("AvaloniaApplication14_Inventory_300326")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
443d2b946cd2eeb128f07ded066e7ac6c211d9b35a96b2cc79f4ba554186321c b1305692aaf9ea52dd6e8e5b2f0805a7d6dc4ecebd5c9a4f90e93bdc05375d82

View File

@ -1 +1 @@
25c1033c54cefc55af85fa62d4ff99e35af5d3062adaeb956dceb28e9085c83a 09f782a9500158492fe24bbc2960ab4ec88cc1ab647d05341362637bd6f000ce

View File

@ -115,3 +115,4 @@
/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.pdb /home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.pdb
/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.genruntimeconfig.cache /home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.genruntimeconfig.cache
/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/ref/AvaloniaApplication14_Inventory_300326.dll /home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/ref/AvaloniaApplication14_Inventory_300326.dll
/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/bin/Debug/net9.0/Avalonia.Controls.DataGrid.dll

View File

@ -124,6 +124,22 @@
} }
} }
}, },
"Avalonia.Controls.DataGrid/11.3.4": {
"type": "package",
"dependencies": {
"Avalonia": "11.3.4"
},
"compile": {
"lib/net8.0/Avalonia.Controls.DataGrid.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net8.0/Avalonia.Controls.DataGrid.dll": {
"related": ".xml"
}
}
},
"Avalonia.Desktop/11.3.4": { "Avalonia.Desktop/11.3.4": {
"type": "package", "type": "package",
"dependencies": { "dependencies": {
@ -1704,6 +1720,25 @@
"lib/netstandard2.0/Avalonia.Controls.ColorPicker.xml" "lib/netstandard2.0/Avalonia.Controls.ColorPicker.xml"
] ]
}, },
"Avalonia.Controls.DataGrid/11.3.4": {
"sha512": "UW1hQ2SvvApvwZoquA48GWtP8EYDZMGrAJ9DIgdudy1j7QS+MlCSVwqF0keDtBYoTUPqdXcNCOrg65m9Gr8+EA==",
"type": "package",
"path": "avalonia.controls.datagrid/11.3.4",
"files": [
".nupkg.metadata",
".signature.p7s",
"Icon.png",
"avalonia.controls.datagrid.11.3.4.nupkg.sha512",
"avalonia.controls.datagrid.nuspec",
"lib/net6.0/Avalonia.Controls.DataGrid.dll",
"lib/net6.0/Avalonia.Controls.DataGrid.xml",
"lib/net8.0/Avalonia.Controls.DataGrid.dll",
"lib/net8.0/Avalonia.Controls.DataGrid.xml",
"lib/netstandard2.0/Avalonia.Controls.DataGrid.dll",
"lib/netstandard2.0/Avalonia.Controls.DataGrid.xml",
"readme.md"
]
},
"Avalonia.Desktop/11.3.4": { "Avalonia.Desktop/11.3.4": {
"sha512": "wKRK2DDXT8xLgQEElOUe+91EO0sNDuplNhCMxjkHLvIIx/hS+Y/BqG0vsIRvkVyYT+sFVD9y3j5c6XTPAuJOsw==", "sha512": "wKRK2DDXT8xLgQEElOUe+91EO0sNDuplNhCMxjkHLvIIx/hS+Y/BqG0vsIRvkVyYT+sFVD9y3j5c6XTPAuJOsw==",
"type": "package", "type": "package",
@ -3793,6 +3828,7 @@
"projectFileDependencyGroups": { "projectFileDependencyGroups": {
"net9.0": [ "net9.0": [
"Avalonia >= 11.3.4", "Avalonia >= 11.3.4",
"Avalonia.Controls.DataGrid >= 11.3.4",
"Avalonia.Desktop >= 11.3.4", "Avalonia.Desktop >= 11.3.4",
"Avalonia.Diagnostics >= 11.3.4", "Avalonia.Diagnostics >= 11.3.4",
"Avalonia.Fonts.Inter >= 11.3.4", "Avalonia.Fonts.Inter >= 11.3.4",
@ -3850,6 +3886,10 @@
"target": "Package", "target": "Package",
"version": "[11.3.4, )" "version": "[11.3.4, )"
}, },
"Avalonia.Controls.DataGrid": {
"target": "Package",
"version": "[11.3.4, )"
},
"Avalonia.Desktop": { "Avalonia.Desktop": {
"target": "Package", "target": "Package",
"version": "[11.3.4, )" "version": "[11.3.4, )"

View File

@ -1,6 +1,6 @@
{ {
"version": 2, "version": 2,
"dgSpecHash": "TM62moL57aw=", "dgSpecHash": "5/jarL7CRng=",
"success": true, "success": true,
"projectFilePath": "/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj", "projectFilePath": "/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj",
"expectedPackageFiles": [ "expectedPackageFiles": [
@ -8,6 +8,7 @@
"/home/student/.nuget/packages/avalonia.angle.windows.natives/2.1.25547.20250602/avalonia.angle.windows.natives.2.1.25547.20250602.nupkg.sha512", "/home/student/.nuget/packages/avalonia.angle.windows.natives/2.1.25547.20250602/avalonia.angle.windows.natives.2.1.25547.20250602.nupkg.sha512",
"/home/student/.nuget/packages/avalonia.buildservices/0.0.31/avalonia.buildservices.0.0.31.nupkg.sha512", "/home/student/.nuget/packages/avalonia.buildservices/0.0.31/avalonia.buildservices.0.0.31.nupkg.sha512",
"/home/student/.nuget/packages/avalonia.controls.colorpicker/11.3.4/avalonia.controls.colorpicker.11.3.4.nupkg.sha512", "/home/student/.nuget/packages/avalonia.controls.colorpicker/11.3.4/avalonia.controls.colorpicker.11.3.4.nupkg.sha512",
"/home/student/.nuget/packages/avalonia.controls.datagrid/11.3.4/avalonia.controls.datagrid.11.3.4.nupkg.sha512",
"/home/student/.nuget/packages/avalonia.desktop/11.3.4/avalonia.desktop.11.3.4.nupkg.sha512", "/home/student/.nuget/packages/avalonia.desktop/11.3.4/avalonia.desktop.11.3.4.nupkg.sha512",
"/home/student/.nuget/packages/avalonia.diagnostics/11.3.4/avalonia.diagnostics.11.3.4.nupkg.sha512", "/home/student/.nuget/packages/avalonia.diagnostics/11.3.4/avalonia.diagnostics.11.3.4.nupkg.sha512",
"/home/student/.nuget/packages/avalonia.fonts.inter/11.3.4/avalonia.fonts.inter.11.3.4.nupkg.sha512", "/home/student/.nuget/packages/avalonia.fonts.inter/11.3.4/avalonia.fonts.inter.11.3.4.nupkg.sha512",

View File

@ -1 +1 @@
"restore":{"projectUniqueName":"/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj","projectName":"AvaloniaApplication14_Inventory_300326","projectPath":"/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj","outputPath":"/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["net9.0"],"sources":{"http://192.168.200.81:8081/repository/nuget.org-proxy/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.300"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Avalonia":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Desktop":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Diagnostics":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Fonts.Inter":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Themes.Fluent":{"target":"Package","version":"[11.3.4, )"},"CommunityToolkit.Mvvm":{"target":"Package","version":"[8.2.1, )"},"FreeSpire.XLS":{"target":"Package","version":"[14.2.0, )"},"Microsoft.Extensions.Hosting":{"target":"Package","version":"[10.0.5, )"},"MySqlConnector":{"target":"Package","version":"[2.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/home/student/.dotnet/sdk/9.0.311/PortableRuntimeIdentifierGraph.json"}} "restore":{"projectUniqueName":"/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj","projectName":"AvaloniaApplication14_Inventory_300326","projectPath":"/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj","outputPath":"/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["net9.0"],"sources":{"http://192.168.200.81:8081/repository/nuget.org-proxy/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.300"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Avalonia":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Controls.DataGrid":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Desktop":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Diagnostics":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Fonts.Inter":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Themes.Fluent":{"target":"Package","version":"[11.3.4, )"},"CommunityToolkit.Mvvm":{"target":"Package","version":"[8.2.1, )"},"FreeSpire.XLS":{"target":"Package","version":"[14.2.0, )"},"Microsoft.Extensions.Hosting":{"target":"Package","version":"[10.0.5, )"},"MySqlConnector":{"target":"Package","version":"[2.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/home/student/.dotnet/sdk/9.0.311/PortableRuntimeIdentifierGraph.json"}}

View File

@ -1 +1 @@
17750017536262496 17750958785606392

View File

@ -1 +1 @@
17750021541047901 17750958843205400