From 2626722af9c735583de68c62c8b2338c75e40b8a Mon Sep 17 00:00:00 2001 From: poignatov Date: Tue, 20 Jan 2026 21:07:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BD=D1=8F=D1=82=D0=B0=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20=D0=B4=D0=BE=203.24.1=20?= =?UTF-8?q?=D0=B8=20=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=20UI=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3=D0=BE=20?= =?UTF-8?q?=D0=BE=D0=BA=D0=BD=D0=B0=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- play-life-web/package.json | 2 +- play-life-web/src/components/TaskDetail.jsx | 24 ++++++++++----------- play-life-web/src/components/TaskList.jsx | 2 +- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/VERSION b/VERSION index 954e228..455cf2c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.24.0 +3.24.1 diff --git a/play-life-web/package.json b/play-life-web/package.json index 6c920d6..9f80abd 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "3.24.0", + "version": "3.24.1", "type": "module", "scripts": { "dev": "vite", diff --git a/play-life-web/src/components/TaskDetail.jsx b/play-life-web/src/components/TaskDetail.jsx index 17547b1..902b62a 100644 --- a/play-life-web/src/components/TaskDetail.jsx +++ b/play-life-web/src/components/TaskDetail.jsx @@ -648,22 +648,20 @@ function TaskDetail({ taskId, onClose, onRefresh, onTaskCompleted, onNavigate }) )} - {/* Разделитель - показываем только если есть прогрессия или подзадачи */} - {(hasProgression || (subtasks && subtasks.length > 0)) && ( + {/* Разделитель - показываем только если есть контент перед ним */} + {(task.wishlist_id || hasProgression || (subtasks && subtasks.length > 0)) && (
)} - {/* Сообщение награды - показываем только если есть прогрессия или подзадачи */} - {(hasProgression || (subtasks && subtasks.length > 0)) && ( -
-
Сообщение награды:
-
$1') - .replace(/\n/g, '
') - }} /> -
- )} + {/* Сообщение награды */} +
+
Сообщение награды:
+
$1') + .replace(/\n/g, '
') + }} /> +
{/* Кнопки действий */}
diff --git a/play-life-web/src/components/TaskList.jsx b/play-life-web/src/components/TaskList.jsx index f1b3bda..af82f58 100644 --- a/play-life-web/src/components/TaskList.jsx +++ b/play-life-web/src/components/TaskList.jsx @@ -528,8 +528,8 @@ function TaskList({ onNavigate, data, loading, backgroundLoading, error, onRetry const renderTaskItem = (task, isCompleted = false) => { const hasProgression = task.has_progression || task.progression_base != null const hasSubtasks = task.subtasks_count > 0 - const showDetailOnCheckmark = hasProgression || hasSubtasks const isTest = task.config_id != null + const showDetailOnCheckmark = !isTest const isWishlist = task.wishlist_id != null // Проверяем бесконечную задачу: repetition_period = 0 И (repetition_date = 0 ИЛИ отсутствует)