Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

Windows/Print.xaml.cs

@@ -142,23 +142,7 @@ namespace formula_manage.Windows
 
         private void Button_Click_12(object sender, RoutedEventArgs e)  //编辑模板
         {
-            if (string.IsNullOrEmpty(Print_path.Text))
-               {
-                   System.Windows.MessageBox.Show("模板不能为空");
-                   return;
-               }
-            var data = this.CreateBillData();
-            if (!data.Item1)
-            {
-                System.Windows.MessageBox.Show("模拟数据生成错误");
-                return;
-            }
 
-            var tuple = PrintHelper.Design(Print_path2.Text, data.Item2, data.Item3);
-            if (!tuple.Item1)
-            {
-                System.Windows.MessageBox.Show($"打开设计器失败：{tuple.Item2}");
-            }
         }
         private void Button_Click_2(object sender, RoutedEventArgs e)  //预览模板
         {

packages.config

@@ -5,11 +5,13 @@
   <package id="FastReport.Compat" version="2024.1.0" targetFramework="net462" />
   <package id="FastReport.DataVisualization" version="2024.1.0" targetFramework="net462" />
   <package id="FastReport.Net.Demo" version="2024.1.2" targetFramework="net462" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
   <package id="ModernUI.WPF" version="1.0.9" targetFramework="net46" />
   <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net46" />
   <package id="NModbus" version="3.0.81" targetFramework="net462" />
   <package id="SamOatesGames.ModernUI.Xceed.Toolkit" version="1.0.1905191936" targetFramework="net46" />
   <package id="Smart.FormDesigner" version="1.4.3" targetFramework="net462" />
+  <package id="System.Data.DataSetExtensions" version="4.5.0" targetFramework="net462" />
   <package id="System.ObjectModel" version="4.3.0" targetFramework="net46" />
   <package id="ThoughtWorks.QRCode" version="1.1.0" targetFramework="net46" />
 </packages>