diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index 93e88eaa..f84b3aca 100644 --- a/src/admin/dialog/select_soft.php +++ b/src/admin/dialog/select_soft.php @@ -62,6 +62,8 @@ a{text-decoration:none!important} function ReturnValue(reimg) { if (window.opener.document. != null) { window.opener.document..value = reimg; + window.close(); + return } var funcNum = ; if (window.opener.CKEDITOR != null && funcNum != 1) { diff --git a/src/admin/js/indexbody.js b/src/admin/js/indexbody.js index 35328e06..4ecd574f 100644 --- a/src/admin/js/indexbody.js +++ b/src/admin/js/indexbody.js @@ -14,6 +14,26 @@ function ShowWaitDiv() { $DE('loaddiv').style.display = 'block'; return true; } +function DedeCopyToClipboard(text) { + if (navigator.clipboard) { + navigator.clipboard.writeText(text); + } else { + var textarea = document.createElement('textarea'); + document.body.appendChild(textarea); + // 隐藏此输入框 + textarea.style.position = 'fixed'; + textarea.style.clip = 'rect(0 0 0 0)'; + textarea.style.top = '10px'; + textarea.style.display = 'none'; + textarea.value = text; + textarea.select(); + document.execCommand('copy', true); + document.body.removeChild(textarea); + } +} +function CopySystemInfo(txt) { + DedeCopyToClipboard(txt); +} $(function () { $.get("index_testenv.php", function (data) { if (data !== '') { diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm index 65e09922..ab673c7f 100644 --- a/src/admin/templets/index_body.htm +++ b/src/admin/templets/index_body.htm @@ -69,7 +69,7 @@ table.stattable td{padding:.6rem;border-bottom:1px solid #dee2e6;text-align:righ
-
 系统信息
+
 系统信息
"; ?> diff --git a/src/system/common.func.php b/src/system/common.func.php index 901101ce..0aab66ec 100755 --- a/src/system/common.func.php +++ b/src/system/common.func.php @@ -205,7 +205,7 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0) global $cfg_soft_lang, $cfg_cmsurl; if(empty($GLOBALS['cfg_plus_dir'])) $GLOBALS['cfg_plus_dir'] = '..'; $htmlhead = "提示信息"; - $htmlhead .= "".(isset($GLOBALS['ucsynlogin']) ? $GLOBALS['ucsynlogin'] : '')."
"; $litime = ($limittime == 0 ? 1000 : $limittime); $func = ''; diff --git a/src/system/libraries/statistics.class.php b/src/system/libraries/statistics.class.php index 96ffd129..378d0fc7 100644 --- a/src/system/libraries/statistics.class.php +++ b/src/system/libraries/statistics.class.php @@ -57,7 +57,31 @@ class DedeStatistics { return << -1) || (ua.indexOf('Trident/') > -1)) { + ms_ie = true; + } + if (ms_ie) { + var xhr; + if (window.XMLHttpRequest) { + xhr = new XMLHttpRequest(); + } else if (window.ActiveXObject) { // IE + try { + xhr = new ActiveXObject('Msxml2.XMLHTTP'); + } catch (e) { + try { + xhr = new ActiveXObject('Microsoft.XMLHTTP'); + } catch (e) {} + } + } + if (xhr) { + xhr.open('GET', u, true); + xhr.send(null); + } + } else { + fetch(u); + } })(); EOT; }