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

* Modify getSysOptions object type.

Browse Source
This commit is contained in:
songchenxuan
2024-02-06 16:26:43 +08:00
parent f9a55dca4f
commit f34f5a745f
3 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/chart/model.php
+15 -8
View File
@@ -711,22 +711,29 @@ class chartModel extends model
case 'object':
if($field)
{
$useField = $field;
$useTable = $object;
$path = $this->app->getModuleRoot() . 'dataview' . DS . 'table' . DS . "$object.php";
if(is_file($path))
{
include $path;
$fieldObject = $schema->fields[$field]['object'];
$table = zget($this->config->objectTables, $fieldObject, '');
$showField = 'id';
$show = explode('.', $schema->fields[$field]['show']);
if(count($show) == 2) $showField = $show[1];
$fieldShow = explode('.', $schema->fields[$field]['show']);
if($table) $options = $this->dao->select("id, {$showField}")->from($table)->fetchPairs();
if($fieldObject) $useTable = $fieldObject;
if(count($fieldShow) == 2) $useField = $show[1];
}
else
$table = isset($this->config->objectTables[$useTable]) ? $this->config->objectTables[$useTable] : zget($this->config->objectTables, $object, '');
if($table)
{
$table = zget($this->config->objectTables, $object, '');
if($table) $options = $this->dao->select("id, {$field}")->from($table)->fetchPairs();
$columns = $this->dbh->query("SHOW COLUMNS FROM $table")->fetchAll();
foreach($columns as $id => $column) $columns[$id] = (array)$column;
$fieldList = array_column($columns, 'Field');
$useField = in_array($useField, $fieldList) ? $useField : 'id';
$options = $this->dao->select("id, {$useField}")->from($table)->fetchPairs();
}
}
break;
module/pivot/model.php
+15 -8
View File
@@ -2531,22 +2531,29 @@ class pivotModel extends model
}
else
{
$useField = $field;
$useTable = $object;
$path = $this->app->getModuleRoot() . 'dataview' . DS . 'table' . DS . "$object.php";
if(is_file($path))
{
include $path;
$fieldObject = $schema->fields[$field]['object'];
$table = zget($this->config->objectTables, $fieldObject, '');
$showField = 'id';
$show = explode('.', $schema->fields[$field]['show']);
if(count($show) == 2) $showField = $show[1];
$fieldShow = explode('.', $schema->fields[$field]['show']);
if($table) $options = $this->dao->select("id, {$showField}")->from($table)->fetchPairs();
if($fieldObject) $useTable = $fieldObject;
if(count($fieldShow) == 2) $useField = $show[1];
}
else
$table = isset($this->config->objectTables[$useTable]) ? $this->config->objectTables[$useTable] : zget($this->config->objectTables, $object, '');
if($table)
{
$table = zget($this->config->objectTables, $object, '');
if($table) $options = $this->dao->select("id, {$field}")->from($table)->fetchPairs();
$columns = $this->dbh->query("SHOW COLUMNS FROM $table")->fetchAll();
foreach($columns as $id => $column) $columns[$id] = (array)$column;
$fieldList = array_column($columns, 'Field');
$useField = in_array($useField, $fieldList) ? $useField : 'id';
$options = $this->dao->select("id, {$useField}")->from($table)->fetchPairs();
}
}
}
module/screen/model.php
+15 -8
View File
@@ -1156,22 +1156,29 @@ class screenModel extends model
case 'object':
if($field)
{
$useField = $field;
$useTable = $object;
$path = $this->app->getModuleRoot() . 'dataview' . DS . 'table' . DS . "$object.php";
if(is_file($path))
{
include $path;
$fieldObject = $schema->fields[$field]['object'];
$table = zget($this->config->objectTables, $fieldObject, '');
$showField = 'id';
$show = explode('.', $schema->fields[$field]['show']);
if(count($show) == 2) $showField = $show[1];
$fieldShow = explode('.', $schema->fields[$field]['show']);
if($table) $options = $this->dao->select("id, {$showField}")->from($table)->fetchPairs();
if($fieldObject) $useTable = $fieldObject;
if(count($fieldShow) == 2) $useField = $show[1];
}
else
$table = isset($this->config->objectTables[$useTable]) ? $this->config->objectTables[$useTable] : zget($this->config->objectTables, $object, '');
if($table)
{
$table = zget($this->config->objectTables, $object, '');
if($table) $options = $this->dao->select("id, {$field}")->from($table)->fetchPairs();
$columns = $this->dbh->query("SHOW COLUMNS FROM $table")->fetchAll();
foreach($columns as $id => $column) $columns[$id] = (array)$column;
$fieldList = array_column($columns, 'Field');
$useField = in_array($useField, $fieldList) ? $useField : 'id';
$options = $this->dao->select("id, {$useField}")->from($table)->fetchPairs();
}
}
break;