fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 12:02:24 +09:00
Code Issues Projects Releases Packages Wiki Activity

Support "if" attribute in navigation elements of XML query

Browse source
This commit is contained in:
Kijin Sung 2025-02-15 22:32:42 +09:00
parent fd0491cb0d
commit 658a28dfd8
3 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/framework/parsers/DBQueryParser.php
View file

@ -198,6 +198,7 @@ class DBQueryParser extends BaseParser
$orderby->default = ($attribs['default'] ?? null) ?: null; $orderby->default = ($attribs['default'] ?? null) ?: null;
$orderby->order_var = ($attribs['order'] ?? null) ?: null; $orderby->order_var = ($attribs['order'] ?? null) ?: null;
$orderby->order_default = strtoupper($attribs['orderdefault'] ?? '') === 'DESC' ? 'DESC' : 'ASC'; $orderby->order_default = strtoupper($attribs['orderdefault'] ?? '') === 'DESC' ? 'DESC' : 'ASC';
$orderby->ifvar = trim($attribs['if'] ?? '') ?: null;
$query->navigation->orderby[] = $orderby; $query->navigation->orderby[] = $orderby;
} }
foreach (['list_count', 'page_count', 'page', 'offset'] as $key) foreach (['list_count', 'page_count', 'page', 'offset'] as $key)
@ -207,6 +208,7 @@ class DBQueryParser extends BaseParser
$query->navigation->{$key} = new DBQuery\VariableBase; $query->navigation->{$key} = new DBQuery\VariableBase;
$query->navigation->{$key}->var = trim($tag['var'] ?? '') ?: null; $query->navigation->{$key}->var = trim($tag['var'] ?? '') ?: null;
$query->navigation->{$key}->default = trim($tag['default'] ?? '') ?: null; $query->navigation->{$key}->default = trim($tag['default'] ?? '') ?: null;
$query->navigation->{$key}->ifvar = trim($tag['if'] ?? '') ?: null;
} }
} }
} }

1
common/framework/parsers/dbquery/OrderBy.php
View file

@ -11,4 +11,5 @@ class OrderBy extends VariableBase
public $default; public $default;
public $order_var; public $order_var;
public $order_default = 'ASC'; public $order_default = 'ASC';
public $ifvar;
} }

27
common/framework/parsers/dbquery/Query.php
View file

@ -607,6 +607,12 @@ class Query extends VariableBase
// Process each column definition. // Process each column definition.
foreach ($navigation->orderby as $orderby) foreach ($navigation->orderby as $orderby)
{ {
// Skip
if ($orderby->ifvar && empty($this->_args[$orderby->ifvar]))
{
continue;
}
// Get the name of the column or expression to order by. // Get the name of the column or expression to order by.
$column_name = ''; $column_name = '';
list($column_name, $is_expression) = $orderby->getValue($this->_args); list($column_name, $is_expression) = $orderby->getValue($this->_args);
@ -648,23 +654,34 @@ class Query extends VariableBase
*/ */
protected function _arrangeLimitOffset(Navigation $navigation): string protected function _arrangeLimitOffset(Navigation $navigation): string
{ {
$list_count = 0;
$page = 0;
$offset = 0;
// Get the list count. // Get the list count.
$list_count = $navigation->list_count->getValue($this->_args)[0]; if (!$navigation->list_count->ifvar || !empty($this->_args[$navigation->list_count->ifvar]))
{
$list_count = $navigation->list_count->getValue($this->_args)[0];
}
if ($list_count <= 0) if ($list_count <= 0)
{ {
return ''; return '';
} }
$page = 0;
$offset = 0;
// Get the offset from the page or offset variable. // Get the offset from the page or offset variable.
if ($navigation->page) if ($navigation->page)
{ {
$page = $navigation->page->getValue($this->_args)[0]; if (!$navigation->page->ifvar || !empty($this->_args[$navigation->page->ifvar]))
{
$page = $navigation->page->getValue($this->_args)[0];
}
} }
if ($navigation->offset) if ($navigation->offset)
{ {
$offset = $navigation->offset->getValue($this->_args)[0]; if (!$navigation->offset->ifvar || !empty($this->_args[$navigation->offset->ifvar]))
{
$offset = $navigation->offset->getValue($this->_args)[0];
}
} }
// If page is available, set the offset and require pagination for this query. // If page is available, set the offset and require pagination for this query.