Skip to content

Commit f3ee646

Browse files
loskaelloskael
committed
update target
1 parent 492793b commit f3ee646

3 files changed

Lines changed: 63 additions & 46 deletions

File tree

‎static/entry.log.js‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2495,52 +2495,56 @@ webpackJsonp([6],{
24952495
break;
24962496
}
24972497

2498+
if (_.isArray(it[i].target)) {
2499+
it[i].target = it[i].target[0];
2500+
}
2501+
24982502
var isHtml = /^.+?\.html\??/.test(it[i].target);
24992503
var _target = it[i]._target = (it[i].target || it[i].url || '').replace(/\)/g, '');
25002504
;
2501-
__p += '\r\n<tr id="tr-' +
2505+
__p += '\n<tr id="tr-' +
25022506
((__t = (i + 1 + opt.startIndex)) == null ? '' : __t) +
2503-
'">\r\n <td class="td-1 info-type-' +
2507+
'">\n <td class="td-1 info-type-' +
25042508
((__t = (type)) == null ? '' : __t) +
25052509
'">' +
25062510
((__t = (i + 1 + opt.startIndex)) == null ? '' : __t) +
2507-
'</td>\r\n <td class="td-2">' +
2511+
'</td>\n <td class="td-2">' +
25082512
((__t = ( _.formatDate(new Date(it[i].date) , 'YYYY-MM-DD hh:mm:ss') )) == null ? '' : __t) +
2509-
'</td>\r\n <td style="" class="td-3">' +
2513+
'</td>\n <td style="" class="td-3">' +
25102514
((__t = ( opt.encodeHtml(it[i].msg) )) == null ? '' : __t) +
2511-
'</td>\r\n <td class="td-4">' +
2515+
'</td>\n <td class="td-4">' +
25122516
((__t = ( opt.encodeHtml(it[i].uin == 'NaN' ? '-' : it[i].uin ))) == null ? '' : __t) +
2513-
'</td>\r\n <td class="td-5">' +
2517+
'</td>\n <td class="td-5">' +
25142518
((__t = (it[i].ip )) == null ? '' : __t) +
2515-
'</td>\r\n <td class="td-6"><span class="ico-browser ' +
2516-
((__t = ( getBrowserType(it[i].userAgent))) == null ? '' : __t) +
2517-
'" title="' +
2519+
'</td>\n <td class="td-6">\n <span\n class="ico-browser ' +
2520+
((__t = (getBrowserType(it[i].userAgent))) == null ? '' : __t) +
2521+
'"\n title="' +
25182522
((__t = (it[i].userAgent)) == null ? '' : __t) +
2519-
'"></span></td>\r\n <td class="td-7">\r\n <a\r\n style="word-break:break-all;display:block"\r\n href="' +
2523+
'"\n ></span>\n </td>\n <td class="td-7">\n <a\n style="word-break:break-all;display:block"\n href="' +
25202524
((__t = ( opt.encodeHtml(_target))) == null ? '' : __t) +
2521-
'"\r\n target="_blank"\r\n data-event-click="showSource"\r\n data-event-data="' +
2525+
'"\n target="_blank"\n data-event-click="showSource"\n data-event-data="' +
25222526
((__t = (opt.set(it[i]))) == null ? '' : __t) +
2523-
'"\r\n >\r\n ' +
2527+
'"\n >\n ' +
25242528
((__t = (opt.encodeHtml(_target))) == null ? '' : __t) +
2525-
'\r\n <span\r\n class="err-where"\r\n style="height:24px;line-height:24px;border-radius:3px"\r\n >\r\n ' +
2529+
'\n <span\n class="err-where"\n style="height:24px;line-height:24px;border-radius:3px"\n >\n ' +
25262530
((__t = (opt.encodeHtml(it[i].rowNum || 0))) == null ? '' : __t) +
2527-
'行\r\n ' +
2531+
'行\n ' +
25282532
((__t = (opt.encodeHtml(it[i].colNum || 0))) == null ? '' : __t) +
2529-
'列\r\n </span>\r\n </a>\r\n <a\r\n class="source_page_link"\r\n style="font-size:12px"\r\n target="_blank"\r\n href="' +
2533+
'列\n </span>\n </a>\n <a\n class="source_page_link"\n style="font-size:12px"\n target="_blank"\n href="' +
25302534
((__t = (sourcePage(it[i], 'href', opt))) == null ? '' : __t) +
2531-
'"\r\n data-viewtext="' +
2535+
'"\n data-viewtext="' +
25322536
((__t = (sourcePage(it[i], 'viewtext', opt))) == null ? '' : __t) +
2533-
'"\r\n data-viewlink="' +
2537+
'"\n data-viewlink="' +
25342538
((__t = (sourcePage(it[i], 'viewlink', opt))) == null ? '' : __t) +
2535-
'"\r\n >' +
2539+
'"\n >' +
25362540
((__t = (sourcePage(it[i], 'view', opt))) == null ? '' : __t) +
2537-
'</a>\r\n </td>\r\n</tr>\r\n';
2541+
'</a>\n </td>\n</tr>\n';
25382542
} ;
2539-
__p += '\r\n\r\n';
2543+
__p += '\n\n';
25402544
if(it.length === 0 ){;
2541-
__p += '\r\n<td colspan="7" style="\r\n text-align: center;\r\n background: rgb(221, 221, 221);\r\n">无更多数据</td>\r\n';
2545+
__p += '\n<td colspan="7" style="\n text-align: center;\n background: rgb(221, 221, 221);\n">无更多数据</td>\n';
25422546
};
2543-
2547+
__p += '\n';
25442548

