Skip to content

V
VIZ.Package
Commit 22b39f0f by liulongfei
Options

节目单列信息保存

parent 865b0aa4
Showing with 728 additions and 78 deletions
VIZ.Package.Common/VIZ.Package.Common.csproj
...@@ -106,6 +106,9 @@ ...@@ -106,6 +106,9 @@
<DependentUpon>Settings.settings</DependentUpon> <DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput> <DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile> </Compile>
<Compile Include="Widgets\GridColumnEx\ColumnDefintionGeneratorTemplate.cs" />
<Compile Include="Widgets\GridColumnEx\ColumnDefintionGeneratorTemplateCollection.cs" />
<Compile Include="Widgets\GridColumnEx\ColumnDefintionGeneratorTemplateSelector.cs" />
<Compile Include="Widgets\InputControl\TextInputControl\TextInputWindow.xaml.cs"> <Compile Include="Widgets\InputControl\TextInputControl\TextInputWindow.xaml.cs">
<DependentUpon>TextInputWindow.xaml</DependentUpon> <DependentUpon>TextInputWindow.xaml</DependentUpon>
</Compile> </Compile>
...@@ -121,6 +124,7 @@ ...@@ -121,6 +124,7 @@
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput> <LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
<None Include="app.config" />
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
......
VIZ.Package.Common/Widgets/GridColumnEx/ColumnDefintionGeneratorTemplate.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;
namespace VIZ.Package.Common
{
/// <summary>
/// 列定义模板
/// </summary>
public class ColumnDefintionGeneratorTemplate
{
/// <summary>
/// 列键
/// </summary>
public string ColumnKey { get; set; }
/// <summary>
/// 模板
/// </summary>
public DataTemplate DataTemplate { get; set; }
}
}
VIZ.Package.Common/Widgets/GridColumnEx/ColumnDefintionGeneratorTemplateCollection.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Package.Common
{
/// <summary>
/// 列定义创建模板列表
/// </summary>
public class ColumnDefintionGeneratorTemplateCollection : List<ColumnDefintionGeneratorTemplate>
{
}
}
VIZ.Package.Common/Widgets/GridColumnEx/ColumnDefintionGeneratorTemplateSelector.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 VIZ.Package.Domain;
namespace VIZ.Package.Common
{
/// <summary>
/// 列定义模板选择器
/// </summary>
public class ColumnDefintionGeneratorTemplateSelector : DataTemplateSelector
{
/// <summary>
/// 模板集合
/// </summary>
public ColumnDefintionGeneratorTemplateCollection Templates { get; set; }
public override DataTemplate SelectTemplate(object item, DependencyObject container)
{
if (this.Templates == null || this.Templates.Count == 0)
return null;
GridColumnDefinition defintion = item as GridColumnDefinition;
if (defintion == null)
return null;
ColumnDefintionGeneratorTemplate template = this.Templates.FirstOrDefault(p => p.ColumnKey == defintion.ColumnKey);
if (template == null)
return null;
return template.DataTemplate;
}
}
}
VIZ.Package.Common/app.config 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
VIZ.Package.Connection/VIZ.Package.Connection.csproj
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
VIZ.Package.Connection/app.config 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
VIZ.Package.Domain/ApplicationDomainEx.cs
...@@ -65,6 +65,11 @@ namespace VIZ.Package.Domain ...@@ -65,6 +65,11 @@ namespace VIZ.Package.Domain
/// </summary> /// </summary>
public static ProjectDbContext ProjectDbContext { get; set; } public static ProjectDbContext ProjectDbContext { get; set; }
/// <summary>
/// CSV数据上下文
/// </summary>
public static CsvDbContext CsvDbContext { get; set; }
// ============================================================= // =============================================================
// 配置 // 配置
// ============================================================= // =============================================================
......
VIZ.Package.Domain/Core/GridColumnControlFieldDefinition.cs 0 → 100644
using DevExpress.Xpf.Grid;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using VIZ.Framework.Core;
using VIZ.Package.Storage;
namespace VIZ.Package.Domain
{
/// <summary>
/// 列控制字段定义
/// </summary>
public class GridColumnControlFieldDefinition : GridColumnDefinition
{
#region Type -- 字段类型
private VizControlFieldType type;
/// <summary>
/// 字段类型
/// </summary>
public VizControlFieldType Type
{
get { return type; }
set { type = value; this.RaisePropertyChanged(nameof(Type)); }
}
#endregion
#region ControlObject -- 控制对象
private ControlObjectModel controlObject;
/// <summary>
/// 控制对象
/// </summary>
public ControlObjectModel ControlObject
{
get { return controlObject; }
set { controlObject = value; this.RaisePropertyChanged(nameof(ControlObject)); }
}
#endregion
#region ControlField -- 控制字段
private ControlFieldNodeModel controlField;
/// <summary>
/// 控制字段
/// </summary>
public ControlFieldNodeModel ControlField
{
get { return controlField; }
set { controlField = value; this.RaisePropertyChanged(nameof(ControlField)); }
}
#endregion
}
}
VIZ.Package.Domain/Core/GridColumnDefinition.cs
using DevExpress.Xpf.Grid; using DevExpress.Xpf.Editors.Settings;
using DevExpress.Xpf.Grid;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
...@@ -13,41 +14,136 @@ namespace VIZ.Package.Domain ...@@ -13,41 +14,136 @@ namespace VIZ.Package.Domain
/// <summary> /// <summary>
/// 列定义 /// 列定义
/// </summary> /// </summary>
public class GridColumnDefinition public class GridColumnDefinition : ModelBase
{ {
// ==================================================================
// 列属性
// ==================================================================
#region ColumnKey -- 列键
private string columnKey;
/// <summary>
/// 列键
/// </summary>
public string ColumnKey
{
get { return columnKey; }
set { columnKey = value; this.RaisePropertyChanged(nameof(ColumnKey)); }
}
#endregion
#region FieldName -- 绑定字段
private string fieldName;
/// <summary> /// <summary>
/// 绑定字段 /// 绑定字段
/// </summary> /// </summary>
public string FieldName { get; set; } public string FieldName
{
get { return fieldName; }
set { fieldName = value; this.RaisePropertyChanged(nameof(FieldName)); }
}
#endregion
#region Header -- 头部
private object header;
/// <summary> /// <summary>
/// 头部 /// 头部
/// </summary> /// </summary>
public object Header { get; set; } public object Header
{
get { return header; }
set { header = value; this.RaisePropertyChanged(nameof(Header)); }
}
#endregion
#region ReadOnly -- 是否只读
private bool readOnly;
/// <summary> /// <summary>
/// 是否只读 /// 是否只读
/// </summary> /// </summary>
public bool ReadOnly { get; set; } public bool ReadOnly
{
get { return readOnly; }
set { readOnly = value; this.RaisePropertyChanged(nameof(ReadOnly)); }
}
#endregion
#region AllowEditing -- 是否启用编辑
private bool allowEditing;
/// <summary> /// <summary>
/// 是否启用编辑 /// 是否启用编辑
/// </summary> /// </summary>
public bool AllowEditing { get; set; } public bool AllowEditing
{
get { return allowEditing; }
set { allowEditing = value; this.RaisePropertyChanged(nameof(AllowEditing)); }
}
#endregion
#region AllowSorting -- 是否启用排序
private bool allowSorting;
/// <summary>
/// 是否启用排序
/// </summary>
public bool AllowSorting
{
get { return allowSorting; }
set { allowSorting = value; this.RaisePropertyChanged(nameof(AllowSorting)); }
}
#endregion
#region AllowResizing -- 是否支持改变大小
private bool allowResizing;
/// <summary> /// <summary>
/// 字段类型 /// 是否支持改变大小
/// </summary> /// </summary>
public VizControlFieldType Type { get; set; } public bool AllowResizing
{
get { return allowResizing; }
set { allowResizing = value; this.RaisePropertyChanged(nameof(AllowResizing)); }
}
#endregion
#region Visible -- 是否可见
private bool visible = true;
/// <summary> /// <summary>
/// 控制对象 /// 是否可见
/// </summary> /// </summary>
public ControlObjectModel ControlObject { get; set; } public bool Visible
{
get { return visible; }
set { visible = value; this.RaisePropertyChanged(nameof(Visible)); }
}
#endregion
#region VisibleIndex -- 排序
private int visibleIndex;
/// <summary> /// <summary>
/// 控制字段 /// 排序
/// </summary> /// </summary>
public ControlFieldNodeModel ControlField { get; set; } public int VisibleIndex
{
get { return visibleIndex; }
set { visibleIndex = value; this.RaisePropertyChanged(nameof(VisibleIndex)); }
}
#endregion
} }
} }
VIZ.Package.Domain/Model/Page/PageGroupModel.cs
...@@ -100,19 +100,5 @@ namespace VIZ.Package.Domain ...@@ -100,19 +100,5 @@ namespace VIZ.Package.Domain
} }
#endregion #endregion
#region IsColumnChooserVisible -- 列选择器是否显示
private bool isColumnChooserVisible;
/// <summary>
/// 列选择器是否显示
/// </summary>
public bool IsColumnChooserVisible
{
get { return isColumnChooserVisible; }
set { isColumnChooserVisible = value; this.RaisePropertyChanged(nameof(IsColumnChooserVisible)); }
}
#endregion
} }
} }
VIZ.Package.Domain/VIZ.Package.Domain.csproj
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
<Compile Include="ApplicationConstants.cs" /> <Compile Include="ApplicationConstants.cs" />
<Compile Include="ApplicationDomainEx.Action.cs" /> <Compile Include="ApplicationDomainEx.Action.cs" />
<Compile Include="ApplicationDomainEx.cs" /> <Compile Include="ApplicationDomainEx.cs" />
<Compile Include="Core\GridColumnControlFieldDefinition.cs" />
<Compile Include="Core\GridColumnDefinition.cs" /> <Compile Include="Core\GridColumnDefinition.cs" />
<Compile Include="Enum\ConnGroupStatus.cs" /> <Compile Include="Enum\ConnGroupStatus.cs" />
<Compile Include="Enum\ModulePluginIds.cs" /> <Compile Include="Enum\ModulePluginIds.cs" />
...@@ -128,6 +129,7 @@ ...@@ -128,6 +129,7 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
VIZ.Package.Domain/app.config 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
VIZ.Package.Module.Resource/VIZ.Package.Module.Resource.csproj
...@@ -122,6 +122,7 @@ ...@@ -122,6 +122,7 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput> <LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<None Include="app.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>
......
VIZ.Package.Module.Resource/app.config 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
VIZ.Package.Module/ControlObject/FieldEdit/Edit/BooleanEdit/BooleanEditPanelModel.cs
...@@ -73,7 +73,7 @@ namespace VIZ.Package.Module ...@@ -73,7 +73,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row); base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row);
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/DupletEdit/DupletEditPanelModel.cs
...@@ -210,7 +210,7 @@ namespace VIZ.Package.Module ...@@ -210,7 +210,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row); base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row);
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/EditPanelModelBase.cs
...@@ -89,11 +89,11 @@ namespace VIZ.Package.Module ...@@ -89,11 +89,11 @@ namespace VIZ.Package.Module
#region ColumnDefinition -- 列定义 #region ColumnDefinition -- 列定义
private GridColumnDefinition columnDefinition; private GridColumnControlFieldDefinition columnDefinition;
/// <summary> /// <summary>
/// 列定义 /// 列定义
/// </summary> /// </summary>
public GridColumnDefinition ColumnDefinition public GridColumnControlFieldDefinition ColumnDefinition
{ {
get { return columnDefinition; } get { return columnDefinition; }
set { columnDefinition = value; this.RaisePropertyChanged(nameof(ColumnDefinition)); } set { columnDefinition = value; this.RaisePropertyChanged(nameof(ColumnDefinition)); }
...@@ -163,7 +163,7 @@ namespace VIZ.Package.Module ...@@ -163,7 +163,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public virtual void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public virtual void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
this.ListCellEdit = listCellEdit; this.ListCellEdit = listCellEdit;
this.ControlObject = columnDefinition.ControlObject; this.ControlObject = columnDefinition.ControlObject;
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/FloatEdit/FloatEditPanelModel.cs
...@@ -64,7 +64,7 @@ namespace VIZ.Package.Module ...@@ -64,7 +64,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row); base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row);
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/FontEdit/FontEditPanelModel.cs
...@@ -73,7 +73,7 @@ namespace VIZ.Package.Module ...@@ -73,7 +73,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row); base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row);
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ImageEdit/ImageEditPanelModel.cs
...@@ -122,7 +122,7 @@ namespace VIZ.Package.Module ...@@ -122,7 +122,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row); base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row);
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/IntegerEdit/IntegerEditPanelModel.cs
...@@ -64,7 +64,7 @@ namespace VIZ.Package.Module ...@@ -64,7 +64,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row); base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row);
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/BooleanListCellEdit.xaml.cs
...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module ...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/DupletListCellEdit.xaml.cs
...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module ...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
...@@ -85,7 +85,7 @@ namespace VIZ.Package.Module ...@@ -85,7 +85,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
...@@ -131,7 +131,7 @@ namespace VIZ.Package.Module ...@@ -131,7 +131,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateEditValue(GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateEditValue(GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
IDictionary<string, object> dic = row as IDictionary<string, object>; IDictionary<string, object> dic = row as IDictionary<string, object>;
if (dic == null) if (dic == null)
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/FloatListCellEdit.xaml.cs
...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module ...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/FontListCellEdit.xaml.cs
...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module ...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
...@@ -85,7 +85,7 @@ namespace VIZ.Package.Module ...@@ -85,7 +85,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
...@@ -104,7 +104,7 @@ namespace VIZ.Package.Module ...@@ -104,7 +104,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateEditValue(GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateEditValue(GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
IDictionary<string, object> dic = row as IDictionary<string, object>; IDictionary<string, object> dic = row as IDictionary<string, object>;
if (dic == null) if (dic == null)
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/ImageListCellEdit.xaml.cs
...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module ...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
...@@ -85,7 +85,7 @@ namespace VIZ.Package.Module ...@@ -85,7 +85,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
...@@ -104,7 +104,7 @@ namespace VIZ.Package.Module ...@@ -104,7 +104,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateEditValue(GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateEditValue(GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
IDictionary<string, object> dic = row as IDictionary<string, object>; IDictionary<string, object> dic = row as IDictionary<string, object>;
if (dic == null) if (dic == null)
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/IntegerListCellEdit.xaml.cs
...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module ...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/RichTextListCellEdit.xaml.cs
...@@ -68,7 +68,7 @@ namespace VIZ.Package.Module ...@@ -68,7 +68,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
...@@ -97,7 +97,7 @@ namespace VIZ.Package.Module ...@@ -97,7 +97,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
...@@ -132,7 +132,7 @@ namespace VIZ.Package.Module ...@@ -132,7 +132,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateEditValue(GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateEditValue(GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
IDictionary<string, object> dic = row as IDictionary<string, object>; IDictionary<string, object> dic = row as IDictionary<string, object>;
if (dic == null) if (dic == null)
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/TextListCellEdit.xaml.cs
...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module ...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
...@@ -85,7 +85,7 @@ namespace VIZ.Package.Module ...@@ -85,7 +85,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
...@@ -104,7 +104,7 @@ namespace VIZ.Package.Module ...@@ -104,7 +104,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateEditValue(GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateEditValue(GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
IDictionary<string, object> dic = row as IDictionary<string, object>; IDictionary<string, object> dic = row as IDictionary<string, object>;
if (dic == null) if (dic == null)
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/TripletListCellEdit.xaml.cs
...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module ...@@ -58,7 +58,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
...@@ -85,7 +85,7 @@ namespace VIZ.Package.Module ...@@ -85,7 +85,7 @@ namespace VIZ.Package.Module
if (cellData == null) if (cellData == null)
return; return;
GridColumnDefinition columnDefinition = cellData.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cellData.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
...@@ -136,7 +136,7 @@ namespace VIZ.Package.Module ...@@ -136,7 +136,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateEditValue(GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateEditValue(GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
IDictionary<string, object> dic = row as IDictionary<string, object>; IDictionary<string, object> dic = row as IDictionary<string, object>;
if (dic == null) if (dic == null)
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/ListCellEditBase.cs
...@@ -71,7 +71,7 @@ namespace VIZ.Package.Module ...@@ -71,7 +71,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public virtual void UpdateEditValue(GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public virtual void UpdateEditValue(GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
} }
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/ListEditPanel.xaml
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
CellTemplateSelector="{StaticResource CellTemplateSelector}" CellTemplateSelector="{StaticResource CellTemplateSelector}"
CellEditTemplateSelector="{StaticResource CellEditTemplateSelector}" CellEditTemplateSelector="{StaticResource CellEditTemplateSelector}"
AllowEditing="{Binding AllowEditing}" AllowEditing="{Binding AllowEditing}"
AllowResizing="True" AllowResizing="True"
AllowSorting="False" AllowColumnFiltering="False"/> AllowSorting="False" AllowColumnFiltering="False"/>
</ContentControl> </ContentControl>
</DataTemplate> </DataTemplate>
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/ListEditPanelCellTemplateSelector.cs
...@@ -71,7 +71,7 @@ namespace VIZ.Package.Module ...@@ -71,7 +71,7 @@ namespace VIZ.Package.Module
public override DataTemplate SelectTemplate(object item, DependencyObject container) public override DataTemplate SelectTemplate(object item, DependencyObject container)
{ {
GridCellData data = (GridCellData)item; GridCellData data = (GridCellData)item;
GridColumnDefinition definition = data.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition definition = data.Column.DataContext as GridColumnControlFieldDefinition;
if (definition == null) if (definition == null)
return null; return null;
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/ListEditPanelModel.cs
...@@ -59,11 +59,11 @@ namespace VIZ.Package.Module ...@@ -59,11 +59,11 @@ namespace VIZ.Package.Module
#region Columns -- 列信息 #region Columns -- 列信息
private List<GridColumnDefinition> columns; private List<GridColumnControlFieldDefinition> columns;
/// <summary> /// <summary>
/// 列信息 /// 列信息
/// </summary> /// </summary>
public List<GridColumnDefinition> Columns public List<GridColumnControlFieldDefinition> Columns
{ {
get { return columns; } get { return columns; }
set { columns = value; this.RaisePropertyChanged(nameof(Columns)); } set { columns = value; this.RaisePropertyChanged(nameof(Columns)); }
...@@ -95,7 +95,7 @@ namespace VIZ.Package.Module ...@@ -95,7 +95,7 @@ namespace VIZ.Package.Module
GridCell cell = cells.FirstOrDefault(); GridCell cell = cells.FirstOrDefault();
GridColumnDefinition columnDefinition = cell.Column.DataContext as GridColumnDefinition; GridColumnControlFieldDefinition columnDefinition = cell.Column.DataContext as GridColumnControlFieldDefinition;
if (columnDefinition == null) if (columnDefinition == null)
return; return;
...@@ -128,9 +128,9 @@ namespace VIZ.Package.Module ...@@ -128,9 +128,9 @@ namespace VIZ.Package.Module
if (controlField == null) if (controlField == null)
return; return;
List<GridColumnDefinition> columns = this.vizCommandControlObjectService.GetControlObjectListColumn(controlField.TypeSchema); List<GridColumnControlFieldDefinition> columns = this.vizCommandControlObjectService.GetControlObjectListColumn(controlField.TypeSchema);
List<ExpandoObject> items = this.vizCommandControlObjectService.GetControlObjectListData(controlField.Value); List<ExpandoObject> items = this.vizCommandControlObjectService.GetControlObjectListData(controlField.Value);
foreach (GridColumnDefinition column in columns) foreach (GridColumnControlFieldDefinition column in columns)
{ {
column.ControlObject = this.ControlObject; column.ControlObject = this.ControlObject;
column.ControlField = this.ControlField; column.ControlField = this.ControlField;
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/RichTextEdit/RichTextEditPanelModel.cs
...@@ -77,7 +77,7 @@ namespace VIZ.Package.Module ...@@ -77,7 +77,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row); base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row);
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/TextEdit/TextEditPanelModel.cs
...@@ -67,7 +67,7 @@ namespace VIZ.Package.Module ...@@ -67,7 +67,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row); base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row);
......
VIZ.Package.Module/ControlObject/FieldEdit/Edit/TripletEdit/TripletEditPanelModel.cs
...@@ -236,7 +236,7 @@ namespace VIZ.Package.Module ...@@ -236,7 +236,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public override void UpdateDynamic(ListCellEditBase listCellEdit, GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row); base.UpdateDynamic(listCellEdit, columnDefinition, rowHandle, row);
......
VIZ.Package.Module/ControlObject/FieldEdit/ViewModel/FieldEditWindowModel.cs
...@@ -24,11 +24,11 @@ namespace VIZ.Package.Module ...@@ -24,11 +24,11 @@ namespace VIZ.Package.Module
#region ColumnDefinition -- 列定义 #region ColumnDefinition -- 列定义
private GridColumnDefinition columnDefinition; private GridColumnControlFieldDefinition columnDefinition;
/// <summary> /// <summary>
/// 列定义 /// 列定义
/// </summary> /// </summary>
public GridColumnDefinition ColumnDefinition public GridColumnControlFieldDefinition ColumnDefinition
{ {
get { return columnDefinition; } get { return columnDefinition; }
set { columnDefinition = value; this.RaisePropertyChanged(nameof(ColumnDefinition)); } set { columnDefinition = value; this.RaisePropertyChanged(nameof(ColumnDefinition)); }
...@@ -89,7 +89,7 @@ namespace VIZ.Package.Module ...@@ -89,7 +89,7 @@ namespace VIZ.Package.Module
/// <param name="columnDefinition">列定义</param> /// <param name="columnDefinition">列定义</param>
/// <param name="rowHandle">行号</param> /// <param name="rowHandle">行号</param>
/// <param name="row">行数据</param> /// <param name="row">行数据</param>
public void Update(ListCellEditBase listCellEdit, GridColumnDefinition columnDefinition, int rowHandle, ExpandoObject row) public void Update(ListCellEditBase listCellEdit, GridColumnControlFieldDefinition columnDefinition, int rowHandle, ExpandoObject row)
{ {
this.ListCellEdit = listCellEdit; this.ListCellEdit = listCellEdit;
this.ColumnDefinition = columnDefinition; this.ColumnDefinition = columnDefinition;
......
VIZ.Package.Module/Page/Group/ViewModel/PageGroupViewModel.cs
...@@ -25,10 +25,18 @@ namespace VIZ.Package.Module ...@@ -25,10 +25,18 @@ namespace VIZ.Package.Module
/// </summary> /// </summary>
private readonly static ILog log = LogManager.GetLogger(typeof(PageGroupViewModel)); private readonly static ILog log = LogManager.GetLogger(typeof(PageGroupViewModel));
/// <summary>
/// 列表列信息配置文件路径
/// </summary>
private readonly static string PAGE_GROUP_VIEW__CSV_PATH = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "config", "GridColumnDefintion", "PageGroupView.csv");
public PageGroupViewModel() public PageGroupViewModel()
{ {
ApplicationDomainEx.ServiceManager.AddService(ViewServiceKeys.PAGE_GROUP_SERVICE, this); ApplicationDomainEx.ServiceManager.AddService(ViewServiceKeys.PAGE_GROUP_SERVICE, this);
// 初始化列
this.InitColumns();
// 初始化命令 // 初始化命令
this.InitCommand(); this.InitCommand();
...@@ -37,6 +45,38 @@ namespace VIZ.Package.Module ...@@ -37,6 +45,38 @@ namespace VIZ.Package.Module
} }
/// <summary> /// <summary>
/// 定义列信息
/// </summary>
private void InitColumns()
{
this.Columns.Add(new GridColumnDefinition { VisibleIndex = 0, ColumnKey = "PageNum" });
this.Columns.Add(new GridColumnDefinition { VisibleIndex = 1, ColumnKey = "ThumbnailBitmap" });
this.Columns.Add(new GridColumnDefinition { VisibleIndex = 2, ColumnKey = "Scene" });
this.Columns.Add(new GridColumnDefinition { VisibleIndex = 3, ColumnKey = "Remark" });
this.Columns.Add(new GridColumnDefinition { VisibleIndex = 4, ColumnKey = "Layer" });
this.Columns.Add(new GridColumnDefinition { VisibleIndex = 5, ColumnKey = "ConnGroupID" });
this.Columns.Add(new GridColumnDefinition { VisibleIndex = 6, ColumnKey = "TakeInitedProgress" });
this.Columns.Add(new GridColumnDefinition { VisibleIndex = 7, ColumnKey = "EngineType" });
this.Columns.Add(new GridColumnDefinition { VisibleIndex = 8, ColumnKey = "PageType" });
this.Columns.Add(new GridColumnDefinition { VisibleIndex = 9, ColumnKey = "PluginName" });
// 根据配置文件调整列是否显示与排序
List<GridColumnDefintionItem> items = ApplicationDomainEx.CsvDbContext.LoadColumnDefintion(PAGE_GROUP_VIEW__CSV_PATH);
if (items == null)
return;
foreach (GridColumnDefintionItem item in items)
{
GridColumnDefinition define = this.Columns.FirstOrDefault(p => p.ColumnKey == item.ColumnKey);
if (define == null)
continue;
define.Visible = item.Visible;
define.VisibleIndex = item.VisibleIndex;
}
}
/// <summary>
/// 初始化命令 /// 初始化命令
/// </summary> /// </summary>
private void InitCommand() private void InitCommand()
...@@ -62,8 +102,8 @@ namespace VIZ.Package.Module ...@@ -62,8 +102,8 @@ namespace VIZ.Package.Module
ApplicationDomainEx.MessageManager.Register<ProjectOpenMessage>(this, this.OnProjectOpenMessage); ApplicationDomainEx.MessageManager.Register<ProjectOpenMessage>(this, this.OnProjectOpenMessage);
ApplicationDomainEx.MessageManager.Register<ProjectCloseMessage>(this, this.OnProjectCloseMessage); ApplicationDomainEx.MessageManager.Register<ProjectCloseMessage>(this, this.OnProjectCloseMessage);
ApplicationDomainEx.MessageManager.Register<ProjectSaveMessage>(this, this.OnProjectSaveMessage); ApplicationDomainEx.MessageManager.Register<ProjectSaveMessage>(this, this.OnProjectSaveMessage);
ApplicationDomainEx.MessageManager.Register<ConnChangedMessage>(this, this.OnConnChangedMessage); ApplicationDomainEx.MessageManager.Register<ConnChangedMessage>(this, this.OnConnChangedMessage);
ApplicationDomainEx.MessageManager.Register<ApplicationClosingMessage>(this, this.OnApplicationClosingMessage);
} }
// ====================================================================================== // ======================================================================================
...@@ -99,6 +139,34 @@ namespace VIZ.Package.Module ...@@ -99,6 +139,34 @@ namespace VIZ.Package.Module
// Property // Property
// ====================================================================================== // ======================================================================================
#region Columns -- 列定义
private ObservableCollection<GridColumnDefinition> columns = new ObservableCollection<GridColumnDefinition>();
/// <summary>
/// 列定义
/// </summary>
public ObservableCollection<GridColumnDefinition> Columns
{
get { return columns; }
set { columns = value; this.RaisePropertyChanged(nameof(Columns)); }
}
#endregion
#region IsColumnChooserVisible -- 是否显示列选择器
private bool isColumnChooserVisible;
/// <summary>
/// 是否显示列选择器
/// </summary>
public bool IsColumnChooserVisible
{
get { return isColumnChooserVisible; }
set { isColumnChooserVisible = value; this.RaisePropertyChanged(nameof(IsColumnChooserVisible)); }
}
#endregion
#region IsEnabled -- 是否可用 #region IsEnabled -- 是否可用
private bool isEnabled; private bool isEnabled;
...@@ -454,10 +522,7 @@ namespace VIZ.Package.Module ...@@ -454,10 +522,7 @@ namespace VIZ.Package.Module
/// </summary> /// </summary>
private void ColumnChoice() private void ColumnChoice()
{ {
if (this.SelectedPageGroupModel == null) this.IsColumnChooserVisible = true;
return;
this.SelectedPageGroupModel.IsColumnChooserVisible = true;
} }
#endregion #endregion
...@@ -536,6 +601,34 @@ namespace VIZ.Package.Module ...@@ -536,6 +601,34 @@ namespace VIZ.Package.Module
this.UpdateConnGroups(); this.UpdateConnGroups();
} }
/// <summary>
/// 应用程序关闭消息
/// </summary>
/// <param name="msg">消息</param>
private void OnApplicationClosingMessage(ApplicationClosingMessage msg)
{
try
{
List<GridColumnDefintionItem> items = new List<GridColumnDefintionItem>();
foreach (GridColumnDefinition define in this.Columns)
{
GridColumnDefintionItem item = new GridColumnDefintionItem();
item.ColumnKey = define.ColumnKey;
item.Visible = define.Visible;
item.VisibleIndex = define.VisibleIndex;
items.Add(item);
}
ApplicationDomainEx.CsvDbContext.SaveColumnDefintion(PAGE_GROUP_VIEW__CSV_PATH, items);
}
catch (Exception ex)
{
log.Error(ex);
}
}
// ====================================================================================== // ======================================================================================
// Public Function // Public Function
// ====================================================================================== // ======================================================================================
......
VIZ.Package.Module/Setup/AppSetup_InitCSV.cs 0 → 100644
using log4net;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Module;
using VIZ.Package.Domain;
using VIZ.Package.Storage;
namespace VIZ.Package.Module
{
/// <summary>
/// 应用程序启动 -- 初始化CSV
/// </summary>
public class AppSetup_InitCSV : AppSetupBase
{
/// <summary>
/// 日志
/// </summary>
private static ILog log = LogManager.GetLogger(typeof(AppSetup_InitCSV));
/// <summary>
/// 描述
/// </summary>
public override string Detail { get; } = "应用程序启动 -- 初始化CSV";
/// <summary>
/// 执行启动
/// </summary>
/// <param name="context">应用程序启动上下文</param>
/// <returns>是否成功执行</returns>
public override bool Setup(AppSetupContext context)
{
string folder = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "config");
if (!System.IO.Directory.Exists(folder))
{
System.IO.Directory.CreateDirectory(folder);
}
folder = System.IO.Path.Combine(folder, "GridColumnDefintion");
if (!System.IO.Directory.Exists(folder))
{
System.IO.Directory.CreateDirectory(folder);
}
ApplicationDomainEx.CsvDbContext = new CsvDbContext();
return true;
}
/// <summary>
/// 执行关闭
/// </summary>
/// <param name="context">应用程序启动上下文</param>
public override void Shutdown(AppSetupContext context)
{
ApplicationDomainEx.LocalDbContext?.Dispose();
ApplicationDomainEx.LocalDbContext = null;
}
}
}
\ No newline at end of file
VIZ.Package.Module/VIZ.Package.Module.csproj
...@@ -351,6 +351,7 @@ ...@@ -351,6 +351,7 @@
</Compile> </Compile>
<Compile Include="Setting\VizConfig\VizConfigSettingPluginLifeCycle.cs" /> <Compile Include="Setting\VizConfig\VizConfigSettingPluginLifeCycle.cs" />
<Compile Include="Setting\VizConfig\ViewModel\VizConfigSettingViewModel.cs" /> <Compile Include="Setting\VizConfig\ViewModel\VizConfigSettingViewModel.cs" />
<Compile Include="Setup\AppSetup_InitCSV.cs" />
<Compile Include="Setup\AppSetup_InitLiteDB.cs" /> <Compile Include="Setup\AppSetup_InitLiteDB.cs" />
<Compile Include="Preview\VizPreview\Controller\VizPreviewController.cs" /> <Compile Include="Preview\VizPreview\Controller\VizPreviewController.cs" />
<Compile Include="Preview\VizPreview\VizPreviewPluginLifeCycle.cs" /> <Compile Include="Preview\VizPreview\VizPreviewPluginLifeCycle.cs" />
......
VIZ.Package.Module/app.config
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.Package.Plugin/VIZ.Package.Plugin.csproj
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput> <LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
<None Include="app.config" />
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
......
VIZ.Package.Plugin/app.config 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
VIZ.Package.Service/VIZ.Package.Service.csproj
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
<Compile Include="Viz\VizCommandService.cs" /> <Compile Include="Viz\VizCommandService.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />
......
VIZ.Package.Service/Viz/VizCommandControlObjectService.cs
...@@ -44,9 +44,9 @@ namespace VIZ.Package.Service ...@@ -44,9 +44,9 @@ namespace VIZ.Package.Service
/// </summary> /// </summary>
/// <param name="schema">定义信息</param> /// <param name="schema">定义信息</param>
/// <returns>列定义</returns> /// <returns>列定义</returns>
public List<GridColumnDefinition> GetControlObjectListColumn(string schema) public List<GridColumnControlFieldDefinition> GetControlObjectListColumn(string schema)
{ {
List<GridColumnDefinition> columns = new List<GridColumnDefinition>(); List<GridColumnControlFieldDefinition> columns = new List<GridColumnControlFieldDefinition>();
using (System.IO.MemoryStream ms = new System.IO.MemoryStream(System.Text.Encoding.UTF8.GetBytes(schema))) using (System.IO.MemoryStream ms = new System.IO.MemoryStream(System.Text.Encoding.UTF8.GetBytes(schema)))
{ {
...@@ -60,7 +60,7 @@ namespace VIZ.Package.Service ...@@ -60,7 +60,7 @@ namespace VIZ.Package.Service
foreach (ControlObject_Field_node field in schemaNode.Fields) foreach (ControlObject_Field_node field in schemaNode.Fields)
{ {
GridColumnDefinition column = new GridColumnDefinition(); GridColumnControlFieldDefinition column = new GridColumnControlFieldDefinition();
column.Header = (field.Name == field.Description) ? field.Name : $"({field.Description}){field.Name}"; column.Header = (field.Name == field.Description) ? field.Name : $"({field.Description}){field.Name}";
column.FieldName = field.Name; column.FieldName = field.Name;
column.Type = this.GetControlFieldType(field.Type); column.Type = this.GetControlFieldType(field.Type);
......
VIZ.Package.Service/app.config 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
VIZ.Package.Storage/CSV/GridColumnDefintionItem.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Package.Storage
{
/// <summary>
/// 列定义配置
/// </summary>
public class GridColumnDefintionItem
{
/// <summary>
/// 列键
/// </summary>
public string ColumnKey { get; set; }
/// <summary>
/// 是否可见
/// </summary>
public bool Visible { get; set; }
/// <summary>
/// 排序
/// </summary>
public int VisibleIndex { get; set; }
}
}
VIZ.Package.Storage/CsvDbContext.cs 0 → 100644
using CsvHelper;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Package.Storage
{
/// <summary>
/// CSV数据上下文
/// </summary>
public class CsvDbContext
{
/// <summary>
/// 加载列定义
/// </summary>
/// <param name="path">文件名</param>
/// <returns>列定义</returns>
public List<GridColumnDefintionItem> LoadColumnDefintion(string path)
{
if (!File.Exists(path))
return null;
using (StreamReader sr = new StreamReader(path, Encoding.Default))
using (CsvReader reader = new CsvReader(sr, CultureInfo.InvariantCulture))
{
return reader.GetRecords<GridColumnDefintionItem>().ToList();
}
}
/// <summary>
/// 保存
/// </summary>
/// <param name="path">路径</param>
/// <param name="items">项列表</param>
public void SaveColumnDefintion(string path, List<GridColumnDefintionItem> items)
{
using (StreamWriter writer = new StreamWriter(path, false, Encoding.Default))
using (CsvWriter csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
{
csv.WriteRecords(items);
}
}
}
}
VIZ.Package.Storage/VIZ.Package.Storage.csproj
...@@ -49,15 +49,40 @@ ...@@ -49,15 +49,40 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="CsvHelper, Version=30.0.0.0, Culture=neutral, PublicKeyToken=8c4959082be5c823, processorArchitecture=MSIL">
<HintPath>..\packages\CsvHelper.30.0.1\lib\net47\CsvHelper.dll</HintPath>
</Reference>
<Reference Include="LiteDB, Version=5.0.15.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL"> <Reference Include="LiteDB, Version=5.0.15.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL">
<HintPath>..\packages\LiteDB.5.0.15\lib\net45\LiteDB.dll</HintPath> <HintPath>..\packages\LiteDB.5.0.15\lib\net45\LiteDB.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath> <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.HashCode.1.0.0\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.0\lib\netstandard2.0\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Web" /> <Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
...@@ -67,6 +92,8 @@ ...@@ -67,6 +92,8 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="CsvDbContext.cs" />
<Compile Include="CSV\GridColumnDefintionItem.cs" />
<Compile Include="Entity\Config\MediaConfigEntity.cs" /> <Compile Include="Entity\Config\MediaConfigEntity.cs" />
<Compile Include="Entity\Config\PluginMappingConfigEntity.cs" /> <Compile Include="Entity\Config\PluginMappingConfigEntity.cs" />
<Compile Include="Entity\Conn\ConnEntity.cs" /> <Compile Include="Entity\Conn\ConnEntity.cs" />
...@@ -109,6 +136,7 @@ ...@@ -109,6 +136,7 @@
<Compile Include="Xml\IXmlSerialize.cs" /> <Compile Include="Xml\IXmlSerialize.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
VIZ.Package.Storage/app.config 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
VIZ.Package.Storage/packages.config
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CsvHelper" version="30.0.1" targetFramework="net48" />
<package id="LiteDB" version="5.0.15" targetFramework="net48" /> <package id="LiteDB" version="5.0.15" targetFramework="net48" />
<package id="log4net" version="2.0.14" targetFramework="net48" /> <package id="log4net" version="2.0.14" targetFramework="net48" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net48" />
<package id="Microsoft.Bcl.HashCode" version="1.0.0" targetFramework="net48" />
<package id="Microsoft.CSharp" version="4.3.0" targetFramework="net48" />
<package id="System.Buffers" version="4.4.0" targetFramework="net48" />
<package id="System.Memory" version="4.5.0" targetFramework="net48" />
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net48" />
</packages> </packages>
\ No newline at end of file
VIZ.Package.TestPlugin/VIZ.Package.TestPlugin.csproj
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput> <LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
<None Include="app.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>
......
VIZ.Package.TestPlugin/app.config 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
VIZ.Package.WpfTest/App.config
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.Package/App.config
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.Package/App.xaml.cs
...@@ -32,6 +32,8 @@ namespace VIZ.Package ...@@ -32,6 +32,8 @@ namespace VIZ.Package
// 初始化LiteDB // 初始化LiteDB
AppSetup.AppendSetup(new AppSetup_InitLiteDB()); AppSetup.AppendSetup(new AppSetup_InitLiteDB());
// 初始化CSV
AppSetup.AppendSetup(new AppSetup_InitCSV());
// 执行启动流程 // 执行启动流程
AppSetupContext context = AppSetup.Setup(); AppSetupContext context = AppSetup.Setup();
......
VIZ.Package/VIZ.Package.csproj
...@@ -225,6 +225,9 @@ ...@@ -225,6 +225,9 @@
<ItemGroup> <ItemGroup>
<Resource Include="logo.ico" /> <Resource Include="logo.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="config\GridColumnDefintion\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>echo ========================================================== <PostBuildEvent>echo ==========================================================
......
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