Search/Order on several columns with VirtualColumn

Author: Seb33300

Datatable/Column/VirtualColumn.php

@@ -53,8 +53,8 @@ public function configureOptions(OptionsResolver $resolver)
             'search_column' => null,
         ]);
 
-        $resolver->setAllowedTypes('order_column', ['null', 'string']);
-        $resolver->setAllowedTypes('search_column', ['null', 'string']);
+        $resolver->setAllowedTypes('order_column', ['null', 'string', 'array']);
+        $resolver->setAllowedTypes('search_column', ['null', 'string', 'array']);
 
         $resolver->setNormalizer('orderable', function (Options $options, $value) {
             if (null === $options['order_column'] && true === $value) {

Resources/doc/columns.md

@@ -360,10 +360,10 @@ The options `searchable` and `orderable` are set to `false` by default.
 
 **Additional:**
 
-| Option        | Type               | Default | Required | Description     |
-|---------------|--------------------|---------|----------|-----------------|
-| order_column  | null or string     | null    |          | The name of an existing column that is used for ordering. |
-| search_column | null or string     | null    |          | The name of an existing column that is used for searching. |
+| Option        | Type                  | Default | Required | Description     |
+|---------------|-----------------------|---------|----------|-----------------|
+| order_column  | null, string or array | null    |          | The name of an existing column that is used for ordering. |
+| search_column | null, string or array | null    |          | The name of an existing column that is used for searching. |
 
 ### Example
 

Response/DatatableQueryBuilder.php

@@ -425,26 +425,30 @@ private function initColumnArrays()
             } else {
                 // Add Order-Field for VirtualColumn
                 if ($this->accessor->isReadable($column, 'orderColumn') && true === $this->accessor->getValue($column, 'orderable')) {
-                    $orderColumn = $this->accessor->getValue($column, 'orderColumn');
-                    $orderParts = explode('.', $orderColumn);
-                    if (\count($orderParts) < 2) {
-                        if (!isset($this->columnNames[$orderColumn]) || null == $this->accessor->getValue($this->columns[$this->columnNames[$orderColumn]], 'customDql')) {
-                            $orderColumn = $this->entityShortName.'.'.$orderColumn;
+                    $orderColumns = (array) $this->accessor->getValue($column, 'orderColumn');
+                    foreach ($orderColumns as $orderColumn) {
+                        $orderParts = explode('.', $orderColumn);
+                        if (\count($orderParts) < 2) {
+                            if (!isset($this->columnNames[$orderColumn]) || null == $this->accessor->getValue($this->columns[$this->columnNames[$orderColumn]], 'customDql')) {
+                                $orderColumn = $this->entityShortName.'.'.$orderColumn;
+                            }
                         }
+                        $this->orderColumns[$key][] = $orderColumn;
                     }
-                    $this->orderColumns[] = $orderColumn;
                 } else {
                     $this->orderColumns[] = null;
                 }
 
                 // Add Search-Field for VirtualColumn
                 if ($this->accessor->isReadable($column, 'searchColumn') && true === $this->accessor->getValue($column, 'searchable')) {
-                    $searchColumn = $this->accessor->getValue($column, 'searchColumn');
-                    $searchParts = explode('.', $searchColumn);
-                    if (\count($searchParts) < 2) {
-                        $searchColumn = $this->entityShortName.'.'.$searchColumn;
+                    $searchColumns = (array) $this->accessor->getValue($column, 'searchColumn');
+                    foreach ($searchColumns as $searchColumn) {
+                        $searchParts = explode('.', $searchColumn);
+                        if (\count($searchParts) < 2) {
+                            $searchColumn = $this->entityShortName . '.' . $searchColumn;
+                        }
+                        $this->searchColumns[$key][] = $searchColumn;
                     }
-                    $this->searchColumns[] = $searchColumn;
                 } else {
                     $this->searchColumns[] = null;
                 }
@@ -508,10 +512,12 @@ private function setWhere(QueryBuilder $qb)
                     /** @var AbstractFilter $filter */
                     $filter = $this->accessor->getValue($column, 'filter');
                     $searchType = $globalSearchType;
-                    $searchField = $this->searchColumns[$key];
+                    $searchFields = (array) $this->searchColumns[$key];
                     $searchValue = $globalSearch;
                     $searchTypeOfField = $column->getTypeOfField();
-                    $orExpr = $filter->addOrExpression($orExpr, $qb, $searchType, $searchField, $searchValue, $searchTypeOfField, $key);
+                    foreach ($searchFields as $searchField) {
+                        $orExpr = $filter->addOrExpression($orExpr, $qb, $searchType, $searchField, $searchValue, $searchTypeOfField, $key);
+                    }
                 }
             }
 
@@ -568,10 +574,12 @@ private function setOrderBy(QueryBuilder $qb)
                 $requestColumn = $this->requestParams['columns'][$columnIdx];
 
                 if ('true' === $requestColumn['orderable']) {
-                    $columnName = $this->orderColumns[$columnIdx];
+                    $columnNames = (array) $this->orderColumns[$columnIdx];
                     $orderDirection = $this->requestParams['order'][$i]['dir'];
 
-                    $qb->addOrderBy($columnName, $orderDirection);
+                    foreach ($columnNames as $columnName) {
+                        $qb->addOrderBy($columnName, $orderDirection);
+                    }
                 }
             }
         }