25452549
}
25462550
return __p

‎static/entry.realtime.js‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -370,52 +370,56 @@ webpackJsonp([8],{
370370
break;
371371
}
372372

373+
if (_.isArray(it[i].target)) {
374+
it[i].target = it[i].target[0];
375+
}
376+
373377
var isHtml = /^.+?\.html\??/.test(it[i].target);
374378
var _target = it[i]._target = (it[i].target || it[i].url || '').replace(/\)/g, '');
375379
;
376-
__p += '\r\n<tr id="tr-' +
380+
__p += '\n<tr id="tr-' +
377381
((__t = (i + 1 + opt.startIndex)) == null ? '' : __t) +
378-
'">\r\n <td class="td-1 info-type-' +
382+
'">\n <td class="td-1 info-type-' +
379383
((__t = (type)) == null ? '' : __t) +
380384
'">' +
381385
((__t = (i + 1 + opt.startIndex)) == null ? '' : __t) +
382-
'</td>\r\n <td class="td-2">' +
386+
'</td>\n <td class="td-2">' +
383387
((__t = ( _.formatDate(new Date(it[i].date) , 'YYYY-MM-DD hh:mm:ss') )) == null ? '' : __t) +
384-
'</td>\r\n <td style="" class="td-3">' +
388+
'</td>\n <td style="" class="td-3">' +
385389
((__t = ( opt.encodeHtml(it[i].msg) )) == null ? '' : __t) +
386-
'</td>\r\n <td class="td-4">' +
390+
'</td>\n <td class="td-4">' +
387391
((__t = ( opt.encodeHtml(it[i].uin == 'NaN' ? '-' : it[i].uin ))) == null ? '' : __t) +
388-
'</td>\r\n <td class="td-5">' +
392+
'</td>\n <td class="td-5">' +
389393
((__t = (it[i].ip )) == null ? '' : __t) +
390-
'</td>\r\n <td class="td-6"><span class="ico-browser ' +
391-
((__t = ( getBrowserType(it[i].userAgent))) == null ? '' : __t) +
392-
'" title="' +
394+
'</td>\n <td class="td-6">\n <span\n class="ico-browser ' +
395+
((__t = (getBrowserType(it[i].userAgent))) == null ? '' : __t) +
396+
'"\n title="' +
393397
((__t = (it[i].userAgent)) == null ? '' : __t) +
394-
'"></span></td>\r\n <td class="td-7">\r\n <a\r\n style="word-break:break-all;display:block"\r\n href="' +
398+
'"\n ></span>\n </td>\n <td class="td-7">\n <a\n style="word-break:break-all;display:block"\n href="' +
395399
((__t = ( opt.encodeHtml(_target))) == null ? '' : __t) +
396-
'"\r\n target="_blank"\r\n data-event-click="showSource"\r\n data-event-data="' +
400+
'"\n target="_blank"\n data-event-click="showSource"\n data-event-data="' +
397401
((__t = (opt.set(it[i]))) == null ? '' : __t) +
398-
'"\r\n >\r\n ' +
402+
'"\n >\n ' +
399403
((__t = (opt.encodeHtml(_target))) == null ? '' : __t) +
400-
'\r\n <span\r\n class="err-where"\r\n style="height:24px;line-height:24px;border-radius:3px"\r\n >\r\n ' +
404+
'\n <span\n class="err-where"\n style="height:24px;line-height:24px;border-radius:3px"\n >\n ' +
401405
((__t = (opt.encodeHtml(it[i].rowNum || 0))) == null ? '' : __t) +
402-
'行\r\n ' +
406+
'行\n ' +
403407
((__t = (opt.encodeHtml(it[i].colNum || 0))) == null ? '' : __t) +
404-
'列\r\n </span>\r\n </a>\r\n <a\r\n class="source_page_link"\r\n style="font-size:12px"\r\n target="_blank"\r\n href="' +
408+
'列\n </span>\n </a>\n <a\n class="source_page_link"\n style="font-size:12px"\n target="_blank"\n href="' +
405409
((__t = (sourcePage(it[i], 'href', opt))) == null ? '' : __t) +
406-
'"\r\n data-viewtext="' +
410+
'"\n data-viewtext="' +
407411
((__t = (sourcePage(it[i], 'viewtext', opt))) == null ? '' : __t) +
408-
'"\r\n data-viewlink="' +
412+
'"\n data-viewlink="' +
409413
((__t = (sourcePage(it[i], 'viewlink', opt))) == null ? '' : __t) +
410-
'"\r\n >' +
414+
'"\n >' +
411415
((__t = (sourcePage(it[i], 'view', opt))) == null ? '' : __t) +
412-
'</a>\r\n </td>\r\n</tr>\r\n';
416+
'</a>\n </td>\n</tr>\n';
413417
} ;
414-
__p += '\r\n\r\n';
418+
__p += '\n\n';
415419
if(it.length === 0 ){;
416-
__p += '\r\n<td colspan="7" style="\r\n text-align: center;\r\n background: rgb(221, 221, 221);\r\n">无更多数据</td>\r\n';
420+
__p += '\n<td colspan="7" style="\n text-align: center;\n background: rgb(221, 221, 221);\n">无更多数据</td>\n';
417421
};
418-
422+
__p += '\n';
419423

