From 944e8f3dea723404e21168e97116cca2c09c70cb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 27 一月 2026 15:26:29 +0800
Subject: [PATCH] 1.扫码事件上报,之前只上报OK一种情况,现在有事种状态。 2.Port事件上报关联PortID, 统一修改为VID:PortID,之前分开很多种。

---
 SourceCode/Bond/Servo/CPanelAttributes.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPanelAttributes.cpp b/SourceCode/Bond/Servo/CPanelAttributes.cpp
index 1c33774..611ebac 100644
--- a/SourceCode/Bond/Servo/CPanelAttributes.cpp
+++ b/SourceCode/Bond/Servo/CPanelAttributes.cpp
@@ -59,6 +59,7 @@
 	SetDlgItemText(IDC_LABEL_TITLE, pStep->getName().c_str());
 	SERVO::CAttributeVector attrubutes;
 	pStep->getAttributeVector(attrubutes);
+	attrubutes.sortWithWeight();
 	unsigned int nSize = attrubutes.size();
 	for (unsigned int i = 0; i < nSize; i++) {
 		SERVO::CAttribute* pAttribute = attrubutes.getAttribute(i);
@@ -161,7 +162,7 @@
 	y += 8;
 
 
-	GetDlgItem(IDC_MFCPROPERTYGRID1)->MoveWindow(5, y, rcClient.Width() - 13, rcClient.Height() - 3 - y);
+	GetDlgItem(IDC_MFCPROPERTYGRID1)->MoveWindow(5, y, rcClient.Width() - 8, rcClient.Height() - 3 - y);
 }
 
 #define ATTRIBUTES_PANEL_MIN_WIDTH		88

--
Gitblit v1.9.3