sc/DyeingComputer
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改工艺步骤编辑逻辑

Browse Source
This commit is contained in:
sc committed 2025-07-16 21:38:58 +08:00
2 parents 2148bb0b9d 87299ac562
commit d4918cd419
5 files changed
+111 -117
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Windows/ViewStep.xaml
+1 -1
View File
@@ -12,7 +12,7 @@
<Grid FocusManager.FocusedElement="{Binding ElementName=box}">
<TextBlock Text="{x:Static lang:Resources.Code}" HorizontalAlignment="Left" Height="30" Margin="10,20,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20" Background="#FFEFEEEE"/>
<TextBlock Text="{x:Static lang:Resources.Function}" HorizontalAlignment="Left" Height="30" Margin="10,60,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20" Background="#FFEFEEEE"/>
<ComboBox x:Name="boxID" HorizontalAlignment="Right" Height="30" Margin="0,60,10,0" VerticalAlignment="Top" Width="230" FontSize="20" Text="12345125" SelectionChanged="BoxID_SelectionChanged"/>
<ComboBox x:Name="boxID" HorizontalAlignment="Right" Height="30" Margin="0,60,10,0" VerticalAlignment="Top" Width="230" FontSize="20" SelectionChanged="BoxID_SelectionChanged"/>
<TextBox x:Name="boxNAME" HorizontalAlignment="Right" Height="30" Margin="0,20,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="230" MaxLines="1" ClipToBounds="True"
TextChanged="TextBox_TextChanged" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False" FontSize="20" HorizontalContentAlignment="Right" MaxLength="3"/>
Windows/ViewStep.xaml.cs
+13 -3
View File
@@ -4,6 +4,7 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net.NetworkInformation;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@@ -11,12 +12,13 @@ using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Forms;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using System.Windows.Forms;
using System.Net.NetworkInformation;
using System.Xml.Linq;
using TouchSocket.Core;
namespace DyeingComputer.Windows
{
@@ -176,7 +178,13 @@ namespace DyeingComputer.Windows
private void YES_Click(object sender, RoutedEventArgs e)//确认
{
if (boxNAME.Text == null) return;
if (string.IsNullOrEmpty(boxID.Text))
{
var args1 = new AddressUpdateEventArgs(data, "", "", "", "0", "0", "0", "0", "0");
AddressUpdated(this, args1);
this.Close(); //关闭窗口
return;
}
string name = " ";
if (P1N.Visibility == Visibility.Visible) name = P1N.Text +":["+P1.Text+"]";
if (P2N.Visibility == Visibility.Visible) name += P2N.Text + ":[" + P2.Text + "]";
@@ -191,6 +199,8 @@ namespace DyeingComputer.Windows
private void NO_Click(object sender, RoutedEventArgs e)//关闭
{
var args = new AddressUpdateEventArgs(data, "", "", "","0","0", "0", "0", "0");
AddressUpdated(this, args);
this.Close(); //关闭窗口
}