diff --git a/Directory.Packages.props b/Directory.Packages.props index 8dc4cd3..04cf0e7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,8 +9,8 @@ all - - + + diff --git a/Test.UI/Components/Pages/BaseEdit.razor.cs b/Test.UI/Components/Pages/BaseEdit.razor.cs index 3f03d14..73c568a 100644 --- a/Test.UI/Components/Pages/BaseEdit.razor.cs +++ b/Test.UI/Components/Pages/BaseEdit.razor.cs @@ -533,8 +533,21 @@ namespace Test.UI.Components.Pages private void updateInfoJwd(string currSer, string? newFamilyHardware, Hardware? newHardware, string? newColorMaterial, string? newMaterial, string? newGlass, string? newProfile) { - var newJwd = SerialMan.MassUpdate(currSer, newFamilyHardware, newHardware, newColorMaterial, newMaterial, newGlass, newProfile); - CurrData.CurrJwd = newJwd; + Dictionary DictParam = new Dictionary(); + if (!string.IsNullOrEmpty(newFamilyHardware)) + DictParam.Add("FamilyHardware", newFamilyHardware!); + if (!string.IsNullOrEmpty(newColorMaterial)) + DictParam.Add("Color", newColorMaterial!); + if (!string.IsNullOrEmpty(newMaterial)) + DictParam.Add("Material", newMaterial!); + if (!string.IsNullOrEmpty(newGlass)) + DictParam.Add("Glass", newGlass!); + if (!string.IsNullOrEmpty(newProfile)) + DictParam.Add("Profile", newProfile!); + var dp = SerialMan.MassUpdate(currSer, DictParam); + CurrData.CurrJwd = dp.serializeStruct; + //var newJwd = SerialMan.MassUpdate(currSer, shape, newFamilyHardware, newHardware, newColorMaterial, newMaterial, newGlass, newProfile); + //CurrData.CurrJwd = newJwd; } #endregion Private Methods diff --git a/Test.UI/Components/Pages/EditJWD.razor b/Test.UI/Components/Pages/EditJWD.razor index 177c798..425f8ca 100644 --- a/Test.UI/Components/Pages/EditJWD.razor +++ b/Test.UI/Components/Pages/EditJWD.razor @@ -4,7 +4,7 @@ EditJWD -@*
+
FamilyHw @@ -21,10 +21,10 @@
Color
@@ -54,7 +54,7 @@
Profile