blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

代码整理

Browse Source
This commit is contained in:
Anyon 2020-07-08 10:14:58 +08:00
parent 3f5fc57c55
commit 60a59b1601
2 changed files with 235 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

463
app/admin/view/error.tpl
View File

@ -13,80 +13,80 @@ if (!function_exists('parse_class')) {
{ {
$names = explode('\\', $name); $names = explode('\\', $name);
return '<abbr title="' . $name . '">' . end($names) . '</abbr>'; return '<abbr title="' . $name . '">' . end($names) . '</abbr>';
} }
} }
if (!function_exists('parse_file')) { if (!function_exists('parse_file')) {
function parse_file($file, $line) function parse_file($file, $line)
{ {
return '<a class="toggle" title="' . "{$file} line {$line}" . '">' . basename($file) . " line {$line}" . '</a>'; return '<a class="toggle" title="' . "{$file} line {$line}" . '">' . basename($file) . " line {$line}" . '</a>';
} }
} }
if (!function_exists('parse_args')) { if (!function_exists('parse_args')) {
function parse_args($args) function parse_args($args)
{ {
$result = []; $result = [];
foreach ($args as $key => $item) { foreach ($args as $key => $item) {
switch (true) { switch (true) {
case is_object($item): case is_object($item):
$value = sprintf('<em>object</em>(%s)', parse_class(get_class($item))); $value = sprintf('<em>object</em>(%s)', parse_class(get_class($item)));
break; break;
case is_array($item): case is_array($item):
if (count($item) > 3) { if (count($item) > 3) {
$value = sprintf('[%s, ...]', parse_args(array_slice($item, 0, 3))); $value = sprintf('[%s, ...]', parse_args(array_slice($item, 0, 3)));
} else { } else {
$value = sprintf('[%s]', parse_args($item)); $value = sprintf('[%s]', parse_args($item));
} }
break; break;
case is_string($item): case is_string($item):
if (strlen($item) > 20) { if (strlen($item) > 20) {
$value = sprintf( $value = sprintf(
'\'<a class="toggle" title="%s">%s...</a>\'', '\'<a class="toggle" title="%s">%s...</a>\'',
htmlentities($item), htmlentities($item),
htmlentities(substr($item, 0, 20)) htmlentities(substr($item, 0, 20))
); );
} else { } else {
$value = sprintf("'%s'", htmlentities($item)); $value = sprintf("'%s'", htmlentities($item));
} }
break; break;
case is_int($item): case is_int($item):
case is_float($item): case is_float($item):
$value = $item; $value = $item;
break; break;
case is_null($item): case is_null($item):
$value = '<em>null</em>'; $value = '<em>null</em>';
break; break;
case is_bool($item): case is_bool($item):
$value = '<em>' . ($item ? 'true' : 'false') . '</em>'; $value = '<em>' . ($item ? 'true' : 'false') . '</em>';
break; break;
case is_resource($item): case is_resource($item):
$value = '<em>resource</em>'; $value = '<em>resource</em>';
break; break;
default: default:
$value = htmlentities(str_replace("\n", '', var_export(strval($item), true))); $value = htmlentities(str_replace("\n", '', var_export(strval($item), true)));
break; 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')) { if (!function_exists('echo_value')) {
function echo_value($val) function echo_value($val)
{ {
if (is_array($val) || is_object($val)) { if (is_array($val) || is_object($val)) {
echo htmlentities(json_encode($val, JSON_PRETTY_PRINT)); echo htmlentities(json_encode($val, JSON_PRETTY_PRINT));
} elseif (is_bool($val)) { } elseif (is_bool($val)) {
echo $val ? 'true' : 'false'; echo $val ? 'true' : 'false';
} elseif (is_scalar($val)) { } elseif (is_scalar($val)) {
echo htmlentities($val); echo htmlentities($val);
} else { } else {
echo 'Resource'; echo 'Resource';
} }
} }
} }
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
@ -161,8 +161,8 @@ echo 'Resource';
} }
.echo pre > pre { .echo pre > pre {
padding: 0;
margin: 0; margin: 0;
padding: 0;
} }
/* Exception Info */ /* Exception Info */
@ -171,11 +171,11 @@ echo 'Resource';
} }
.exception .message { .exception .message {
padding: 12px;
border: 1px solid #ddd; border: 1px solid #ddd;
border-bottom: 0 none; padding: 12px;
line-height: 18px;
font-size: 16px; font-size: 16px;
line-height: 18px;
border-bottom: 0 none;
border-top-left-radius: 4px; border-top-left-radius: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;
font-family: Consolas, "Liberation Mono", Courier, Verdana, "微软雅黑", serif; font-family: Consolas, "Liberation Mono", Courier, Verdana, "微软雅黑", serif;
@ -192,12 +192,10 @@ echo 'Resource';
} }
.exception .source-code { .exception .source-code {
padding: 6px;
border: 1px solid #ddd; border: 1px solid #ddd;
padding: 6px;
background: #f9f9f9;
overflow-x: auto; overflow-x: auto;
background: #f9f9f9;
} }
.exception .source-code pre { .exception .source-code pre {
@ -209,25 +207,24 @@ echo 'Resource';
color: #4288ce; color: #4288ce;
display: inline-block; display: inline-block;
min-width: 100%; min-width: 100%;
box-sizing: border-box;
font-size: 14px; font-size: 14px;
box-sizing: border-box;
font-family: "Century Gothic", Consolas, "Liberation Mono", Courier, Verdana, serif; font-family: "Century Gothic", Consolas, "Liberation Mono", Courier, Verdana, serif;
padding-left: < ? php echo (isset($ source) & & ! empty($ source)) ? parse_padding($ source): 40; padding-left: <?php echo (isset($source) && ! empty($source)) ? parse_padding($source): 40;?> px;
? > px;
} }
.exception .source-code pre li { .exception .source-code pre li {
border-left: 1px solid #ddd;
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
border-left: 1px solid #ddd;
} }
.exception .source-code pre code { .exception .source-code pre code {
color: #333; color: #333;
height: 100%; height: 100%;
font-size: 14px;
display: inline-block; display: inline-block;
border-left: 1px solid #fff; border-left: 1px solid #fff;
font-size: 14px;
font-family: Consolas, "Liberation Mono", Courier, Verdana, "微软雅黑", serif; font-family: Consolas, "Liberation Mono", Courier, Verdana, "微软雅黑", serif;
} }
@ -374,28 +371,37 @@ echo 'Resource';
</head> </head>
<body> <body>
<?php if (\think\facade\App::isDebug()) { ?> <?php if (\think\facade\App::isDebug()) { ?>
<?php foreach ($traces as $index => $trace) { ?> <?php if (isset($traces)) foreach ($traces as $index => $trace) { ?>
<div class="exception"> <div class="exception">
<div class="message"> <div class="message">
<div class="info"> <div class="info">
<div> <div>
<h2><?php echo "#{$index} [{$trace['code']}]" . sprintf('%s in %s', parse_class($trace['name']), parse_file($trace['file'], $trace['line'])); ?></h2> <h2><?php echo "#{$index} [{$trace['code']}]" . sprintf('%s in %s', parse_class($trace['name']), parse_file($trace['file'], $trace['line'])); ?></h2>
</div>
<div><h1><?php echo nl2br(htmlentities($trace['message'])); ?></h1></div>
</div>
</div> </div>
<div><h1><?php echo nl2br(htmlentities($trace['message'])); ?></h1></div> <?php if (!empty($trace['source'])) { ?>
</div> <div class="source-code">
</div> <pre class="prettyprint lang-php">
<?php if (!empty($trace['source'])) { ?> <?php
<div class="source-code"> echo "<ol start='{$trace['source']['first']}'>";
<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> foreach ((array)$trace['source']['source'] as $key => $value) {
</div> $class = " {$index}-" . ($key + $trace['source']['first']) . ($trace['line'] === $key + $trace['source']['first'] ? ' line-error' : '');
<?php } ?> echo "<li class='{$class}'><code>" . htmlentities($value) . "</code></li>";
<div class="trace"> }
<h2 data-expand="<?php echo 0 === $index ? '1' : '0'; ?>">Call Stack</h2> echo "</ol>";
<ol> ?>
<li><?php echo sprintf('in %s', parse_file($trace['file'], $trace['line'])); ?></li> </pre>
<?php foreach ((array)$trace['trace'] as $value) { ?> </div>
<li> <?php } ?>
<?php <div class="trace">
<h2 data-expand="<?php echo 0 === $index ? '1' : '0'; ?>">Call Stack</h2>
<ol>
<li><?php echo sprintf('in %s', parse_file($trace['file'], $trace['line'])); ?></li>
<?php foreach ((array)$trace['trace'] as $value) { ?>
<li>
<?php
// Show Function // Show Function
if ($value['function']) { if ($value['function']) {
echo sprintf( echo sprintf(
@ -406,169 +412,154 @@ echo 'Resource';
isset($value['args']) ? parse_args($value['args']) : '' isset($value['args']) ? parse_args($value['args']) : ''
); );
} }
// Show line // Show line
if (isset($value['file']) && isset($value['line'])) { if (isset($value['file']) && isset($value['line'])) {
echo sprintf(' in %s', parse_file($value['file'], $value['line'])); echo sprintf(' in %s', parse_file($value['file'], $value['line']));
} }
?> ?>
</li> </li>
<?php } ?> <?php } ?>
</ol> </ol>
</div> </div>
</div> </div>
<?php } ?> <?php } ?>
<?php } else { ?> <?php } else { ?>
<div class="exception"> <div class="exception">
<div class="info"><h1><?php echo htmlentities($message); ?></h1></div> <div class="info"><h1><?php echo htmlentities($message); ?></h1></div>
</div> </div>
<?php } ?> <?php } ?>
<?php if (!empty($datas)) { ?> <?php if (!empty($datas)) { ?>
<div class="exception-var"> <div class="exception-var">
<h2>Exception Datas</h2> <h2>Exception Datas</h2>
<?php foreach ((array)$datas as $label => $value) { ?> <?php foreach ((array)$datas as $label => $value) { ?>
<table> <table>
<?php if (empty($value)) { ?> <?php if (empty($value)) { ?>
<caption><?php echo $label; ?><small>empty</small></caption> <caption><?php echo $label; ?><small>empty</small></caption>
<?php } else { ?> <?php } else { ?>
<caption><?php echo $label; ?></caption> <caption><?php echo $label; ?></caption>
<tbody> <tbody>
<?php foreach ((array)$value as $key => $val) { ?> <?php foreach ((array)$value as $key => $val) { ?>
<tr> <tr>
<td><?php echo htmlentities($key); ?></td> <td><?php echo htmlentities($key); ?></td>
<td><?php echo_value($val); ?></td> <td><?php echo_value($val); ?></td>
</tr> </tr>
<?php } ?>
</tbody>
<?php } ?>
</table>
<?php } ?> <?php } ?>
</tbody> </div>
<?php } ?>
</table>
<?php } ?>
</div>
<?php } ?> <?php } ?>
<?php if (!empty($tables)) { ?> <?php if (!empty($tables)) { ?>
<div class="exception-var"> <div class="exception-var">
<h2>Environment Variables</h2> <h2>Environment Variables</h2>
<?php foreach ((array)$tables as $label => $value) { ?> <?php foreach ((array)$tables as $label => $value) { ?>
<table> <table>
<?php if (empty($value)) { ?> <?php if (empty($value)) { ?>
<caption><?php echo $label; ?><small>empty</small></caption> <caption><?php echo $label; ?><small>empty</small></caption>
<?php } else { ?> <?php } else { ?>
<caption><?php echo $label; ?></caption> <caption><?php echo $label; ?></caption>
<tbody> <tbody>
<?php foreach ((array)$value as $key => $val) { ?> <?php foreach ((array)$value as $key => $val) { ?>
<tr> <tr>
<td><?php echo htmlentities($key); ?></td> <td><?php echo htmlentities($key); ?></td>
<td><?php echo_value($val); ?></td> <td><?php echo_value($val); ?></td>
</tr> </tr>
<?php } ?>
</tbody>
<?php } ?>
</table>
<?php } ?> <?php } ?>
</tbody> </div>
<?php } ?>
</table>
<?php } ?>
</div>
<?php } ?> <?php } ?>
<?php if (\think\facade\App::isDebug()) { ?> <?php if (\think\facade\App::isDebug()) { ?>
<script> <script>
function $(selector, node) { function $(selector, node) {
var elements; var elements;
node = node || document;
if (document.querySelectorAll) {
elements = node.querySelectorAll(selector);
} else {
switch (selector.substr(0, 1)) {
case '#':
elements = [node.getElementById(selector.substr(1))];
break;
case '.':
if (document.getElementsByClassName) {
elements = node.getElementsByClassName(selector.substr(1));
} else {
elements = get_elements_by_class(selector.substr(1), node);
}
break;
default:
elements = node.getElementsByTagName();
}
}
return elements;
function get_elements_by_class(search_class, node, tag) {
var elements = [], eles,
pattern = new RegExp('(^|\\s)' + search_class + '(\\s|$)');
node = node || document; node = node || document;
tag = tag || '*'; if (document.querySelectorAll) {
elements = node.querySelectorAll(selector);
eles = node.getElementsByTagName(tag); } else {
for (var i = 0; i < eles.length; i++) { switch (selector.substr(0, 1)) {
if (pattern.test(eles[i].className)) { case '#':
elements.push(eles[i]) elements = [node.getElementById(selector.substr(1))];
break;
case '.':
if (document.getElementsByClassName) {
elements = node.getElementsByClassName(selector.substr(1));
} else {
elements = get_elements_by_class(selector.substr(1), node);
}
break;
default:
elements = node.getElementsByTagName();
} }
} }
return elements; return elements;
}
}
$.getScript = function (src, func) { function get_elements_by_class(search_class, node, tag) {
var script = document.createElement('script'); var elements = [], eles, pattern = new RegExp('(^|\\s)' + search_class + '(\\s|$)');
node = node || document, tag = tag || '*', eles = node.getElementsByTagName(tag);
script.async = 'async'; for (var i = 0; i < eles.length; i++) {
script.src = src; if (pattern.test(eles[i].className)) {
script.onload = func || function () { elements.push(eles[i])
}; }
$('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];
expand = undefined === expand ? dom.attributes['data-expand'].value === '0' : undefined;
if (expand) {
dom.attributes['data-expand'].value = '1';
ol.style.display = 'none';
dom.innerText = 'Call Stack (展开)';
} else {
dom.attributes['data-expand'].value = '0';
ol.style.display = 'block';
dom.innerText = 'Call Stack (折叠)';
} }
}; return elements;
var traces = $('.trace');
for (var i = 0; i < traces.length; i++) {
var h2 = $('h2', traces[i])[0];
expand(h2);
h2.onclick = function () {
expand(this);
};
} }
})(); }
$.getScript('//cdn.bootcss.com/prettify/r298/prettify.min.js', function () { $.getScript = function (src, func) {
prettyPrint(); var script = document.createElement('script');
}); script.src = src;
})(); script.async = 'async';
</script> script.onload = func || function () {
};
$('head')[0].appendChild(script);
}
;(function () {
var files = $('.toggle');
// 短路径和长路径变换
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];
expand = undefined === expand ? dom.attributes['data-expand'].value === '0' : undefined;
if (expand) {
dom.attributes['data-expand'].value = '1';
ol.style.display = 'none';
dom.innerText = 'Call Stack (展开)';
} else {
dom.attributes['data-expand'].value = '0';
ol.style.display = 'block';
dom.innerText = 'Call Stack (折叠)';
}
};
var traces = $('.trace');
for (var i = 0; i < traces.length; i++) {
var h2 = $('h2', traces[i])[0];
expand(h2);
h2.onclick = function () {
expand(this);
};
}
})();
$.getScript('//cdn.bootcss.com/prettify/r298/prettify.min.js', function () {
prettyPrint();
});
})();
</script>
<?php } ?> <?php } ?>
</body> </body>
</html> </html>

