Merge branch 'sprint/237_tianshujie_bug' into 'master'

Sprint/237 tianshujie bug

See merge request easycorp/zentaopms!5264
This commit is contained in:
王怡栋
2022-09-05 07:45:45 +00:00
5 changed files with 32 additions and 27 deletions
-2
View File
@@ -76,6 +76,4 @@ $(document).ready(function()
{
toggleCopy(false);
$('[data-id="edit"] a').modalTrigger({type: 'iframe', width: 500});
parent.$('#triggerModal .modal-content .modal-header .close').on('click', function(){parent.location.reload();});
});
+2
View File
@@ -335,6 +335,8 @@ $(function()
if(window.config.viewType == 'line') $('#modulemenu > .nav > li > a[href*=product][href*=all]').parent('li[data-id=all]').addClass('active');
if(viewType == 'case' || viewType == 'caselib') $('#subNavbar li[data-id="' + viewType +'"]').addClass('active');
});
if("<?php $from == 'doc'?>") parent.$('#triggerModal .modal-content .modal-header .close').on('click', function(){parent.location.reload();});
</script>
<style>
.module-name {display: inline-block; max-width: calc(100% - 85px); white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}