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

Merge branch 'master' into 'importExport'

Browse Source 
# Conflicts:
#   module/port/model.php
This commit is contained in:
王怡栋
2022-09-07 02:30:00 +00:00
parent 25613fe0c6 2a7d73ef55
commit 17aec51cbe
89 changed files with 658 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/port/model.php
+9 -9
View File
@@ -219,7 +219,7 @@ class portModel extends model
$this->commonActions($model);
$datas = fixer::input('post')->get();
$objectData = array();
foreach ($datas as $field => $data)
foreach($datas as $field => $data)
{
if(is_array($data))
{
@@ -256,18 +256,18 @@ class portModel extends model
$fieldList = array();
/* build module fieldList. */
foreach ($fields as $key => $field)
foreach($fields as $key => $field)
{
$field = trim($field);
$modelFieldList = isset($this->modelFieldList[$field]) ? $this->modelFieldList[$field] : array();
foreach ($portFieldList as $portField => $value)
foreach($portFieldList as $portField => $value)
{
$funcName = 'init' . ucfirst($portField);
if((!isset($modelFieldList[$portField])) or $portField == 'title')
{
$modelFieldList[$portField] = $this->portConfig->fieldList[$portField];
if(strpos($this->portConfig->initFunction, $portField) !== false) $modelFieldList[$portField] = $this->$funcName($model, $field);
$modelFieldList[$portField] = $this->portConfig->fieldList[$portField];
if(strpos($this->portConfig->initFunction, $portField) !== false) $modelFieldList[$portField] = $this->$funcName($model, $field);
}
}
@@ -402,7 +402,7 @@ class portModel extends model
if(is_array($values) and $withKey)
{
unset($values['']);
foreach ($values as $key => $value)
foreach($values as $key => $value)
{
$values[$key] = $value . "(#$key)";
}
@@ -546,7 +546,7 @@ class portModel extends model
if(!empty($pairs))
{
$valuePairs = array();
foreach ($values as $key => $value)
foreach($values as $key => $value)
{
if(is_object($value)) $value = get_object_vars($value);
@@ -583,7 +583,7 @@ class portModel extends model
$exportDatas = array();
$dataSourceList = array();
foreach ($fieldList as $key => $field)
foreach($fieldList as $key => $field)
{
$exportDatas['fields'][$key] = $field['title'];
if($field['values'])
@@ -597,7 +597,7 @@ class portModel extends model
$exportDatas['user'] = $this->loadModel('user')->getPairs('noclosed|nodeleted|noletter');
foreach ($rows as $id => $values)
foreach($rows as $id => $values)
{
foreach($values as $field => $value)
{