diff --git a/WPF基础-6-Grid7跨行和列的对话框/App.xaml b/WPF基础-6-Grid7跨行和列的对话框/App.xaml
new file mode 100644
index 0000000..9bff8b0
--- /dev/null
+++ b/WPF基础-6-Grid7跨行和列的对话框/App.xaml
@@ -0,0 +1,9 @@
+<Application x:Class="WPF基础_6_Grid7跨行和列的对话框.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:WPF基础_6_Grid7跨行和列的对话框"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/WPF基础-6-Grid7跨行和列的对话框/App.xaml.cs b/WPF基础-6-Grid7跨行和列的对话框/App.xaml.cs
new file mode 100644
index 0000000..169db17
--- /dev/null
+++ b/WPF基础-6-Grid7跨行和列的对话框/App.xaml.cs
@@ -0,0 +1,12 @@
+using System.Configuration;
+using System.Data;
+using System.Windows;
+
+namespace WPF基础_6_Grid7跨行和列的对话框;
+
+/// <summary>
+/// Interaction logic for App.xaml
+/// </summary>
+public partial class App : Application
+{
+}
\ No newline at end of file
diff --git a/WPF基础-6-Grid7跨行和列的对话框/AssemblyInfo.cs b/WPF基础-6-Grid7跨行和列的对话框/AssemblyInfo.cs
new file mode 100644
index 0000000..4a05c7d
--- /dev/null
+++ b/WPF基础-6-Grid7跨行和列的对话框/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+    //(used if a resource is not found in the page,
+    // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    //(used if a resource is not found in the page,
+    // app, or any theme specific resource dictionaries)
+)]
\ No newline at end of file
diff --git a/WPF基础-6-Grid7跨行和列的对话框/MainWindow.xaml b/WPF基础-6-Grid7跨行和列的对话框/MainWindow.xaml
new file mode 100644
index 0000000..56a2475
--- /dev/null
+++ b/WPF基础-6-Grid7跨行和列的对话框/MainWindow.xaml
@@ -0,0 +1,33 @@
+<Window x:Class="WPF基础_6_Grid7跨行和列的对话框.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="450" Width="800">
+    <Grid ShowGridLines="True" UseLayoutRounding="True">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+
+        <TextBox Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Margin="10" Padding="5" BorderBrush="Red"
+                 BorderThickness="8" FontSize="26" Foreground="SeaGreen" SelectionBrush="Coral">
+            这是个对话框
+        </TextBox>
+        <!-- <StackPanel Grid.Row="1" Grid.Column="2" Orientation="Horizontal" Margin="10"> -->
+        <!--     <Button Margin="0 0 2 0" Padding="5 2">确认</Button> -->
+        <!--     <Button Margin="2 0 0 0" Padding="5 2">取消</Button> -->
+        <!-- </StackPanel> -->
+        <Button Grid.Row="1" Grid.Column="1" Background="DeepSkyBlue" Foreground="White" Margin="10 10 2 10"
+                Padding="10 5">
+            确认
+        </Button>
+        <Button Grid.Row="1" Grid.Column="2" Background="Orange" Foreground="White" Margin="2 10 10 10" Padding="10 5">取消</Button>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/WPF基础-6-Grid7跨行和列的对话框/MainWindow.xaml.cs b/WPF基础-6-Grid7跨行和列的对话框/MainWindow.xaml.cs
new file mode 100644
index 0000000..6b54ec8
--- /dev/null
+++ b/WPF基础-6-Grid7跨行和列的对话框/MainWindow.xaml.cs
@@ -0,0 +1,23 @@
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace WPF基础_6_Grid7跨行和列的对话框;
+
+/// <summary>
+/// Interaction logic for MainWindow.xaml
+/// </summary>
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/WPF基础-6-Grid7跨行和列的对话框/WPF基础-6-Grid7跨行和列的对话框.csproj b/WPF基础-6-Grid7跨行和列的对话框/WPF基础-6-Grid7跨行和列的对话框.csproj
new file mode 100644
index 0000000..ded5af8
--- /dev/null
+++ b/WPF基础-6-Grid7跨行和列的对话框/WPF基础-6-Grid7跨行和列的对话框.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>net8.0-windows</TargetFramework>
+        <RootNamespace>WPF基础_6_Grid7跨行和列的对话框</RootNamespace>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <UseWPF>true</UseWPF>
+    </PropertyGroup>
+
+</Project>
diff --git a/WPF基础.sln b/WPF基础.sln
index 017f897..f8e1bda 100644
--- a/WPF基础.sln
+++ b/WPF基础.sln
@@ -34,6 +34,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPF基础-6-Grid5反锯齿
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPF基础-6-Grid6跨行和列", "WPF基础-6-Grid6跨行和列\WPF基础-6-Grid6跨行和列.csproj", "{F8D3CE0C-01D6-4046-B24A-BA09A7EC298E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPF基础-6-Grid7跨行和列的对话框", "WPF基础-6-Grid7跨行和列的对话框\WPF基础-6-Grid7跨行和列的对话框.csproj", "{607674A7-8006-4619-84D6-F165BA45F45C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -108,5 +110,9 @@ Global
 		{F8D3CE0C-01D6-4046-B24A-BA09A7EC298E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F8D3CE0C-01D6-4046-B24A-BA09A7EC298E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F8D3CE0C-01D6-4046-B24A-BA09A7EC298E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{607674A7-8006-4619-84D6-F165BA45F45C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{607674A7-8006-4619-84D6-F165BA45F45C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{607674A7-8006-4619-84D6-F165BA45F45C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{607674A7-8006-4619-84D6-F165BA45F45C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal