整理一下项目文件

This commit is contained in:
艾竹
2022-10-28 22:45:39 +08:00
parent 334297b074
commit 513937c1d6
598 changed files with 684 additions and 544 deletions

View File

@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<UseWPF>true</UseWPF>
</PropertyGroup>
@@ -10,13 +9,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AIStudio.Wpf.BaseDiagram\AIStudio.Wpf.BaseDiagram.csproj" />
</ItemGroup>
<ItemGroup>
<Page Update="ViewModels\FlowNode.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
</Page>
<ProjectReference Include="..\AIStudio.Wpf.DiagramHelper\AIStudio.Wpf.DiagramHelper.csproj" />
</ItemGroup>
</Project>

View File

@@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Windows;
using System.Windows.Media;
using Util.DiagramDesigner;
using AIStudio.Wpf.DiagramDesigner;
using Expression = org.mariuszgromada.math.mxparser.Expression;
namespace AIStudio.Wpf.Flowchart
@@ -192,7 +192,7 @@ namespace AIStudio.Wpf.Flowchart
if (middleFlowNode.UserIds != null && middleFlowNode.UserIds.Count > 1)
{
//实际情况不是这样的,这里只是演示,简化。
int count = remark.Split("审批人:", StringSplitOptions.RemoveEmptyEntries).Length;
int count = remark.Split(new String[] { "审批人:" }, StringSplitOptions.RemoveEmptyEntries).Length;
if (middleFlowNode.UserIds.Count != count)
{
SetStatus(flowNode, 1, remark);
@@ -202,7 +202,7 @@ namespace AIStudio.Wpf.Flowchart
else if (middleFlowNode.RoleIds != null && middleFlowNode.RoleIds.Count > 1)
{
//实际情况不是这样的,这里只是演示,简化。
int count = remark.Split("审批人:", StringSplitOptions.RemoveEmptyEntries).Length;
int count = remark.Split(new String[] { "审批人:" }, StringSplitOptions.RemoveEmptyEntries).Length;
if (middleFlowNode.RoleIds.Count != count)
{
SetStatus(flowNode, 1, remark);

View File

@@ -7,7 +7,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Media;
using System.Xml.Serialization;
using Util.DiagramDesigner;
using AIStudio.Wpf.DiagramDesigner;
namespace AIStudio.Wpf.Flowchart.Models
{

View File

@@ -1,9 +1,9 @@
using AIStudio.Wpf.BaseDiagram;
using AIStudio.Wpf.BaseDiagram.Services;
using AIStudio.Wpf.DiagramHelper;
using AIStudio.Wpf.DiagramHelper.Services;
using AIStudio.Wpf.Flowchart.Models;
using System.Collections.Generic;
using System.ComponentModel;
using Util.DiagramDesigner;
using AIStudio.Wpf.DiagramDesigner;
namespace AIStudio.Wpf.Flowchart.ViewModels
{

View File

@@ -1,8 +1,8 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="clr-namespace:Util.DiagramDesigner;assembly=Util.DiagramDesigner"
xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner"
xmlns:viewmodel="clr-namespace:AIStudio.Wpf.Flowchart.ViewModels"
xmlns:converter="clr-namespace:AIStudio.Wpf.BaseDiagram.Converters;assembly=AIStudio.Wpf.BaseDiagram">
xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters;assembly=AIStudio.Wpf.DiagramHelper">
<s:ColorBrushConverter x:Key="ColorBrushConverter"/>

View File

@@ -1,8 +1,8 @@
using AIStudio.Wpf.BaseDiagram.Controls;
using AIStudio.Wpf.DiagramHelper.Controls;
using System.Collections.Generic;
using System.ComponentModel;
using System.Windows;
using Util.DiagramDesigner;
using AIStudio.Wpf.DiagramDesigner;
namespace AIStudio.Wpf.Flowchart.ViewModels
{

View File

@@ -1,4 +1,4 @@
using AIStudio.Wpf.BaseDiagram.Models;
using AIStudio.Wpf.DiagramHelper.Models;
namespace AIStudio.Wpf.Flowchart.ViewModels
{