Skip to content

Commit

Permalink
新增
Browse files Browse the repository at this point in the history
  • Loading branch information
@DamonWWC
DamonWWC committed Mar 8, 2023
1 parent 02a5aa1 commit 135bee4
Show file tree
Hide file tree
Showing 6 changed files with 104 additions and 10 deletions.
11 changes: 11 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,3 +466,14 @@ obj
/Tests/AppWindowDemo/bin/Debug
/PDFDemo/bin/Debug
/Tests/WpfApp3/bin/Debug/net6.0-windows
/Tests/RoslynDemo/bin/Debug/net6.0
/Tests/SourceGenerator/bin/Debug/netstandard2.0
/Tests/TaskDemo/bin/Debug/net6.0
/Tests/Drop/bin/Debug/net6.0-windows
/Tests/SignalRClient/bin/Debug/net6.0
*.dll
*.exe
*.pdb
/Tests/SignalRServer/bin/Debug/net6.0
/Tests/WorkflowDemo/bin/Debug/net6.0
/Tests/WpfWorkflowDemo/bin/Debug/net6.0-windows
58 changes: 57 additions & 1 deletion HjmosControl.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppWindowDemo", "Tests\AppW
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PDFDemo", "PDFDemo\PDFDemo.csproj", "{C583820E-3CC1-47A9-9B55-734468E798EF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApp3", "Tests\WpfApp3\WpfApp3.csproj", "{81567F0B-1A10-4A97-A70C-8030740B9793}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfApp3", "Tests\WpfApp3\WpfApp3.csproj", "{81567F0B-1A10-4A97-A70C-8030740B9793}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskDemo", "Tests\TaskDemo\TaskDemo.csproj", "{4270E4ED-A557-458B-9AE7-4E1129E41DF4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGenerator", "Tests\SourceGenerator\SourceGenerator.csproj", "{3F9F5658-CD1F-4048-BFEB-C216E552FFAB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RoslynDemo", "Tests\RoslynDemo\RoslynDemo.csproj", "{F53A1CBA-3B21-41FF-A68B-6EEF1A50CA71}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Drop", "Tests\Drop\Drop.csproj", "{C8883D32-99D9-4A81-B595-0C5F3991DD2B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalRServer", "Tests\SignalRServer\SignalRServer.csproj", "{FDF0ED15-35C9-4E4A-97F1-8B70B569AFB8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalRClient", "Tests\SignalRClient\SignalRClient.csproj", "{BC355152-2780-46E2-8C8E-3E2FA871927A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowDemo", "Tests\WorkflowDemo\WorkflowDemo.csproj", "{A6D98D3D-FD6C-474B-A11B-C628EC801E6C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfWorkflowDemo", "Tests\WpfWorkflowDemo\WpfWorkflowDemo.csproj", "{40C94F1F-6B7C-45AF-ADF3-24AC304FBE7F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -175,6 +191,38 @@ Global
{81567F0B-1A10-4A97-A70C-8030740B9793}.Debug|Any CPU.Build.0 = Debug|Any CPU
{81567F0B-1A10-4A97-A70C-8030740B9793}.Release|Any CPU.ActiveCfg = Release|Any CPU
{81567F0B-1A10-4A97-A70C-8030740B9793}.Release|Any CPU.Build.0 = Release|Any CPU
{4270E4ED-A557-458B-9AE7-4E1129E41DF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4270E4ED-A557-458B-9AE7-4E1129E41DF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4270E4ED-A557-458B-9AE7-4E1129E41DF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4270E4ED-A557-458B-9AE7-4E1129E41DF4}.Release|Any CPU.Build.0 = Release|Any CPU
{3F9F5658-CD1F-4048-BFEB-C216E552FFAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3F9F5658-CD1F-4048-BFEB-C216E552FFAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3F9F5658-CD1F-4048-BFEB-C216E552FFAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3F9F5658-CD1F-4048-BFEB-C216E552FFAB}.Release|Any CPU.Build.0 = Release|Any CPU
{F53A1CBA-3B21-41FF-A68B-6EEF1A50CA71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F53A1CBA-3B21-41FF-A68B-6EEF1A50CA71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F53A1CBA-3B21-41FF-A68B-6EEF1A50CA71}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F53A1CBA-3B21-41FF-A68B-6EEF1A50CA71}.Release|Any CPU.Build.0 = Release|Any CPU
{C8883D32-99D9-4A81-B595-0C5F3991DD2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C8883D32-99D9-4A81-B595-0C5F3991DD2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C8883D32-99D9-4A81-B595-0C5F3991DD2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C8883D32-99D9-4A81-B595-0C5F3991DD2B}.Release|Any CPU.Build.0 = Release|Any CPU
{FDF0ED15-35C9-4E4A-97F1-8B70B569AFB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FDF0ED15-35C9-4E4A-97F1-8B70B569AFB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FDF0ED15-35C9-4E4A-97F1-8B70B569AFB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FDF0ED15-35C9-4E4A-97F1-8B70B569AFB8}.Release|Any CPU.Build.0 = Release|Any CPU
{BC355152-2780-46E2-8C8E-3E2FA871927A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC355152-2780-46E2-8C8E-3E2FA871927A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC355152-2780-46E2-8C8E-3E2FA871927A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC355152-2780-46E2-8C8E-3E2FA871927A}.Release|Any CPU.Build.0 = Release|Any CPU
{A6D98D3D-FD6C-474B-A11B-C628EC801E6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A6D98D3D-FD6C-474B-A11B-C628EC801E6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6D98D3D-FD6C-474B-A11B-C628EC801E6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6D98D3D-FD6C-474B-A11B-C628EC801E6C}.Release|Any CPU.Build.0 = Release|Any CPU
{40C94F1F-6B7C-45AF-ADF3-24AC304FBE7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{40C94F1F-6B7C-45AF-ADF3-24AC304FBE7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40C94F1F-6B7C-45AF-ADF3-24AC304FBE7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{40C94F1F-6B7C-45AF-ADF3-24AC304FBE7F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -207,6 +255,14 @@ Global
{B0603413-8049-4624-9D65-3316B6768256} = {1ABD8763-AE00-4DB0-802B-7034D1E8A5A8}
{C583820E-3CC1-47A9-9B55-734468E798EF} = {1ABD8763-AE00-4DB0-802B-7034D1E8A5A8}
{81567F0B-1A10-4A97-A70C-8030740B9793} = {1ABD8763-AE00-4DB0-802B-7034D1E8A5A8}
{4270E4ED-A557-458B-9AE7-4E1129E41DF4} = {1ABD8763-AE00-4DB0-802B-7034D1E8A5A8}
{3F9F5658-CD1F-4048-BFEB-C216E552FFAB} = {1ABD8763-AE00-4DB0-802B-7034D1E8A5A8}
{F53A1CBA-3B21-41FF-A68B-6EEF1A50CA71} = {1ABD8763-AE00-4DB0-802B-7034D1E8A5A8}
{C8883D32-99D9-4A81-B595-0C5F3991DD2B} = {1ABD8763-AE00-4DB0-802B-7034D1E8A5A8}
{FDF0ED15-35C9-4E4A-97F1-8B70B569AFB8} = {1ABD8763-AE00-4DB0-802B-7034D1E8A5A8}
{BC355152-2780-46E2-8C8E-3E2FA871927A} = {1ABD8763-AE00-4DB0-802B-7034D1E8A5A8}
{A6D98D3D-FD6C-474B-A11B-C628EC801E6C} = {1ABD8763-AE00-4DB0-802B-7034D1E8A5A8}
{40C94F1F-6B7C-45AF-ADF3-24AC304FBE7F} = {1ABD8763-AE00-4DB0-802B-7034D1E8A5A8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {015BA3E1-CA9C-46CF-8039-765B8AD2C281}
Expand Down
5 changes: 3 additions & 2 deletions PDFDemo/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ IContainer DefaultCellStyle(IContainer container, string backgroundColor)
int m = 5;
for (int j=0;j<n;j++)
{
column2.Item().Text("谢家桥");
column2.Item().Padding(5).Text("谢家桥");
for (int i = 0; i < m; i+=2)
{
column2.Item().Row(row =>
Expand All @@ -231,7 +231,8 @@ IContainer DefaultCellStyle(IContainer container, string backgroundColor)
{
column.Spacing(2);

column.Item().AlignCenter().AlignMiddle().Width(150).Image("河流.png", ImageScaling.FitArea);
//column.Item().AlignCenter().AlignMiddle().Width(150).Image("河流.png", ImageScaling.FitArea);
column.Item().PaddingVertical(5).PaddingHorizontal(10).Height(200).Placeholder();
column.Item().Padding(10).Row(row1 =>
{
row1.RelativeItem().Table(table =>
Expand Down
8 changes: 7 additions & 1 deletion PDFDemo/PDFDemo.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net472</TargetFrameworks>
<UseWPF>true</UseWPF>
<LangVersion>latest</LangVersion>
</PropertyGroup>
Expand All @@ -11,4 +11,10 @@
<PackageReference Include="QuestPDF" Version="2022.11.0" />
</ItemGroup>

<ItemGroup>
<Page Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>

</Project>
13 changes: 11 additions & 2 deletions Tests/Controltest/ExcelWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,16 @@
Topmost="True"
mc:Ignorable="d">
<Grid>
<Button
<ComboBox
Width="144"
Height="36"
Margin="8,5"
VerticalAlignment="Top"
Background="#FF18486F"
BorderThickness="0"
Foreground="Red"
ItemsSource="{Binding list}" />
<!--<Button
Width="80"
Height="25"
Margin="285,175,0,0"
Expand All @@ -25,6 +34,6 @@
<ContentControl>
<local:UserControl1></local:UserControl1>
</ContentControl>
<ContentControl></ContentControl>
<ContentControl></ContentControl>-->
</Grid>
</Window>
19 changes: 15 additions & 4 deletions Tests/Controltest/ExcelWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Microsoft.VisualBasic.Devices;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Media;
using System.Runtime.InteropServices;
Expand All @@ -21,20 +22,30 @@ namespace Controltest
/// <summary>
/// ExcelWindow.xaml 的交互逻辑
/// </summary>
public partial class ExcelWindow : Window
public partial class ExcelWindow : Window, INotifyPropertyChanged
{
[DllImport("user32.dll")]
public static extern int MessageBeep(uint uType);

public ExcelWindow()
{
InitializeComponent();
this.DataContext = this;
//this.Loaded += ExcelWindow_Loaded;

this.Loaded += ExcelWindow_Loaded;


list = new List<string> { "1", "2", "3" };
}

public List<string> list { get; set; }





SpeechSynthesizer synth;

public event PropertyChangedEventHandler PropertyChanged;

private void ExcelWindow_Loaded(object sender, RoutedEventArgs e)
{

Expand Down

0 comments on commit 135bee4

Please sign in to comment.