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

Merge branch 'dev/gfl_zentaopms_305' into 'master'

Browse Source 
Dev/gfl zentaopms 305

See merge request easycorp/zentaopms!7393
This commit is contained in:
王怡栋
2023-04-13 03:10:18 +00:00
parent 82dc38118e 4b603d8495
commit 40e2ae98d5
8 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/doc/control.php
View File

@@ -1210,13 +1210,13 @@ class doc extends control
$methodName = 'mySpace';
}
$crumbs[] = html::a(inLink($methodName, $linkParams), html::image("static/svg/wiki-file-lib.svg") . $lib->name);
$crumbs[] = html::a(inLink($methodName, $linkParams), html::image("static/svg/wiki-file-lib.svg") . $lib->name, '', 'title =' . $lib -> name);
$moduleList = $this->loadModel('tree')->getParents($doc->module);
foreach($moduleList as $module)
{
$withModuleParams = $linkParams . "&moduleID=$module->id";
$crumbs[] = html::a(inLink($methodName, $withModuleParams), $module->name);
$crumbs[] = html::a(inLink($methodName, $withModuleParams), $module->name . '&nbsp', '', 'title =' . $module->name);
}
$spaceType = $objectType . 'Space';

2
module/doc/css/common.css
View File

@@ -104,7 +104,7 @@ ol, ul {margin-bottom: 0}
#subHeader .list-group>a.selected {color: #e9f2fb !important;}
#pageNav #dropMenu .table-col .list-group .icon-move {display:block; float: left; font-size: 12px; padding: 3px 4px 3px 1px;}
#content .detail-content.article-content {overflow-y: auto; height: calc(100vh - 300px);}
#content .detail-content.article-content {overflow-y: auto; height: calc(100vh - 200px);}
#aclBox .acl-tip {color: #838a9d;}
.ajaxCollect > img.star-empty {margin-right: 0px;}
#outlineMenu {background: #fff; position: absolute; height: calc(100vh - 200px)!important; overflow-y: auto; top: 50px; right: 20px;}

3
module/doc/css/view.css
View File

@@ -63,10 +63,11 @@
.info .version, .info .crumbs {float: left;}
.crumbs img {margin-right: 3px; margin-bottom: 4px;}
.crumbs {float: left; display: flex;height: 32px; width: 670px; align-items: center; overflow: hidden;}
.crumbs {float: left; display: flex;height: 32px; width: 640px; align-items: center; overflow: hidden;}
.crumbs .crumb-item {padding: 6px 2px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; flex: none; display: flex;}
.crumb-item .separator {flex: 0 0 15px; display: flex; justify-content: center; align-items: center;}
.crumb-item a {flex: none}
.main-col {position: relative;}
#autoBox {display: flex; overflow: hidden; text-overflow: ellipsis; padding-right: 15px; position: relative;}
#autoBox > .ellipsis {position: absolute; top: 3px; right: 0; width: 10px; background: #F4F5F7; height: 100%;}
.detail+.detail {padding-top: 0;}

7
module/doc/js/common.js
View File

@@ -421,9 +421,10 @@ function updateCrumbs()
if(widthSum >= crumbMaxWidth)
{
$(crumbItem).addClass('in-auto-box');
var $autoCrumbItems = $('#crumbs > .in-auto-box');
$lastChild.before('<div id="autoBox" class="flex-auto"><div class="ellipsis">...<div></div>');
$('#autoBox').prepend($autoCrumbItems);
return;
}
}
var $autoCrumbItems = $('#crumbs > .in-auto-box');
$lastChild.before('<div id="autoBox" class="flex-auto"><div class="ellipsis">...<div></div>');
$('#autoBox').prepend($autoCrumbItems);
}

20
module/doc/js/view.js
View File

@@ -141,15 +141,15 @@ $(function()
$('.outline').height($('.article-content').height());
$('body').on('click', '.outline-toggle i.icon-angle-right', function()
$('body').on('click', '.outline-toggle i.icon-menu-arrow-left', function()
{
$('.outline').css({'min-width' : '180px', 'border-left' : '2px solid #efefef'});
$(this).removeClass('icon-angle-right').addClass('icon-angle-left').css('left', '-9px');
$(this).removeClass('icon-menu-arrow-left').addClass('icon-menu-arrow-right').css('left', '-9px');
$('.outline-content').show();
if($('#sidebar>.cell').is(':visible')) $('#sidebar .icon.icon-angle-right').trigger("click");
}).on('click', '.outline-toggle i.icon-angle-left', function()
if($('#sidebar>.cell').is(':visible')) $('#sidebar .icon.icon-menu-arrow-right').trigger("click");
}).on('click', '.outline-toggle i.icon-menu-arrow-right', function()
{
$(this).removeClass('icon-angle-left').addClass('icon-angle-right');
$(this).removeClass('icon-menu-arrow-right').addClass('icon-menu-arrow-left');
$('.outline').css({'min-width' : '180px', 'border-left' : 'none'});
$('.outline-content').hide();
}).on('click', '#outline li', function(e)
@@ -190,15 +190,14 @@ $(function()
});
})
$('#sidebar .icon.icon-angle-right').click(function()
$('#sidebar .icon.icon-menu-arrow-left').click(function()
{
if($('#sidebar>.cell').is(':hidden') && $('.outline-content').is(':visible'))
{
$('.outline .outline-toggle i.icon-angle-left').trigger("click");
$('.outline .outline-toggle i.icon-menu-arrow-right').trigger("click");
}
})
$('.outline .outline-toggle i.icon-angle-right').trigger("click");
$('#history').append('<a id="closeBtn" href="###" class="btn btn-link"><i class="icon icon-close"></i></a>');
$('#hisTrigger').on('click', function()
{
@@ -226,4 +225,9 @@ $(function()
$('#hisTrigger').removeClass('text-primary');
})
$('#history').find('.btn.pull-right').removeClass('pull-right');
if($('.files-list').length)
{
$('#content .detail-content.article-content').css('height', 'calc(100vh - 300px)');
}
$('.outline .outline-toggle i.icon-menu-arrow-left').trigger("click");
})

2
module/doc/view/content.html.php
View File

@@ -158,7 +158,7 @@
<?php echo $outline;?>
</div>
</div>
<div class="outline-toggle"><i class="icon icon-angle-right"></i></div>
<div class="outline-toggle"><i class="icon icon-menu-arrow-left"></i></div>
<?php endif;?>
<div id="history" class='panel hidden' style="margin-left: 2px;">
<?php

2
module/doc/view/lefttree.html.php
View File

@@ -24,7 +24,7 @@
.tree-icon {position: absolute; right: 0;}
.tree li.has-input {overflow: hidden;}
.tree li.has-input > input.input-bro {margin-left: 15px;}
.img-lib {flex: 0 0 14px; height: 14px; margin-right: 5px;}
.img-lib {flex: 0 0 14px; height: 14px; margin-right: 5px; margin-bottom: 5px;}
.tree-icon {position: absolute; right: 0;}
.tree li > a {max-width: 100%; padding: 2px;}
.file-tree a.show-icon > div,

2
module/doc/view/view.html.php
View File

@@ -29,7 +29,7 @@
<div id="crumbs" class="crumbs">
<?php foreach($crumbs as $crumbKey => $crumb):?>
<div class="crumb-item">
<?php if($crumbKey != 0) echo '<div class="separator"> > </div>'?>
<?php if($crumbKey != 0) echo '<div class="separator">> </div>'?>
<?php echo $crumb;?>
</div>
<?php endforeach;?>