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

Merge branch 'tsj_fixbug' into 'master'

Browse Source 
Tsj fixbug

See merge request easycorp/zentaopms!7474
This commit is contained in:
王怡栋
2023-04-19 07:49:35 +00:00
parent cd2c399484 18cba3006d
commit 01c8d5d893
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/css/createlib.css
+2 -1
View File
@@ -1,9 +1,10 @@
.modal-dialog {width: 75%;}
form {margin-bottom: 50px;}
table {width: 90% !important;}
#mainContent table th {width: 70px;}
#whiteListBox div.input-group {margin-bottom: 2px;}
#groups_chosen.chosen-container .chosen-results, #users_chosen.chosen-container .chosen-results {max-height: 160px;}
#aclBox > th {vertical-align: top; padding-top: 17px;}
tr.executionBox > td {display: flex; width: 103%;}
tr.executionBox > td > .icon-help {margin: 8px 0 0 5px;}
module/doc/model.php
+2 -2
View File
@@ -3127,7 +3127,7 @@ class docModel extends model
if($type != 'project') $libTree = array_values($libTree[$type]);
if($type == 'mine')
{
$libType = zget($this->app->rawParams, 'type', '');
$libType = $this->app->rawMethod == 'view' ? 'mine' : zget($this->app->rawParams, 'type', '');
$libType = strtolower($libType);
$myLib = new stdclass();
@@ -3138,7 +3138,7 @@ class docModel extends model
$myLib->objectID = 0;
$myLib->active = 0;
$myLib->hasAction = false;
$myLib->active = $libType == 'mine' ? 1 : 0;
$myLib->active = $libType == 'mine' ? 1 : 0;
$myLib->children = $libTree;
$myView = new stdclass();
module/doc/view/createlib.html.php
+2 -1
View File
@@ -36,7 +36,8 @@
<th><?php echo $lang->doc->execution?></th>
<td>
<?php $disabled = $project->multiple ? '' : 'disabled';?>
<?php echo html::select('execution', $executionPairs, 0, "class='form-control chosen' data-drop-direction='down' data-placeholder='{$lang->doclib->tip->selectExecution}' $disabled")?>
<?php echo html::select('execution', $executionPairs, 0, "class='form-control chosen' data-drop-direction='down' $disabled")?>
<i class='icon icon-help' title='<?php echo $lang->doclib->tip->selectExecution;?>'></i>
</td>
</tr>
<?php endif;?>
module/doc/view/lefttree.html.php
+6 -6
View File
@@ -12,21 +12,21 @@
/* css for tree */
#fileTree .title {font-size: 16px; height: 20px; margin-top: 5px; margin-bottom: 5px;}
#fileTree .tree li.has-list.open:before {content: unset;}
#fileTree .tree li > a {max-width: 100%; padding: 2px;}
#fileTree.tree li.has-list.open:before {content: unset;}
#fileTree.tree li > a {max-width: 100%; padding: 2px;}
.file-tree a {height: 30px;}
.flex-between {display: flex; align-items: center; justify-content: space-between;}
.flex-center {display: flex; align-items: center; justify-content: center;}
.flex-start {display: flex; align-items: center;}
#fileTree .tree li > .list-toggle {top: 4px;}
#fileTree.tree li > .list-toggle {top: 4px;}
.input-tree {width: 120px;}
.tree-icon {position: absolute; right: 0;}
#fileTree .tree li.has-input {overflow: hidden;}
#fileTree .tree li.has-input > input.input-bro {margin-left: 15px;}
#fileTree.tree li.has-input {overflow: hidden;}
#fileTree.tree li.has-input > input.input-bro {margin-left: 15px;}
.img-lib {flex: 0 0 14px; height: 14px; margin-right: 5px; margin-bottom: 2px;}
.file-icon {width: 14px; margin-bottom: 4px;}
.tree-icon {position: absolute; right: 0;}
#fileTree .tree li > a {max-width: 100%; padding: 2px;}
#fileTree.tree li > a {max-width: 100%; padding: 2px;}
.file-tree a.show-icon > div,
.file-tree a.hover > div {padding-right: 15px;}
.tree-text {overflow: hidden; min-width: 50px;}