diamond-cut
/
SparkClient
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 样式修正

Browse Source
master
Tongg 7 months ago
parent a4587ba9a3
commit b90466ee0d
5 changed files with 254 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Views/BaseWindow/BaseControl.xaml
  2. 57
      Views/Configuration/AlgorithmConfigPage.xaml
  3. 45
      Views/Configuration/ConfigMenuPage.xaml
  4. 211
      Views/Configuration/LevelConfigPage.xaml
  5. 3
      Views/Configuration/SettingPageBase.xaml

2
Views/BaseWindow/BaseControl.xaml
Unescape View File

@ -134,7 +134,7 @@
</Button>
</Border>
</Grid>
<Border Grid.Row="1" Grid.Column="0" Background="#ffffff" Padding="10" Margin="20 10" CornerRadius="15">
<Border Grid.Row="1" Grid.Column="0" Padding="10" Margin="20 10" CornerRadius="15">
<ContentControl Name="ContentMain" Content="{Binding Content}" />
</Border>

57
Views/Configuration/AlgorithmConfigPage.xaml
Unescape View File

@ -22,9 +22,60 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Button Grid.Column="0" Grid.Row="0" Content="{ DynamicResource Save}" Width="80" Margin="10 5 " Command="{Binding SaveAlgorithmDataCommand}"/>
<Button Grid.Column="1" Grid.Row="0" Content="{DynamicResource BeautifyJson}" Width="80" Margin="10 5 " Command="{Binding BeautifyJsonCommand}"/>
<Button Grid.Column="2" Grid.Row="0" Content="{DynamicResource UglifyJson}" Width="80" Margin="10 5 " Command="{Binding UglifyJsonCommand}"/>
<Button Grid.Column="0" Grid.Row="0" Width="100" Margin="0 5 " Padding="0" Height="50"
BorderThickness="0" Background="Transparent" FocusVisualStyle="{x:Null}" Command="{Binding SaveAlgorithmDataCommand}">
<Border HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="0 0 0 0"
Padding="10, 10"
Width="100"
BorderThickness="0"
CornerRadius="20">
<Border.Background>
<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
<GradientStop Color="#61bde2" Offset="0"/>
<GradientStop Color="#53abd9" Offset="1"/>
</LinearGradientBrush>
</Border.Background>
<TextBlock Text="{ DynamicResource Save}" TextAlignment="Center" Foreground="#ffffff" FontSize="16"></TextBlock>
</Border>
</Button>
<Button Grid.Column="1" Grid.Row="0" Width="100" Margin="10 5 " Padding="0" Height="50"
BorderThickness="0" Background="Transparent" FocusVisualStyle="{x:Null}" Command="{Binding BeautifyJsonCommand}">
<Border HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="0 0 0 0"
Padding="10, 10"
Width="100"
BorderThickness="0"
CornerRadius="20">
<Border.Background>
<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
<GradientStop Color="#61bde2" Offset="0"/>
<GradientStop Color="#53abd9" Offset="1"/>
</LinearGradientBrush>
</Border.Background>
<TextBlock Text="{ DynamicResource BeautifyJson}" TextAlignment="Center" Foreground="#ffffff" FontSize="16"></TextBlock>
</Border>
</Button>
<Button Grid.Column="2" Grid.Row="0" Width="100" Margin="0 5 " Padding="0" Height="50"
BorderThickness="0" Background="Transparent" FocusVisualStyle="{x:Null}" Command="{Binding UglifyJsonCommand}">
<Border HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="0 0 0 0"
Padding="10, 10"
Width="100"
BorderThickness="0"
CornerRadius="20">
<Border.Background>
<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
<GradientStop Color="#61bde2" Offset="0"/>
<GradientStop Color="#53abd9" Offset="1"/>
</LinearGradientBrush>
</Border.Background>
<TextBlock Text="{ DynamicResource UglifyJson}" TextAlignment="Center" Foreground="#ffffff" FontSize="16"></TextBlock>
</Border>
</Button>
<!-- <TextBox Grid.Column="3" Grid.Row="0" Text="{Binding AlgorithmConfigJson}"></TextBox> -->

