Commit 561def36 by liulongfei

修复值类型与浮点类型不可编辑的bug

parent d51b79ed
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
ColumnGeneratorTemplateSelector="{StaticResource ResourceKey=ColumnDefintionGeneratorTemplateSelector}"> ColumnGeneratorTemplateSelector="{StaticResource ResourceKey=ColumnDefintionGeneratorTemplateSelector}">
<dxg:GridControl.ContextMenu> <dxg:GridControl.ContextMenu>
<common:ContextMenuEx BindingTargetType="{x:Type dx:DXTabControl}"> <common:ContextMenuEx BindingTargetType="{x:Type dx:DXTabControl}">
<MenuItem Header="粘贴选中页" Command="{Binding Path=DataContext.PastePageCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type common:ContextMenuEx}}}"/> <MenuItem Header="粘贴页" Command="{Binding Path=DataContext.PastePageCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type common:ContextMenuEx}}}"/>
</common:ContextMenuEx> </common:ContextMenuEx>
</dxg:GridControl.ContextMenu> </dxg:GridControl.ContextMenu>
...@@ -332,7 +332,7 @@ ...@@ -332,7 +332,7 @@
<dxb:BarButtonItem Name="CopyPage" Content="复制选中页" <dxb:BarButtonItem Name="CopyPage" Content="复制选中页"
Command="{Binding ElementName=uc,Path=DataContext.BeginCopyPageCommand}" Command="{Binding ElementName=uc,Path=DataContext.BeginCopyPageCommand}"
Tag="{x:Static Member=common:GridControlHelper.KEEP_MENU_TAG}"/> Tag="{x:Static Member=common:GridControlHelper.KEEP_MENU_TAG}"/>
<dxb:BarButtonItem Name="PastePage" Content="粘贴选中页" <dxb:BarButtonItem Name="PastePage" Content="粘贴页"
Command="{Binding ElementName=uc,Path=DataContext.PastePageCommand}" Command="{Binding ElementName=uc,Path=DataContext.PastePageCommand}"
Tag="{x:Static Member=common:GridControlHelper.KEEP_MENU_TAG}"/> Tag="{x:Static Member=common:GridControlHelper.KEEP_MENU_TAG}"/>
<dxb:BarItemLinkSeparator /> <dxb:BarItemLinkSeparator />
......
...@@ -34,8 +34,6 @@ namespace VIZ.Package.Service ...@@ -34,8 +34,6 @@ namespace VIZ.Package.Service
VizControlFieldType.none, VizControlFieldType.none,
VizControlFieldType.boolean, VizControlFieldType.boolean,
VizControlFieldType.image, VizControlFieldType.image,
VizControlFieldType.integer,
VizControlFieldType.@float,
VizControlFieldType.duplet, VizControlFieldType.duplet,
VizControlFieldType.triplet, VizControlFieldType.triplet,
VizControlFieldType.font VizControlFieldType.font
......
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