Merge branch 'clh' into liuyang

mrDarker

2025-10-22 e8a27bb203fe2aff70390a5eca002d7438da9b0f

 SourceCode/Bond/Servo/CControlJobManagerDlg.cpp

@@ -78,6 +78,9 @@
         if (contextType == 1) {
            UpProcessJobId((PJWarp*)pContext);
         }
         else if (contextType == 2) {
            UpControlJobId((SERVO::CControlJob*)pContext);
         }
      }
   };

@@ -307,7 +310,8 @@
         SERVO::CControlJob* cj = (SERVO::CControlJob*)m_tree.GetItemData(hSel);
         ASSERT(m_pages.size() == 3);
         if (0 == ShowPage(2)) {

            SERVO::CControlJob* pControlJob = (SERVO::CControlJob*)m_tree.GetItemData(hSel);
            m_pages[2]->SetContext(pControlJob, 2);
         }
      }
      else if (m_tree.GetParentItem(hParent) == nullptr) {
@@ -406,6 +410,20 @@
   }
}

void CControlJobManagerDlg::UpControlJobId(SERVO::CControlJob* pControlJob)
{
   // 更新树控件
   // 遍历根节点
   HTREEITEM hRoot = m_tree.GetRootItem();
   if (hRoot != nullptr) {
      DWORD_PTR data = m_tree.GetItemData(hRoot);
      if ((void*)data == pControlJob) {
         m_tree.SetItemText(hRoot, pControlJob->id().c_str());
         return; // 找到就返回
      }
   }
}

void CControlJobManagerDlg::LoadState()
{
   if (!m_bHasState) return;