From ebb4ee21af4a4bc6cc8f21fa26faf875b3b50cfb Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 29 Nov 2024 09:30:05 +0800 Subject: [PATCH] * [task#133321 doing 0.1h 1.2h] modify detailTip of thinkstepbase. --- lib/zin/wg/thinkstepbase/v1.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/zin/wg/thinkstepbase/v1.php b/lib/zin/wg/thinkstepbase/v1.php index 002567e275..5086316dcb 100644 --- a/lib/zin/wg/thinkstepbase/v1.php +++ b/lib/zin/wg/thinkstepbase/v1.php @@ -122,12 +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; - $canConfigureRatio = !empty($step->options->canConfigureRatio) ? $step->options->canConfigureRatio : '0'; - $showBuiltTip = !$canConfigureRatio && !empty($step->options->canBuilt); + $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; + $showBuiltTip = isset($step->options->canConfigureRatio) && $step->options->canConfigureRatio == 0; if(!empty($quotedQuestions)) { @@ -168,12 +167,13 @@ class thinkStepBase extends wg ); } } + $runSourceTip = !empty($sourceQuestion) && !$preViewModel; - if($isRun && (!empty($quotedQuestions) || !empty($sourceQuestion))) + if($isRun && (!empty($quotedQuestions) || $runSourceTip)) { $tipType = $lang->thinkstep->label->option; $sourceQuestionTip = array(); - if(!empty($sourceQuestion)) + if($runSourceTip) { foreach ($sourceQuestion as $sourceQuestionItem) { @@ -227,7 +227,7 @@ class thinkStepBase extends wg } if($preViewModel) { - $detailTip[] = ((!empty($quotedQuestions) && !empty($isAssignedObject)) || $showBuiltTip )? div + $detailTip[] = ((!empty($quotedQuestions) && !empty($isAssignedObject)) || $showBuiltTip)? div ( setClass('flex text-gray-400 mt-2 items-center text-sm ml-2'), icon(setClass('text-important mr-2'), 'about'),