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!7453
This commit is contained in:
王怡栋
2023-04-18 06:43:52 +00:00
parent dc1b7fa857 f9f3549e9d
commit 6c74871804
10 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/block/lang/de.php
View File

@@ -355,7 +355,7 @@ $lang->block->default['doc']['5']['grid'] = 4;
if($config->vision == 'rnd')
{
$lang->block->default['doc']['6']['title'] = $lang->productCommon . 'Document';
$lang->block->default['doc']['6']['title'] = $lang->productCommon . ' Document';
$lang->block->default['doc']['6']['block'] = 'productdoc';
$lang->block->default['doc']['6']['grid'] = 8;
}
@@ -364,7 +364,7 @@ $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard';
$lang->block->default['doc']['7']['block'] = 'doccollectlist';
$lang->block->default['doc']['7']['grid'] = 4;
$lang->block->default['doc']['8']['title'] = $lang->projectCommon . 'Document';
$lang->block->default['doc']['8']['title'] = $lang->projectCommon . ' Document';
$lang->block->default['doc']['8']['block'] = 'projectdoc';
$lang->block->default['doc']['8']['grid'] = 8;

4
module/block/lang/en.php
View File

@@ -355,7 +355,7 @@ $lang->block->default['doc']['5']['grid'] = 4;
if($config->vision == 'rnd')
{
$lang->block->default['doc']['6']['title'] = $lang->productCommon . 'Document';
$lang->block->default['doc']['6']['title'] = $lang->productCommon . ' Document';
$lang->block->default['doc']['6']['block'] = 'productdoc';
$lang->block->default['doc']['6']['grid'] = 8;
}
@@ -364,7 +364,7 @@ $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard';
$lang->block->default['doc']['7']['block'] = 'doccollectlist';
$lang->block->default['doc']['7']['grid'] = 4;
$lang->block->default['doc']['8']['title'] = $lang->projectCommon . 'Document';
$lang->block->default['doc']['8']['title'] = $lang->projectCommon . ' Document';
$lang->block->default['doc']['8']['block'] = 'projectdoc';
$lang->block->default['doc']['8']['grid'] = 8;

4
module/block/lang/fr.php
View File

@@ -355,7 +355,7 @@ $lang->block->default['doc']['5']['grid'] = 4;
if($config->vision == 'rnd')
{
$lang->block->default['doc']['6']['title'] = $lang->productCommon . 'Document';
$lang->block->default['doc']['6']['title'] = $lang->productCommon . ' Document';
$lang->block->default['doc']['6']['block'] = 'productdoc';
$lang->block->default['doc']['6']['grid'] = 8;
}
@@ -364,7 +364,7 @@ $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard';
$lang->block->default['doc']['7']['block'] = 'doccollectlist';
$lang->block->default['doc']['7']['grid'] = 4;
$lang->block->default['doc']['8']['title'] = $lang->projectCommon . 'Document';
$lang->block->default['doc']['8']['title'] = $lang->projectCommon . ' Document';
$lang->block->default['doc']['8']['block'] = 'projectdoc';
$lang->block->default['doc']['8']['grid'] = 8;

3
module/block/view/doccollectlistblock.html.php
View File