20
public/static/admin.js
View File

@ -36,8 +36,8 @@ require.config({
'michat': ['plugs/michat/michat'], 'michat': ['plugs/michat/michat'],
'base64': ['plugs/jquery/base64.min'], 'base64': ['plugs/jquery/base64.min'],
'upload': [tapiRoot + '/api.upload?.js'], 'upload': [tapiRoot + '/api.upload?.js'],
'echarts': ['plugs/echarts/echarts.min'],
'angular': ['plugs/angular/angular.min'], 'angular': ['plugs/angular/angular.min'],
'echarts': ['plugs/echarts/echarts.min'],
'ckeditor': ['plugs/ckeditor/ckeditor'], 'ckeditor': ['plugs/ckeditor/ckeditor'],
'websocket': ['plugs/socket/websocket'], 'websocket': ['plugs/socket/websocket'],
'pcasunzips': ['plugs/jquery/pcasunzips'], 'pcasunzips': ['plugs/jquery/pcasunzips'],
@ -474,15 +474,14 @@ $(function () {
/*! 表单转JSON */ /*! 表单转JSON */
$.fn.formToJson = function () { $.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_]+$/}; var patterns = {"key": /[a-zA-Z0-9_]+|(?=\[\])/g, "push": /^$/, "fixed": /^\d+$/, "named": /^[a-zA-Z0-9_]+$/};
this.build = function (base, key, value) { this.build = function (base, key, value) {
base[key] = value; return (base[key] = value), base;
return base;
}; };
this.pushCounter = function (name) { this.pushCounter = function (name) {
if (pushCounters[name] === undefined) pushCounters[name] = 0; if (push[name] === undefined) push[name] = 0;
return pushCounters[name]++; return push[name]++;
}; };
$.each($(this).serializeArray(), function () { $.each($(this).serializeArray(), function () {
var key, keys = this.name.match(patterns.key), merge = this.value, name = this.name; 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 () { $body.on('click', '[data-check-target]', function () {
var checked = !!this.checked; var checked = !!this.checked;
$($(this).attr('data-check-target')).map(function () { $($(this).attr('data-check-target')).map(function () {
this.checked = checked; (this.checked = checked), $(this).trigger('change');
$(this).trigger('change');
}); });
}); });
@ -642,8 +640,7 @@ $(function () {
data[attrs[i].split('#')[0]] = attrs[i].split('#')[1]; data[attrs[i].split('#')[0]] = attrs[i].split('#')[1];
} }
that.callback = function (ret) { that.callback = function (ret) {
$this.css('border', (ret && ret.code) ? '1px solid #e6e6e6' : '1px solid red'); return $this.css('border', (ret && ret.code) ? '1px solid #e6e6e6' : '1px solid red'), false;
return false;
}; };
data['_token_'] = $this.attr('data-token') || $this.attr('data-csrf') || '--'; data['_token_'] = $this.attr('data-token') || $this.attr('data-csrf') || '--';
if (!confirm) return $.form.load(action, data, method, that.callback, load, tips, time); 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) { $body.on('click', '[data-history-back]', function (title) {
title = this.getAttribute('data-history-back') || '确定要返回上一页吗？'; title = this.getAttribute('data-history-back') || '确定要返回上一页吗？';
$.msg.confirm(title, function (index) { $.msg.confirm(title, function (index) {
history.back(); history.back(), $.msg.close(index);
$.msg.close(index);
}) })
}); });