fix converting logic error issue

hillsburg · Jun 3, 2024 · f92c71f · f92c71f
1 parent 58bdde6
commit f92c71f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/Log2Html/App.xaml b/Log2Html/App.xaml
@@ -9,9 +9,8 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/ColorPicker;component/Styles/DefaultColorPickerStyle.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.DeepPurple.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <FontFamily x:Key="IconFont">/Log2Html;Component/Assets/#iconfont</FontFamily>
             <FontFamily x:Key="ImFellDwPicaSc">/Log2Html;Component/Assets/#IM FELL DW Pica SC</FontFamily>

diff --git a/Log2Html/ViewModel/AboutViewModel.cs b/Log2Html/ViewModel/AboutViewModel.cs
@@ -8,12 +8,12 @@ namespace Log2Html.ViewModel
 {
     public class AboutViewModel : INotifyPropertyChanged
     {
-        public string AppVersion { get; } = "1.0.3";
+        public string AppVersion { get; } = "1.0.6";
 
         public event PropertyChangedEventHandler? PropertyChanged;
 
 
-        private string _latestVersion = "1.0.3";
+        private string _latestVersion = "1.0.6";
 
         public AboutViewModel()
         {

diff --git a/Log2Html/ViewModel/MainViewVM.cs b/Log2Html/ViewModel/MainViewVM.cs
@@ -1,10 +1,4 @@
-using Log2Html.Dao;
-using Log2Html.Dao.Model;
-using Log2Html.Enum;
-using Log2Html.Model;
-using Log2Html.Utils;
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -14,6 +8,12 @@
 using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Input;
+using Log2Html.Dao;
+using Log2Html.Dao.Model;
+using Log2Html.Enum;
+using Log2Html.Model;
+using Log2Html.Utils;
+using Newtonsoft.Json;
 
 namespace Log2Html.ViewModel
 {
@@ -271,7 +271,11 @@ public ReturnInfo ConvertFile(string filePath, out string logInfo, out string ht
                         var htmlCssColor = item.ColorRgb.StartsWith("#") && item.ColorRgb.Length > 8 ? "#" + item.ColorRgb.Substring(3) + item.ColorRgb.Substring(1, 2) : item.ColorRgb;
                         if (tempLine.Contains(key))
                         {
-                            isMatched = true;
+                            if (!isMatched)
+                            {
+                                isMatched = true;
+                            }
+
                             if (item.ShouldApplyForAllLine)
                             {
                                 if (tempLine.StartsWith("<p"))