* Adjust for show progress.

This commit is contained in:
wangyidong
2023-10-20 09:54:59 +08:00
parent a2d148897a
commit 540610e1d3
4 changed files with 5 additions and 6 deletions
+1 -1
View File
@@ -220,7 +220,7 @@ class install extends control
}
$log = trim($log);
if(!empty($log)) $error = $finish = '';
return print(json_encode(array('log' => str_replace("\n", "<br />", $log) . '<br />', 'error' => $error, 'finish' => $finish, 'offset' => $offset + strlen($log))));
return print(json_encode(array('log' => str_replace("\n", "<br />", $log) . ($log ? '<br />' : ''), 'error' => $error, 'finish' => $finish, 'offset' => $offset + strlen($log))));
}
/**
+1 -1
View File
@@ -1 +1 @@
.progress{overflow:auto; display: block;}
.progress{overflow:auto; height:400px; display: block; white-space: normal;}
+3 -3
View File
@@ -2,10 +2,11 @@ window.showProgress = function(offset)
{
$.getJSON($.createLink('install', 'ajaxShowProgress', 'offset=' + offset), function(data)
{
$('#progress').append(data.log);
if(!$('.toolbar .toolbar-item.next').hasClass('disabled')) return;
if(data.log) $('#progress').append(data.log);
var element = document.getElementById('progress');
if(element.scrollHeight > 20000) element.innerHTML = element.innerHTML.substr(40000); // Remove old sql.
if(element.scrollHeight > 20000) element.innerHTML = element.innerHTML.substr(60000); // Remove old log.
element.scrollTop = element.scrollHeight;
if(data.error == '' && data.finish == '') return window.showProgress(data.offset);
@@ -25,6 +26,5 @@ $(document).on('click', '.next:not(.disabled)', function()
location.href = $.createLink('install', 'step3');
})
$('.progress').height($(window).height() - 200);
$.get($.createLink('install', 'ajaxCreateTable'));
window.showProgress(0);
@@ -33,4 +33,3 @@ div
);
render('pagebase');