* Fix chart filter select item not display in screen.

2023-11-15 13:02:05 +08:00
parent 1d4ce9d934
commit 33e44b98a1
1 changed files with 8 additions and 12 deletions
@@ -767,20 +767,16 @@ class screenModel extends model
                    if($table) $options = $this->dao->select("id, {$field}")->from($table)->fetchPairs();
                }
                break;
-            case 'string':
-                if($field)
+            default:
+                if($field && $sql)
                {
-                    if($sql)
-                    {
-                        $cols = $this->dbh->query($sql)->fetchAll();
-                        foreach($cols as $col)
-                        {
-                            $data = $col->$field;
-                            $options[$data] = $data;
-                        }
-                    }
+                    $options = $this->dao->select("tt.`$field`,tt.`$field`")
+                        ->from("($sql)")->alias('tt')
+                        ->groupBy("tt.`$field`")
+                        ->orderBy("tt.`$field` desc")
+                        ->fetchPairs();
                }
-                break;
+
        }

        $options = array_filter($options);