2026年5月23日暂存

This commit is contained in:
2026-05-23 14:16:57 +08:00
parent c8a5a121c9
commit 1cb9d5ac42
59 changed files with 15774 additions and 8662 deletions
+5 -3
View File
@@ -1376,7 +1376,7 @@ void TestPrintWidget::onBtnItemConfigClicked()
if(item->sourceType() == SourceType::SCHEDULE_SHIFT) {
auto scheduleItem = dynamic_cast<PicScheduleShiftItem*>(item);
emit sig_showScheduleShiftsEditor(scheduleItem);
emit sig_showScheduleShiftsEditor(scheduleItem->schedules(), scheduleItem->textItemModel());
return;
}
@@ -1561,7 +1561,7 @@ void TestPrintWidget::addDateTimeItem(const DateItemModel &model)
item->setModel(model);
}
void TestPrintWidget::addScheduleShiftsItem(QVector<ScheduleModel> schedules)
void TestPrintWidget::addScheduleShiftsItem(QVector<ScheduleModel> schedules, TextItemModel txtModel)
{
// 如果当前选中了一个日期时间item,则直接设置模型
auto selectItems = pPicScene->selectedItems();
@@ -1570,6 +1570,7 @@ void TestPrintWidget::addScheduleShiftsItem(QVector<ScheduleModel> schedules)
if(item->sourceType() == SourceType::SCHEDULE_SHIFT) {
auto scheduleItem = dynamic_cast<PicScheduleShiftItem*>(item);
scheduleItem->setSchedules(schedules);
scheduleItem->setTextItemModel(txtModel);
return;
}
}
@@ -1584,6 +1585,7 @@ void TestPrintWidget::addScheduleShiftsItem(QVector<ScheduleModel> schedules)
item->setPos(boundingRect.right(), 0.0);
item->setSelected(true);
item->setSchedules(std::move(schedules));
item->setTextItemModel(txtModel);
}
void TestPrintWidget::addCounterItem(CounterViewModel vm, QSharedPointer<QFont> f)
@@ -1654,7 +1656,7 @@ void TestPrintWidget::showBarcodeEditor(bool restoreViewModel)
void TestPrintWidget::onBtnArrowClicked()
{
pPicScene->clearSelection();
emit sig_showScheduleShiftsEditor(nullptr);
emit sig_showScheduleShiftsEditor(QVector<ScheduleModel>(), TextItemModel());
}
void TestPrintWidget::on_btn_copy_clicked()