Merge branch dev/bug-65184 of zentao/zentaopms (#11302)

This commit is contained in:
刘刚
2025-09-08 14:18:35 +08:00
committed by Gitfox
2 changed files with 6 additions and 4 deletions
+1 -2
View File
@@ -11,9 +11,8 @@ let savingDocData = {};
let docBasicModal = {};
let currentDocApp = null;
window.setZentaoSlashMenu = function(menus, title, vision, position)
window.setZentaoSlashMenu = function(menus, title, position)
{
if(vision == 'or' || vision == 'lite') return;
if(!menus?.length) return;
const slashMenus = menus.map(menu =>
+5 -2
View File
@@ -320,11 +320,14 @@ class docApp extends wg
$historyPanelProps = array('fileListProps' => $fileListProps);
$canPreviewOffice = $canDownload && isset($config->file->libreOfficeTurnon) and $config->file->libreOfficeTurnon == 1;
// 不可用场景:文档模板、API 文档、开源版
/* 对比不可用场景:文档模板、API 文档、开源版 */
$diffEnabled = ($config->edition != 'open')
&& !($rawModule == 'doc' && $rawMethod == 'view')
&& $rawModule != 'api';
/* 禅道数据菜单不可用界面:运营(lite)、需求与市场(or) */
if ($config->vision == 'lite' || $config->vision == 'or') $hasZentaoSlashMenu = false;
$zentaoListMenu = $hasZentaoSlashMenu ? $this->getZentaoListMenu() : array();
$moreMenus = $zentaoListMenu
@@ -382,7 +385,7 @@ class docApp extends wg
set::moreMenuAction(jsRaw('window.moreMenuAction')),
set::canPreviewOffice($canPreviewOffice),
set::fileInfoUrl($fileInfoUrl),
$hasZentaoSlashMenu ? jsCall('setZentaoSlashMenu', $zentaoListMenu, $lang->doc->zentaoData, $config->vision, $config->doc->zentaoListMenuPosition) : null
$hasZentaoSlashMenu ? jsCall('setZentaoSlashMenu', $zentaoListMenu, $lang->doc->zentaoData, $config->doc->zentaoListMenuPosition) : null
);
}
}