Commit 22c7cb6c authored by guanghongwei's avatar guanghongwei

Merge branch 'dev' of ssh://172.10.10.9:2001/opt/jumpserver into dev

parents 24415f5b 931ac3dd
......@@ -74,6 +74,7 @@
//去除log中的颜色控制字符
var regx = /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/g;
tag.append('<p>'+escapeString(obj.content.replace(regx,''))+'</p>');
tag.animate({ scrollTop: tag[0].scrollHeight}, 1000);
});
return tag[0];
} ,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment