From 8cca6a5deba6dc99290b53a2db6208416e130481 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 28 Nov 2024 11:09:46 +0800 Subject: [PATCH] * [task#133312 doing 0.2h 1.2h] modify the run detailTip of thinkstepbase. --- lib/zin/wg/thinkstepbase/v1.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/zin/wg/thinkstepbase/v1.php b/lib/zin/wg/thinkstepbase/v1.php index 5603e0a52c..83aa35df6f 100644 --- a/lib/zin/wg/thinkstepbase/v1.php +++ b/lib/zin/wg/thinkstepbase/v1.php @@ -122,6 +122,11 @@ class thinkStepBase extends wg $sourceQuestion = array(); $sourceItems = array(); + $wizard->config = !empty($wizard->config) ? $wizard->config : array(); + $wizard->config = is_string($wizard->config) ? json_decode($wizard->config, true) : $wizard->config; + $configureObjects = !empty($wizard->config['configureObjects']) ? json_decode($wizard->config['configureObjects'], true) : array(); + $isAssignedObject = !empty($configureObjects['isAssignedObject']) ? $configureObjects['isAssignedObject'] : 0; + if(!empty($quotedQuestions)) { foreach($quotedQuestions as $item) @@ -180,11 +185,11 @@ class thinkStepBase extends wg ); } } - $showRunTips = (!empty($quotedQuestions) || !empty($sourceQuestion)) && !$preViewModel; + $showRunTips = ((!empty($quotedQuestions) && empty($isAssignedObject)) || !empty($sourceQuestion)); $detailTip[] = $showRunTips ? div ( setClass('bg-primary-50 text-gray p-2 mt-3 leading-normal'), - !empty($quotedQuestions) ? div + (!empty($quotedQuestions) && empty($isAssignedObject)) ? div ( setClass('flex items-center'), icon(setClass('font text-warning mr-1'), 'about'), @@ -220,11 +225,7 @@ class thinkStepBase extends wg } if($preViewModel) { - $wizard->config = !empty($wizard->config) ? $wizard->config : array(); - $wizard->config = is_string($wizard->config) ? json_decode($wizard->config, true) : $wizard->config; - $configureObjects = !empty($wizard->config['configureObjects']) ? json_decode($wizard->config['configureObjects'], true) : array(); - $isAssignedObject = !empty($configureObjects['isAssignedObject']) ? $configureObjects['isAssignedObject'] : 0; - $detailTip[] = (!empty($quotedQuestions) && !empty($isAssignedObject)) ? div + $detailTip[] = (!empty($quotedQuestions) && !empty($isAssignedObject)) ? div ( setClass('flex text-gray-400 mt-2 items-center text-sm ml-2'), icon(setClass('text-important mr-2'), 'about'),