Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug

This commit is contained in:
tianshujie
2023-04-18 14:16:36 +08:00
31 changed files with 358 additions and 70 deletions
+4 -3
View File
@@ -8,8 +8,7 @@
#main {margin-bottom: 0;}
/* css for mian */
#mainContent > #sideBar {flex: 0 0 150px; overflow-x: auto; padding-right: 5px;}
[lang^=zh] #mainContent > #sideBar {flex: 0 0 180px;}
#mainContent > #sideBar {flex: 0 0 180px; overflow-x: auto; padding-right: 5px;}
/* css for tree */
#fileTree .title {font-size: 16px; height: 20px; margin-top: 5px; margin-bottom: 5px;}
@@ -504,6 +503,7 @@ $(function()
$('body').on('click', function()
{
$('a.sort-module').removeClass('dragging-shadow');
var $dropdown = $('.dropdown-in-tree');
if($dropdown.length)
{
@@ -518,7 +518,7 @@ $(function()
}
}).on('click', '.sidebar-toggle', function()
{
var $icon = $(this).find('.icon-drop');
var $icon = $(this).find('.icon');
if($('#sideBar').hasClass('hidden'))
{
$icon.addClass('icon-angle-left');
@@ -673,6 +673,7 @@ $(function()
start: function()
{
$('#dropDownCatalogue').remove();
$('a.sort-module').removeClass('dragging-shadow');
},
canMoveHere: function($ele, $target)
{