diff --git a/app/admin/controller/api/Queue.php b/app/admin/controller/api/Queue.php index 36def8b6a..ebec73e5d 100644 --- a/app/admin/controller/api/Queue.php +++ b/app/admin/controller/api/Queue.php @@ -1,13 +1,34 @@ _vali(['code.require' => '任务编号不能为空!']); diff --git a/public/static/admin.js b/public/static/admin.js index 81a29a673..361eeec11 100644 --- a/public/static/admin.js +++ b/public/static/admin.js @@ -788,7 +788,9 @@ $(function () { this.lines = []; for (this.i in lines) { this.line = lines[this.i], this.percent = '[ ' + this.line.progress + '% ] '; - this.lines.push(this.line.message.indexOf('>>>') > -1 ? this.line.message : this.percent + this.line.message); + if (this.line.message.indexOf('javascript:') === -1) { + this.lines.push(this.line.message.indexOf('>>>') > -1 ? this.line.message : this.percent + this.line.message); + } } that.$area.val(this.lines.join("\n")), that.$area.animate({scrollTop: that.$area[0].scrollHeight + 'px'}, 200); })(ret.data.history);