45
Views/Configuration/ConfigMenuPage.xaml
Unescape View File

@ -7,28 +7,47 @@
Loaded="ConfigMenuPage_OnLoaded"
mc:Ignorable="d" >
<Border.Resources>
<!-- 定义一个平移转换，用于让按钮整体向上移动 -->
<TranslateTransform x:Key="ButtonTranslateTransform" X="0" Y="0" x:Shared="False" />
<!-- 定义一个缩放变换，用于按钮的放大缩小 -->
<ScaleTransform x:Key="ButtonScaleTransform" ScaleX="1" ScaleY="1" x:Shared="False" />
<!-- 鼠标移入时的动画：Y从0移动到 -20 像素（向上） -->
<!-- 鼠标移入的放大动画 -->
<Storyboard x:Key="MouseEnterStoryboard">
<!-- 放大ScaleX -->
<DoubleAnimation
From="0" To="-20"
From="1" To="1.1"
Duration="0:0:0.3"
Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)">
<!-- 使用三次方缓动函数，EaseOut 表示前快后慢 -->
Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)">
<DoubleAnimation.EasingFunction>
<CubicEase EasingMode="EaseOut"/>
</DoubleAnimation.EasingFunction>
</DoubleAnimation>
<!-- 放大ScaleY -->
<DoubleAnimation
From="1" To="1.1"
Duration="0:0:0.3"
Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)">
<DoubleAnimation.EasingFunction>
<CubicEase EasingMode="EaseOut"/>
</DoubleAnimation.EasingFunction>
</DoubleAnimation>
</Storyboard>
<!-- 鼠标移出时的动画：Y从 -20 返回到 0 -->
<!-- 鼠标移出的缩小动画 -->
<Storyboard x:Key="MouseLeaveStoryboard">
<!-- 缩回ScaleX -->
<DoubleAnimation
From="1.1" To="1"
Duration="0:0:0.3"
Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)">
<DoubleAnimation.EasingFunction>
<CubicEase EasingMode="EaseOut"/>
</DoubleAnimation.EasingFunction>
</DoubleAnimation>
<!-- 缩回ScaleY -->
<DoubleAnimation
From="-20" To="0"
From="1.1" To="1"
Duration="0:0:0.3"
Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)">
Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)">
<DoubleAnimation.EasingFunction>
<CubicEase EasingMode="EaseOut"/>
</DoubleAnimation.EasingFunction>
@ -172,7 +191,7 @@
</Grid.ColumnDefinitions>
<Button Grid.Column="0" Padding="0" Width="250" Height="250" BorderBrush="Transparent"
RenderTransformOrigin="0.5, 0.5" RenderTransform="{StaticResource ButtonTranslateTransform}"
RenderTransformOrigin="0.5, 0.5" RenderTransform="{StaticResource ButtonScaleTransform}"
Command="{Binding LevelConfigCommand}">
<Button.Background>
<ImageBrush ImageSource="../../Resource/Images/UIResource/02-4.png"></ImageBrush>
@ -190,7 +209,7 @@
Text="{StaticResource LevelConfig}"/>
</Button>
<Button Grid.Column="2" Padding="0" Width="250" Height="250" BorderBrush="Transparent"
RenderTransformOrigin="0.5, 0.5" RenderTransform="{StaticResource ButtonTranslateTransform}"
RenderTransformOrigin="0.5, 0.5" RenderTransform="{StaticResource ButtonScaleTransform}"
Command="{Binding AlgorithmConfigCommand}">
<Button.Background>
<ImageBrush ImageSource="../../Resource/Images/UIResource/02-5.png"></ImageBrush>
@ -208,7 +227,7 @@
Text="{StaticResource AlgorithmConfig}"/>
</Button>
<Button Grid.Column="4" Padding="0" Width="250" Height="250" BorderBrush="Transparent"
RenderTransformOrigin="0.5, 0.5" RenderTransform="{StaticResource ButtonTranslateTransform}"
RenderTransformOrigin="0.5, 0.5" RenderTransform="{StaticResource ButtonScaleTransform}"
Command="{Binding CutConfigCommand}">
<Button.Background>
<ImageBrush ImageSource="../../Resource/Images/UIResource/02-6.png"></ImageBrush>
@ -226,7 +245,7 @@
Text="{StaticResource CutConfig}"/>
</Button>
<Button Grid.Column="6" Padding="0" Width="250" Height="250" BorderBrush="Transparent"
RenderTransformOrigin="0.5, 0.5" RenderTransform="{StaticResource ButtonTranslateTransform}"
RenderTransformOrigin="0.5, 0.5" RenderTransform="{StaticResource ButtonScaleTransform}"
Command="{Binding SettingConfigCommand}">
<Button.Background>
<ImageBrush ImageSource="../../Resource/Images/UIResource/02-7.png"></ImageBrush>

