Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [story#66940] add matchFieldSettingFromBuilder.

Browse Source
This commit is contained in:
qixinzhi
2024-09-10 13:57:18 +08:00
committed by 代婷婷
parent 121020b7a7
commit ece72fd126
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pivotstate/pivotstate.class.php
+4 -6
View File
@@ -417,23 +417,21 @@ class pivotState
* @access public
* @return array
*/
/*
public function matchFieldSettingFromBuilder($key, $setting)
{
$selects = array_merge($this->sqlBuilder->getSelects(), $this->sqlBuilder->getFuncSelects());
$selects = array_merge($this->sqlbuilder->getSelects(), $this->sqlbuilder->getFuncSelects());
foreach($selects as $select)
{
list($table, $field, $alias) = $select;
if($key != $alias) continue;
$fieldList = $this->sqlBuilder->getTableDescList($table);
$fieldList = $this->sqlbuilder->getTableDescList($table);
$name = zget($fieldList, $field, $field);
$setting[$this->clientLang] = $name;
$setting['field'] = $field;
}
return $setting;
}
*/
/**
* Clear fieldSettings.
@@ -1037,8 +1035,8 @@ class pivotState
}
else
{
$newFieldSettings[$field] = $setting;
// $newFieldSettings[$field] = $this->matchFieldSettingFromBuilder($field, $setting);
// $newFieldSettings[$field] = $setting;
$newFieldSettings[$field] = $this->matchFieldSettingFromBuilder($field, $setting);
}
}