From af9c3e0b3b1eb370e966b3ca9db3f62848d4189b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 21 八月 2021 13:03:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC

---
 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs
index 341c300..58df0a8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs
@@ -133,6 +133,18 @@
 
                 //娣诲姞鏁版嵁瀵硅薄
                 AttributesStatus buttonObj = new AttributesStatus();
+
+                //闃叉key涓嶅敮涓�
+                var attrCount = control.attributes.Count;
+                var keyString = "key" + attrCount;
+                while (true)
+                {
+                    if (control.attributes.Find((obj) => obj.key == keyString) == null)
+                    {
+                        break;
+                    }
+                    keyString = "key" + (++attrCount);
+                }
                 buttonObj.key = "key" + control.attributes.Count.ToString();
                 buttonObj.value = texts;
 

--
Gitblit v1.8.0