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

* Adjust dtable sort link.

Browse Source
This commit is contained in:
caoyanyi
2023-11-10 17:12:58 +08:00
parent 8c9c41a0d9
commit a019fee014
4 changed files with 12 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/js/view.ui.js
-17
View File
@@ -28,23 +28,6 @@ $(document).off('click','.dtable-footer .batch-btn').on('click', '.dtable-footer
window.appendLinkBtn();
});
/**
* 生成列表的排序链接。
* Create sort link for table.
*
* @param object col
* @access public
* @return string
*/
window.createSortLink = function(col)
{
let tabType = $('.tab-pane.active').attr('id');
let sort = `${col.name}_asc`;
if(sort == orderBy) sort = col.name + '_desc';
return sortLink.replace('{type}', tabType).replace('{orderBy}', sort);
}
window.showLink = function(obj)
{
var $this = $(obj);
module/build/ui/view.html.php
+6 -5
View File
@@ -58,9 +58,7 @@ detailHeader
jsVar('initLink', $link);
jsVar('type', $type);
jsVar('orderBy', $orderBy);
jsVar('buildID', $build->id);
jsVar('sortLink', helper::createLink($buildModule, 'view', "buildID={$build->id}&type={type}&link={$link}&param={$param}&orderBy={orderBy}"));
jsVar('confirmDelete', $lang->build->confirmDelete);
jsVar('currentAccount', $app->user->account);
jsVar('buildProduct', $build->product);
@@ -129,7 +127,8 @@ detailBody
set::cols(array_values($config->build->story->dtable->fieldList)),
set::data($stories),
set::checkable($canBatchUnlinkStory || $canBatchCloseStory),
set::sortLink(jsRaw('window.createSortLink')),
set::sortLink(createLink($buildModule, 'view', "buildID={$build->id}&type=story&link={$link}&param={$param}&orderBy={name}_{sortType}")),
set::orderBy($orderBy),
set::footToolbar($storyFootToolbar),
set::footPager(usePager('storyPager', '', array(
'recPerPage' => $storyPager->recPerPage,
@@ -158,7 +157,8 @@ detailBody
set::cols(array_values($config->build->bug->dtable->fieldList)),
set::data($bugs),
set::checkable($canBatchUnlinkBug || $canBatchCloseBug),
set::sortLink(jsRaw('window.createSortLink')),
set::sortLink(createLink($buildModule, 'view', "buildID={$build->id}&type=bug&link={$link}&param={$param}&orderBy={name}_{sortType}")),
set::orderBy($orderBy),
set::footToolbar($bugFootToolbar),
set::footPager(usePager('bugPager', '', array(
'recPerPage' => $bugPager->recPerPage,
@@ -180,7 +180,8 @@ detailBody
set::userMap($users),
set::cols(array_values($config->build->generatedBug->dtable->fieldList)),
set::data(array_values($generatedBugs)),
set::sortLink(jsRaw('window.createSortLink')),
set::sortLink(createLink($buildModule, 'view', "buildID={$build->id}&type=generatedBug&link={$link}&param={$param}&orderBy={name}_{sortType}")),
set::orderBy($orderBy),
set::footPager(usePager('generatedBugPager', '', array(
'recPerPage' => $generatedBugPager->recPerPage,
'recTotal' => $generatedBugPager->recTotal,
module/release/js/view.ui.js
-31
View File
@@ -70,37 +70,6 @@ window.setStoryStatistics = function(element, checkedIDList)
};
}
/**
* 生成列表的排序链接。
* Create sort link for table.
*
* @param object col
* @param string tabType
* @access public
* @return string
*/
window.createSortLink = function(col, sortType)
{
const tabID = $('.tab-pane.active').attr('id');
let tabType = '';
switch(tabID)
{
case 'resolvedBug':
tabType = 'bug';
break;
case 'leftBug':
tabType = 'leftBug';
break;
default:
tabType = 'story';
break;
}
let sort = `${col.name}_asc`;
if(sort == orderBy) sort = col.name + '_desc';
return sortLink.replace('{type}', tabType).replace('{orderBy}', sort);
}
/**
* 移除关联的对象。
* Remove linked object.
module/release/ui/view.html.php
+6 -5
View File
@@ -22,9 +22,7 @@ detailHeader
!empty($menus) ? to::suffix(btnGroup(set::items($menus))) : null
);
jsVar('orderBy', $orderBy);
jsVar('releaseID', $release->id);
jsVar('sortLink', helper::createLink($releaseModule, 'view', "releaseID={$release->id}&type={type}&link={$link}&param={$param}&orderBy={orderBy}"));
/* Table data and setting for finished stories tab. */
jsVar('summary', $summary);
@@ -154,7 +152,8 @@ detailBody
set::data($storyTableData),
set::userMap($users),
set::checkable($canBatchUnlinkStory || $canBatchCloseStory),
set::sortLink(jsRaw('window.createSortLink')),
set::sortLink(createLink($releaseModule, 'view', "releaseID={$release->id}&type=story&link={$link}&param={$param}&orderBy={name}_{sortType}")),
set::orderBy($orderBy),
set::footToolbar($storyFootToolbar),
set::footPager(usePager('storyPager', '', array('recPerPage' => $storyPager->recPerPage, 'recTotal' => $storyPager->recTotal, 'linkCreator' => createLink($releaseModule, 'view', "releaseID={$release->id}&type=story&link={$link}&param={$param}&orderBy={$orderBy}&recTotal={$storyPager->recTotal}&recPerPage={recPerPage}&page={page}")))),
set::checkInfo(jsRaw('function(checkedIDList){return window.setStoryStatistics(this, checkedIDList);}'))
@@ -180,7 +179,8 @@ detailBody
set::cols(array_values($config->release->dtable->bug->fieldList)),
set::data($bugTableData),
set::checkable($canBatchUnlinkBug || $canBatchCloseBug),
set::sortLink(jsRaw('window.createSortLink')),
set::sortLink(createLink($releaseModule, 'view', "releaseID={$release->id}&type=bug&link={$link}&param={$param}&orderBy={name}_{sortType}")),
set::orderBy($orderBy),
set::footToolbar($bugFootToolbar),
set::footPager(usePager('bugPager', '', array('recPerPage' => $bugPager->recPerPage, 'recTotal' => $bugPager->recTotal, 'linkCreator' => createLink($releaseModule, 'view', "releaseID={$release->id}&type=bug&link={$link}&param={$param}&orderBy={$orderBy}&recTotal={$bugPager->recTotal}&recPerPage={recPerPage}&page={page}"))))
)
@@ -205,7 +205,8 @@ detailBody
set::cols(array_values($config->release->dtable->leftBug->fieldList)),
set::data($leftBugTableData),
set::checkable($canBatchUnlinkBug || $canBatchCloseBug),
set::sortLink(jsRaw('window.createSortLink')),
set::sortLink(createLink($releaseModule, 'view', "releaseID={$release->id}&type=leftBug&link={$link}&param={$param}&orderBy={name}_{sortType}")),
set::orderBy($orderBy),
set::footToolbar($leftBugFootToolbar),
set::footPager(usePager('leftBugPager', '', array('recPerPage' => $leftBugPager->recPerPage, 'recTotal' => $leftBugPager->recTotal, 'linkCreator' => createLink($releaseModule, 'view', "releaseID={$release->id}&type=bug&link={$link}&param={$param}&orderBy={$orderBy}&recTotal={$leftBugPager->recTotal}&recPerPage={recPerPage}&page={page}"))))
)