Skip to content

T
Thick-Common
Commit 847fa9ba authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

Merge remote-tracking branch 'remotes/origin/dev8.0-blowing' into dev8.0-blowingMultiLangError 

# Conflicts:
#	Project.FLY.Misc/MISC/Culture.cs
parents d9cd5e60 26796810
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 74 deletions
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/Colors2.xaml
View file @ 847fa9ba
...@@ -77,10 +77,11 @@ ...@@ -77,10 +77,11 @@
<SolidColorBrush x:Key="Brushes.Card.Badged.Foreground" Color="{StaticResource Colors.Card.Badged.Foreground}"/> <SolidColorBrush x:Key="Brushes.Card.Badged.Foreground" Color="{StaticResource Colors.Card.Badged.Foreground}"/>
<!--卡片所在容器 背景 颜色--> <!--卡片所在容器 背景 颜色-->
<SolidColorBrush x:Key="Brushes.Card.Background" Color="{StaticResource Colors.Gray8}"/> <SolidColorBrush x:Key="Brushes.Card.Background" Color="{StaticResource Colors.Gray8}"/>
<SolidColorBrush x:Key="Brushes.Text.White" Color="{StaticResource Colors.Text.White}"/> <SolidColorBrush x:Key="Brushes.Text.White" Color="{StaticResource Colors.Text.White}"/>
<SolidColorBrush x:Key="Brushes.Text.Gray" Color="{StaticResource Colors.Text.Gray}"/> <SolidColorBrush x:Key="Brushes.Text.LightGray" Color="{StaticResource Colors.Gray8}"/>
<SolidColorBrush x:Key="Brushes.Text.Gray" Color="{StaticResource Colors.Gray2}"/>
<SolidColorBrush x:Key="Brushes.Text.Black" Color="{StaticResource Colors.Text.Black}"/> <SolidColorBrush x:Key="Brushes.Text.Black" Color="{StaticResource Colors.Text.Black}"/>
<SolidColorBrush x:Key="Brushes.Gray1" Color="{StaticResource Colors.Gray1}" /> <SolidColorBrush x:Key="Brushes.Gray1" Color="{StaticResource Colors.Gray1}" />
......
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/IconButtonStyle2.xaml
View file @ 847fa9ba
...@@ -83,21 +83,33 @@ ...@@ -83,21 +83,33 @@
<!--圆形确定按钮，绿色， 很多界面使用，例如扫描图 设置界面 --> <!--圆形确定按钮，绿色， 很多界面使用，例如扫描图 设置界面 -->
<Style TargetType="Button" x:Key="Styles.Button.Apply" BasedOn="{StaticResource Styles.Button.Empty}"> <Style TargetType="Button" x:Key="Styles.Button.Apply" >
<Setter Property="Foreground" Value="#FF31AE15"/> <Setter Property="Template">
<Setter Property="Margin" Value="{StaticResource ControlMargin}"/>
<Setter Property="HorizontalAlignment" Value="Right"/>
<Setter Property="VerticalAlignment" Value="Top"/>
<Setter Property="Content">
<Setter.Value> <Setter.Value>
<Grid> <ControlTemplate TargetType="{x:Type Button}">
<Ellipse Fill="White" Height="90" Width="90"/> <Grid>
<iconPacks:PackIconMaterial Kind="CheckCircle" HorizontalAlignment="Center" VerticalAlignment="Center" Width="80" Height="auto" /> <Ellipse Fill="White" Height="90" Width="90"/>
</Grid> <iconPacks:PackIconMaterial Kind="CheckCircle"
HorizontalAlignment="Center" VerticalAlignment="Center" Width="80" Height="auto"
Foreground="#FF31AE15"
/>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsKeyboardFocused" Value="true">
</Trigger>
<Trigger Property="IsEnabled" Value="false">
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Opacity" Value="0.5"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
<Setter Property="Margin" Value="{StaticResource ControlMargin}"/>
<Setter Property="HorizontalAlignment" Value="Right"/>
<Setter Property="VerticalAlignment" Value="Top"/>
</Style> </Style>
<!--矩形图标按钮 内部为iconPacks的按键，下方不可带文字 --> <!--矩形图标按钮 内部为iconPacks的按键，下方不可带文字 -->
<Style TargetType="Button" x:Key="Styles.Button.Icon.Rectangle"> <Style TargetType="Button" x:Key="Styles.Button.Icon.Rectangle">
<Setter Property="Template"> <Setter Property="Template">
......
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/SectionStyle2.xaml
View file @ 847fa9ba
...@@ -59,17 +59,41 @@ ...@@ -59,17 +59,41 @@
<Setter Property="FontSize" Value="30" /> <Setter Property="FontSize" Value="30" />
</Style> </Style>
<!--标题区,左边的后退键(蓝底白图标)--> <!--标题区,左边的后退键(蓝底白图标)-->
<Style TargetType="Button" x:Key="Styles.TitleBar.BackButton" BasedOn="{StaticResource Styles.Button.Empty}"> <Style TargetType="Button" x:Key="Styles.TitleBar.BackButton" >
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}"
Height="{TemplateBinding Height}"
Width="{TemplateBinding Width}"
>
<iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsKeyboardFocused" Value="true">
</Trigger>
<Trigger Property="IsEnabled" Value="false">
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Opacity" Value="0.5"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="Width" Value="80"/> <Setter Property="Width" Value="80"/>
<Setter Property="Height" Value="80"/> <Setter Property="Height" Value="80"/>
<Setter Property="Margin" Value="0,24"/> <Setter Property="Margin" Value="0,24"/>
<Setter Property="Foreground" Value="{StaticResource Brushes.TitleBar.Foreground}"/> <Setter Property="Foreground" Value="{StaticResource Brushes.TitleBar.Foreground}"/>
<Setter Property="Background" Value="{StaticResource Brushes.TitleBar.Background}"/> <Setter Property="Background" Value="{StaticResource Brushes.TitleBar.Background}"/>
<Setter Property="Content">
<Setter.Value>
<iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
</Setter.Value>
</Setter>
<Style.Resources> <Style.Resources>
<Style TargetType="iconPacks:PackIconMaterial" > <Style TargetType="iconPacks:PackIconMaterial" >
<Setter Property="Width" Value="60"/> <Setter Property="Width" Value="60"/>
......
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/TextStyle2.xaml
View file @ 847fa9ba
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<!-- 只读项 的标题 --> <!-- 只读项 的标题 -->
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader"> <Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader">
<Setter Property="Margin" Value="{StaticResource Margin.Text}" /> <Setter Property="Margin" Value="{StaticResource Margin.Text}" />
<Setter Property="Foreground" Value="#FF3B3B3B" /> <Setter Property="Foreground" Value="{StaticResource Brushes.Text.Black}" />
<Setter Property="FontWeight" Value="Bold" /> <Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="{StaticResource FontSize.FieldHeader}" /> <Setter Property="FontSize" Value="{StaticResource FontSize.FieldHeader}" />
<Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" /> <Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
...@@ -64,10 +64,10 @@ ...@@ -64,10 +64,10 @@
<!-- 可写项 的标题 --> <!-- 可写项 的标题 -->
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader.Editable" BasedOn="{StaticResource Styles.Text.FieldHeader}"> <Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader.Editable" BasedOn="{StaticResource Styles.Text.FieldHeader}">
<Setter Property="Foreground" Value="#FF0083D7" /> <Setter Property="Foreground" Value="{StaticResource Brushes.Text.Activity}" />
</Style> </Style>
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader.Comment" BasedOn="{StaticResource Styles.Text.FieldHeader}"> <Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader.Comment" BasedOn="{StaticResource Styles.Text.FieldHeader}">
<Setter Property="Foreground" Value="#FF888888" /> <Setter Property="Foreground" Value="{StaticResource Brushes.Text.Gray}" />
<Setter Property="FontSize" Value="13" /> <Setter Property="FontSize" Value="13" />
</Style> </Style>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<!-- 只读项 内容 --> <!-- 只读项 内容 -->
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent"> <Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent">
<Setter Property="Margin" Value="{StaticResource Margin.Text}" /> <Setter Property="Margin" Value="{StaticResource Margin.Text}" />
<Setter Property="Foreground" Value="#FF3B3B3B" /> <Setter Property="Foreground" Value="{StaticResource Brushes.Text.Black}" />
<!--<Setter Property="FontWeight" Value="Bold" />--> <!--<Setter Property="FontWeight" Value="Bold" />-->
<Setter Property="FontSize" Value="{StaticResource FontSize.FieldContent}" /> <Setter Property="FontSize" Value="{StaticResource FontSize.FieldContent}" />
<Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" /> <Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<!-- 输入框 内容 --> <!-- 输入框 内容 -->
<Style TargetType="TextBox" x:Key="Styles.Text.FieldContent.Input" BasedOn="{StaticResource Styles.Text.Input}"> <Style TargetType="TextBox" x:Key="Styles.Text.FieldContent.Input" BasedOn="{StaticResource Styles.Text.Input}">
<Setter Property="Margin" Value="{StaticResource Margin.Text}" /> <Setter Property="Margin" Value="{StaticResource Margin.Text}" />
<Setter Property="Foreground" Value="#FF3B3B3B" /> <Setter Property="Foreground" Value="{StaticResource Brushes.Text.Black}" />
<!--<Setter Property="FontWeight" Value="Bold" />--> <!--<Setter Property="FontWeight" Value="Bold" />-->
<Setter Property="FontSize" Value="{StaticResource FontSize.FieldContent}" /> <Setter Property="FontSize" Value="{StaticResource FontSize.FieldContent}" />
<Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" /> <Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<!-- 内容的分割线 --> <!-- 内容的分割线 -->
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent.Separator"> <Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent.Separator">
<Setter Property="Foreground" Value="#FF888888" /> <Setter Property="Foreground" Value="{StaticResource Brushes.Text.Gray}" />
<Setter Property="FontSize" Value="{StaticResource FontSize.FieldContent}" /> <Setter Property="FontSize" Value="{StaticResource FontSize.FieldContent}" />
<Setter Property="FontFamily" Value="Arial" /> <Setter Property="FontFamily" Value="Arial" />
<Setter Property="TextAlignment" Value="Left" /> <Setter Property="TextAlignment" Value="Left" />
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<!-- 内容的单位 --> <!-- 内容的单位 -->
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent.Unit"> <Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent.Unit">
<Setter Property="Foreground" Value="#FF888888" /> <Setter Property="Foreground" Value="{StaticResource Brushes.Text.Gray}" />
<Setter Property="FontSize" Value="{StaticResource FontSize.FieldContent.Small}" /> <Setter Property="FontSize" Value="{StaticResource FontSize.FieldContent.Small}" />
<Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" /> <Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
<Setter Property="TextAlignment" Value="Left" /> <Setter Property="TextAlignment" Value="Left" />
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Themes/GraphStyle.xaml
View file @ 847fa9ba
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
<Setter Property="DataLabelForeground" Value="White"/> <Setter Property="DataLabelForeground" Value="White"/>
<Setter Property="Opacity" Value="0.1"/> <Setter Property="Opacity" Value="0.1"/>
<Setter Property="Stroke" Value="#FFCA000C"/> <Setter Property="Stroke" Value="#40CA000C"/>
<Setter Property="Fill" Value="#59CA000C"/> <Setter Property="Fill" Value="#20CA000C"/>
</Style> </Style>
<!--图表中放大用选择器--> <!--图表中放大用选择器-->
...@@ -76,4 +76,15 @@ ...@@ -76,4 +76,15 @@
<Setter Property="Opacity" Value="0.5"/> <Setter Property="Opacity" Value="0.5"/>
<Setter Property="Panel.ZIndex" Value="1"/> <Setter Property="Panel.ZIndex" Value="1"/>
</Style> </Style>
<!--扫描图，纵向趋势图Y轴 标签 公差，目标值，上下限-->
<Style x:Key="Styles.Axis.Section.Tolerance" TargetType="lvc:AxisSection" >
<Setter Property="StrokeThickness" Value="1"/>
<Setter Property="DataLabel" Value="True"/>
<Setter Property="DisableAnimations" Value="True"/>
<Setter Property="DataLabelForeground" Value="White"/>
<Setter Property="Opacity" Value="0.5"/>
<Setter Property="Panel.ZIndex" Value="1"/>
<Setter Property="StrokeDashArray" Value="3"/>
</Style>
</ResourceDictionary> </ResourceDictionary>
\ No newline at end of file
Project.SQLiteHelper/SQLiteHelper/SQLiteDbContext.cs
View file @ 847fa9ba
...@@ -19,7 +19,8 @@ namespace SQLite ...@@ -19,7 +19,8 @@ namespace SQLite
{ {
get get
{ {
return string.Format("Data Source={0};Version=3;", DBPath); //超时100ms
return string.Format("Data Source={0};Version=3;BusyTimeout=100", DBPath);
} }
} }
public string DBPath { get; private set; } = @"test.sqlite3"; public string DBPath { get; private set; } = @"test.sqlite3";
......
Project.SQLiteHelper/SQLiteHelper/SQLiteHelper.cs
View file @ 847fa9ba
...@@ -491,9 +491,9 @@ namespace SQLite ...@@ -491,9 +491,9 @@ namespace SQLite
/// <returns></returns> /// <returns></returns>
public bool QueryTran(IEnumerable<string> queryList) public bool QueryTran(IEnumerable<string> queryList)
{ {
if (isHoldQueryTran) if (isHoldQueryTran)//打包模式
{ {
holdQueryList.AddRange(queryList); holdQueryList.AddRange(queryList);//记录SQLs
return true; return true;
} }
else else
...@@ -504,30 +504,29 @@ namespace SQLite ...@@ -504,30 +504,29 @@ namespace SQLite
{ {
connection.Open(); connection.Open();
SQLiteTransaction tran = connection.BeginTransaction(); using (SQLiteTransaction tran = connection.BeginTransaction())
bool check = false;
try
{ {
foreach (string item in queryList) bool check = false;
try
{ {
command.CommandText = item; foreach (string item in queryList)
command.ExecuteNonQuery(); {
command.CommandText = item;
command.ExecuteNonQuery();
}
tran.Commit();//事务提交
check = true;//执行成功
} }
tran.Commit(); catch (Exception ex)
check = true; {
} //异常
catch (Exception ex) tran.Rollback();//事务回滚
{ check = false;//执行失败
tran.Rollback(); logger.Error(ex, Newtonsoft.Json.JsonConvert.SerializeObject(queryList));
check = false; throw ex;//抛出异常
logger.Error(ex, Newtonsoft.Json.JsonConvert.SerializeObject(queryList)); }
throw ex; return check;
}
finally
{
connection.Close();
} }
return check;
} }
} }
} }
...@@ -564,35 +563,36 @@ namespace SQLite ...@@ -564,35 +563,36 @@ namespace SQLite
{ {
connection.Open(); connection.Open();
SQLiteTransaction tran = connection.BeginTransaction(); using (SQLiteTransaction tran = connection.BeginTransaction())
bool check = false;
try
{ {
foreach (string item in holdQueryList) bool check;
try
{ {
command.CommandText = item; foreach (string item in holdQueryList)//全部SQL 打包为一个事务执行
command.ExecuteNonQuery(); {
command.CommandText = item;
command.ExecuteNonQuery();
}
tran.Commit();//事务提交
check = true;//执行成功
} }
tran.Commit(); catch (Exception ex)
check = true; {
} tran.Rollback();//异常出错，事务回滚
catch (Exception ex) check = false;//执行失败
{ throw ex;//弹出异常
tran.Rollback(); }
check = false; finally
throw ex; {
} holdQueryList.Clear();//清除 SQL
finally isHoldQueryTran = false;//退出打包模式
{ }
holdQueryList.Clear(); return check;
connection.Close();
isHoldQueryTran = false;
} }
return check;
} }
} }
} }
isHoldQueryTran = false; isHoldQueryTran = false;//退出打包模式
return true; return true;
} }
/// <summary> /// <summary>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment