zhusenlin/aistudio-wpf-diagram
1
0
Fork 0
mirror of https://gitee.com/akwkevin/aistudio.-wpf.-diagram synced 2026-03-02 07:40:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

重新加载Item的bug修复

Browse Source
This commit is contained in:
艾竹
2024-02-18 16:40:33 +08:00
parent 807d37bd28
commit edf6bd49d3
30 changed files with 89 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/BarcodeDesignerItemViewModel.cs
View File

@@ -34,13 +34,14 @@ namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels
return new DesignerItemBase(this, Format.ToString());
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);
CustomText = true;
visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
if (visualiserService == null)
visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
}
protected override void InitNew()

5
AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/OutLineTextDesignerItemViewModel.cs
View File

@@ -35,11 +35,12 @@ namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels
return new TextDesignerItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);
visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
if (visualiserService == null)
visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
}
protected override void InitNew()

2
AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/PathItemViewModel.cs
View File

@@ -32,7 +32,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels
return new PathDesignerItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);

6
AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/PersistDesignerItemViewModel.cs
View File

@@ -35,12 +35,14 @@ namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels
return new PersistDesignerItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);
visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
this.ShowConnectors = false;
if (visualiserService == null)
visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
}
protected override void InitNew()

6
AIStudio.Wpf.DiagramDesigner.Additionals/Extensions/ViewModels/SettingsDesignerItemViewModel.cs
View File

@@ -35,12 +35,14 @@ namespace AIStudio.Wpf.DiagramDesigner.Additionals.Extensions.ViewModels
return new SettingsDesignerItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);
visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
this.ShowConnectors = false;
if (visualiserService == null)
visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
}
protected override void InitNew()

2
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/ConnectorInfoBase.cs
View File

@@ -36,7 +36,7 @@ namespace AIStudio.Wpf.DiagramDesigner
return new ConnectorInfoItemBase(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);
}

2
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/ConnectorLabelModel.cs
View File

@@ -36,7 +36,7 @@ namespace AIStudio.Wpf.DiagramDesigner
return new ConnectorLabelItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);

2
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/ConnectorPointModel.cs
View File

@@ -48,7 +48,7 @@ namespace AIStudio.Wpf.DiagramDesigner
return new ConnectorPointItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);
}

2
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/ConnectorVertexModel.cs
View File

@@ -33,7 +33,7 @@ namespace AIStudio.Wpf.DiagramDesigner
return new ConnectorVertexItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);

2
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/FullyCreatedConnectorInfo.cs
View File

@@ -52,7 +52,7 @@ namespace AIStudio.Wpf.DiagramDesigner
return new FullyCreatedConnectorInfoItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);

2
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Container/BlockItemsContainerInfo.cs
View File

@@ -40,7 +40,7 @@ namespace AIStudio.Wpf.DiagramDesigner
return new BlockItemsContainerInfoItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);
}

1
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs
View File

@@ -1285,6 +1285,7 @@ namespace AIStudio.Wpf.DiagramDesigner
{
designerItemViewModelBase.SetCellAlignment();
}
item.Init(this, false);
Items.Add(item);
if (isSelected != null)
{

2
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/GroupDesignerItemViewModel.cs
View File

@@ -36,7 +36,7 @@ namespace AIStudio.Wpf.DiagramDesigner
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);

2
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs
View File

@@ -42,7 +42,7 @@ namespace AIStudio.Wpf.DiagramDesigner
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);
}

67
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableViewModelBase.cs
View File

@@ -71,47 +71,62 @@ namespace AIStudio.Wpf.DiagramDesigner
return null;
}
protected virtual void Init(IDiagramViewModel root, bool initNew)
public virtual void Init(IDiagramViewModel root, bool initNew)
{
Root = root;
if (Root?.ColorViewModel != null)
if (this.ColorViewModel == null)
{
this.ColorViewModel = CopyHelper.Mapper(Root.ColorViewModel);
}
else
{
this.ColorViewModel = _service.CopyDefaultColorViewModel();
if (Root?.ColorViewModel != null)
{
this.ColorViewModel = CopyHelper.Mapper(Root.ColorViewModel);
}
else
{
this.ColorViewModel = _service.CopyDefaultColorViewModel();
}
}
if (Root?.FontViewModel != null)
if (this.FontViewModel == null)
{
this.FontViewModel = CopyHelper.Mapper(Root.FontViewModel);
}
else
{
this.FontViewModel = _service.CopyDefaultFontViewModel();
if (Root?.FontViewModel != null)
{
this.FontViewModel = CopyHelper.Mapper(Root.FontViewModel);
}
else
{
this.FontViewModel = _service.CopyDefaultFontViewModel();
}
}
if (Root?.ShapeViewModel != null)
if (this.ShapeViewModel == null)
{
this.ShapeViewModel = CopyHelper.Mapper(Root.ShapeViewModel);
}
else
{
this.ShapeViewModel = _service.CopyDefaultShapeViewModel();
if (Root?.ShapeViewModel != null)
{
this.ShapeViewModel = CopyHelper.Mapper(Root.ShapeViewModel);
}
else
{
this.ShapeViewModel = _service.CopyDefaultShapeViewModel();
}
}
if (Root?.AnimationViewModel != null)
if (this.AnimationViewModel == null)
{
this.AnimationViewModel = CopyHelper.Mapper(Root.AnimationViewModel);
}
else
{
this.AnimationViewModel = _service.CopyDefaultAnimationViewModel();
if (Root?.AnimationViewModel != null)
{
this.AnimationViewModel = CopyHelper.Mapper(Root.AnimationViewModel);
}
else
{
this.AnimationViewModel = _service.CopyDefaultAnimationViewModel();
}
}
LockObjectViewModel = new LockObjectViewModel();
if (LockObjectViewModel == null)
{
LockObjectViewModel = new LockObjectViewModel();
}
if (initNew)
{

2
AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs
View File

@@ -44,7 +44,7 @@ namespace AIStudio.Wpf.DiagramDesigner
AddConnector(new BlockConnectorInfo(this.Root, this, ConnectorOrientation.Bottom));
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);

2
AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/GifImageItemViewModel.cs
View File

@@ -42,7 +42,7 @@ namespace AIStudio.Wpf.DiagramDesigner
return new MediaDesignerItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);

2
AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/ImageItemViewModel.cs
View File

@@ -41,7 +41,7 @@ namespace AIStudio.Wpf.DiagramDesigner
return new ImageDesignerItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);

2
AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/LogicalGateItemViewModelBase.cs
View File

@@ -54,7 +54,7 @@ namespace AIStudio.Wpf.DiagramDesigner
return new LogicalGateDesignerItemBase(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
ShowRotate = false;
ShowArrow = false;

2
AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/MediaItemViewModel.cs
View File

@@ -36,7 +36,7 @@ namespace AIStudio.Wpf.DiagramDesigner
return new MediaDesignerItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);

2
AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/TextAutoDesignerItemViewModel.cs
View File

@@ -25,7 +25,7 @@ namespace AIStudio.Wpf.DiagramDesigner
{
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);

2
AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/TextDesignerItemViewModel.cs
View File

@@ -35,7 +35,7 @@ namespace AIStudio.Wpf.DiagramDesigner
return new TextDesignerItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);

2
AIStudio.Wpf.DiagramDesigner/ViewModels/DrawingViewModel/Erasable/DrawingDesignerItemViewModelBase.cs
View File

@@ -47,7 +47,7 @@ namespace AIStudio.Wpf.DiagramDesigner
return new DrawingDesignerItemBase(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);
}

2
AIStudio.Wpf.DiagramDesigner/ViewModels/DrawingViewModel/Erasable/TextDrawingDesignerItemViewModel.cs
View File

@@ -33,7 +33,7 @@ namespace AIStudio.Wpf.DiagramDesigner
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);

5
Extensions/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs
View File

@@ -40,7 +40,7 @@ namespace AIStudio.Wpf.Flowchart.ViewModels
return new FlowNodeDesignerItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);
@@ -48,7 +48,8 @@ namespace AIStudio.Wpf.Flowchart.ViewModels
ShowText = true;
IsReadOnlyText = true;
visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
if (visualiserService == null)
visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
}
protected override void InitNew()

9
Extensions/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs
View File

@@ -37,11 +37,12 @@ namespace AIStudio.Wpf.Logical.ViewModels
return new LogicalGateDesignerItemBase(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);
visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
if (visualiserService == null)
visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
}
protected override void InitNew()
@@ -2577,11 +2578,13 @@ namespace AIStudio.Wpf.Logical.ViewModels
BuildMenuOptions();
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);
MenuItemCommand = new SimpleCommand(Command_Enable, ExecuteMenuItemCommand);
readDataTimer.Elapsed -= timeCycle;
readDataTimer.Elapsed += timeCycle;
readDataTimer.Interval = 1000;
}

2
Extensions/AIStudio.Wpf.Mind/ViewModels/MindNode.cs
View File

@@ -71,7 +71,7 @@ namespace AIStudio.Wpf.Mind.ViewModels
return mindNodeModel;
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);

2
Extensions/AIStudio.Wpf.SFC/ViewModels/SFCConditionNode.cs
View File

@@ -35,7 +35,7 @@ namespace AIStudio.Wpf.SFC.ViewModels
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);
CustomText = true;

5
Extensions/AIStudio.Wpf.SFC/ViewModels/SFCNode.cs
View File

@@ -42,7 +42,7 @@ namespace AIStudio.Wpf.SFC.ViewModels
return new SFCNodeDesignerItem(this);
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
IsInnerConnector = true;
ShowRotate = false;
@@ -52,7 +52,8 @@ namespace AIStudio.Wpf.SFC.ViewModels
base.Init(root, initNew);
visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
if (visualiserService == null)
visualiserService = ApplicationServicesProvider.Instance.Provider.VisualizerService;
}
protected override void InitNew()

2
Extensions/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModel.cs
View File

@@ -34,7 +34,7 @@ namespace AIStudio.Wpf.SFC.ViewModels
}
protected override void Init(IDiagramViewModel root, bool initNew)
public override void Init(IDiagramViewModel root, bool initNew)
{
base.Init(root, initNew);
CustomText = true;