Merge branch release/21.7.8 of zentao/zentaopms (#13081)

This commit is contained in:
刘刚
2025-12-30 16:16:36 +08:00
committed by Gitfox
3 changed files with 8 additions and 38 deletions
+8
View File
@@ -1718,6 +1718,14 @@ $config->delete['21_7_7'][] = 'extension/ipd/upgrade/ext/lang';
$config->delete['21_7_7'][] = 'extension/ipd/upgrade/ext/view';
$config->delete['21_7_7'][] = 'module/install/js/installduckdb.ui.js';
$config->delete['21_7_7'][] = 'module/install/ui/installduckdb.html.php';
$config->delete['21_7_7'][] = 'module/upgrade/css/afterexec.en.css';
$config->delete['21_7_7'][] = 'module/upgrade/css/afterexec.vi.css';
$config->delete['21_7_7'][] = 'module/upgrade/css/common.css';
$config->delete['21_7_7'][] = 'module/upgrade/css/common.ui.css';
$config->delete['21_7_7'][] = 'module/upgrade/css/confirm.ui.css';
$config->delete['21_7_7'][] = 'module/upgrade/css/execute.ui.css';
$config->delete['21_7_7'][] = 'module/upgrade/js/common.js';
$config->delete['21_7_7'][] = 'module/upgrade/js/confirm.ui.js';
$config->upgrade->openModules = array('action', 'admin', 'ai', 'bi', 'aiapp', 'api', 'automation', 'backup', 'block', 'branch', 'budget', 'bug', 'build', 'cache', 'caselib', 'chart', 'ci', 'client', 'common', 'company', 'compile', 'convert', 'cron', 'custom', 'datatable', 'dataview', 'dept', 'design', 'dev', 'dimension', 'doc', 'durationestimation', 'entry', 'execution', 'extension', 'file', 'git', 'gitlab', 'group', 'holiday', 'im', 'index', 'index.html', 'install', 'issue', 'jenkins', 'job', 'kanban', 'license', 'mail', 'message', 'metric', 'misc', 'mr', 'my', 'personnel', 'pipeline', 'product', 'productplan', 'productset', 'program', 'programplan', 'project', 'projectbuild', 'projectplan', 'projectrelease', 'projectstory', 'pivot', 'qa', 'release', 'repo', 'report', 'risk', 'score', 'screen', 'search', 'setting', 'sonarqube', 'sso', 'stage', 'stakeholder', 'story', 'subject', 'svn', 'task', 'testcase', 'testreport', 'testsuite', 'testtask', 'todo', 'tree', 'tutorial', 'upgrade', 'user', 'webhook', 'weekly', 'workestimation', 'gitea', 'gogs', 'transfer', 'zahost', 'zanode', 'editor', 'charter', 'roadmap', 'account', 'cne', 'host', 'instance', 'ops', 'serverroom', 'space', 'store', 'system', 'solution', 'demand', 'gitfox', 'epic', 'requirement', 'mark', 'zai');
$config->upgrade->unsetModules = array('design', 'program', 'programplan', 'projectbuild', 'projectrelease', 'stage', 'stakeholder', 'product', 'branch', 'productplan', 'release', 'build', 'qa', 'bug', 'testcase', 'testtask', 'testreport', 'testsuite', 'caselib', 'automation', 'repo', 'ci', 'compile', 'jenkins', 'job', 'svn', 'gitlab', 'sonarqube', 'mr', 'git', 'report', 'sqlbuilder', 'feedback', 'faq', 'attend', 'holiday', 'leave', 'makeup', 'overtime', 'lieu', 'ops', 'host', 'serverroom', 'account', 'domain', 'service', 'deploy', 'conference', 'traincourse', 'pssp', 'baseline', 'classify', 'cm', 'cmcl', 'auditcl', 'reviewcl', 'process', 'activity', 'zoutput', 'auditplan', 'nc', 'subject', 'weekly', 'workestimation', 'issue', 'durationestimation', 'risk', 'opportunity', 'trainplan', 'gapanalysis', 'researchplan', 'researchreport', 'meeting', 'meetingroom', 'budget', 'reviewissue', 'reviewsetting', 'review', 'milestone', 'measurement', 'measrecord', 'assetlib', 'setting', 'im', 'client', 'ldap', 'dev', 'api', 'gitea', 'gogs', 'zanode', 'zahost');
-38
View File
@@ -1,38 +0,0 @@
$(function()
{
setTimeout('setPing()', 1000 * 60 * 10);
});
function updateProgressInterval() {
interval = setInterval(function ()
{
updateProgress();
}, 500);
}
let logOffset = 0;
function updateProgress()
{
var url = createLink('upgrade', 'ajaxGetProgress', 'offset=' + logOffset);
$.ajax(
{
url:url,
success:function(result)
{
result = JSON.parse(result);
logOffset = result.offset;
let progress = parseInt(result.progress);
$("#progress .progress-bar").css('width', progress + '%');
$('.title').text(progress + '%');
if(result.log) $('#logBox').append(result.log);
let element = document.getElementById('logBox');
if(element.scrollHeight > 20000) element.innerHTML = element.innerHTML.substr(60000); // Remove old log.
element.scrollTop = element.scrollHeight;
if(progress == 100) clearInterval(interval);
}
});
}
View File