From 717f7242efa73441c36f372fab03f7babf89099d Mon Sep 17 00:00:00 2001
From: qixinzhi <>
Date: Tue, 2 Jan 2024 09:39:04 +0800
Subject: [PATCH] Revert "Revert "* Filter metric's data for screen designer.""

This reverts commit fa7a08b9b1f5d3038ce34d094cfca6f831417195.
---
 module/screen/control.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/module/screen/control.php b/module/screen/control.php
index 1309b7d8bf..86e5aa8587 100644
--- a/module/screen/control.php
+++ b/module/screen/control.php
@@ -168,14 +168,17 @@ class screen extends control
                     $mergeFilters[] = $filter;
                 }
 
-                if($table == TABLE_PIVOT)
+                if($type != 'metric')
                 {
-                    list($sql, $filterFormat) = $this->loadModel($type)->getFilterFormat($chart->sql, $mergeFilters);
-                    $chart->sql = $sql;
-                }
-                else
-                {
-                    $filterFormat = $this->loadModel($type)->getFilterFormat($mergeFilters);
+                    if($table == TABLE_PIVOT)
+                    {
+                        list($sql, $filterFormat) = $this->loadModel($type)->getFilterFormat($chart->sql, $mergeFilters);
+                        $chart->sql = $sql;
+                    }
+                    else
+                    {
+                        $filterFormat = $this->loadModel($type)->getFilterFormat($mergeFilters);
+                    }
                 }
             }