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

* [bug#63968] Fix error the metriclib remind doesn't display.

Browse Source
This commit is contained in:
liugang
2025-08-06 15:22:16 +08:00
committed by tianshujie
parent 968ff46ab9
commit 4cb01a56d5
3 changed files with 116 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/js/dashboard.ui.js
+3 -3
View File
@@ -1,8 +1,8 @@
$(function()
{
if($('#expiredModal').length) zui.Modal.open({id: 'expiredModal'});
if($('#metriclibModal').length) zui.Modal.open({id: 'metriclibModal'});
if($('#upgradeModal').length) zui.Modal.open({id: 'upgradeModal'});
if($('#upgradeModal').length) zui.Modal.open({id: 'upgradeModal'});
else if($('#expiredModal').length) zui.Modal.open({id: 'expiredModal'});
else if($('#metriclibModal').length) zui.Modal.open({id: 'metriclibModal'});
});
function deleteBlock(dashboard, data, block)
module/block/ui/dashboard.html.php
+112 -102
View File
@@ -42,116 +42,126 @@ dashboard
set::onLayoutChange(jsRaw('handleLayoutChange'))
);
$remind = $this->loadModel('misc')->getPluginRemind();
$remind ? modal
(
setID('expiredModal'),
set::title($lang->misc->expiredTipsTitle),
html($remind)
) : null;
$metriclibRemind = $this->misc->getMetriclibRemind();
$metriclibRemind ? modal
(
setID('metriclibModal'),
html($metriclibRemind)
) : null;
$upgradeRemind = $this->misc->getUpgradeRemind();
$upgradeRemind = $this->loadModel('misc')->getUpgradeRemind();
if($upgradeRemind)
{
$guideInfo = $this->config->upgradeGuide[$config->edition];
$clientLang = common::checkNotCN() ? 'en' : 'cn';
$guideInfo = $this->config->upgradeGuide[$config->edition];
$version = $guideInfo['version'];
$imagePath = $guideInfo['imagePath'];
$moreLink = 'https://api.zentao.net/goto.php?item=' . $guideInfo['linkItem'];
modal
(
setID('upgradeModal'),
div
(
setClass('page-block pageOne'),
img(set::src("{$imagePath}{$clientLang}_upgrade_guide1_{$version}.svg")),
div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')),
div
(
setClass('my-6 text-center'),
btn
(
setClass('primary'),
on::click("togglePage('pageTwo')"),
$lang->block->nextPage
)
)
),
div
(
setClass('page-block pageTwo hidden'),
img(set::src("{$imagePath}{$clientLang}_upgrade_guide2_{$version}.svg")),
div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')),
div
(
setClass('my-6 text-center'),
btn
(
setClass('mr-4'),
on::click("togglePage('pageOne')"),
$lang->block->prevPage
),
btn
(
setClass('primary'),
on::click("togglePage('pageThree')"),
$lang->block->nextPage
)
)
),
div
(
setClass('page-block pageThree hidden'),
img(set::src("{$imagePath}{$clientLang}_upgrade_guide3_{$version}.svg")),
div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')),
div
(
setClass('my-6 text-center'),
btn
(
setClass('mr-4'),
on::click("togglePage('pageTwo')"),
$lang->block->prevPage
),
btn
(
setClass('primary'),
on::click("togglePage('pageFour')"),
$lang->block->nextPage
)
)
),
div
(
setClass('page-block pageFour hidden'),
img(set::src("{$imagePath}{$clientLang}_upgrade_guide4_{$version}.svg")),
div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')),
div
(
setClass('my-6 text-center'),
btn
(
setClass('mr-4'),
on::click("togglePage('pageThree')"),
$lang->block->prevPage
),
btn
(
setClass('primary'),
setData('dismiss', 'modal'),
$lang->block->experience
)
)
)
);
}
$upgradeRemind ? modal
(
setID('upgradeModal'),
div
(
setClass('page-block pageOne'),
img(set::src("{$imagePath}{$clientLang}_upgrade_guide1_{$version}.svg")),
div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')),
div
else
{
$pluginRemind = $this->misc->getPluginRemind();
if($pluginRemind)
{
modal
(
setClass('my-6 text-center'),
btn
setID('expiredModal'),
set::title($lang->misc->expiredTipsTitle),
html($pluginRemind)
);
}
else
{
$metriclibRemind = $this->misc->getMetriclibRemind();
if($metriclibRemind)
{
modal
(
setClass('primary'),
on::click("togglePage('pageTwo')"),
$lang->block->nextPage
)
)
),
div
(
setClass('page-block pageTwo hidden'),
img(set::src("{$imagePath}{$clientLang}_upgrade_guide2_{$version}.svg")),
div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')),
div
(
setClass('my-6 text-center'),
btn
(
setClass('mr-4'),
on::click("togglePage('pageOne')"),
$lang->block->prevPage
),
btn
(
setClass('primary'),
on::click("togglePage('pageThree')"),
$lang->block->nextPage
)
)
),
div
(
setClass('page-block pageThree hidden'),
img(set::src("{$imagePath}{$clientLang}_upgrade_guide3_{$version}.svg")),
div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')),
div
(
setClass('my-6 text-center'),
btn
(
setClass('mr-4'),
on::click("togglePage('pageTwo')"),
$lang->block->prevPage
),
btn
(
setClass('primary'),
on::click("togglePage('pageFour')"),
$lang->block->nextPage
)
)
),
div
(
setClass('page-block pageFour hidden'),
img(set::src("{$imagePath}{$clientLang}_upgrade_guide4_{$version}.svg")),
div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')),
div
(
setClass('my-6 text-center'),
btn
(
setClass('mr-4'),
on::click("togglePage('pageThree')"),
$lang->block->prevPage
),
btn
(
setClass('primary'),
setData('dismiss', 'modal'),
$lang->block->experience
)
)
)
) : null;
setID('metriclibModal'),
html($metriclibRemind)
);
};
}
}
render();
module/misc/model.php
+1
View File
@@ -95,6 +95,7 @@ class miscModel extends model
{
if(!$this->app->user->admin) return '';
if($this->config->edition == 'open') return '';
if($this->config->vision != 'rnd') return '';
$remind = '';
if(empty($this->config->global->metriclibShowed))