diff --git a/app/admin/view/error.tpl b/app/admin/view/error.tpl index 53daea770..c0516caa2 100644 --- a/app/admin/view/error.tpl +++ b/app/admin/view/error.tpl @@ -13,80 +13,80 @@ if (!function_exists('parse_class')) { { $names = explode('\\', $name); return '' . end($names) . ''; -} + } } if (!function_exists('parse_file')) { -function parse_file($file, $line) -{ -return '' . basename($file) . " line {$line}" . ''; -} + function parse_file($file, $line) + { + return '' . basename($file) . " line {$line}" . ''; + } } if (!function_exists('parse_args')) { -function parse_args($args) -{ -$result = []; -foreach ($args as $key => $item) { -switch (true) { -case is_object($item): -$value = sprintf('object(%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( -'\'%s...\'', -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 = 'null'; -break; -case is_bool($item): -$value = '' . ($item ? 'true' : 'false') . ''; -break; -case is_resource($item): -$value = 'resource'; -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('object(%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( + '\'%s...\'', + 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 = 'null'; + break; + case is_bool($item): + $value = '' . ($item ? 'true' : 'false') . ''; + break; + case is_resource($item): + $value = 'resource'; + 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'; + } + } } ?> @@ -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: 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,28 +371,37 @@ echo 'Resource'; - $trace) { ?> -
-
-
-
-

+ $trace) { ?> +
+
+
+
+

+
+

+
-

-
-
- -
- 
     $value) { ?>
  1. ">
-
- -
-

Call Stack

-
    -
    2. - -
  2. - +
    + 
    +                        ";
+                        foreach ((array)$trace['source']['source'] as $key => $value) {
+                            $class = " {$index}-" . ($key + $trace['source']['first']) . ($trace['line'] === $key + $trace['source']['first'] ? ' line-error' : '');
+                            echo "
  3. " . htmlentities($value) . "
    4. ";
+                        }
+                        echo "
"; + ?> + +
+ +
+

Call Stack

+
    +
    2. + +
  2. + -
    3. - -
-
-
- + + + +
+
+ -
-

-
+
+

+
-
-

Exception Datas

- $value) { ?> - - - - - - - $val) { ?> - - - - +
+

Exception Datas

+ $value) { ?> +
empty
+ + + + + + $val) { ?> + + + + + + + +
empty
- - - - -
+ -
-

Environment Variables

- $value) { ?> - - - - - - - $val) { ?> - - - - +
+

Environment Variables

+ $value) { ?> +
empty
+ + + + + + $val) { ?> + + + + + + + +
empty
- - - - -
+ - + $.getScript = function (src, func) { + var script = document.createElement('script'); + script.src = src; + script.async = 'async'; + 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(); + }); + })(); + diff --git a/public/static/admin.js b/public/static/admin.js index 7a6a25a53..e2dcb3d4d 100644 --- a/public/static/admin.js +++ b/public/static/admin.js @@ -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); }) });