* [perf] fix pivot getfieldoptions.

2024-12-30 09:51:11 +08:00
parent 064495b2b4
commit fbd1ba6dfc
1 changed files with 21 additions and 0 deletions
@@ -924,6 +924,27 @@ class pivotModel extends model
        return $fieldSql;
    }

+    public function filterFieldsWithSettings(array $fields, array $groups, array $columns)
+    {
+        $filteredFields = array();
+        $settingFields  = $groups;
+
+        foreach($columns as $column)
+        {
+            $slice = zget($column, 'slice', 'noSlice');
+            $settingFields[] = $column['field'];
+            if($slice != 'noSlice') $settingFields[] = $slice;
+        }
+
+        $settingFields = array_unique($settingFields);
+        foreach($settingFields as $field)
+        {
+            if(!isset($filteredFields[$field]) && isset($fields[$field])) $filteredFields[$field] = $fields[$field];
+        }
+
+        return $filteredFields;
+    }
+
    /**
     * Filter fields with settings.
     *