更新项目配置,新增设备同步模块,优化WebSocket和Swagger配置,增强SCADA系统的免登录接口,支持数据字典项和登录日志的免登录查询与记录。调整Java编译设置,确保更好的开发体验。
This commit is contained in:
75
yy-admin-master/YY.Admin/Resources/Styles/YY.xaml
Normal file
75
yy-admin-master/YY.Admin/Resources/Styles/YY.xaml
Normal file
@@ -0,0 +1,75 @@
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:system="clr-namespace:System;assembly=mscorlib"
|
||||
xmlns:hc="https://handyorg.github.io/handycontrol"
|
||||
xmlns:converter="clr-namespace:YY.Admin.Core.Converter;assembly=YY.Admin.Core">
|
||||
|
||||
<!-- 转换器 -->
|
||||
<converter:EnumDescriptionConverter x:Key="EnumDescriptionConverter"/>
|
||||
<converter:EnumToTagTypeConverter x:Key="EnumToTagTypeConverter"/>
|
||||
<converter:EnumToIntConverter x:Key="EnumToIntConverter"/>
|
||||
<converter:EnumToBoolConverter x:Key="EnumToBoolConverter"/>
|
||||
<converter:EnumToVisibilityConverter x:Key="EnumToVisibilityConverter"/>
|
||||
<converter:RadioButtonEnumMultiConverter x:Key="RadioButtonEnumMultiConverter"/>
|
||||
<converter:NegativeLeftThicknessConverter x:Key="NegativeLeftThicknessConverter" />
|
||||
<converter:BrushToSolidColorPaintConverter x:Key="BrushToSolidColorPaintConverter" />
|
||||
<converter:MaxWidthConverter x:Key="MaxWidthConverter" />
|
||||
<converter:PercentageConverter x:Key="PercentageConverter" />
|
||||
|
||||
<!-- 字体大小 -->
|
||||
<system:Double x:Key="FontSize">14</system:Double>
|
||||
|
||||
<!-- 控件校验错误信息模板 -->
|
||||
<ControlTemplate x:Key="BottomLeftErrorTemplate_ForInfoElement">
|
||||
<Grid>
|
||||
<!-- 占位原控件 -->
|
||||
<AdornedElementPlaceholder x:Name="adorner" />
|
||||
|
||||
<!-- 错误提示框:左对齐,相对于 AdornedElement 的 TitleWidth 做左移 -->
|
||||
<Border
|
||||
VerticalAlignment="Bottom"
|
||||
HorizontalAlignment="Left">
|
||||
<Border.Margin>
|
||||
<MultiBinding Converter="{StaticResource NegativeLeftThicknessConverter}" ConverterParameter="-18">
|
||||
<!-- 通过 adorner 访问 adorned element 的附加属性 -->
|
||||
<Binding Path="AdornedElement.(hc:InfoElement.TitleWidth)"
|
||||
ElementName="adorner"/>
|
||||
<Binding Path="AdornedElement.(hc:InfoElement.TitlePlacement)"
|
||||
ElementName="adorner"/>
|
||||
</MultiBinding>
|
||||
</Border.Margin>
|
||||
<TextBlock Foreground="#E74C3C" FontSize="12" Text="{Binding [0].ErrorContent}" />
|
||||
</Border>
|
||||
</Grid>
|
||||
</ControlTemplate>
|
||||
|
||||
<Style x:Key="IconButtonStyle" TargetType="TextBlock">
|
||||
<Setter Property="Margin" Value="5,0,0,0"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="BaseViewStyle" TargetType="FrameworkElement">
|
||||
<Setter Property="Margin" Value="20"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="DataGridOpeButtonStyle" TargetType="Border">
|
||||
<!--<Setter Property="Margin" Value="5 0 0 0"/>-->
|
||||
<Setter Property="Padding" Value="0,7"/>
|
||||
<Setter Property="Background" Value="Transparent"/>
|
||||
<Setter Property="Cursor" Value="Hand"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="GridSplitterPreviewStyle" TargetType="Control">
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate>
|
||||
<Border
|
||||
Background="{DynamicResource PrimaryBrush}"
|
||||
Opacity="0.6"
|
||||
Margin="-1,0"/>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
</ResourceDictionary>
|
||||
Reference in New Issue
Block a user