420424
}
421425
return __p

‎static/module/log/template/logTable.ejs‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ for (var i = 0 , l = it.length, type = ''; i < l; i++) {
7373
break;
7474
}
7575
76+
if (_.isArray(it[i].target)) {
77+
it[i].target = it[i].target[0];
78+
}
79+
7680
var isHtml = /^.+?\.html\??/.test(it[i].target);
7781
var _target = it[i]._target = (it[i].target || it[i].url || '').replace(/\)/g, '');
7882
%>
@@ -82,7 +86,12 @@ for (var i = 0 , l = it.length, type = ''; i < l; i++) {
8286
<td style="" class="td-3"><%= opt.encodeHtml(it[i].msg) %></td>
8387
<td class="td-4"><%= opt.encodeHtml(it[i].uin == 'NaN' ? '-' : it[i].uin )%></td>
8488
<td class="td-5"><%=it[i].ip %></td>
85-
<td class="td-6"><span class="ico-browser <%= getBrowserType(it[i].userAgent)%>" title="<%=it[i].userAgent%>"></span></td>
89+
<td class="td-6">
90+
<span
91+
class="ico-browser <%=getBrowserType(it[i].userAgent)%>"
92+
title="<%=it[i].userAgent%>"
93+
></span>
94+
</td>
8695
<td class="td-7">
8796
<a
8897
style="word-break:break-all;display:block"
@@ -117,4 +126,4 @@ for (var i = 0 , l = it.length, type = ''; i < l; i++) {
117126
text-align: center;
118127
background: rgb(221, 221, 221);
119128
">无更多数据</td>
120-
<%}%>
129+
<%}%>

0 commit comments

Comments
 (0)