From 375b488be2666cd56e70728624f4eadaefee0440 Mon Sep 17 00:00:00 2001
From: chenghaoran <chenghaoran@ipilotwhale.com>
Date: 星期二, 12 三月 2024 17:36:49 +0800
Subject: [PATCH] 优化项目结构；
---
WPFProject/UI/Test/FunctionSetting.xaml | 108 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/UI/Test/FunctionSetting.xaml b/WPFProject/UI/Test/FunctionSetting.xaml
similarity index 99%
rename from UI/Test/FunctionSetting.xaml
rename to WPFProject/UI/Test/FunctionSetting.xaml
index 6347066..a54d9e2 100644
--- a/UI/Test/FunctionSetting.xaml
+++ b/WPFProject/UI/Test/FunctionSetting.xaml
@@ -1,54 +1,54 @@
-锘�<UserControl x:Class="WPFProject.UI.Test.FunctionSetting"
- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:WPFProject.UI.Test"
- xmlns:dd="urn:gong-wpf-dragdrop"
-
- xmlns:m="clr-namespace:WPFProject.Models"
- xmlns:util="clr-namespace:WPFProject.Utils"
- xmlns:hc="https://handyorg.github.io/handycontrol"
- mc:Ignorable="d"
- d:DesignHeight="450" d:DesignWidth="800">
- <UserControl.Resources>
- <ResourceDictionary>
- <ResourceDictionary.MergedDictionaries>
- <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
- <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
- <ResourceDictionary Source="/WPFProject;component/Style/colors.xaml"/>
- <ResourceDictionary Source="/WPFProject;component/Style/CommonTree.xaml"/>
- <ResourceDictionary Source="/WPFProject;component/Style/MainTab.xaml"/>
- </ResourceDictionary.MergedDictionaries>
- <Style TargetType="Label"/>
-
- <Style TargetType="TabControl"/>
- <Style TargetType="TreeView">
- </Style>
- </ResourceDictionary>
- </UserControl.Resources>
-
- <Grid>
- <TabControl Style="{StaticResource ControlStyle}">
- <TabItem Header="鍑芥暟鍒楄〃">
- <StackPanel>
- <hc:SearchBar hc:InfoElement.Placeholder="杈撳叆鏂囨湰鏌ヨ" Style="{StaticResource SearchBarPlus}" Margin="10,5,10,5"/>
- <TreeView BorderThickness="0" ItemsSource="{Binding FuncModels}"
- dd:DragDrop.IsDragSource="True"
- dd:DragDrop.ShowAlwaysDropTargetAdorner="True"
- dd:DragDrop.UseDefaultDragAdorner="True"
- dd:DragDrop.DragHandler="{Binding dragHandler}"
- >
- <TreeView.ItemTemplate>
- <HierarchicalDataTemplate DataType="{x:Type m:FuncModel}" ItemsSource="{Binding Path=Children}">
- <ContentControl Content="{Binding Name}"/>
- </HierarchicalDataTemplate>
- </TreeView.ItemTemplate>
- </TreeView>
- </StackPanel>
- </TabItem>
- <TabItem Header="鍙橀噺鍒楄〃">
- </TabItem>
- </TabControl>
- </Grid>
-</UserControl>
+锘�<UserControl x:Class="WPFProject.UI.Test.FunctionSetting"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:local="clr-namespace:WPFProject.UI.Test"
+ xmlns:dd="urn:gong-wpf-dragdrop"
+
+ xmlns:m="clr-namespace:WPFProject.Models"
+ xmlns:util="clr-namespace:WPFProject.Utils"
+ xmlns:hc="https://handyorg.github.io/handycontrol"
+ mc:Ignorable="d"
+ d:DesignHeight="450" d:DesignWidth="800">
+ <UserControl.Resources>
+ <ResourceDictionary>
+ <ResourceDictionary.MergedDictionaries>
+ <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
+ <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
+ <ResourceDictionary Source="/WPFProject;component/Style/colors.xaml"/>
+ <ResourceDictionary Source="/WPFProject;component/Style/CommonTree.xaml"/>
+ <ResourceDictionary Source="/WPFProject;component/Style/MainTab.xaml"/>
+ </ResourceDictionary.MergedDictionaries>
+ <Style TargetType="Label"/>
+
+ <Style TargetType="TabControl"/>
+ <Style TargetType="TreeView">
+ </Style>
+ </ResourceDictionary>
+ </UserControl.Resources>
+
+ <Grid>
+ <TabControl Style="{StaticResource ControlStyle}">
+ <TabItem Header="鍑芥暟鍒楄〃">
+ <StackPanel>
+ <hc:SearchBar hc:InfoElement.Placeholder="杈撳叆鏂囨湰鏌ヨ" Style="{StaticResource SearchBarPlus}" Margin="10,5,10,5"/>
+ <TreeView BorderThickness="0" ItemsSource="{Binding FuncModels}"
+ dd:DragDrop.IsDragSource="True"
+ dd:DragDrop.ShowAlwaysDropTargetAdorner="True"
+ dd:DragDrop.UseDefaultDragAdorner="True"
+ dd:DragDrop.DragHandler="{Binding dragHandler}"
+ >
+ <TreeView.ItemTemplate>
+ <HierarchicalDataTemplate DataType="{x:Type m:FuncModel}" ItemsSource="{Binding Path=Children}">
+ <ContentControl Content="{Binding Name}"/>
+ </HierarchicalDataTemplate>
+ </TreeView.ItemTemplate>
+ </TreeView>
+ </StackPanel>
+ </TabItem>
+ <TabItem Header="鍙橀噺鍒楄〃">
+ </TabItem>
+ </TabControl>
+ </Grid>
+</UserControl>
--
Gitblit v1.9.1