mirror of
https://gitee.com/akwkevin/aistudio.-wpf.-diagram
synced 2026-04-17 06:36:36 +08:00
Revert "Revert "block 可以拖拽到内部，还有少量问题待解决""
This reverts commit fcd7beb193.
This commit is contained in:
艾竹
@@ -103,6 +103,9 @@
|
||||
<Button Margin="5" ToolTip="画板" Command="{Binding NewCommand}" CommandParameter="Drawing" Width="80" Height="80" Foreground="{DynamicResource BlackBrush}" Background="{DynamicResource WhiteBrush}" BorderBrush="{DynamicResource BlackBrush}">
|
||||
<Path Stretch="Uniform" Margin="20" Fill="{DynamicResource GrayBrush2}" Data="M9.75 20.85C11.53 20.15 11.14 18.22 10.24 17C9.35 15.75 8.12 14.89 6.88 14.06C6 13.5 5.19 12.8 4.54 12C4.26 11.67 3.69 11.06 4.27 10.94C4.86 10.82 5.88 11.4 6.4 11.62C7.31 12 8.21 12.44 9.05 12.96L10.06 11.26C8.5 10.23 6.5 9.32 4.64 9.05C3.58 8.89 2.46 9.11 2.1 10.26C1.78 11.25 2.29 12.25 2.87 13.03C4.24 14.86 6.37 15.74 7.96 17.32C8.3 17.65 8.71 18.04 8.91 18.5C9.12 18.94 9.07 18.97 8.6 18.97C7.36 18.97 5.81 18 4.8 17.36L3.79 19.06C5.32 20 7.88 21.47 9.75 20.85M20.84 5.25C21.06 5.03 21.06 4.67 20.84 4.46L19.54 3.16C19.33 2.95 18.97 2.95 18.76 3.16L17.74 4.18L19.82 6.26M11 10.92V13H13.08L19.23 6.85L17.15 4.77L11 10.92Z" ></Path>
|
||||
</Button>
|
||||
<Button Margin="5" ToolTip="Stratch" Command="{Binding NewCommand}" CommandParameter="Block" Width="80" Height="80" Foreground="{DynamicResource BlackBrush}" Background="{DynamicResource WhiteBrush}" BorderBrush="{DynamicResource BlackBrush}">
|
||||
<Path Stretch="Uniform" Margin="20" Fill="{DynamicResource GrayBrush2}" Data="M884.48 296.106667l-5.973333-10.666667a90.88 90.88 0 0 0-31.146667-29.44l-201.386667-116.48a85.333333 85.333333 0 0 0-42.666666-11.52h-11.946667a81.92 81.92 0 0 0-42.666667 11.52L176.64 354.986667a85.333333 85.333333 0 0 0-31.146667 31.146666l-5.973333 10.666667a85.333333 85.333333 0 0 0-11.52 42.666667v245.76a85.333333 85.333333 0 0 0 11.52 42.666666l5.973333 10.666667a90.88 90.88 0 0 0 31.146667 31.146667l201.386667 114.773333a85.333333 85.333333 0 0 0 42.666666 11.52h11.946667a81.92 81.92 0 0 0 42.666667-11.52l372.053333-215.466667a85.333333 85.333333 0 0 0 31.146667-31.146666l5.973333-10.666667a85.333333 85.333333 0 0 0 11.52-42.666667V338.773333a85.333333 85.333333 0 0 0-11.52-42.666666zM591.36 213.333333h11.946667L768 307.2l-341.333333 197.546667-170.666667-97.28z m213.333333 384L469.333333 789.333333v-210.346666l341.333334-197.973334v203.52z" ></Path>
|
||||
</Button>
|
||||
</WrapPanel>
|
||||
</TabItem>
|
||||
<TabItem Header="思维导图" >
|
||||
@@ -2651,70 +2654,76 @@
|
||||
</dragablz:TabablzControl.HeaderItemTemplate>
|
||||
<dragablz:TabablzControl.ContentTemplate>
|
||||
<DataTemplate>
|
||||
<dd:DiagramTabControl ItemsSource="{Binding DiagramViewModels}" SelectedItem="{Binding DiagramViewModel}" Style="{StaticResource TabControlStyle}"
|
||||
<Grid>
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="Loaded" >
|
||||
<i:CallMethodAction MethodName="View_Loaded" TargetObject="{Binding}" />
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
<dd:DiagramTabControl ItemsSource="{Binding DiagramViewModels}" SelectedItem="{Binding DiagramViewModel}" Style="{StaticResource TabControlStyle}"
|
||||
BorderThickness="0" Margin="0" Padding="0">
|
||||
<TabControl.ItemContainerStyle>
|
||||
<Style>
|
||||
<Setter Property="TabItem.Visibility" Value="Collapsed"/>
|
||||
</Style>
|
||||
</TabControl.ItemContainerStyle>
|
||||
<TabControl.ContentTemplate>
|
||||
<DataTemplate>
|
||||
<Grid>
|
||||
<ScrollViewer x:Name="designerScrollViewer"
|
||||
<TabControl.ItemContainerStyle>
|
||||
<Style>
|
||||
<Setter Property="TabItem.Visibility" Value="Collapsed"/>
|
||||
</Style>
|
||||
</TabControl.ItemContainerStyle>
|
||||
<TabControl.ContentTemplate>
|
||||
<DataTemplate>
|
||||
<Grid>
|
||||
<ScrollViewer x:Name="designerScrollViewer"
|
||||
Background="{DynamicResource GrayBrush8}"
|
||||
HorizontalScrollBarVisibility="Auto"
|
||||
VerticalScrollBarVisibility="Auto"
|
||||
Focusable="False">
|
||||
<DockPanel x:Name="panel">
|
||||
<controls:Ruler x:Name="hruler"
|
||||
<DockPanel x:Name="panel">
|
||||
<controls:Ruler x:Name="hruler"
|
||||
Unit="{Binding DiagramOption.LayoutOption.PageUnit,Converter={StaticResource RulerUnitConverter}}"
|
||||
DockPanel.Dock="Top"
|
||||
Margin="21,0,0,0"
|
||||
Zoom="{Binding ZoomValue}"
|
||||
AutoSize="True"
|
||||
ClipToBounds="True" >
|
||||
<controls:Ruler.CountShift>
|
||||
<MultiBinding Converter="{StaticResource CountShiftConverter}" ConverterParameter="X">
|
||||
<Binding ElementName="diagram" Path="." />
|
||||
<Binding Path="DelayZoomValue"/>
|
||||
<Binding Path="DiagramOption.LayoutOption.PageUnit"/>
|
||||
<Binding ElementName="designerScrollViewer" Path="ActualWidth"/>
|
||||
<Binding ElementName="panel" Path="ActualWidth"/>
|
||||
<Binding ElementName="diagram" Path="ActualWidth"/>
|
||||
</MultiBinding>
|
||||
</controls:Ruler.CountShift>
|
||||
</controls:Ruler>
|
||||
<controls:Ruler x:Name="vruler"
|
||||
<controls:Ruler.CountShift>
|
||||
<MultiBinding Converter="{StaticResource CountShiftConverter}" ConverterParameter="X">
|
||||
<Binding ElementName="diagram" Path="." />
|
||||
<Binding Path="DelayZoomValue"/>
|
||||
<Binding Path="DiagramOption.LayoutOption.PageUnit"/>
|
||||
<Binding ElementName="designerScrollViewer" Path="ActualWidth"/>
|
||||
<Binding ElementName="panel" Path="ActualWidth"/>
|
||||
<Binding ElementName="diagram" Path="ActualWidth"/>
|
||||
</MultiBinding>
|
||||
</controls:Ruler.CountShift>
|
||||
</controls:Ruler>
|
||||
<controls:Ruler x:Name="vruler"
|
||||
Unit="{Binding DiagramOption.LayoutOption.PageUnit,Converter={StaticResource RulerUnitConverter}}"
|
||||
Marks="Up"
|
||||
RenderTransformOrigin="0,0"
|
||||
AutoSize="True"
|
||||
Zoom="{Binding ZoomValue}"
|
||||
ClipToBounds="True">
|
||||
<controls:Ruler.LayoutTransform>
|
||||
<TransformGroup>
|
||||
<ScaleTransform ScaleX="1" ScaleY="1" />
|
||||
<SkewTransform AngleX="0" AngleY="0" />
|
||||
<RotateTransform Angle="90" />
|
||||
<TranslateTransform X="23" />
|
||||
</TransformGroup>
|
||||
</controls:Ruler.LayoutTransform>
|
||||
<controls:Ruler.CountShift>
|
||||
<MultiBinding Converter="{StaticResource CountShiftConverter}" ConverterParameter="Y">
|
||||
<Binding ElementName="diagram" Path="." />
|
||||
<Binding Path="DelayZoomValue"/>
|
||||
<Binding Path="DiagramOption.LayoutOption.PageUnit"/>
|
||||
<Binding ElementName="designerScrollViewer" Path="ActualHeight"/>
|
||||
<Binding ElementName="panel" Path="ActualHeight"/>
|
||||
<Binding ElementName="diagram" Path="ActualHeight"/>
|
||||
</MultiBinding>
|
||||
</controls:Ruler.CountShift>
|
||||
</controls:Ruler>
|
||||
<dd:DiagramControl x:Name="diagram" DataContext="{Binding .}" Margin="50"/>
|
||||
</DockPanel>
|
||||
</ScrollViewer>
|
||||
<dd:ZoomBox x:Name="zoomBox"
|
||||
<controls:Ruler.LayoutTransform>
|
||||
<TransformGroup>
|
||||
<ScaleTransform ScaleX="1" ScaleY="1" />
|
||||
<SkewTransform AngleX="0" AngleY="0" />
|
||||
<RotateTransform Angle="90" />
|
||||
<TranslateTransform X="23" />
|
||||
</TransformGroup>
|
||||
</controls:Ruler.LayoutTransform>
|
||||
<controls:Ruler.CountShift>
|
||||
<MultiBinding Converter="{StaticResource CountShiftConverter}" ConverterParameter="Y">
|
||||
<Binding ElementName="diagram" Path="." />
|
||||
<Binding Path="DelayZoomValue"/>
|
||||
<Binding Path="DiagramOption.LayoutOption.PageUnit"/>
|
||||
<Binding ElementName="designerScrollViewer" Path="ActualHeight"/>
|
||||
<Binding ElementName="panel" Path="ActualHeight"/>
|
||||
<Binding ElementName="diagram" Path="ActualHeight"/>
|
||||
</MultiBinding>
|
||||
</controls:Ruler.CountShift>
|
||||
</controls:Ruler>
|
||||
<dd:DiagramControl x:Name="diagram" DataContext="{Binding .}" Margin="50"/>
|
||||
</DockPanel>
|
||||
</ScrollViewer>
|
||||
<dd:ZoomBox x:Name="zoomBox"
|
||||
Width="180"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Bottom"
|
||||
@@ -2725,10 +2734,11 @@
|
||||
ZoomValue="{Binding ZoomValue,Mode=TwoWay}"
|
||||
FitViewModel="{Binding FitViewModel}"
|
||||
Margin="20,0,0,20" />
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</TabControl.ContentTemplate>
|
||||
</dd:DiagramTabControl>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</TabControl.ContentTemplate>
|
||||
</dd:DiagramTabControl>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</dragablz:TabablzControl.ContentTemplate>
|
||||
</dragablz:TabablzControl>
|
||||
|
||||
Reference in New Issue
Block a user
