From 4d798e5d992cde069292ad2eaa1ba0cb5e83cf22 Mon Sep 17 00:00:00 2001
From: GG Z <903524121@qq.com>
Date: Sun, 30 Mar 2025 19:18:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/.idea.Sai.RvKits/.idea/workspace.xml | 60 +++++++-
WPFUIAPP/App.config | 6 -
WPFUIAPP/App.xaml | 19 ---
WPFUIAPP/App.xaml.cs | 26 ----
WPFUIAPP/MainWindow.xaml | 131 -----------------
WPFUIAPP/MainWindow.xaml.cs | 89 ------------
WPFUIAPP/Properties/AssemblyInfo.cs | 52 -------
WPFUIAPP/Properties/Resources.Designer.cs | 71 ---------
WPFUIAPP/Properties/Resources.resx | 117 ---------------
WPFUIAPP/Properties/Settings.Designer.cs | 30 ----
WPFUIAPP/Properties/Settings.settings | 7 -
WPFUIAPP/ViewModel.cs | 160 ---------------------
WPFUIAPP/ViewModel2.cs | 71 ---------
WPFUIAPP/WPFUIAPP.csproj | 18 ---
14 files changed, 58 insertions(+), 799 deletions(-)
delete mode 100644 WPFUIAPP/App.config
delete mode 100644 WPFUIAPP/App.xaml
delete mode 100644 WPFUIAPP/App.xaml.cs
delete mode 100644 WPFUIAPP/MainWindow.xaml
delete mode 100644 WPFUIAPP/MainWindow.xaml.cs
delete mode 100644 WPFUIAPP/Properties/AssemblyInfo.cs
delete mode 100644 WPFUIAPP/Properties/Resources.Designer.cs
delete mode 100644 WPFUIAPP/Properties/Resources.resx
delete mode 100644 WPFUIAPP/Properties/Settings.Designer.cs
delete mode 100644 WPFUIAPP/Properties/Settings.settings
delete mode 100644 WPFUIAPP/ViewModel.cs
delete mode 100644 WPFUIAPP/ViewModel2.cs
delete mode 100644 WPFUIAPP/WPFUIAPP.csproj
diff --git a/.idea/.idea.Sai.RvKits/.idea/workspace.xml b/.idea/.idea.Sai.RvKits/.idea/workspace.xml
index d596b32..7d7b6e1 100644
--- a/.idea/.idea.Sai.RvKits/.idea/workspace.xml
+++ b/.idea/.idea.Sai.RvKits/.idea/workspace.xml
@@ -348,7 +348,7 @@
-
+
@@ -374,7 +374,63 @@
1743332841659
-
+
+
+ 1743332917877
+
+
+
+ 1743332917877
+
+
+
+ 1743332957439
+
+
+
+ 1743332957439
+
+
+
+ 1743333002958
+
+
+
+ 1743333002958
+
+
+
+ 1743333052755
+
+
+
+ 1743333052755
+
+
+
+ 1743333090485
+
+
+
+ 1743333090485
+
+
+
+ 1743333125703
+
+
+
+ 1743333125703
+
+
+
+ 1743333169763
+
+
+
+ 1743333169763
+
+
diff --git a/WPFUIAPP/App.config b/WPFUIAPP/App.config
deleted file mode 100644
index 56efbc7..0000000
--- a/WPFUIAPP/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/WPFUIAPP/App.xaml b/WPFUIAPP/App.xaml
deleted file mode 100644
index 6a229e2..0000000
--- a/WPFUIAPP/App.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/WPFUIAPP/App.xaml.cs b/WPFUIAPP/App.xaml.cs
deleted file mode 100644
index 8ac3e60..0000000
--- a/WPFUIAPP/App.xaml.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-
-using Wpf.Ui.Violeta.Controls;
-
-namespace WPFUIAPP
-{
- ///
- /// App.xaml 的交互逻辑
- ///
- public partial class App : Application
- {
- public App()
- {
- Splash.ShowAsync("pack://application:,,,/Wpf.Ui.Test;component/wpfui.png");
- InitializeComponent();
- }
-
-
- }
-}
diff --git a/WPFUIAPP/MainWindow.xaml b/WPFUIAPP/MainWindow.xaml
deleted file mode 100644
index 0c4a083..0000000
--- a/WPFUIAPP/MainWindow.xaml
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/WPFUIAPP/MainWindow.xaml.cs b/WPFUIAPP/MainWindow.xaml.cs
deleted file mode 100644
index 6963a43..0000000
--- a/WPFUIAPP/MainWindow.xaml.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System.Threading;
-using System.Windows;
-
-using Wpf.Ui.Controls;
-using Wpf.Ui.Violeta.Controls;
-
-using MessageBox = Wpf.Ui.Violeta.Controls.MessageBox;
-
-namespace WPFUIAPP
-{
- ///
- /// MainWindow.xaml 的交互逻辑
- ///
- public partial class MainWindow
- {
- Wpf.Ui.Controls.ContentDialog dialog;
- Wpf.Ui.Violeta.Controls.ContentDialog newdialog;
- public MainWindow()
- {
- InitializeComponent();
- dialog = new()
- {
- Title = "My sample dialog",
- Content = "Content of the dialog",
- CloseButtonText = "Close button",
- PrimaryButtonText = "Primary button",
- SecondaryButtonText = "Secondary button",
- // Setting the dialog container
- DialogHost = ContentDialogHostService.ContentPresenterForDialogs
- };
- newdialog = new()
- {
- Title = "My sample dialog",
- Content = "Content of the dialog",
- CloseButtonText = "Close button",
- PrimaryButtonText = "Primary button",
- SecondaryButtonText = "Secondary button",
- DefaultButton = Wpf.Ui.Violeta.Controls.ContentDialogButton.Primary,
- };
- Splash.CloseOnLoaded(this, minimumMilliseconds: 1800);
- }
-
- private void Button_Click(object sender, RoutedEventArgs e)
- {
- Toast.Information("I am information message");
- Toast.Error("I am error message");
- //Toast.Success("I am success message");
- //Toast.Warning("I am warning message");
- //Toast.Show(owner: null, "I am any message", new ToastConfig());
- }
-
- private void MsgSyncClick(object sender, RoutedEventArgs e)
- {
- _ = MessageBox.Information("This is a information message");
- _ = MessageBox.Warning("This is a warning message");
- _ = MessageBox.Error("This is a error message");
- var result = MessageBox.Question("This is a question and do you want to click OK?");
- }
-
- private async void MsgAsyncClick(object sender, RoutedEventArgs e)
- {
- // Async methods
- _ = await MessageBox.InformationAsync("This is a information message");
- _ = await MessageBox.WarningAsync("This is a warning message");
- _ = await MessageBox.ErrorAsync("This is a error message");
- var result = await MessageBox.QuestionAsync("This is a question and do you want to click OK?");
- }
-
- private void PendingBoxClick(object sender, RoutedEventArgs e)
- {
- // Default style.
- using IPendingHandler pending = PendingBox.Show();
-
- // Show with title and cancel button.
- //using IPendingHandler pending = PendingBox.Show("Doing something", "I'm a title", isShowCancel: true);
-
- }
-
- private async void ContentDialogClick(object sender, RoutedEventArgs e)
- {
- await dialog.ShowAsync(CancellationToken.None);
- }
-
- private async void NewContentDialogClick(object sender, RoutedEventArgs e)
- {
- _ = await dialog.ShowAsync();
- }
- }
-}
diff --git a/WPFUIAPP/Properties/AssemblyInfo.cs b/WPFUIAPP/Properties/AssemblyInfo.cs
deleted file mode 100644
index 40536ac..0000000
--- a/WPFUIAPP/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// 有关程序集的一般信息由以下
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("WPFUIAPP")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WPFUIAPP")]
-[assembly: AssemblyCopyright("Copyright © 2025")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 会使此程序集中的类型
-//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
-//请将此类型的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-//若要开始生成可本地化的应用程序，请设置
-//.csproj 文件中的 CultureYouAreCodingWith
-//在 中。例如，如果你使用的是美国英语。
-//使用的是美国英语，请将 设置为 en-US。 然后取消
-//对以下 NeutralResourceLanguage 特性的注释。 更新
-//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
- ResourceDictionaryLocation.None, //主题特定资源词典所处位置
- //(未在页面中找到资源时使用，
- //或应用程序资源字典中找到时使用)
- ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置
- //(未在页面中找到资源时使用，
- //、应用程序或任何主题专用资源字典中找到时使用)
-)]
-
-
-// 程序集的版本信息由下列四个值组成:
-//
-// 主版本
-// 次版本
-// 生成号
-// 修订号
-//
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/WPFUIAPP/Properties/Resources.Designer.cs b/WPFUIAPP/Properties/Resources.Designer.cs
deleted file mode 100644
index b426fdf..0000000
--- a/WPFUIAPP/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// 此代码由工具生成。
-// 运行时版本: 4.0.30319.42000
-//
-// 对此文件的更改可能导致不正确的行为，如果
-// 重新生成代码，则所做更改将丢失。
-//
-//------------------------------------------------------------------------------
-
-namespace WPFUIAPP.Properties
-{
-
-
- ///
- /// 强类型资源类，用于查找本地化字符串等。
- ///
- // 此类是由 StronglyTypedResourceBuilder
- // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
- // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
- // (以 /str 作为命令选项)，或重新生成 VS 项目。
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources
- {
-
- private static global::System.Resources.ResourceManager resourceMan;
-
- private static global::System.Globalization.CultureInfo resourceCulture;
-
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources()
- {
- }
-
- ///
- /// 返回此类使用的缓存 ResourceManager 实例。
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager
- {
- get
- {
- if ((resourceMan == null))
- {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WPFUIAPP.Properties.Resources", typeof(Resources).Assembly);
- resourceMan = temp;
- }
- return resourceMan;
- }
- }
-
- ///
- /// 重写当前线程的 CurrentUICulture 属性，对
- /// 使用此强类型资源类的所有资源查找执行重写。
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture
- {
- get
- {
- return resourceCulture;
- }
- set
- {
- resourceCulture = value;
- }
- }
- }
-}
diff --git a/WPFUIAPP/Properties/Resources.resx b/WPFUIAPP/Properties/Resources.resx
deleted file mode 100644
index af7dbeb..0000000
--- a/WPFUIAPP/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/WPFUIAPP/Properties/Settings.Designer.cs b/WPFUIAPP/Properties/Settings.Designer.cs
deleted file mode 100644
index 4829c00..0000000
--- a/WPFUIAPP/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace WPFUIAPP.Properties
-{
-
-
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
- {
-
- private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default
- {
- get
- {
- return defaultInstance;
- }
- }
- }
-}
diff --git a/WPFUIAPP/Properties/Settings.settings b/WPFUIAPP/Properties/Settings.settings
deleted file mode 100644
index 033d7a5..0000000
--- a/WPFUIAPP/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/WPFUIAPP/ViewModel.cs b/WPFUIAPP/ViewModel.cs
deleted file mode 100644
index 52595ee..0000000
--- a/WPFUIAPP/ViewModel.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace WPFUIAPP
-{
- public partial class ViewModel : ObservableObject
- {
- [ObservableProperty]
- private ObservableCollection staffList = [];
-
- public ViewModel()
- {
- InitNode1Value();
- }
- public void InitNode1Value()
- {
- Staff staff = new Staff()
- {
- Name = "Alice",
- Age = 30,
- Sex = "Male",
- Duty = "Manager",
- IsExpanded = true
- };
- Staff staff2 = new Staff()
- {
- Name = "Alice1",
- Age = 21,
- Sex = "Male",
- Duty = "Normal",
- IsExpanded = true
- };
- Staff staff3 = new Staff()
- {
- Name = "Alice11",
- Age = 21,
- Sex = "Male",
- Duty = "Normal"
- };
- staff2.StaffList.Add(staff3);
- staff3 = new Staff()
- {
- Name = "Alice22",
- Age = 21,
- Sex = "Female",
- Duty = "Normal"
- };
- staff2.StaffList.Add(staff3);
- staff.StaffList.Add(staff2);
- staff2 = new Staff()
- {
- Name = "Alice2",
- Age = 22,
- Sex = "Female",
- Duty = "Normal"
- };
- staff.StaffList.Add(staff2);
- staff2 = new Staff()
- {
- Name = "Alice3",
- Age = 23,
- Sex = "Female",
- Duty = "Normal"
- };
- staff.StaffList.Add(staff2);
- StaffList.Add(staff);
-
- staff = new Staff()
- {
- Name = "Bob",
- Age = 31,
- Sex = "Male",
- Duty = "CEO"
- };
- staff2 = new Staff()
- {
- Name = "Bob1",
- Age = 24,
- Sex = "Female",
- Duty = "Normal"
- };
- staff.StaffList.Add(staff2);
- staff2 = new Staff()
- {
- Name = "Bob2",
- Age = 25,
- Sex = "Female",
- Duty = "Normal"
- };
- staff.StaffList.Add(staff2);
- staff2 = new Staff()
- {
- Name = "Bob3",
- Age = 26,
- Sex = "Male",
- Duty = "Normal"
- };
- staff.StaffList.Add(staff2);
- StaffList.Add(staff);
-
- staff = new Staff()
- {
- Name = "Cyber",
- Age = 32,
- Sex = "Female",
- Duty = "Leader"
- };
- staff2 = new Staff()
- {
- Name = "Cyber1",
- Age = 27,
- Sex = "Female",
- Duty = "Normal"
- };
- staff.StaffList.Add(staff2);
- staff2 = new Staff()
- {
- Name = "Cyber2",
- Age = 28,
- Sex = "Female",
- Duty = "Normal"
- };
- staff.StaffList.Add(staff2);
- StaffList.Add(staff);
- }
- }
-
- public partial class Staff : ObservableObject
- {
- [ObservableProperty]
- private string? name = null;
-
- [ObservableProperty]
- private int age;
-
- [ObservableProperty]
- private string? sex = null;
-
- [ObservableProperty]
- private string? duty = null;
-
- [ObservableProperty]
- private bool isChecked = true;
-
- [ObservableProperty]
- private bool isSelected = false;
-
- [ObservableProperty]
- private bool isExpanded = false;
-
- [ObservableProperty]
- private ObservableCollection staffList = [];
- }
-}
diff --git a/WPFUIAPP/ViewModel2.cs b/WPFUIAPP/ViewModel2.cs
deleted file mode 100644
index 20e98fe..0000000
--- a/WPFUIAPP/ViewModel2.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using CommunityToolkit.Mvvm.ComponentModel;
-using Wpf.Ui.Controls;
-
-namespace WPFUIAPP;
-public partial class ViewModel2 : ObservableObject
-{
- [ObservableProperty]
- private TreeModelCollection treeTestModel = CreateTestModel();
-
- public static TreeModelCollection CreateTestModel()
- {
- return new TreeModelCollection()
- {
- Children = new(
- [
- new()
- {
- Column1 = "Test 1",
- Column2 = "Test 1",
- Column3 = "Test 1",
- Children = new(
- [
- new()
- {
- Column1 = "Test 1.1",
- Column2 = "Test 1.1",
- Column3 = "Test 1.1",
- Children = new(
- [
- new()
- {
- Column1 = "Test 1.2",
- Column2 = "Test 1.2",
- Column3 = "Test 1.2",
- },
- ]),
- },
- ]),
- },
- new()
- {
- Column1 = "Test 2",
- Column2 = "Test 2",
- Column3 = "Test 2",
- }
- ]),
- };
- }
-}
-
-[ObservableObject]
-public partial class TreeTestModel : TreeModelObject
-{
- [ObservableProperty]
- private string? column1;
-
- [ObservableProperty]
- private string? column2;
-
- [ObservableProperty]
- private string? column3;
-
- [ObservableProperty]
- private bool isChecked = false;
-}
diff --git a/WPFUIAPP/WPFUIAPP.csproj b/WPFUIAPP/WPFUIAPP.csproj
deleted file mode 100644
index bfe2335..0000000
--- a/WPFUIAPP/WPFUIAPP.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
- net472
- WinExe
- false
- true
- enable
- 13.0
- true
- All;Debug One;Debug;DefaultBuild;Release
-
-
-
-
-
-
-
-
\ No newline at end of file