mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-06 03:58:04 +08:00
代码整理
This commit is contained in:
Anyon
parent
3f5fc57c55
commit
60a59b1601
@ -13,80 +13,80 @@ if (!function_exists('parse_class')) {
|
||||
{
|
||||
$names = explode('\\', $name);
|
||||
return '<abbr title="' . $name . '">' . end($names) . '</abbr>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!function_exists('parse_file')) {
|
||||
function parse_file($file, $line)
|
||||
{
|
||||
return '<a class="toggle" title="' . "{$file} line {$line}" . '">' . basename($file) . " line {$line}" . '</a>';
|
||||
}
|
||||
function parse_file($file, $line)
|
||||
{
|
||||
return '<a class="toggle" title="' . "{$file} line {$line}" . '">' . basename($file) . " line {$line}" . '</a>';
|
||||
}
|
||||
}
|
||||
|
||||
if (!function_exists('parse_args')) {
|
||||
function parse_args($args)
|
||||
{
|
||||
$result = [];
|
||||
foreach ($args as $key => $item) {
|
||||
switch (true) {
|
||||
case is_object($item):
|
||||
$value = sprintf('<em>object</em>(%s)', parse_class(get_class($item)));
|
||||
break;
|
||||
case is_array($item):
|
||||
if (count($item) > 3) {
|
||||
$value = sprintf('[%s, ...]', parse_args(array_slice($item, 0, 3)));
|
||||
} else {
|
||||
$value = sprintf('[%s]', parse_args($item));
|
||||
}
|
||||
break;
|
||||
case is_string($item):
|
||||
if (strlen($item) > 20) {
|
||||
$value = sprintf(
|
||||
'\'<a class="toggle" title="%s">%s...</a>\'',
|
||||
htmlentities($item),
|
||||
htmlentities(substr($item, 0, 20))
|
||||
);
|
||||
} else {
|
||||
$value = sprintf("'%s'", htmlentities($item));
|
||||
}
|
||||
break;
|
||||
case is_int($item):
|
||||
case is_float($item):
|
||||
$value = $item;
|
||||
break;
|
||||
case is_null($item):
|
||||
$value = '<em>null</em>';
|
||||
break;
|
||||
case is_bool($item):
|
||||
$value = '<em>' . ($item ? 'true' : 'false') . '</em>';
|
||||
break;
|
||||
case is_resource($item):
|
||||
$value = '<em>resource</em>';
|
||||
break;
|
||||
default:
|
||||
$value = htmlentities(str_replace("\n", '', var_export(strval($item), true)));
|
||||
break;
|
||||
}
|
||||
function parse_args($args)
|
||||
{
|
||||
$result = [];
|
||||
foreach ($args as $key => $item) {
|
||||
switch (true) {
|
||||
case is_object($item):
|
||||
$value = sprintf('<em>object</em>(%s)', parse_class(get_class($item)));
|
||||
break;
|
||||
case is_array($item):
|
||||
if (count($item) > 3) {
|
||||
$value = sprintf('[%s, ...]', parse_args(array_slice($item, 0, 3)));
|
||||
} else {
|
||||
$value = sprintf('[%s]', parse_args($item));
|
||||
}
|
||||
break;
|
||||
case is_string($item):
|
||||
if (strlen($item) > 20) {
|
||||
$value = sprintf(
|
||||
'\'<a class="toggle" title="%s">%s...</a>\'',
|
||||
htmlentities($item),
|
||||
htmlentities(substr($item, 0, 20))
|
||||
);
|
||||
} else {
|
||||
$value = sprintf("'%s'", htmlentities($item));
|
||||
}
|
||||
break;
|
||||
case is_int($item):
|
||||
case is_float($item):
|
||||
$value = $item;
|
||||
break;
|
||||
case is_null($item):
|
||||
$value = '<em>null</em>';
|
||||
break;
|
||||
case is_bool($item):
|
||||
$value = '<em>' . ($item ? 'true' : 'false') . '</em>';
|
||||
break;
|
||||
case is_resource($item):
|
||||
$value = '<em>resource</em>';
|
||||
break;
|
||||
default:
|
||||
$value = htmlentities(str_replace("\n", '', var_export(strval($item), true)));
|
||||
break;
|
||||
}
|
||||
|
||||
$result[] = is_int($key) ? $value : "'{$key}' => {$value}";
|
||||
}
|
||||
$result[] = is_int($key) ? $value : "'{$key}' => {$value}";
|
||||
}
|
||||
|
||||
return implode(', ', $result);
|
||||
}
|
||||
return implode(', ', $result);
|
||||
}
|
||||
}
|
||||
if (!function_exists('echo_value')) {
|
||||
function echo_value($val)
|
||||
{
|
||||
if (is_array($val) || is_object($val)) {
|
||||
echo htmlentities(json_encode($val, JSON_PRETTY_PRINT));
|
||||
} elseif (is_bool($val)) {
|
||||
echo $val ? 'true' : 'false';
|
||||
} elseif (is_scalar($val)) {
|
||||
echo htmlentities($val);
|
||||
} else {
|
||||
echo 'Resource';
|
||||
}
|
||||
}
|
||||
function echo_value($val)
|
||||
{
|
||||
if (is_array($val) || is_object($val)) {
|
||||
echo htmlentities(json_encode($val, JSON_PRETTY_PRINT));
|
||||
} elseif (is_bool($val)) {
|
||||
echo $val ? 'true' : 'false';
|
||||
} elseif (is_scalar($val)) {
|
||||
echo htmlentities($val);
|
||||
} else {
|
||||
echo 'Resource';
|
||||
}
|
||||
}
|
||||
}
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
@ -161,8 +161,8 @@ echo 'Resource';
|
||||
}
|
||||
|
||||
.echo pre > pre {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/* Exception Info */
|
||||
@ -171,11 +171,11 @@ echo 'Resource';
|
||||
}
|
||||
|
||||
.exception .message {
|
||||
padding: 12px;
|
||||
border: 1px solid #ddd;
|
||||
border-bottom: 0 none;
|
||||
line-height: 18px;
|
||||
padding: 12px;
|
||||
font-size: 16px;
|
||||
line-height: 18px;
|
||||
border-bottom: 0 none;
|
||||
border-top-left-radius: 4px;
|
||||
border-top-right-radius: 4px;
|
||||
font-family: Consolas, "Liberation Mono", Courier, Verdana, "微软雅黑", serif;
|
||||
@ -192,12 +192,10 @@ echo 'Resource';
|
||||
}
|
||||
|
||||
.exception .source-code {
|
||||
padding: 6px;
|
||||
border: 1px solid #ddd;
|
||||
|
||||
background: #f9f9f9;
|
||||
padding: 6px;
|
||||
overflow-x: auto;
|
||||
|
||||
background: #f9f9f9;
|
||||
}
|
||||
|
||||
.exception .source-code pre {
|
||||
@ -209,25 +207,24 @@ echo 'Resource';
|
||||
color: #4288ce;
|
||||
display: inline-block;
|
||||
min-width: 100%;
|
||||
box-sizing: border-box;
|
||||
font-size: 14px;
|
||||
box-sizing: border-box;
|
||||
font-family: "Century Gothic", Consolas, "Liberation Mono", Courier, Verdana, serif;
|
||||
padding-left: < ? php echo (isset($ source) & & ! empty($ source)) ? parse_padding($ source): 40;
|
||||
? > px;
|
||||
padding-left: <?php echo (isset($source) && ! empty($source)) ? parse_padding($source): 40;?> px;
|
||||
}
|
||||
|
||||
.exception .source-code pre li {
|
||||
border-left: 1px solid #ddd;
|
||||
height: 18px;
|
||||
line-height: 18px;
|
||||
border-left: 1px solid #ddd;
|
||||
}
|
||||
|
||||
.exception .source-code pre code {
|
||||
color: #333;
|
||||
height: 100%;
|
||||
font-size: 14px;
|
||||
display: inline-block;
|
||||
border-left: 1px solid #fff;
|
||||
font-size: 14px;
|
||||
font-family: Consolas, "Liberation Mono", Courier, Verdana, "微软雅黑", serif;
|
||||
}
|
||||
|
||||
@ -374,8 +371,8 @@ echo 'Resource';
|
||||
</head>
|
||||
<body>
|
||||
<?php if (\think\facade\App::isDebug()) { ?>
|
||||
<?php foreach ($traces as $index => $trace) { ?>
|
||||
<div class="exception">
|
||||
<?php if (isset($traces)) foreach ($traces as $index => $trace) { ?>
|
||||
<div class="exception">
|
||||
<div class="message">
|
||||
<div class="info">
|
||||
<div>
|
||||
@ -386,7 +383,16 @@ echo 'Resource';
|
||||
</div>
|
||||
<?php if (!empty($trace['source'])) { ?>
|
||||
<div class="source-code">
|
||||
<pre class="prettyprint lang-php"><ol start="<?php echo $trace['source']['first']; ?>"><?php foreach ((array)$trace['source']['source'] as $key => $value) { ?><li class="line-<?php echo " {$index}-" . ($key + $trace['source']['first']) . ($trace['line'] === $key + $trace['source']['first'] ? ' line-error' : ''); ?>"><code><?php echo htmlentities($value); ?></code></li><?php } ?></ol></pre>
|
||||
<pre class="prettyprint lang-php">
|
||||
<?php
|
||||
echo "<ol start='{$trace['source']['first']}'>";
|
||||
foreach ((array)$trace['source']['source'] as $key => $value) {
|
||||
$class = " {$index}-" . ($key + $trace['source']['first']) . ($trace['line'] === $key + $trace['source']['first'] ? ' line-error' : '');
|
||||
echo "<li class='{$class}'><code>" . htmlentities($value) . "</code></li>";
|
||||
}
|
||||
echo "</ol>";
|
||||
?>
|
||||
</pre>
|
||||
</div>
|
||||
<?php } ?>
|
||||
<div class="trace">
|
||||
@ -406,7 +412,6 @@ echo 'Resource';
|
||||
isset($value['args']) ? parse_args($value['args']) : ''
|
||||
);
|
||||
}
|
||||
|
||||
// Show line
|
||||
if (isset($value['file']) && isset($value['line'])) {
|
||||
echo sprintf(' in %s', parse_file($value['file'], $value['line']));
|
||||
@ -416,16 +421,16 @@ echo 'Resource';
|
||||
<?php } ?>
|
||||
</ol>
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
<?php } else { ?>
|
||||
<div class="exception">
|
||||
<div class="exception">
|
||||
<div class="info"><h1><?php echo htmlentities($message); ?></h1></div>
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php if (!empty($datas)) { ?>
|
||||
<div class="exception-var">
|
||||
<div class="exception-var">
|
||||
<h2>Exception Datas</h2>
|
||||
<?php foreach ((array)$datas as $label => $value) { ?>
|
||||
<table>
|
||||
@ -444,11 +449,11 @@ echo 'Resource';
|
||||
<?php } ?>
|
||||
</table>
|
||||
<?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php if (!empty($tables)) { ?>
|
||||
<div class="exception-var">
|
||||
<div class="exception-var">
|
||||
<h2>Environment Variables</h2>
|
||||
<?php foreach ((array)$tables as $label => $value) { ?>
|
||||
<table>
|
||||
@ -467,14 +472,13 @@ echo 'Resource';
|
||||
<?php } ?>
|
||||
</table>
|
||||
<?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php if (\think\facade\App::isDebug()) { ?>
|
||||
<script>
|
||||
<script>
|
||||
function $(selector, node) {
|
||||
var elements;
|
||||
|
||||
node = node || document;
|
||||
if (document.querySelectorAll) {
|
||||
elements = node.querySelectorAll(selector);
|
||||
@ -497,49 +501,36 @@ echo 'Resource';
|
||||
return elements;
|
||||
|
||||
function get_elements_by_class(search_class, node, tag) {
|
||||
var elements = [], eles,
|
||||
pattern = new RegExp('(^|\\s)' + search_class + '(\\s|$)');
|
||||
|
||||
node = node || document;
|
||||
tag = tag || '*';
|
||||
|
||||
eles = node.getElementsByTagName(tag);
|
||||
var elements = [], eles, pattern = new RegExp('(^|\\s)' + search_class + '(\\s|$)');
|
||||
node = node || document, tag = tag || '*', eles = node.getElementsByTagName(tag);
|
||||
for (var i = 0; i < eles.length; i++) {
|
||||
if (pattern.test(eles[i].className)) {
|
||||
elements.push(eles[i])
|
||||
}
|
||||
}
|
||||
|
||||
return elements;
|
||||
}
|
||||
}
|
||||
|
||||
$.getScript = function (src, func) {
|
||||
var script = document.createElement('script');
|
||||
|
||||
script.async = 'async';
|
||||
script.src = src;
|
||||
script.async = 'async';
|
||||
script.onload = func || function () {
|
||||
};
|
||||
|
||||
$('head')[0].appendChild(script);
|
||||
}
|
||||
|
||||
;(function () {
|
||||
var files = $('.toggle');
|
||||
var ol = $('ol', $('.prettyprint')[0]);
|
||||
var li = $('li', ol[0]);
|
||||
|
||||
// 短路径和长路径变换
|
||||
for (var i = 0; i < files.length; i++) {
|
||||
files[i].ondblclick = function () {
|
||||
var title = this.title;
|
||||
|
||||
this.title = this.innerHTML;
|
||||
this.innerHTML = title;
|
||||
}
|
||||
}
|
||||
|
||||
(function () {
|
||||
var expand = function (dom, expand) {
|
||||
var ol = $('ol', dom.parentNode)[0];
|
||||
@ -568,7 +559,7 @@ echo 'Resource';
|
||||
prettyPrint();
|
||||
});
|
||||
})();
|
||||
</script>
|
||||
</script>
|
||||
<?php } ?>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -36,8 +36,8 @@ require.config({
|
||||
'michat': ['plugs/michat/michat'],
|
||||
'base64': ['plugs/jquery/base64.min'],
|
||||
'upload': [tapiRoot + '/api.upload?.js'],
|
||||
'echarts': ['plugs/echarts/echarts.min'],
|
||||
'angular': ['plugs/angular/angular.min'],
|
||||
'echarts': ['plugs/echarts/echarts.min'],
|
||||
'ckeditor': ['plugs/ckeditor/ckeditor'],
|
||||
'websocket': ['plugs/socket/websocket'],
|
||||
'pcasunzips': ['plugs/jquery/pcasunzips'],
|
||||
@ -474,15 +474,14 @@ $(function () {
|
||||
|
||||
/*! 表单转JSON */
|
||||
$.fn.formToJson = function () {
|
||||
var self = this, data = {}, pushCounters = {};
|
||||
var self = this, data = {}, push = {};
|
||||
var patterns = {"key": /[a-zA-Z0-9_]+|(?=\[\])/g, "push": /^$/, "fixed": /^\d+$/, "named": /^[a-zA-Z0-9_]+$/};
|
||||
this.build = function (base, key, value) {
|
||||
base[key] = value;
|
||||
return base;
|
||||
return (base[key] = value), base;
|
||||
};
|
||||
this.pushCounter = function (name) {
|
||||
if (pushCounters[name] === undefined) pushCounters[name] = 0;
|
||||
return pushCounters[name]++;
|
||||
if (push[name] === undefined) push[name] = 0;
|
||||
return push[name]++;
|
||||
};
|
||||
$.each($(this).serializeArray(), function () {
|
||||
var key, keys = this.name.match(patterns.key), merge = this.value, name = this.name;
|
||||
@ -601,8 +600,7 @@ $(function () {
|
||||
$body.on('click', '[data-check-target]', function () {
|
||||
var checked = !!this.checked;
|
||||
$($(this).attr('data-check-target')).map(function () {
|
||||
this.checked = checked;
|
||||
$(this).trigger('change');
|
||||
(this.checked = checked), $(this).trigger('change');
|
||||
});
|
||||
});
|
||||
|
||||
@ -642,8 +640,7 @@ $(function () {
|
||||
data[attrs[i].split('#')[0]] = attrs[i].split('#')[1];
|
||||
}
|
||||
that.callback = function (ret) {
|
||||
$this.css('border', (ret && ret.code) ? '1px solid #e6e6e6' : '1px solid red');
|
||||
return false;
|
||||
return $this.css('border', (ret && ret.code) ? '1px solid #e6e6e6' : '1px solid red'), false;
|
||||
};
|
||||
data['_token_'] = $this.attr('data-token') || $this.attr('data-csrf') || '--';
|
||||
if (!confirm) return $.form.load(action, data, method, that.callback, load, tips, time);
|
||||
@ -734,8 +731,7 @@ $(function () {
|
||||
$body.on('click', '[data-history-back]', function (title) {
|
||||
title = this.getAttribute('data-history-back') || '确定要返回上一页吗？';
|
||||
$.msg.confirm(title, function (index) {
|
||||
history.back();
|
||||
$.msg.close(index);
|
||||
history.back(), $.msg.close(index);
|
||||
})
|
||||
});
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user