211
Views/Configuration/LevelConfigPage.xaml
Unescape View File

@ -6,58 +6,177 @@
xmlns:local="clr-namespace:SparkClient.Views"
xmlns:hc="https://handyorg.github.io/handycontrol"
mc:Ignorable="d">
<Border.Resources>
<Style x:Key="BorderRowStyle" TargetType="Border">
<Setter Property="CornerRadius" Value="15" />
<Setter Property="Background" Value="#ffffff" />
<Setter Property="Padding" Value="5 10" />
<Setter Property="Margin" Value="2 3" />
</Style>
<!-- 自定义 DataGrid 样式 -->
<Style TargetType="DataGrid" x:Key="CustomDataGridStyle">
<!-- 整体设置 -->
<Setter Property="Background" Value="Transparent"/> <!-- DataGrid 背景透明 -->
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="GridLinesVisibility" Value="None"/> <!-- 去掉网格线 -->
<Setter Property="IsReadOnly" Value="True"/> <!-- 不可编辑 -->
<Setter Property="ColumnWidth" Value="*"/> <!-- 列铺满剩余空间 -->
<Setter Property="HeadersVisibility" Value="Column"/> <!-- 显示标题行 -->
<Setter Property="AutoGenerateColumns" Value="False"/> <!-- 根据需要，可开启或关闭 -->
<Setter Property="RowStyle">
<Setter.Value>
<Style TargetType="DataGridRow">
<!-- 行背景色, 包括选中、鼠标悬浮等情况下也都能看到基本色 -->
<Setter Property="Background" Value="#f0f1f6"/>
<Setter Property="Height" Value="50"/>
<!-- 行下方留 2 像素空隙，相当于“行间距” -->
<Setter Property="Margin" Value="0,3,0,3"/>
<!-- 如果你想去掉选中/悬浮的高亮色，可进一步设置 SelectionUnit、Triggers 等 -->
</Style>
</Setter.Value>
</Setter>
<!-- 标题行样式 -->
<Setter Property="ColumnHeaderStyle">
<Setter.Value>
<Style TargetType="DataGridColumnHeader">
<!-- 标题背景色 -->
<Setter Property="Background" Value="#f0f1f6"/>
<!-- 标题内容居中 -->
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Height" Value="50"/>
<!-- <Setter Property="ClipToBounds" Value="True"/> -->
<!-- 如果想去掉边框，可设置 BorderThickness、BorderBrush 等 -->
</Style>
</Setter.Value>
</Setter>
<!-- 单元格样式：让单元格内容水平/垂直居中 -->
<Setter Property="CellStyle">
<Setter.Value>
<Style TargetType="DataGridCell">
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<!-- 同样可以在此修改单元格的边框、前景色等 -->
</Style>
</Setter.Value>
</Setter>
</Style>
</Border.Resources>
<Grid Background="Transparent">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid Grid.Row="0" Margin=" 0 10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<ComboBox Grid.Column="0" Width="140" hc:DropDownElement.ConsistentWidth="False" SelectedIndex="0"
ItemsSource="{Binding Institutes}" Margin="10 0" DisplayMemberPath="{DynamicResource RULE_NAME}" SelectedValuePath="RULE_ID"
SelectedValue="{Binding InstituteId, Mode=TwoWay}"
SelectionChanged="ChangeInstitutes"
IsEnabled="{Binding InstitutesEnabled,Mode=TwoWay}"/>
<ComboBox Grid.Column="1" Width="140" hc:DropDownElement.ConsistentWidth="False" SelectedIndex="0"
ItemsSource="{Binding Shapes}" Margin="10 0" DisplayMemberPath="{DynamicResource SHAPE_NAME}" SelectedValuePath="SHAPE_ID"
SelectedValue="{Binding ShapeId, Mode=TwoWay}"
SelectionChanged="ChangeShapes"
IsEnabled="{Binding ShapesEnabled,Mode=TwoWay}"/>
<Button Grid.Column="2" Content="{DynamicResource Save}" Margin="10 0" Command="{Binding SaveLevelConfigCommand}"/>
<!--<Button Grid.Column="3" Content="{DynamicResource DeleteConfig}" Margin="10 0" Command="{Binding DelLevelConfigCommand}"/>-->
<Button Grid.Column="5" Content="{DynamicResource ImportConfig}" Margin="10 0" HorizontalAlignment="Right" Command="{Binding LoadLevelConfigCommand}"
/>
</Grid>
<Border Grid.Row="0" Style="{DynamicResource BorderRowStyle}">
<Grid Margin=" 0 10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Border Grid.Column="0" Background="#e0e2ee" CornerRadius="20" Height="40" Width="210" Margin="10 0 0 0">
<ComboBox Width="180" hc:DropDownElement.ConsistentWidth="False" SelectedIndex="0"
ItemsSource="{Binding Institutes}" Margin="10 0" DisplayMemberPath="{DynamicResource RULE_NAME}" SelectedValuePath="RULE_ID"
SelectedValue="{Binding InstituteId, Mode=TwoWay}"
SelectionChanged="ChangeInstitutes"
IsEnabled="{Binding InstitutesEnabled,Mode=TwoWay}"
FontSize="16" Background="Transparent" BorderThickness="0" BorderBrush="Black"
>
</ComboBox>
</Border>
<Border Grid.Column="1" Background="#e0e2ee" CornerRadius="20" Height="40" Width="210" Margin="10 0 0 0">
<ComboBox Width="180" hc:DropDownElement.ConsistentWidth="False" SelectedIndex="0"
ItemsSource="{Binding Shapes}" Margin="10 0" DisplayMemberPath="{DynamicResource SHAPE_NAME}" SelectedValuePath="SHAPE_ID"
SelectedValue="{Binding ShapeId, Mode=TwoWay}"
SelectionChanged="ChangeShapes" FontSize="16" Background="Transparent" BorderThickness="0"
IsEnabled="{Binding ShapesEnabled,Mode=TwoWay}" BorderBrush="Black"/>
</Border>
<Button Grid.Column="2" Grid.Row="0" Width="100" Margin="10 5 " Padding="0" Height="50"
BorderThickness="0" Background="Transparent" FocusVisualStyle="{x:Null}" Command="{Binding SaveLevelConfigCommand}">
<Border HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="0 0 0 0"
Padding="10, 10"
Width="100"
BorderThickness="0"
CornerRadius="20">
<Border.Background>
<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
<GradientStop Color="#29c4ba" Offset="0"/>
<GradientStop Color="#13b1a8" Offset="1"/>
</LinearGradientBrush>
</Border.Background>
<TextBlock Text="{ DynamicResource Save}" TextAlignment="Center" Foreground="#ffffff" FontSize="16"></TextBlock>
</Border>
</Button>
<!-- <Button Grid.Column="2" Content="{DynamicResource Save}" Margin="10 0" Command="{Binding SaveLevelConfigCommand}"/> -->
<!--<Button Grid.Column="3" Content="{DynamicResource DeleteConfig}" Margin="10 0" Command="{Binding DelLevelConfigCommand}"/>-->
<!-- <Button Grid.Column="5" Content="{DynamicResource ImportConfig}" Margin="10 0" HorizontalAlignment="Right" Command="{Binding LoadLevelConfigCommand}"/> -->
<Button Grid.Column="5" Grid.Row="0" Width="100" Margin="10 5 10 5" Padding="0" Height="50"
BorderThickness="0" Background="Transparent" FocusVisualStyle="{x:Null}" Command="{Binding LoadLevelConfigCommand}">
<Border HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="0 0 0 0"
Padding="10, 10"
Width="100"
BorderThickness="0"
CornerRadius="20">
<Border.Background>
<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
<GradientStop Color="#36adff" Offset="0"/>
<GradientStop Color="#3c9ce6" Offset="1"/>
</LinearGradientBrush>
</Border.Background>
<TextBlock Text="{ DynamicResource ImportConfig}" TextAlignment="Center" Foreground="#ffffff" FontSize="16"></TextBlock>
</Border>
</Button>
</Grid>
</Border>
<DataGrid Grid.Row="1" x:Name="DataGrid1" HeadersVisibility="Column" RowHeaderWidth="60" AutoGenerateColumns="False" IsReadOnly="True"
ItemsSource="{Binding StandardList}" CanUserResizeColumns="False" CanUserResizeRows="False">
<DataGrid.ColumnHeaderStyle>
<Style TargetType="DataGridColumnHeader">
<Setter Property="MinWidth" Value="150"/>
<Setter Property="BorderThickness" Value="1,1,1,1"/>
<Setter Property="BorderBrush" Value="Gray"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<Setter Property="BorderThickness" Value="1,1,1,1"/>
<Setter Property="BorderBrush" Value="Gray"/>
</Style>
</DataGrid.CellStyle>
<DataGrid.RowStyle>
<Style TargetType="DataGridRow">
<Setter Property="HorizontalContentAlignment" Value="Center"/>
</Style>
</DataGrid.RowStyle>
</DataGrid>
<Border Grid.Row="1" Style="{DynamicResource BorderRowStyle}">
<!-- <DataGrid Grid.Row="1" x:Name="DataGrid1" HeadersVisibility="Column" RowHeaderWidth="60" AutoGenerateColumns="False" IsReadOnly="True" -->
<!-- ItemsSource="{Binding StandardList}" CanUserResizeColumns="False" CanUserResizeRows="False"> -->
<!-- <DataGrid.ColumnHeaderStyle> -->
<!-- <Style TargetType="DataGridColumnHeader"> -->
<!-- <Setter Property="MinWidth" Value="150"/> -->
<!-- <Setter Property="BorderThickness" Value="1,1,1,1"/> -->
<!-- <Setter Property="BorderBrush" Value="Gray"/> -->
<!-- <Setter Property="HorizontalContentAlignment" Value="Center"/> -->
<!-- </Style> -->
<!-- </DataGrid.ColumnHeaderStyle> -->
<!-- <DataGrid.CellStyle> -->
<!-- <Style TargetType="DataGridCell"> -->
<!-- <Setter Property="BorderThickness" Value="1,1,1,1"/> -->
<!-- <Setter Property="BorderBrush" Value="Gray"/> -->
<!-- </Style> -->
<!-- </DataGrid.CellStyle> -->
<!-- <DataGrid.RowStyle> -->
<!-- <Style TargetType="DataGridRow"> -->
<!-- <Setter Property="HorizontalContentAlignment" Value="Center"/> -->
<!-- </Style> -->
<!-- </DataGrid.RowStyle> -->
<!-- </DataGrid> -->
<DataGrid Style="{StaticResource CustomDataGridStyle}"
ItemsSource="{Binding StandardList}" x:Name="DataGrid1">
<!-- 自定义列示例（AutoGenerateColumns=false 时需要手动定义） -->
<!-- <DataGrid.Columns> -->
<!-- <DataGridTextColumn Header="列一" Binding="{Binding Prop1}" /> -->
<!-- <DataGridTextColumn Header="列二" Binding="{Binding Prop2}" /> -->
<!-- ~1~ ... @1@ -->
<!-- </DataGrid.Columns> -->
</DataGrid>
</Border>
</Grid>
</Border>

3
Views/Configuration/SettingPageBase.xaml
Unescape View File

@ -5,7 +5,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:local="clr-namespace:SparkClient.Views.Configuration"
mc:Ignorable="d"
mc:Ignorable="d" CornerRadius="15"
Background="#ffffff"
d:DesignHeight="300" d:DesignWidth="500">
<Border.Resources>
<!-- 渐变背景色，用于选项卡的不同状态 -->

Write Preview
Loading…
Cancel
Save