David P.G
72d2440314
2
3 - 从Trigger、DbTriggerDefinition和TriggerItem类中移除了所有条件相关的属性（Condition, Threshold, LowerBound, UpperBound）
4 - 删除了ConditionType枚举，简化了触发器逻辑
5 - 为触发器添加了Name字段，在核心模型、数据库实体和视图模型中都添加了该属性
6 - 删除了TriggerDialog界面中的变量选择和搜索功能
7 - 从TriggerDialog界面中删除了触发条件相关的UI元素
8 - 更新了TriggerDialogViewModel，移除了条件相关的验证和业务逻辑
9 - 更新了TriggersViewModel，移除了条件的初始化设置
10 - 更新了AutoMapper配置文件，增加TriggerItem与Trigger之间的映射
11 - 在TriggerEvaluationService中移除了条件判断逻辑，现在激活的触发器会直接执行动作
12 - 更新了App.xaml，移除了对已删除枚举的引用
13 - 修改了保存验证逻辑，确保触发器名称不能为空
50 lines
2.7 KiB
XML
50 lines
2.7 KiB
XML
<Application
|
|
x:Class="DMS.WPF.App"
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
|
xmlns:triggers="clr-namespace:DMS.Core.Models.Triggers;assembly=DMS.Core"
|
|
xmlns:converters="clr-namespace:DMS.WPF.Converters"
|
|
xmlns:localConverters="clr-namespace:DMS.WPF.Converters"
|
|
|
|
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
|
|
<Application.Resources>
|
|
<ResourceDictionary>
|
|
<ResourceDictionary.MergedDictionaries>
|
|
<ui:ThemeResources />
|
|
<ui:XamlControlsResources />
|
|
<ResourceDictionary Source="Resources/DevicesItemTemplateDictionary.xaml" />
|
|
|
|
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml" />
|
|
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml" />
|
|
</ResourceDictionary.MergedDictionaries>
|
|
|
|
<!-- Converters -->
|
|
<converters:EnumToVisibilityConverter x:Key="EnumToVisibilityConverter"/>
|
|
<converters:NullableTimeSpanToSecondsConverter x:Key="NullableTimeSpanToSecondsConverter"/>
|
|
<localConverters:BooleanToBrushConverter x:Key="BooleanToBrushConverter"/> <!-- 确保这个转换器也被引用 -->
|
|
|
|
<!-- 添加缺失的转换器 -->
|
|
<localConverters:EnumToVisibilityConverter x:Key="LocalEnumToVisibilityConverter"/>
|
|
<localConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
|
|
<localConverters:CountToVisibilityConverter x:Key="CountToVisibilityConverter"/>
|
|
<localConverters:BoolToStringConverter x:Key="BoolToStringConverter"/>
|
|
<localConverters:BoolToColorConverter x:Key="BoolToColorConverter"/>
|
|
|
|
<!-- System Accent Color as Brush -->
|
|
<SolidColorBrush x:Key="SystemAccentColorBrush" Color="{DynamicResource SystemAccentColor}" />
|
|
|
|
<!-- Material Design Icons Font -->
|
|
<FontFamily x:Key="MdFontIcons">/Assets/Fonts/materialdesignicons-webfont.ttf#Material Design Icons</FontFamily>
|
|
|
|
<!-- Enum Values for ComboBoxes -->
|
|
<ObjectDataProvider x:Key="ActionTypeEnum" ObjectType="{x:Type sys:Enum}" MethodName="GetValues">
|
|
<ObjectDataProvider.MethodParameters>
|
|
<x:Type TypeName="triggers:ActionType"/>
|
|
</ObjectDataProvider.MethodParameters>
|
|
</ObjectDataProvider>
|
|
|
|
</ResourceDictionary>
|
|
|
|
</Application.Resources>
|
|
</Application> |