Skip to content

V
VIZ.Package
Commit e8f8a419 by liulongfei
Options

添加页编号

parent 331a29fb
Showing with 227 additions and 35 deletions
VIZ.Package.Domain/Message/Application/ApplicationCloseMessage.cs → VIZ.Package.Domain/Message/Application/ApplicationClosedMessage.cs
......@@ -9,11 +9,8 @@ namespace VIZ.Package.Domain
/// <summary>
/// 系统关闭消息
/// </summary>
public class ApplicationCloseMessage
public class ApplicationClosedMessage
{
/// <summary>
/// 是否取消关闭
/// </summary>
public bool IsCancel { get; set; }
}
}
VIZ.Package.Domain/Message/Application/ApplicationClosingMessage.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Package.Domain
{
/// <summary>
/// 应用程序关闭之前消息
/// </summary>
public class ApplicationClosingMessage
{
/// <summary>
/// 是否取消
/// </summary>
public bool Cancel { get; set; }
}
}
VIZ.Package.Domain/Model/Page/PageModel.cs
......@@ -82,5 +82,19 @@ namespace VIZ.Package.Domain
}
#endregion
#region PageNum -- 页号
private int pageNum;
/// <summary>
/// 页号
/// </summary>
public int PageNum
{
get { return pageNum; }
set { pageNum = value; this.RaisePropertyChanged(nameof(PageNum)); }
}
#endregion
}
}
VIZ.Package.Domain/VIZ.Package.Domain.csproj
......@@ -78,7 +78,8 @@
<Compile Include="Enum\ModulePluginIds.cs" />
<Compile Include="Enum\ViewServiceKeys.cs" />
<Compile Include="Info\VizTreeNodeInfo.cs" />
<Compile Include="Message\Application\ApplicationCloseMessage.cs" />
<Compile Include="Message\Application\ApplicationClosedMessage.cs" />
<Compile Include="Message\Application\ApplicationClosingMessage.cs" />
<Compile Include="Message\Conn\ConnChangedMessage.cs" />
<Compile Include="Message\ControlObject\ControlListFieldChangedMessage.cs" />
<Compile Include="Message\ControlObject\ControlFieldChangedMessage.cs" />
......
VIZ.Package.Module/ControlObject/FieldEdit/View/FieldEditView.xaml
......@@ -28,11 +28,13 @@
<Border Background="#11FFFFFF" Grid.Row="0">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" >
<TextBlock Text="页:" Margin="8,0,0,0" d:Foreground="White" Opacity="0.7"></TextBlock>
<TextBlock Text="{Binding PageID}" Margin="5,0,0,0" d:Foreground="White"></TextBlock>
<TextBlock Text="场景:" Margin="30,0,0,0" d:Foreground="White" Opacity="0.7"></TextBlock>
<TextBlock Text="{Binding Scene}" Margin="5,0,0,0" d:Foreground="White"></TextBlock>
<TextBlock Text="字段:" Margin="30,0,0,0" d:Foreground="White" Opacity="0.7"></TextBlock>
<TextBlock Text="{Binding Path=ControlField.FieldIdentifier}" Margin="5,0,0,0" d:Foreground="White"></TextBlock>
<TextBlock Text="{Binding PageID}" Margin="10,0,0,0" MinWidth="40" d:Foreground="White"></TextBlock>
<TextBlock Text="场景:" Margin="40,0,0,0" d:Foreground="White" Opacity="0.7"></TextBlock>
<TextBlock Text="{Binding Scene}" Margin="10,0,0,0" MinWidth="80" d:Foreground="White"></TextBlock>
<TextBlock Text="字段:" Margin="40,0,0,0" d:Foreground="White" Opacity="0.7"></TextBlock>
<TextBlock Text="{Binding Path=ControlField.FieldIdentifier}" MinWidth="80" Margin="10,0,0,0" d:Foreground="White"></TextBlock>
<TextBlock Text="字段描述:" Margin="40,0,0,0" d:Foreground="White" Opacity="0.7"></TextBlock>
<TextBlock Text="{Binding Path=ControlField.Description}" Margin="10,0,0,0" d:Foreground="White"></TextBlock>
</StackPanel>
</Border>
<!-- 按钮组 -->
......
VIZ.Package.Module/ControlObject/FieldEdit/ViewModel/FieldEditViewModel.cs
......@@ -92,11 +92,11 @@ namespace VIZ.Package.Module
#region PageID -- 页ID
private int? pageID;
private string pageID;
/// <summary>
/// 页ID
/// </summary>
public int? PageID
public string PageID
{
get { return pageID; }
set { pageID = value; this.RaisePropertyChanged(nameof(PageID)); }
......@@ -219,8 +219,15 @@ namespace VIZ.Package.Module
/// <param name="msg">消息</param>
private void OnPageOpenMessage(PageOpenMessage msg)
{
this.PageID = 1000;
this.Scene = msg.Page?.Scene;
if (msg.Page is PageModel page)
{
this.PageID = string.Format("{0:D4}", page.PageNum);
}
else
{
this.PageID = null;
}
}
/// <summary>
......
VIZ.Package.Module/Main/ViewModel/MainTopViewModel.cs
......@@ -52,7 +52,7 @@ namespace VIZ.Package.Module
private void InitMessage()
{
ApplicationDomainEx.MessageManager.Register<VizPreviewReadyMessage>(this, this.OnVizPreviewReadyMessage);
ApplicationDomainEx.MessageManager.Register<ApplicationCloseMessage>(this, this.OnApplicationCloseMessage);
ApplicationDomainEx.MessageManager.Register<ApplicationClosingMessage>(this, this.OnApplicationClosingMessage);
}
// =====================================================================
......@@ -361,17 +361,17 @@ namespace VIZ.Package.Module
}
/// <summary>
/// 应用程序关闭消息
/// 应用程序关闭前消息
/// </summary>
/// <param name="msg">消息</param>
private void OnApplicationCloseMessage(ApplicationCloseMessage msg)
private void OnApplicationClosingMessage(ApplicationClosingMessage msg)
{
// 项目未打开
if (ApplicationDomainEx.ProjectDbContext == null)
{
var result = DXMessageBox.Show("确定关闭系统?", "提示", MessageBoxButton.YesNo);
msg.IsCancel = result == MessageBoxResult.No;
msg.Cancel = result == MessageBoxResult.No;
}
// 项目已经打开
else
......@@ -389,7 +389,7 @@ namespace VIZ.Package.Module
// 取消关闭
if (result == MessageBoxResult.Cancel)
{
msg.IsCancel = true;
msg.Cancel = true;
}
}
}
......
VIZ.Package.Module/Main/ViewModel/MainViewModel.cs
......@@ -41,7 +41,7 @@ namespace VIZ.Package.Module
/// </summary>
private void InitMessage()
{
ApplicationDomainEx.MessageManager.Register<ApplicationCloseMessage>(this, this.OnApplicationCloseMessage);
ApplicationDomainEx.MessageManager.Register<ApplicationClosedMessage>(this, this.OnApplicationClosedMessage);
}
// ============================================================
......@@ -113,7 +113,7 @@ namespace VIZ.Package.Module
/// 系统关闭消息
/// </summary>
/// <param name="msg">消息</param>
private void OnApplicationCloseMessage(ApplicationCloseMessage msg)
private void OnApplicationClosedMessage(ApplicationClosedMessage msg)
{
// 保存布局
this.SaveLayout();
......
VIZ.Package.Module/Page/Group/Service/IPageGroupService.cs
......@@ -31,5 +31,13 @@ namespace VIZ.Package.Module
/// </summary>
/// <param name="page">页</param>
void OpenPage(PageModel page);
/// <summary>
/// 尝试改变页号
/// </summary>
/// <param name="page">页</param>
/// <param name="pageNum">页号</param>
/// <returns>是否成功改变</returns>
bool TryChangePageNum(PageModel page, int pageNum);
}
}
VIZ.Package.Module/Page/Group/View/PageGroupView.xaml
......@@ -64,12 +64,19 @@
<dxg:GridControl ItemsSource="{Binding Pages}" ShowBorder="False" IsFilterEnabled="False"
SelectedItem="{Binding ElementName=uc, Path=DataContext.SelectedPageModel,Mode=TwoWay}">
<dxg:GridControl.Columns>
<dxg:GridColumn Header="序号" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="40" AllowResizing="False">
<dxg:GridColumn Header="编号" AllowSorting="False" AllowColumnFiltering="False" AllowResizing="True"
FieldName="PageNum">
<dxg:GridColumn.CellTemplate>
<DataTemplate>
<TextBlock Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding RowData.RowHandle,Converter={StaticResource RowHandleConverter}}"></TextBlock>
<TextBlock Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="4,0,4,0"
Text="{Binding Row.PageNum,StringFormat={}{0:D4}}"></TextBlock>
</DataTemplate>
</dxg:GridColumn.CellTemplate>
<dxg:GridColumn.CellEditTemplate>
<DataTemplate>
<local:PageNumberEdit></local:PageNumberEdit>
</DataTemplate>
</dxg:GridColumn.CellEditTemplate>
</dxg:GridColumn>
<dxg:GridColumn Header="缩略图" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="120" MinWidth="40" MaxWidth="300" AllowResizing="True">
<dxg:GridColumn.CellTemplate>
......
VIZ.Package.Module/Page/Group/ViewModel/PageGroupViewModel.cs
......@@ -407,6 +407,7 @@ namespace VIZ.Package.Module
page.ThumbnailBitmap = template.ThumbnailBitmap;
page.PluginID = vm.SelectedTemplatePlugin?.ID;
page.PluginName = vm.SelectedTemplatePlugin?.Name;
page.PageNum = this.SelectedPageGroupModel.Pages.Max(p => p.PageNum) + 1;
this.SelectedPageGroupModel.Pages.Add(page);
......@@ -453,6 +454,7 @@ namespace VIZ.Package.Module
page.ThumbnailBitmap = this.SelectedPageModel.ThumbnailBitmap;
page.PluginID = this.SelectedPageModel.PluginID;
page.PluginName = this.SelectedPageModel.PluginName;
page.PageNum = this.SelectedPageGroupModel.Pages.Max(p => p.PageNum) + 1;
this.SelectedPageGroupModel.Pages.Add(page);
......@@ -487,5 +489,25 @@ namespace VIZ.Package.Module
this.OpenPage();
}
/// <summary>
/// 尝试改变页号
/// </summary>
/// <param name="page">页</param>
/// <param name="pageNum">页号</param>
/// <returns>是否成功改变</returns>
public bool TryChangePageNum(PageModel page, int pageNum)
{
if (this.SelectedPageGroupModel == null)
return false;
PageModel same = this.SelectedPageGroupModel.Pages.FirstOrDefault(p => p != page && p.PageNum == pageNum);
if (same == null)
return true;
DXMessageBox.Show($"页 {pageNum} 已经存在!", "提示");
return false;
}
}
}
VIZ.Package.Module/Page/Group/Widgets/PageNumberEdit.xaml 0 → 100644
<UserControl x:Class="VIZ.Package.Module.PageNumberEdit"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
xmlns:fcore="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:storage="clr-namespace:VIZ.Package.Storage;assembly=VIZ.Package.Storage"
xmlns:resource="clr-namespace:VIZ.Package.Module.Resource;assembly=VIZ.Package.Module.Resource"
xmlns:local="clr-namespace:VIZ.Package.Module"
d:Background="White"
mc:Ignorable="d"
d:DesignHeight="30" d:DesignWidth="200">
<dxe:TextEdit x:Name="PART_Text" MaskType="RegEx" Mask="[0-9]{4}" ShowBorder="False"
EditValuePostMode="Delayed" EditValueChanged="EditValueChanged"></dxe:TextEdit>
</UserControl>
VIZ.Package.Module/Page/Group/Widgets/PageNumberEdit.xaml.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VIZ.Package.Domain;
namespace VIZ.Package.Module
{
/// <summary>
/// PageNumberEdit.xaml 的交互逻辑
/// </summary>
public partial class PageNumberEdit : UserControl
{
public PageNumberEdit()
{
InitializeComponent();
this.DataContextChanged += OnDataContextChanged;
}
/// <summary>
/// 是否处于初始化中
/// </summary>
private bool isInInited;
private void OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
{
DevExpress.Xpf.Grid.EditGridCellData cellData = e.NewValue as DevExpress.Xpf.Grid.EditGridCellData;
int.TryParse(cellData?.Value?.ToString(), out int value);
this.isInInited = true;
this.PART_Text.EditValue = string.Format("{0:d4}", value);
this.isInInited = false;
}
/// <summary>
/// 值改变
/// </summary>
private void EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
{
if (this.isInInited)
return;
DevExpress.Xpf.Grid.EditGridCellData cellData = this.DataContext as DevExpress.Xpf.Grid.EditGridCellData;
PageModel page = cellData.Row as PageModel;
if (page == null)
return;
int.TryParse(e.NewValue?.ToString(), out int newNum);
if (page.PageNum == newNum)
return;
IPageGroupService service = ApplicationDomainEx.ServiceManager.GetService<IPageGroupService>(ViewServiceKeys.PAGE_GROUP_SERVICE);
if (service == null)
return;
if (service.TryChangePageNum(page, newNum))
{
page.PageNum = newNum;
}
}
}
}
VIZ.Package.Module/Page/Templage/View/PageTemplateView.xaml
......@@ -41,13 +41,6 @@
</ContextMenu>
</dxg:GridControl.ContextMenu>
<dxg:GridControl.Columns>
<dxg:GridColumn Header="序号" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="40" AllowResizing="False">
<dxg:GridColumn.CellTemplate>
<DataTemplate>
<TextBlock Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding RowData.RowHandle,Converter={StaticResource RowHandleConverter}}"></TextBlock>
</DataTemplate>
</dxg:GridColumn.CellTemplate>
</dxg:GridColumn>
<dxg:GridColumn Header="缩略图" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="120" MinWidth="40" MaxWidth="300" AllowResizing="True">
<dxg:GridColumn.CellTemplate>
<DataTemplate>
......
VIZ.Package.Module/Preview/VizPreview/ViewModel/VizPreviewViewModel.cs
......@@ -65,7 +65,7 @@ namespace VIZ.Package.Module
private void initMessage()
{
ApplicationDomainEx.MessageManager.Register<PageOpenMessage>(this, this.OnPageOpenMessage);
ApplicationDomainEx.MessageManager.Register<ApplicationCloseMessage>(this, this.OnApplicationCloseMessage);
ApplicationDomainEx.MessageManager.Register<ApplicationClosedMessage>(this, this.OnApplicationClosedMessage);
ApplicationDomainEx.MessageManager.Register<ControlFieldChangedMessage>(this, this.OnControlFieldChangedMessage);
ApplicationDomainEx.MessageManager.Register<ControlListFieldChangedMessage>(this, this.OnControlListFieldChangedMessage);
}
......@@ -418,7 +418,7 @@ namespace VIZ.Package.Module
/// 应用程序关闭消息
/// </summary>
/// <param name="msg">消息</param>
private void OnApplicationCloseMessage(ApplicationCloseMessage msg)
private void OnApplicationClosedMessage(ApplicationClosedMessage msg)
{
if (ApplicationDomainEx.VizPreviewProcess == null || ApplicationDomainEx.VizPreviewProcess.HasExited)
return;
......
VIZ.Package.Module/VIZ.Package.Module.csproj
......@@ -125,6 +125,9 @@
<Compile Include="Main\View\MainStatusView.xaml.cs">
<DependentUpon>MainStatusView.xaml</DependentUpon>
</Compile>
<Compile Include="Page\Group\Widgets\PageNumberEdit.xaml.cs">
<DependentUpon>PageNumberEdit.xaml</DependentUpon>
</Compile>
<Compile Include="Plugin\Service\IPluginService.cs" />
<Compile Include="Resource\MediaResource\Controller\Model\ms.cs" />
<Compile Include="Resource\MediaResource\Core\MHResourceFileDoubleClickEventArgs.cs" />
......@@ -382,6 +385,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Page\Group\Widgets\PageNumberEdit.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Setting\Conn\View\ConnSettingView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
......
VIZ.Package.Service/DB/Page/PageService.cs
......@@ -120,6 +120,7 @@ namespace VIZ.Package.Service
model.PluginID = entity.PluginID;
model.Order = entity.Order;
model.PluginName = ApplicationDomainEx.PluginInfos.FirstOrDefault(p => p.ID == entity.PluginID)?.Name;
model.PageNum = entity.PageNum;
groupModel.Pages.Add(model);
}
......@@ -175,6 +176,7 @@ namespace VIZ.Package.Service
pageEntity.PageGroupID = pageModel.PageGroupID;
pageEntity.TemplateID = pageModel.TemplateID;
pageEntity.PluginID = pageModel.PluginID;
pageEntity.PageNum = pageModel.PageNum;
pageEntity.Order = j;
pages.Add(pageEntity);
......
VIZ.Package.Storage/Entity/Page/PageEntity.cs
......@@ -31,5 +31,10 @@ namespace VIZ.Package.Storage
/// 关联插件ID
/// </summary>
public string PluginID { get; set; }
/// <summary>
/// 页号
/// </summary>
public int PageNum { get; set; }
}
}
VIZ.Package/MainWindow.xaml.cs
......@@ -43,10 +43,20 @@ namespace VIZ.Package
// 发送系统关闭消息
try
{
ApplicationCloseMessage msg = new ApplicationCloseMessage();
ApplicationDomainEx.MessageManager.Send(msg);
ApplicationClosingMessage closeingMsg = new ApplicationClosingMessage();
ApplicationDomainEx.MessageManager.Send(closeingMsg);
e.Cancel = msg.IsCancel;
// 如果取消关闭
if (closeingMsg.Cancel)
{
e.Cancel = true;
return;
}
// 发送确定关闭消息
ApplicationClosedMessage closedMsg = new ApplicationClosedMessage();
ApplicationDomainEx.MessageManager.Send(closedMsg);
}
catch (Exception ex)
{
......
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