Merge branch 'dev/gfl_zentaopms_305' into 'master'

Dev/gfl zentaopms 305

See merge request easycorp/zentaopms!7422
This commit is contained in:
王怡栋
2023-04-14 07:48:44 +00:00
3 changed files with 12 additions and 9 deletions
+5
View File
@@ -70,3 +70,8 @@
.detail+.detail {padding-top: 0;}
.comment-edit-form .form-actions {display: flex;}
#content .detail-content.article-content::-webkit-scrollbar,
#outlineMenu::-webkit-scrollbar {height: 0px; width: 0px; background: transparent;}
#content .detail-content.article-content::-moz-scrollbar,
#outlineMenu::-moz-scrollbar {height: 0px; width: 0px; background: transparent;}
-3
View File
@@ -210,13 +210,11 @@ $(function()
if($history.hasClass('hidden'))
{
$history.removeClass('hidden');
$('#outlineMenu').addClass('hidden');
$icon.addClass('text-primary');
}
else
{
$history.addClass('hidden');
$('#outlineMenu').removeClass('hidden');
$icon.removeClass('text-primary');
}
})
@@ -225,7 +223,6 @@ $(function()
$('#closeBtn').on('click', function()
{
$('#history').addClass('hidden');
$('#outlineMenu').removeClass('hidden');
$('#hisTrigger').removeClass('text-primary');
})
$('#history').find('.btn.pull-right').removeClass('pull-right');
+7 -6
View File
@@ -56,6 +56,7 @@ i.btn-info, i.btn-info:hover {border: none; background: #fff; box-shadow: unset;
[lang^=zh] #leftBar .selectBox #currentItem {width: 180px;}
#leftBar .selectBox #currentItem > .text {overflow: hidden; text-align: left; flex: 0 1 100%;}
.dropdown-in-tree {max-height: 293px; overflow-y: auto;}
.before-tree-item {flex: 0 0 14px; margin-right: 5px;}
</style>
<?php
@@ -234,7 +235,7 @@ $(function()
var imgObj = {
'annex': 'annex',
'api': 'interface',
'lib': 'wiki-file-lib',
'lib': 'wiki',
'execution': 'wiki-file-lib',
'text': 'wiki-file',
'word': 'word',
@@ -259,7 +260,7 @@ $(function()
var $item = '<a href="' + link + '" style="position: relative" data-has-children="' + hasChild + '" title="' + item.name + '" data-id="' + item.id + '" class="' + libClass + '" data-type="' + item.type + '" data-action="' + item.hasAction + '">';
$item += '<div class="text h-full w-full flex-start overflow-hidden">';
if((libClass == 'lib' && item.type != 'execution') || (item.type == 'execution' && item.hasAction)) $item += '<div class="img-lib" style="background-image:url(static/svg/' + imgObj[item.type || 'lib'] + '.svg)"></div>';
if((libClass == 'lib' && item.type != 'execution') || (item.type == 'execution' && item.hasAction)) $item += '<i class="before-tree-item icon icon-' + imgObj[item.type] +'-lib"></i>';
if(['text', 'word', 'ppt', 'excel'].indexOf(item.type) !== -1) $item += '<div class="img-lib" style="background-image:url(static/svg/' + imgObj[item.type] + '.svg)"></div>';
$item += '<div class="tree-text">';
$item += item.name;
@@ -355,13 +356,13 @@ $(function()
var libClass = '.' + moduleType + 'LibDorpdown';
if(!$(this).hasClass('lib')) libClass = '.' + moduleType + 'ModuleDorpdown';
$(this).find('.icon').removeClass('hidden');
$(this).find('.icon-drop').removeClass('hidden');
$(this).addClass('show-icon');
if($(libClass).find('li').length == 0) return false;
}).on('mouseout', 'a', function()
{
if(!$(this).closest('a').hasClass('hover')) $(this).find('.icon').addClass('hidden');
if(!$(this).closest('a').hasClass('hover')) $(this).find('.icon-drop').addClass('hidden');
$(this).removeClass('show-icon');
}).on('click', 'a', function()
{
@@ -482,13 +483,13 @@ $(function()
if($hoverItem.length)
{
$hoverItem.removeClass('hover');
$hoverItem.find('.icon').addClass('hidden');
$hoverItem.find('.icon-drop').addClass('hidden');
}
$dropdown.remove();
}
}).on('click', '.sidebar-toggle', function()
{
var $icon = $(this).find('.icon');
var $icon = $(this).find('.icon-drop');
if($('#sideBar').hasClass('hidden'))
{
$icon.addClass('icon-angle-left');