Skip to content

V
VIZ.Package
Commit 9811b555 by liulongfei
Options

部分样式调整

parent cbc951d5
Showing with 20 additions and 13 deletions
VIZ.Package.Module.Resource/Style/Button/Button_Default.xaml
...@@ -15,9 +15,6 @@ ...@@ -15,9 +15,6 @@
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#FF5C59F6"></Setter> <Setter Property="Background" Value="#FF5C59F6"></Setter>
</Trigger> </Trigger>
<Trigger Property="IsFocused" Value="True">
<Setter Property="Background" Value="#FF0078D7"></Setter>
</Trigger>
<Trigger Property="IsEnabled" Value="False"> <Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.4"></Setter> <Setter Property="Opacity" Value="0.4"></Setter>
</Trigger> </Trigger>
......
VIZ.Package.Module/Help/About/View/AboutWindow.xaml
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<!-- 系统版本 --> <!-- 系统版本 -->
<TextBlock Text="系统版本：" VerticalAlignment="Center" HorizontalAlignment="Right" <TextBlock Text="系统版本：" VerticalAlignment="Center" HorizontalAlignment="Right"
Grid.Row="1" Grid.Column="0" Margin="0,0,10,0"></TextBlock> Grid.Row="1" Grid.Column="0" Margin="0,0,10,0"></TextBlock>
<TextBlock Text="V1.0.0.03022003_beta" VerticalAlignment="Center" HorizontalAlignment="Left" <TextBlock Text="V1.1.0.03141048_beta" VerticalAlignment="Center" HorizontalAlignment="Left"
Grid.Row="1" Grid.Column="1"></TextBlock> Grid.Row="1" Grid.Column="1"></TextBlock>
</Grid> </Grid>
</dx:ThemedWindow> </dx:ThemedWindow>
VIZ.Package.Module/Main/View/MainStatusView.xaml
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<TextBlock Text="{Binding Scene}" Margin="10,0,0,0" <TextBlock Text="{Binding Scene}" Margin="10,0,0,0"
ToolTip="{Binding Scene}"></TextBlock> ToolTip="{Binding Scene}"></TextBlock>
<!-- 页编号 --> <!-- 页编号 -->
<TextBlock Text="页编号：" Margin="40,0,0,0" Opacity="0.6"></TextBlock> <TextBlock Text="页ID：" Margin="40,0,0,0" Opacity="0.6"></TextBlock>
<TextBlock Text="{Binding PageNum, StringFormat={}{0:D4}}" Margin="10,0,0,0"> <TextBlock Text="{Binding PageNum, StringFormat={}{0:D4}}" Margin="10,0,0,0">
<TextBlock.ToolTip> <TextBlock.ToolTip>
<TextBlock Text="{Binding PageNum, StringFormat={}{0:D4}}" Margin="2,0,2,0"></TextBlock> <TextBlock Text="{Binding PageNum, StringFormat={}{0:D4}}" Margin="2,0,2,0"></TextBlock>
......
VIZ.Package.Module/Page/Core/Controller/PageModelController.cs
...@@ -51,10 +51,7 @@ namespace VIZ.Package.Module ...@@ -51,10 +51,7 @@ namespace VIZ.Package.Module
if (string.IsNullOrWhiteSpace(page.ThumbnailUri)) if (string.IsNullOrWhiteSpace(page.ThumbnailUri))
continue; continue;
Uri srcUri = new Uri(page.ThumbnailUri); var bitmap = this.ghService.GetImage(page.ThumbnailUri);
string destUri = srcUri.ToString().Replace(srcUri.Host, ApplicationDomainEx.VizConfig.GH_IP).Replace(srcUri.Port.ToString(), ApplicationDomainEx.VizConfig.GH_Port.ToString());
var bitmap = this.ghService.GetImage(destUri);
WPFHelper.BeginInvoke(() => WPFHelper.BeginInvoke(() =>
{ {
......
VIZ.Package.Module/Page/Group/View/PageGroupView.xaml
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
<fcore:MultiBool2BoolConverter x:Key="MultiBool2BoolConverter" Mask="1 0" MatchResult="True" NotMatchResult="False"></fcore:MultiBool2BoolConverter> <fcore:MultiBool2BoolConverter x:Key="MultiBool2BoolConverter" Mask="1 0" MatchResult="True" NotMatchResult="False"></fcore:MultiBool2BoolConverter>
<!-- 层模板 --> <!-- 层模板 -->
<!-- 层模板 -->
<fcore:Bool2ControlTemplateConverter x:Key="Bool2ControlTemplateConverter_LayerColumnCellTemplate"> <fcore:Bool2ControlTemplateConverter x:Key="Bool2ControlTemplateConverter_LayerColumnCellTemplate">
<fcore:Bool2ControlTemplateConverter.TrueResult> <fcore:Bool2ControlTemplateConverter.TrueResult>
<ControlTemplate> <ControlTemplate>
...@@ -143,7 +142,7 @@ ...@@ -143,7 +142,7 @@
<common:ColumnDefintionGeneratorTemplate.DataTemplate> <common:ColumnDefintionGeneratorTemplate.DataTemplate>
<DataTemplate> <DataTemplate>
<ContentControl> <ContentControl>
<dxg:GridColumn Header="编号" AllowSorting="False" AllowColumnFiltering="False" AllowResizing="True" <dxg:GridColumn Header="ID" AllowSorting="False" AllowColumnFiltering="False" AllowResizing="True"
FieldName="PageNum" FieldName="PageNum"
Visible="{Binding Path=Visible,Mode=TwoWay}" Visible="{Binding Path=Visible,Mode=TwoWay}"
VisibleIndex="{Binding Path=VisibleIndex,Mode=TwoWay}"> VisibleIndex="{Binding Path=VisibleIndex,Mode=TwoWay}">
...@@ -269,7 +268,7 @@ ...@@ -269,7 +268,7 @@
<common:ColumnDefintionGeneratorTemplate.DataTemplate> <common:ColumnDefintionGeneratorTemplate.DataTemplate>
<DataTemplate> <DataTemplate>
<ContentControl> <ContentControl>
<dxg:GridColumn Header="初始化加载" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" AllowEditing="False" <dxg:GridColumn Header="初始化状态" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" AllowEditing="False"
Visible="{Binding Path=Visible,Mode=TwoWay}" Visible="{Binding Path=Visible,Mode=TwoWay}"
VisibleIndex="{Binding Path=VisibleIndex,Mode=TwoWay}"> VisibleIndex="{Binding Path=VisibleIndex,Mode=TwoWay}">
<dxg:GridColumn.CellTemplate> <dxg:GridColumn.CellTemplate>
......
VIZ.Package.Module/Setting/PluginMapping/PluginMappingSettingPluginLifeCycle.cs
...@@ -29,7 +29,7 @@ namespace VIZ.Package.Module ...@@ -29,7 +29,7 @@ namespace VIZ.Package.Module
/// <summary> /// <summary>
/// 插件名称 /// 插件名称
/// </summary> /// </summary>
public const string PLUGIN_NAME = "插件映射"; public const string PLUGIN_NAME = "数据模板映射";
/// <summary> /// <summary>
/// 注册 /// 注册
......
VIZ.Package.Module/Setting/PluginMapping/ViewModel/PluginMappingSettingViewModel.cs
...@@ -104,6 +104,14 @@ namespace VIZ.Package.Module ...@@ -104,6 +104,14 @@ namespace VIZ.Package.Module
{ {
// 插件映射配置 // 插件映射配置
PluginMappingConfigEntity config = ApplicationDomainEx.PluginMappingConfig; PluginMappingConfigEntity config = ApplicationDomainEx.PluginMappingConfig;
if (config == null)
{
config = new PluginMappingConfigEntity();
config.PluginGroup = ApplicationDomainEx.VizConfig.PluginGroup;
config.Mappings = new List<PluginMapping>();
ApplicationDomainEx.LocalDbContext.PluginMappingConfig.Insert(config);
}
ObservableCollection<PluginMappingModel> list = new ObservableCollection<PluginMappingModel>(); ObservableCollection<PluginMappingModel> list = new ObservableCollection<PluginMappingModel>();
......
VIZ.Package.Service/Viz/VizControlObjectDownloadService.cs
...@@ -82,6 +82,12 @@ namespace VIZ.Package.Service ...@@ -82,6 +82,12 @@ namespace VIZ.Package.Service
// 切换场景 // 切换场景
this.vizCommandService.SetObject(ApplicationDomainEx.PreviewConn, pageBase.ScenePath, pageBase.Layer); this.vizCommandService.SetObject(ApplicationDomainEx.PreviewConn, pageBase.ScenePath, pageBase.Layer);
// 获取场景缩略图
//if (pageBase.ThumbnailBitmap == null)
//{
// pageBase.ThumbnailBitmap = this.vizCommandService.GetSceneImage(ApplicationDomainEx.PreviewConn, pageBase.ScenePath);
//}
// 获取控制对象 // 获取控制对象
ControlObjectModel controlObject = this.vizCommandControlObjectService.GetControlObject(ApplicationDomainEx.PreviewConn); ControlObjectModel controlObject = this.vizCommandControlObjectService.GetControlObject(ApplicationDomainEx.PreviewConn);
......
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