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

Merge branch 'importExport' into 'master'

Browse Source 
* Code for port.

See merge request easycorp/zentaopms!4848
This commit is contained in:
王怡栋
2022-08-09 00:33:29 +00:00
parent 4384002a33 851af309cb
commit 652a3456f0
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/port/model.php
+2 -2
View File
@@ -1302,9 +1302,9 @@ class portModel extends model
elseif($control == 'multiple') $html .= '<td>' . html::select($name . "[]", $options, $selected, "multiple class='form-control picker-select nopicker' data-field='{$field}'") . '</td>';
elseif($control == 'date') $html .= '<td>' . html::input("$name", $selected, "class='form-control form-date autocomplete='off'") . '</td>';
elseif($control == 'date') $html .= '<td>' . html::input("$name", $selected, "class='form-control form-date' autocomplete='off'") . '</td>';
elseif($control == 'datetime') $html .= '<td>' . html::input("$name", $selected, "class='form-control form-datetime autocomplete='off'") . '</td>';
elseif($control == 'datetime') $html .= '<td>' . html::input("$name", $selected, "class='form-control form-datetime' autocomplete='off'") . '</td>';
elseif($control == 'hidden') $html .= html::hidden("$name", $selected);
module/port/view/footer.html.php
+4
View File
@@ -5,6 +5,8 @@ $.get(createLink('port', 'ajaxGetTbody','model=<?php echo $model;?>&lastID=0&pag
$('#showData > tbody').append(data);
if($('#showData tbody').find('tr').hasClass('showmore') === false) $('#showData tfoot').removeClass('hidden');
$('#showData tbody').find('.picker-select').picker({chosenMode: true});
$('.form-date').datetimepicker('update');
$('.form-datetime').datetimepicker('update');
})
window.addEventListener('scroll', this.handleScroll);
@@ -34,6 +36,8 @@ function loadData($showmore)
$showmore.after(data);
if($('#showData tbody').find('tr').hasClass('showmore') === false) $('#showData tfoot').removeClass('hidden');
$('#showData tbody').find('.picker-select').picker({chosenMode: true}).removeClass('nopicker');
$('.form-date').datetimepicker('update');
$('.form-datetime').datetimepicker('update');
})
}
module/story/config.php
+1
View File
@@ -109,6 +109,7 @@ $config->story->datatable->fieldList['plan']['title'] = 'planAB';
$config->story->datatable->fieldList['plan']['fixed'] = 'no';
$config->story->datatable->fieldList['plan']['width'] = '90';
$config->story->datatable->fieldList['plan']['required'] = 'no';
$config->story->datatable->fieldList['plan']['control'] = 'select';
$config->story->datatable->fieldList['plan']['dataSource'] = array('module' => 'story', 'method' => 'getRelatedObjects', 'params' => 'plan&id,title');
$config->story->datatable->fieldList['source']['title'] = 'source';
module/story/model.php
+1 -1
View File
@@ -5533,7 +5533,7 @@ class storyModel extends model
/* Get users, products and relations. */
$users = $this->loadModel('user')->getPairs('noletter');
$products = $this->product->getPairs('nocode');
$products = $this->loadModel('product')->getPairs('nocode');
$relatedStoryIds = array();
foreach($stories as $story) $relatedStoryIds[$story->id] = $story->id;