增加了逻辑判断项（无法使用），仅作为外观参考

Author: Dime12022

Round.NET.AvaloniaApp.EncodeCalculator/Models/Mange/ItemManage/ItemMange.cs

@@ -4,6 +4,7 @@
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;
 using Round.NET.AvaloniaApp.EncodeCalculator.Views.Controls;
+using Round.NET.AvaloniaApp.EncodeCalculator.Views.Controls.Items.ItemControls;
 
 namespace Round.NET.AvaloniaApp.EncodeCalculator.Models.ItemManage;
 
@@ -52,11 +53,11 @@ public string Note
         }
         public UnitItem Item { get; set; } = new UnitItem();
         public string UUID { get; set; }
-        public int Type { get; set; } = 0;
+        public Type.Type.NodeType Type { get; set; } = Models.Type.Type.NodeType.Function;
         public bool IsMain { get; set; } = false;
     }
 
-    public static void AddItem(RootConfig config)
+    public static void AddFuncItem(RootConfig config)
     {
         if (!Deduplication.DeduplicationItem(config.Name))
         {
@@ -84,6 +85,10 @@ public static void AddItem(RootConfig config)
             });
         }
     }
+    public static void AddCompItem() // 未完成!!!!!!!!!!!!!!!!!!!!!!!
+    {
+        ItemListBox.Items.Add(new ComparisonItem());
+    }
 
     public static void ClearItems()
     {

Round.NET.AvaloniaApp.EncodeCalculator/Models/Mange/ProjectMange/Project.cs

@@ -26,6 +26,7 @@ public class ItemListClass
         public string ClassicValue { get; set; }
         public string Note { get; set; } = "无备注";
         public bool IsMain { get; set; } = false;
+        public Type.Type.NodeType Type { get; set; } = Models.Type.Type.NodeType.Function;
     }
     public class SaveProject
     {
@@ -47,7 +48,8 @@ public static Root GetNowRoot()
                     Value = item.Value.Replace("\n","").Replace("\r",""),
                     ClassicValue = item.ClassicValue.Replace("\n","\\n").Replace("\r","\\r"),
                     IsMain = item.IsMain,
-                    Note = item.Note
+                    Note = item.Note,
+                    Type = item.Type
                 });
             }
             return root;
@@ -69,14 +71,17 @@ public static void OpenProjectCore(Root root)
 
             foreach (var item in root.Items)
             {
-                ItemMange.AddItem(new ItemMange.RootConfig()
+                if (item.Type == Models.Type.Type.NodeType.Function)
                 {
-                    Name = item.Name,
-                    Value = item.Value,
-                    ClassicValue = item.ClassicValue,
-                    IsMain = item.IsMain,
-                    Note = item.Note
-                });
+                    ItemMange.AddFuncItem(new ItemMange.RootConfig()
+                    {
+                        Name = item.Name,
+                        Value = item.Value,
+                        ClassicValue = item.ClassicValue,
+                        IsMain = item.IsMain,
+                        Note = item.Note
+                    });
+                }
             }
         }
     }
@@ -87,7 +92,7 @@ public static void NewProjectCore()
         {
             Edit.Edit.EditMode = true;
             ItemMange.ClearItems();
-            ItemMange.AddItem(new ItemMange.RootConfig()
+            ItemMange.AddFuncItem(new ItemMange.RootConfig()
             {
                 Value = "1+1",
                 Name = "Main",

Round.NET.AvaloniaApp.EncodeCalculator/Models/Type/Type.cs

@@ -4,7 +4,7 @@ public class Type
 {
     public enum NodeType
     {
-        Function,
-        Variable
+        Function, // 函数
+        Comparison // 比较
     }
 }

Round.NET.AvaloniaApp.EncodeCalculator/Round.NET.AvaloniaApp.EncodeCalculator.csproj

@@ -24,20 +24,24 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Update="Views\Controls\Items\ItemControls\UnitItem.axaml.cs">
+      <DependentUpon>UnitItem.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="Views\Controls\Items\ItemsView.axaml.cs">
       <DependentUpon>ItemsView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Controls\Items\UnitItem.axaml.cs">
-      <DependentUpon>UnitItem.axaml</DependentUpon>
+    <Compile Update="Views\Controls\Items\EditItem\FunItems\AddItem.axaml.cs">
+      <DependentUpon>AddItem.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Controls\Items\EditItem\EditItem.axaml.cs">
-      <DependentUpon>EditItem.axaml</DependentUpon>
+    <Compile Update="Views\Controls\Items\EditItem\FunItems\DeepEditItem.axaml.cs">
+      <DependentUpon>DeepEditItem.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Controls\Items\EditItem\AddItem.axaml.cs">
-      <DependentUpon>AddItem.axaml</DependentUpon>
+    <Compile Update="Views\Controls\Items\EditItem\FunItems\EditItem.axaml.cs">
+      <DependentUpon>EditItem.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>

Round.NET.AvaloniaApp.EncodeCalculator/Views/Controls/Items/EditItem/CompItems/AddCompItem.axaml

@@ -0,0 +1,39 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Round.NET.AvaloniaApp.EncodeCalculator.Views.Controls.Items.EditItem.CompItems.AddCompItem">
+    <Grid>
+        <StackPanel>
+            <DockPanel Margin="5">
+                <Label Width="90" VerticalAlignment="Center">名称：</Label>
+                <TextBox Name="NameBox">NewComparisonItem</TextBox>
+            </DockPanel>
+            <DockPanel Margin="5">
+                <Label Width="90" VerticalAlignment="Center">备注：</Label>
+                <TextBox Name="NoteBox">无备注</TextBox>
+            </DockPanel>
+            <DockPanel Margin="5">
+                <Label Width="90" VerticalAlignment="Center">表达式 1：</Label>
+                <TextBox Name="ValueBox1" IsReadOnly="False" Height="32"></TextBox>
+            </DockPanel>
+            <DockPanel Margin="5">
+                <Label Width="90" VerticalAlignment="Center">表达式 2：</Label>
+                <TextBox Name="ValueBox2" IsReadOnly="False" Height="32"></TextBox>
+            </DockPanel>
+            <DockPanel Margin="5">
+                <Label Width="90" VerticalAlignment="Center">条件判断：</Label>
+                <ComboBox Name="ValueBox3" Height="32" HorizontalAlignment="Stretch" SelectedIndex="0">
+                    <ComboBoxItem>==</ComboBoxItem>
+                    <ComboBoxItem>!=</ComboBoxItem>
+                    <ComboBoxItem>&gt;=</ComboBoxItem>
+                    <ComboBoxItem>&lt;=</ComboBoxItem>
+                    <ComboBoxItem>&gt;</ComboBoxItem>
+                    <ComboBoxItem>&lt;</ComboBoxItem>
+                </ComboBox>
+            </DockPanel>
+            <Label Foreground="Gray" HorizontalAlignment="Center">值为true返回 表达式1 ; 反之为 表达式2.</Label>
+        </StackPanel>
+    </Grid>
+</UserControl>

Round.NET.AvaloniaApp.EncodeCalculator/Views/Controls/Items/EditItem/CompItems/AddCompItem.axaml.cs

@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Round.NET.AvaloniaApp.EncodeCalculator.Views.Controls.Items.EditItem.CompItems;
+
+public partial class AddCompItem : UserControl
+{
+    public AddCompItem()
+    {
+        InitializeComponent();
+    }
+}