@@ -17,7 +17,8 @@
.block-doccollectlist .doc-list > .doc-title > .label-rank-1 {color: #FC5959; background-color: #FFE2D9;}
.block-doccollectlist .doc-list > .doc-title > .label-rank-2 {color: #FF8058; background-color: #FFE2D9;}
.block-doccollectlist .doc-list > .doc-title > .label-rank-3 {color: #FF9F46; background-color: #FFECDB;}
.block-doccollectlist .doc-list > .doc-title > .doc-name {overflow: hidden; max-width: calc(100% - 110px);}
.block-doccollectlist .doc-list > .doc-title > .doc-name {overflow: hidden; max-width: calc(100% - 130px);}
[lang^=zh] .block-doccollectlist .doc-list > .doc-title > .doc-name {max-width: calc(100% - 110px);}
.block-doccollectlist .doc-list > .doc-title > .label-collect-count {margin-left: 10px;}
.block-doccollectlist .doc-list > .doc-title > .label-collect-count > .icon-flame {margin-bottom: 3px;}
.block-doccollectlist .doc-list > .doc-title > .label-collect-count > .icon-flame.gray {filter: grayscale(100%);}

4
module/doc/control.php
View File

@@ -158,6 +158,7 @@ class doc extends control
if($type == 'execution' and $this->post->execution) $objectID = $this->post->execution;
if($type == 'custom') $objectID = 0;
$type = $type == 'execution' && $this->app->tab != 'execution' ? 'project' : $type;
$this->action->create('docLib', $libID, 'Created');
@@ -185,7 +186,6 @@ class doc extends control
}
}
if($type == 'execution')
{
$objects = $this->execution->getPairs(0, 'sprint,stage', 'multiple,leaf,noprefix,withobject');
@@ -550,7 +550,7 @@ class doc extends control
if(!empty($changes)) $this->action->logHistory($actionID, $changes);
}
$link = $this->createLink('doc', 'view', "docID={$docID}") . "#app={$this->app->tab}";
$link = $this->createLink('doc', 'view', "docID={$docID}");
$oldLib = $doc->lib;
$doc = $this->doc->getById($docID);
$lib = $this->doc->getLibById($doc->lib);

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

@@ -79,9 +79,12 @@
#hostory::-moz-scrollbar {height: 0px; width: 0px; background: transparent;}
.main-col iframe {min-height: unset;}
#editorBox > .btn-group > button {margin: 2px 6px 0 4px; color: #838A9D;}
#editorMenu {max-height: 200px; overflow: auto; margin-left: 4px;}
#editorMenu > li {color: #838A9D; font-weight: 400; padding: 5px 12px;}
#editorBox > .btn-group.noDropdown {top: 6px; overflow: hidden;}
#editorBox > .btn-group > button {margin: 2px 12px 0 4px; color: #838A9D;}
#editorBox > .btn-group > span.text {color: #838A9D; font-weight: 400; padding: 5px 12px; overflow: hidden; text-overflow: clip; white-space: nowrap; font-size: 13px;}
#editorMenu {max-height: 200px; overflow-y: auto; overflow-x: hidden; margin-left: 4px; max-width: 100%;}
[lang^=zh] #editorMenu {max-width: calc(100% - 10px);}
#editorMenu > li {color: #838A9D; font-weight: 400; padding: 5px 12px; text-overflow: clip; white-space: nowrap;}
.doc-version-menu {padding: 10px 5px;}
#changeBtn > i {font-size: 24px;}

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

@@ -333,17 +333,23 @@ function locateNewLib(type, objectID, libID)
{
var method = 'teamSpace';
var params = 'objectID=' + objectID + '&libID=' + libID;
var module = 'doc';
if(type == 'product' || type == 'project')
{
method = type + 'Space';
}
else if(type == 'execution')
{
module = 'execution';
method = 'doc';
}
else if(type == 'mine')
{
method = 'mySpace';
params = 'type=mine&libID=' + libID;
}
location.href = createLink('doc', method, params);
location.href = createLink(module, method, params);
}
/**

2
module/doc/model.php
View File

@@ -3185,7 +3185,7 @@ class docModel extends model
$objectID = zget($lib, $lib->type, 0);
$class = $from == 'list' ? 'btn-info' : 'btn-primary';
$html = "<div class='dropdown btn-group createDropdown'>";
$html .= html::a(helper::createLink('doc', 'create', "objectType={$lib->type}&objectID=$objectID&libID={$lib->id}&moduleID=$moduleID&type=html"), "<i class='icon icon-plus'></i> {$this->lang->doc->create}", '', "class='btn $class'");
$html .= html::a(helper::createLink('doc', 'create', "objectType={$lib->type}&objectID=$objectID&libID={$lib->id}&moduleID=$moduleID&type=html"), "<i class='icon icon-plus'></i> {$this->lang->doc->create}", '', "class='btn $class' data-app='{$this->app->tab}'");
$html .= "<button type='button' class='btn $class dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
$html .= "<ul class='dropdown-menu pull-right'>";

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

@@ -79,7 +79,8 @@
</div>
<?php if(!empty($editors)):?>
<div id='editorBox'>
<div class="btn-group">
<?php $groupClass = count($editors) == 1 ? 'noDropdown' : '';?>
<div class="btn-group <?php echo $groupClass;?>">
<?php
$space = common::checkNotCN() ? ' ' : '';
$firstEditor = current($editors);
@@ -87,22 +88,22 @@
array_shift($editors);
?>
<button class="btn btn-link dropdown-toggle" data-toggle="dropdown">
<span class="text"><?php echo $editorInfo;?></span>
<?php if(!empty($editors)):?>
<span class="caret"></span>
<?php endif;?>
</button>
<?php if(!empty($editors)):?>
<button class="btn btn-link dropdown-toggle" data-toggle="dropdown">
<span class="text" title='<?php echo $editorInfo;?>'><?php echo $editorInfo;?></span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu" id='editorMenu'>
<?php
foreach($editors as $editor)
{
$editorInfo = zget($users, $editor->account) . ' ' . substr($editor->date, 0, 10) . $space . $lang->doc->update;
echo "<li>$editorInfo</li>";
echo "<li title='$editorInfo'>$editorInfo</li>";
}
?>
</ul>
<?php else:?>
<span class="text" title='<?php echo $editorInfo;?>'><?php echo $editorInfo;?></span>
<?php endif;?>
</div>
</div>

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

@@ -261,6 +261,7 @@ $(function()
initialState: 'active',
itemCreator: function($li, item)
{
if(item.type == 'apiDoc' && release) item.hasAction = false;
if(typeof item.hasAction == 'undefined') item.hasAction = true;
if(typeof item.active == 'undefined') item.active = 0;
if(typeof docID != 'undefined' && item.id == docID) item.active = 1;
@@ -270,7 +271,7 @@ $(function()
var libClass = ['lib', 'annex', 'api', 'execution'].indexOf(objectType) !== -1 ? 'lib' : '';
var moduleClass = item.type == 'doc' || item.type == 'apiDoc' ? 'catalog' : '';
var sortClass = '';
if(config.currentMethod != 'view' && ((item.type == 'doc' && canSortDocCatalog) || (item.type == 'apiDoc' && canSortAPICatalog))) sortClass = 'sort-module';
if(config.currentMethod != 'view' && ((item.type == 'doc' && canSortDocCatalog) || (item.type == 'apiDoc' && canSortAPICatalog && !release))) sortClass = 'sort-module';
var hasChild = item.children ? !!item.children.length : false;
var link = item.type != 'execution' || item.hasAction ? '###' : '#';