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

Merge branch 'sprint/fixbug_hufangzhou_17933' into 'master'

Browse Source 
* Fix bug #17933.

See merge request easycorp/zentaopms!3012
This commit is contained in:
王怡栋
2022-04-19 07:50:20 +00:00
parent ed8bea2a98 9b6857a689
commit ec6b8f86fd
3 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/css/manage.css
+2 -3
View File
@@ -4,9 +4,8 @@
a.setDefault {padding-left: 8px !important}
td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
td.flex .label-primary {min-width: 40px;}
td.flex .setDefault {min-width: 120px;}
td.branchName > span.text-ellipsis {display: inline-block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}
td.branchName > span {vertical-align: middle;}
#mergeBranch .form-actions {padding-top: 20px;}
.modal-body {padding-top: 0;}
module/branch/js/manage.js
+23 -7
View File
@@ -37,13 +37,29 @@ $(function()
}
});
$('td.c-name.flex').mouseenter(function()
{
$(this).find('.setDefault').removeClass('hidden');
}).mouseleave(function()
{
$(this).find('.setDefault').addClass('hidden');
});
//$('td.c-name.flex').mouseenter(function()
//{
// $(this).find('.setDefault').removeClass('hidden');
// if($(this).find('span.label-primary').length > 0)
// {
// $(this).find('span.text-ellipsis').css('max-width', 'calc(100% - 50px)');
// }
// else
// {
// $(this).find('span.text-ellipsis').css('max-width', 'calc(100% - 120px)');
// }
//}).mouseleave(function()
//{
// $(this).find('.setDefault').addClass('hidden');
// if($(this).find('span.label-primary').length > 0)
// {
// $(this).find('span.text-ellipsis').css('max-width', 'calc(100% - 50px)');
// }
// else
// {
// $(this).find('span.text-ellipsis').css('max-width', '100%');
// }
//});
$("input[id*='branchIDList']").change(function()
{
module/branch/view/manage.html.php
+1 -1
View File
@@ -79,7 +79,7 @@
<?php echo $isMain ? '' : '<i class="icon icon-move"></i>';?>
</td>
<?php endif;?>
<td class='c-name flex branchName' title='<?php echo $branch->name;?>'>
<td class='c-name branchName' title='<?php echo $branch->name;?>'>
<span class="text-ellipsis"><?php echo $branch->name;?>&nbsp;</span>
<?php
/* Fix bug#17342,由于默认分支的后续功能没做,暂时隐藏设置默认分支的功能 */