From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/UserManagerDlg.cpp | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/Servo/UserManagerDlg.cpp b/SourceCode/Bond/Servo/UserManagerDlg.cpp
index 9f87215..7fde4bf 100644
--- a/SourceCode/Bond/Servo/UserManagerDlg.cpp
+++ b/SourceCode/Bond/Servo/UserManagerDlg.cpp
@@ -88,9 +88,10 @@
m_gridUserManager.ExpandLastColumn(); // 鏈�鍚庝竴鍒楀～鍏呯綉鏍�
m_mapRoleDescriptions.clear();
- m_mapRoleDescriptions.emplace(_T("绠＄悊鍛�"), _T("绠＄悊鎵�鏈夌敤鎴凤紝鍒嗛厤鏉冮檺"));
- m_mapRoleDescriptions.emplace(_T("宸ョ▼甯�"), _T("缁存姢绯荤粺锛岃В鍐虫妧鏈棶棰�"));
- m_mapRoleDescriptions.emplace(_T("鎿嶄綔鍛�"), _T("鎵ц鏃ュ父鎿嶄綔浠诲姟"));
+ m_mapRoleDescriptions.emplace(_T("绠＄悊鍛�"), _T("绠＄悊鎵�鏈夌敤鎴疯处鎴凤紝鍒嗛厤鍜岃皟鏁存潈闄愶紝璐熻矗绯荤粺瀹夊叏涓庢暣浣撹繍琛�"));
+ m_mapRoleDescriptions.emplace(_T("鍒剁▼宸ョ▼甯�"), _T("璐熻矗鐢熶骇宸ヨ壓鐨勫埗瀹氥�佷紭鍖栦笌鏀硅繘锛岀‘淇濆伐鑹虹ǔ瀹氬拰鑹巼鎻愬崌"));
+ m_mapRoleDescriptions.emplace(_T("璁惧宸ョ▼甯�"), _T("缁存姢鍜屼繚鍏昏澶囷紝澶勭悊鏁呴殰锛屼繚闅滆澶囩ǔ瀹氳繍琛岋紝鍙備笌鎶�鏈崌绾�"));
+ m_mapRoleDescriptions.emplace(_T("鎿嶄綔鍛�"), _T("鎸夌収鏍囧噯娴佺▼鎵ц鏃ュ父鎿嶄綔浠诲姟锛岀洃鎺х敓浜х姸鍐碉紝鍙婃椂鍙嶉寮傚父"));
FillUserManager();
}
@@ -134,12 +135,13 @@
CStringArray permissions;
permissions.Add(_T("绠＄悊鍛�"));
- permissions.Add(_T("宸ョ▼甯�"));
+ permissions.Add(_T("鍒剁▼宸ョ▼甯�"));
+ permissions.Add(_T("璁惧宸ョ▼甯�"));
permissions.Add(_T("鎿嶄綔鍛�"));
int nCols = m_gridUserManager.GetColumnCount();
for (int i = 1; i < m_gridUserManager.GetRowCount(); ++i) {
- m_gridUserManager.SetItemState(i, 0, GVIS_READONLY); // 绗竴鍒楀彧璇�
+ m_gridUserManager.SetItemState(i, 0, GVIS_READONLY); // 绗竴鍒楀彧璇�
m_gridUserManager.SetItemState(i, nCols - 2, GVIS_READONLY); // 鍊掓暟绗簩鍒楀彧璇�
m_gridUserManager.SetItemState(i, nCols - 1, GVIS_READONLY); // 鏈�鍚庝竴鍒楀彧璇�
@@ -149,13 +151,12 @@
pCell->SetOptions(permissions);
pCell->SetStyle(CBS_DROPDOWNLIST);
- CString cstrRole = m_gridUserManager.GetItemText(i, 3);
- int nRole = _ttoi(cstrRole);
- if (nRole < 0 || nRole > 2) {
+ int nRole = _ttoi(m_gridUserManager.GetItemText(i, 3));
+ if (nRole < 0 || nRole > 3) {
CString cstrMessage;
cstrMessage.Format(_T("鐢ㄦ埛 [%s]锛屾潈闄愬紓甯革紒灏嗚缃垚鎿嶄綔鍛橈紒"), m_gridUserManager.GetItemText(i, 1));
AfxMessageBox(cstrMessage);
- nRole = 2;
+ nRole = 3;
}
m_gridUserManager.SetItemText(i, 3, permissions.GetAt(nRole));
@@ -237,7 +238,8 @@
// 绗洓鍒楄缃紙鏉冮檺鍒楋級涓轰笅鎷夋
CStringArray permissions;
permissions.Add(_T("绠＄悊鍛�"));
- permissions.Add(_T("宸ョ▼甯�"));
+ permissions.Add(_T("鍒剁▼宸ョ▼甯�"));
+ permissions.Add(_T("璁惧宸ョ▼甯�"));
permissions.Add(_T("鎿嶄綔鍛�"));
if (pGridCtrl->SetCellType(newRowIndex, 3, RUNTIME_CLASS(CGridCellCombo))) {
@@ -443,7 +445,8 @@
CStringArray permissions;
permissions.Add(_T("绠＄悊鍛�"));
- permissions.Add(_T("宸ョ▼甯�"));
+ permissions.Add(_T("鍒剁▼宸ョ▼甯�"));
+ permissions.Add(_T("璁惧宸ョ▼甯�"));
permissions.Add(_T("鎿嶄綔鍛�"));
if (m_gridUserManager.SetCellType(row, 3, RUNTIME_CLASS(CGridCellCombo))) {
@@ -527,12 +530,14 @@
if (j == 3) {
if (cellText == _T("绠＄悊鍛�"))
cellString = "0";
- else if (cellText == _T("宸ョ▼甯�"))
+ else if (cellText == _T("鍒剁▼宸ョ▼甯�"))
cellString = "1";
+ else if (cellText == _T("璁惧宸ョ▼甯�"))
+ cellString = "2";
else if (cellText == _T("鎿嶄綔鍛�"))
- cellString = "2";
+ cellString = "3";
else
- cellString = "2";
+ cellString = "3";
}
rowData.push_back(cellString);
--
Gitblit v1.9.3