美化界面,修复bug

把最近merge进来的功能美化和完善了一下,顺便修复bug。
当前版本已支持:
1. 多行输入,文本框高度自动调节
2. AI回答途中可以随时打断
3. 增加了API_KEY被封禁和未提供API_KEY错误的提示
4. 增加了一些预设话术
5. 对手机浏览器进行了适配优化
6. 修复了AI回复内容包含某些代码时,显示效果异常的bug
pull/39/head
dirk1983 4 years ago
parent 3fe554bceb
commit b102e49c9f

File diff suppressed because it is too large Load Diff

@ -1,5 +1,4 @@
.logo-title {
line-height: 50px;
color: #fff;
text-decoration: none
}
@ -23,7 +22,7 @@
}
#article-wrapper {
height: calc(100vh - 280px);
height: calc(100vh - 178px);
overflow-y: auto;
border: 1px solid;
border-radius: var(--zhuluan-primary-border-radius);

@ -32,22 +32,6 @@ $type = "个人";
<link rel="stylesheet" href="css/common.css?v1.1">
<link rel="stylesheet" href="css/wenda.css?v1.1">
<link rel="stylesheet" href="css/hightlight.css">
<style>
#kw-target {
background-color: black;
color: white;
height: auto;
}
textarea {
height: auto;
min-height: 100px; /* 输入区域的最小高度 */
}
#fixed-block {
height: auto; /* 容器元素自适应高度 */
}
</style>
</head>
<body>
@ -66,19 +50,21 @@ $type = "个人";
<div class="container">
<article class="article" id="article">
<div class="article-box">
<div style="text-align: center;color:#9ca2a8">
采用最新的gpt-3.5-turbo模型,stream模式,秒回
</div>
<div class="precast-block" data-flex="main:left">
<!--
<div class="input-group">
<span style="text-align: center;color:#9ca2a8">&nbsp;&nbsp;API-KEY&nbsp;&nbsp;</span>
<input type="password" id="key" style="border:1px solid grey;display:block;max-width:270px;width:calc(100% - 70px);" onload="this.focus();">
</div>
-->
<div class="input-group">
<span style="text-align: center;color:#9ca2a8">&nbsp;&nbsp;连续对话:</span>
<input type="checkbox" id="keep" checked="" style="min-width:220px;">
<label for="keep"></label>
<span style="text-align: center;color:#9ca2a8">&nbsp;&nbsp;&nbsp;&nbsp;默认开启</span>
</div>
<div class="input-group">
<span style="text-align: center;color:#9ca2a8">&nbsp;&nbsp;选择预设话术:</span>
<select id="preset-text" onchange="insertPresetText()">
<span style="text-align: center;color:#9ca2a8">&nbsp;&nbsp;预设话术:</span>
<select id="preset-text" onchange="insertPresetText()" style="width:calc(100% - 90px);max-width:280px;">
<option value="">请选择</option>
<option value="我想让你充当 Linux 终端。我将输入命令,您将回复终端应显示的内容。我希望您只在一个唯一的代码块内回复终端输出,而不是其他任何内容。不要写解释。除非我指示您这样做,否则不要键入命令。当我需要用英语告诉你一些事情时,我会把文字放在中括号内[就像这样]。我的第一个命令是 pwd">充当 Linux 终端</option>
<option value="我希望你能担任英语翻译、拼写校对和修辞改进的角色。我会用任何语言和你交流,你会识别语言,将其翻译并用更为优美和精炼的英语回答我。请将我简单的词汇和句子替换成更为优美和高雅的表达方式,确保意思不变,但使其更具文学性。请仅回答更正和改进的部分,不要写解释。我的第一句话是“how are you ?”,请翻译它。">充当英语翻译和改进者</option>
@ -203,7 +189,7 @@ $type = "个人";
<div id="fixed-block">
<div class="precast-block" id="kw-target-box" data-flex="main:left cross:center">
<div id="target-box" class="box">
<textarea name="kw-target" placeholder="在此提问。电脑使用 Shift+Enter 换行,Enter发送。移动端输入法换行,点击页面按钮发送。" id="kw-target" autofocus rows="5"></textarea>
<textarea name="kw-target" placeholder="在此提问,按 Ctrl+Enter 发送" id="kw-target" autofocus rows=1></textarea>
</div>
<div class="right-btn layout-bar">
<p class="btn ai-btn bright-btn" id="ai-btn" data-flex="main:center cross:center"><i class="iconfont icon-wuguan"></i>发送</p>
@ -222,12 +208,7 @@ $type = "个人";
<script src="js/highlight.min.js"></script>
<script src="js/showdown.min.js"></script>
<script>
function insertPresetText() {
var select = document.getElementById("preset-text");
var text = select.options[select.selectedIndex].value;
document.getElementById("kw-target").value = text;
}
</script>
</body>
</html>
</html>

