From 25305b8d6b0c9a3da6a16cc9ab0ab318275bf755 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Mon, 9 Jun 2025 15:58:11 +0800 Subject: [PATCH 1/4] + [task#144607,doing,0.4h] add processFilterTitle method for story. --- module/story/zen.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/module/story/zen.php b/module/story/zen.php index 0f27272362..3adf8668b8 100644 --- a/module/story/zen.php +++ b/module/story/zen.php @@ -2021,4 +2021,22 @@ class storyZen extends story } return $storyIdList; } + + /** + * 处理过滤条件显示内容。 + * Process filter title. + * + * @param string $browseType + * @param int $param + * @access public + * @return string + */ + protected function processFilterTitle(string $browseType, int $param): string + { + if($browseType != 'bysearch' && $browseType != 'bymodule') + { + $statusName = zget($this->lang->execution->featureBar['story'], $browseType, ''); + return sprintf($this->lang->story->report->tpl->feature, $statusName); + } + } } From 638986d202e8926108199e1fb678983a57336196 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Mon, 9 Jun 2025 15:59:00 +0800 Subject: [PATCH 2/4] + [task#144607,doing,0.4h] add module header for story report. --- module/story/zen.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module/story/zen.php b/module/story/zen.php index 3adf8668b8..d242de7448 100644 --- a/module/story/zen.php +++ b/module/story/zen.php @@ -2038,5 +2038,9 @@ class storyZen extends story $statusName = zget($this->lang->execution->featureBar['story'], $browseType, ''); return sprintf($this->lang->story->report->tpl->feature, $statusName); } - } + + $fieldParams = array(); + $searchConfig = $this->session->executionStorysearchParams; + if($searchConfig) $fieldParams = json_decode($searchConfig['fieldParams'], true); + if($browseType == 'bymodule') return sprintf($this->lang->story->report->tpl->search, $this->config->execution->search['fields']['module'], '=', zget($fieldParams, $param)); } From 51e98fa5d7be5d2a1dea25f5af2153b124819dbf Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Mon, 9 Jun 2025 15:59:36 +0800 Subject: [PATCH 3/4] + [task#144607,doing,0.4h] add search header for story report. --- module/story/zen.php | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/module/story/zen.php b/module/story/zen.php index d242de7448..afc68cef64 100644 --- a/module/story/zen.php +++ b/module/story/zen.php @@ -2043,4 +2043,35 @@ class storyZen extends story $searchConfig = $this->session->executionStorysearchParams; if($searchConfig) $fieldParams = json_decode($searchConfig['fieldParams'], true); if($browseType == 'bymodule') return sprintf($this->lang->story->report->tpl->search, $this->config->execution->search['fields']['module'], '=', zget($fieldParams, $param)); + + $leftConditions = array(); + $rightConditions = array(); + $searchFields = $this->session->executionStoryForm; + $fieldNames = json_decode($searchConfig['searchFields']); + if(!$searchFields) return ''; + + $this->app->loadLang('search'); + $groupAndOr = 'and'; + $users = $this->loadModel('user')->getPairs('noletter'); + foreach($searchFields as $index => $field) + { + if($index == 6) $groupAndOr = $field['groupAndOr']; + if(!isset($field['field'])) continue; + + if(isset($field['value']) && $field['value'] === '') continue; + if(!empty($fieldParams[$field['field']]['values'])) + { + if($fieldParams[$field['field']]['values'] == 'users') $fieldParams[$field['field']]['values'] = $users; + $field['value'] = zget($fieldParams[$field['field']]['values'], $field['value']); + } + + $fieldName = zget($fieldNames, $field['field']); + $operator = zget($this->lang->search->operators, $field['operator']); + + if($index == 0 || $index == 3) $field['andOr'] = ''; + if($index < 3) $leftConditions[] = zget($this->lang->search->andor, $field['andOr']) . sprintf($this->lang->story->report->tpl->search, $fieldName, $operator, $field['value']); + elseif($index < 6) $rightConditions[] = zget($this->lang->search->andor, $field['andOr']) . sprintf($this->lang->story->report->tpl->search, $fieldName, $operator, $field['value']); + } + return sprintf($this->lang->story->report->tpl->multi, implode('', $leftConditions), zget($this->lang->search->andor, $groupAndOr), implode('', $rightConditions)); + } } From fdd2115e71108cb5fd697055e6181f6415538b24 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Mon, 9 Jun 2025 16:00:20 +0800 Subject: [PATCH 4/4] + [task#144607,doing,0.4h] add search header for story report. --- module/story/zen.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/module/story/zen.php b/module/story/zen.php index afc68cef64..efeb3a1bab 100644 --- a/module/story/zen.php +++ b/module/story/zen.php @@ -2072,6 +2072,11 @@ class storyZen extends story if($index < 3) $leftConditions[] = zget($this->lang->search->andor, $field['andOr']) . sprintf($this->lang->story->report->tpl->search, $fieldName, $operator, $field['value']); elseif($index < 6) $rightConditions[] = zget($this->lang->search->andor, $field['andOr']) . sprintf($this->lang->story->report->tpl->search, $fieldName, $operator, $field['value']); } + + if(empty($leftConditions) && empty($rightConditions)) return ''; + if(empty($leftConditions)) return implode('', $rightConditions); + if(empty($rightConditions)) return implode('', $leftConditions); + return sprintf($this->lang->story->report->tpl->multi, implode('', $leftConditions), zget($this->lang->search->andor, $groupAndOr), implode('', $rightConditions)); } }