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

* [bug#62331,done,1h] get original field for pivot.

Browse Source
This commit is contained in:
liumengyi
2025-05-19 10:26:26 +08:00
committed by 刘刚
parent b573423dc0
commit 80cd4baff4
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/pivot/control.php
-1
View File
@@ -168,7 +168,6 @@ class pivot extends control
$saveAs = zget($_POST, 'saveAs', '');
$sql = zget($_POST, 'sql', '');
if(strpos($field, '_') !== false) $field = substr($field, strpos($field, '_') + 1);
$options = $this->pivot->getSysOptions($type, $object, $field, $sql, $saveAs);
/* 根据关键字过滤选项。*/
module/pivot/model.php
+2 -1
View File
@@ -2305,7 +2305,8 @@ class pivotModel extends model
static $workflowFields = array();
if(!isset($workflowFields[$object])) $workflowFields[$object] = $this->loadModel('workflowfield')->getList($object);
$fieldObject = zget($workflowFields[$object], $field, null);
$originalField = zget($_POST, 'originalField', $field);
$fieldObject = zget($workflowFields[$object], $originalField, null);
if($fieldObject)
{
if($fieldObject->control == 'multi-select') $this->config->dataview->multipleMappingFields[] = $object . '-' . $field;
module/pivot/zen.php
+6 -5
View File
@@ -514,11 +514,12 @@ class pivotZen extends pivot
$fieldSetting = (array)$fieldSetting;
$fieldType = $fieldSetting['type'];
$data['type'] = $fieldType;
$data['object'] = $fieldSetting['object'];
$data['field'] = $fieldType != 'options' && $fieldType != 'object' ? $field : $fieldSetting['field'];
$data['saveAs'] = zget($filter, 'saveAs', $field);
$data['sql'] = $sql;
$data['type'] = $fieldType;
$data['object'] = $fieldSetting['object'];
$data['field'] = $fieldType != 'options' && $fieldType != 'object' ? $field : $fieldSetting['field'];
$data['saveAs'] = zget($filter, 'saveAs', $field);
$data['sql'] = $sql;
$data['originalField'] = zget($fieldSetting, 'field', $data['field']);
}
return (object)array('url' => $url, 'method' => 'post', 'data' => $data);