@ -11,57 +11,58 @@ function getCookie(name) {
return null;
}
$(document).ready(function () {
function insertPresetText() {
$("#kw-target").val($('#preset-text').val());
autoresize();
}
function autoresize() {
var textarea = $('#kw-target');
var width = textarea.width();
var content = (textarea.val() + "a").replace(/\\n/g, '<br>');
var div = $('<div>').css({
'position': 'absolute',
'top': '-99999px',
'border': '1px solid red',
'width': width,
'font-size': '15px',
'line-height': '20px',
'white-space': 'pre-wrap'
}).html(content).appendTo('body');
var height = div.height();
var rows = Math.ceil(height / 20);
div.remove();
textarea.attr('rows', rows);
$("#article-wrapper").height(parseInt($(window).height()) - parseInt($("#fixed-block").height()) - parseInt($(".layout-header").height()) - 80);
}
$("#kw-target").on('keydown', function (event) {
if (event.keyCode == 13 && !event.shiftKey) {
if(window.innerWidth <= 768){ // 假设宽度小于等于768px为移动设备
// 在移动设备上按下 Enter 键时触发 textarea 的换行功能
var content = this.value;
var caret = getCaret(this);
this.value = content.substring(0, caret) + "\n" + content.substring(caret);
setCaret(this, caret + 1);
$(document).ready(function () {
autoresize();
$("#kw-target").on('keydown', function (event) {
if (event.keyCode == 13 && event.ctrlKey) {
send_post();
return false;
}
send_post();
return false;
}
});
});
// 获取光标位置
function getCaret(el) {
if (el.selectionStart) {
return el.selectionStart;
} else if (document.selection) {
el.focus();
var r = document.selection.createRange();
if (r == null) {
return 0;
}
var re = el.createTextRange(), rc = re.duplicate();
re.moveToBookmark(r.getBookmark());
rc.setEndPoint('EndToStart', re);
return rc.text.length;
}
return 0;
}
$(window).resize(function () {
autoresize();
});
// 设置光标位置
function setCaret(el, pos) {
if (el.setSelectionRange) {
el.focus();
el.setSelectionRange(pos, pos);
} else if (el.createTextRange) {
var range = el.createTextRange();
range.collapse(true);
range.moveEnd('character', pos);
range.moveStart('character', pos);
range.select();
}
}
$('#kw-target').on('input', function () {
autoresize();
});
$("#ai-btn").click(function () {
send_post();
if ($("#kw-target").is(':disabled')) {
clearInterval(timer);
$("#kw-target").val("");
$("#kw-target").attr("disabled", false);
autoresize();
$("#ai-btn").html('<i class="iconfont icon-wuguan"></i>发送');
} else {
send_post();
}
return false;
});
$("#clean").click(function () {
@ -89,7 +90,7 @@ function setCaret(el, pos) {
return;
}
var loading = layer.msg('AI正在思考,请稍等...Processing', {
var loading = layer.msg('正在组织语言,请稍等片刻...', {
icon: 16,
shade: 0.4,
time: false //取消自动关闭
@ -108,13 +109,19 @@ function setCaret(el, pos) {
layer.msg("API-KEY不合法");
break;
case "context_length_exceeded":
layer.msg("问题和上下文长度超限,请重新提问。");
layer.msg("问题和上下文长度超限,请重新提问");
break;
case "rate_limit_reached":
layer.msg("同时访问用户过多,请稍后再试。");
layer.msg("同时访问用户过多,请稍后再试");
break;
case "access_terminated":
layer.msg("违规使用,API-KEY被封禁");
break;
case "no_api_key":
layer.msg("未提供API-KEY");
break;
case null:
layer.msg("OpenAI服务器访问超时。");
layer.msg("OpenAI服务器访问超时或未知类型错误");
break;
default:
layer.msg("OpenAI服务器故障,错误类型:" + errcode);
@ -127,6 +134,8 @@ function setCaret(el, pos) {
layer.close(loading);
$("#kw-target").val("请耐心等待AI把话说完……");
$("#kw-target").attr("disabled", true);
autoresize();
$("#ai-btn").html('<i class="iconfont icon-wuguan"></i>中止');
layer.msg("处理成功!");
isstarted = false;
answer = randomString(16);
@ -137,10 +146,14 @@ function setCaret(el, pos) {
$("#article-wrapper").append('<li class="article-content" id="' + answer + '"></li>');
let str_ = '';
let i = 0;
let timer = setInterval(() => {
alltext = alltext.replace(/\\n/g, '\n');
if (str_.length < alltext.length) {
str_ += alltext[i++];
timer = setInterval(() => {
//下面这行是为了处理有时服务器错误地返回\\n作为换行符,但返回的结果如果包含代码,则\\n是正确的格式。
let newalltext = alltext;
if (newalltext.indexOf("```") == -1) {
newalltext = newalltext.replace(/\\n/g, '\n');
}
if (str_.length < newalltext.length) {
str_ += newalltext[i++];
strforcode = str_ + "_";
if ((str_.split("```").length % 2) == 0) strforcode += "\n```\n";
} else {
@ -149,10 +162,23 @@ function setCaret(el, pos) {
strforcode = str_;
$("#kw-target").val("");
$("#kw-target").attr("disabled", false);
autoresize();
$("#ai-btn").html('<i class="iconfont icon-wuguan"></i>发送');
}
}
let arr = strforcode.split("```");
for (var j = 0; j <= arr.length; j++) {
if (j % 2 == 0) {
arr[j] = arr[j].replace(/\n\n/g, '\n');
arr[j] = arr[j].replace(/\n/g, '\n\n');
arr[j] = arr[j].replace(/\t/g, '\\t');
arr[j] = $("<div>").text(arr[j]).html();
}
}
var converter = new showdown.Converter();
$("#" + answer).html(converter.makeHtml(strforcode));
newalltext = converter.makeHtml(arr.join("```"));
newalltext = newalltext.replace(/\\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;');
$("#" + answer).html(newalltext);
hljs.highlightAll();
document.getElementById("article-wrapper").scrollTop = 100000;
}, 30);

@ -5,8 +5,8 @@ session_start();
$postData = $_SESSION['data'];
$_SESSION['response'] = "";
$ch = curl_init();
$OPENAI_API_KEY = "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";
if ((isset($_SESSION['key'])) && (!empty($_POST['key']))) {
$OPENAI_API_KEY = "sk-replace_with_your_api_key_dude";
if (isset($_SESSION['key'])) {
$OPENAI_API_KEY = $_SESSION['key'];
}
$headers = [
@ -26,6 +26,12 @@ $callback = function ($ch, $data) {
if (strpos($complete->error->message, "Rate limit reached") === 0) { //访问频率超限错误返回的code为空,特殊处理一下
setcookie("errcode", "rate_limit_reached");
}
if (strpos($complete->error->message, "Your access was terminated") === 0) { //违规使用,被封禁,特殊处理一下
setcookie("errcode", "access_terminated");
}
if (strpos($complete->error->message, "You didn't provide an API key") === 0) { //未提供API-KEY
setcookie("errcode", "no_api_key");
}
} else {
echo $data;
$_SESSION['response'] .= $data;

Loading…
Cancel
Save