From 3074821609454b94a4a3f7ae51900af978556362 Mon Sep 17 00:00:00 2001 From: luxl <726857632@qq.com> Date: Tue, 14 Nov 2023 16:39:53 +0800 Subject: [PATCH 1/3] Update MjLogsTable.js --- web/src/components/MjLogsTable.js | 79 ++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 28 deletions(-) diff --git a/web/src/components/MjLogsTable.js b/web/src/components/MjLogsTable.js index 8a93d13..02ba759 100644 --- a/web/src/components/MjLogsTable.js +++ b/web/src/components/MjLogsTable.js @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import { Button, Form, Header, Label, Pagination, Segment, Select, Table } from 'semantic-ui-react'; +import { Button, Form, Header, Label, Pagination, Segment, Select, Table,Modal } from 'semantic-ui-react'; import { API, isAdmin, showError, timestamp2string } from '../helpers'; import { ITEMS_PER_PAGE } from '../constants'; @@ -85,6 +85,8 @@ const LogsTable = () => { const [searching, setSearching] = useState(false); const [logType, setLogType] = useState(0); const isAdminUser = isAdmin(); + + let now = new Date(); const [inputs, setInputs] = useState({ username: '', @@ -100,33 +102,14 @@ const LogsTable = () => { token: 0 }); - const handleInputChange = (e, { name, value }) => { - setInputs((inputs) => ({ ...inputs, [name]: value })); + const [modalContent, setModalContent] = useState(''); + const [showModal, setShowModal] = useState(false); + + const showFullContent = (content) => { + setModalContent(content); + setShowModal(true); }; - const getLogSelfStat = async () => { - let localStartTimestamp = Date.parse(start_timestamp) / 1000; - let localEndTimestamp = Date.parse(end_timestamp) / 1000; - let res = await API.get(`/api/log/self/stat?type=${logType}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}`); - const { success, message, data } = res.data; - if (success) { - setStat(data); - } else { - showError(message); - } - }; - - const getLogStat = async () => { - let localStartTimestamp = Date.parse(start_timestamp) / 1000; - let localEndTimestamp = Date.parse(end_timestamp) / 1000; - let res = await API.get(`/api/log/stat?type=${logType}&username=${username}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}`); - const { success, message, data } = res.data; - if (success) { - setStat(data); - } else { - showError(message); - } - }; const loadLogs = async (startIdx) => { let url = ''; @@ -301,6 +284,15 @@ const LogsTable = () => { > Prompt + { + sortLog('prompt_en'); + }} + width={3} + > + PromptEn + { @@ -342,8 +334,33 @@ const LogsTable = () => { ) : '暂未生成图片' } - {log.prompt} - {log.fail_reason ? log.fail_reason : '无'} + + {log.prompt.length > 10 + ?
+ {log.prompt.slice(0, 10)} + showFullContent(log.prompt)}>查看全部 +
+ : log.prompt + } + + + {log.prompt_en.length > 10 + ?
+ {log.prompt_en.slice(0, 10)} + showFullContent(log.prompt_en)}>查看全部 +
+ : log.prompt_en + } + + + {log.fail_reason && log.fail_reason.length > 10 + ?
+ {log.fail_reason.slice(0, 10)} + showFullContent(log.fail_reason)}>查看全部 +
+ : log.fail_reason || '无' + } + ); })} @@ -379,6 +396,12 @@ const LogsTable = () => { + {/*Modal component goes here*/} + setShowModal(false)} centered> + + 
{modalContent}
+ + ); }; From 08b8b7b980e488bc85ae9e4624858f1bc0e55ee6 Mon Sep 17 00:00:00 2001 From: luxl <726857632@qq.com> Date: Tue, 14 Nov 2023 16:41:19 +0800 Subject: [PATCH 2/3] Update token.go --- model/token.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/token.go b/model/token.go index 06b9775..5a5ca75 100644 --- a/model/token.go +++ b/model/token.go @@ -33,7 +33,7 @@ func SearchUserTokens(userId int, keyword string, token string) (tokens []*Token if token != "" { token = strings.Trim(token, "sk-") } - err = DB.Where("user_id = ?", userId).Where("name LIKE ?", keyword+"%").Where("key LIKE ?", token+"%").Find(&tokens).Error + err = DB.Where("user_id = ?", userId).Where("name LIKE ?", keyword+"%").Where("`key` LIKE ?", token+"%").Find(&tokens).Error return tokens, err } From 6fbb6ca0c0924066f1d144da9bc20471522cda4d Mon Sep 17 00:00:00 2001 From: luxl <726857632@qq.com> Date: Tue, 14 Nov 2023 17:02:32 +0800 Subject: [PATCH 3/3] Update web/src/components/MjLogsTable.js --- web/src/components/MjLogsTable.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/src/components/MjLogsTable.js b/web/src/components/MjLogsTable.js index 02ba759..4d070b0 100644 --- a/web/src/components/MjLogsTable.js +++ b/web/src/components/MjLogsTable.js @@ -338,7 +338,7 @@ const LogsTable = () => { {log.prompt.length > 10 ?
{log.prompt.slice(0, 10)} - showFullContent(log.prompt)}>查看全部 + showFullContent(log.prompt)}>查看全部
: log.prompt } @@ -347,7 +347,7 @@ const LogsTable = () => { {log.prompt_en.length > 10 ?
{log.prompt_en.slice(0, 10)} - showFullContent(log.prompt_en)}>查看全部 + showFullContent(log.prompt_en)}>查看全部
: log.prompt_en } @@ -356,7 +356,7 @@ const LogsTable = () => { {log.fail_reason && log.fail_reason.length > 10 ?
{log.fail_reason.slice(0, 10)} - showFullContent(log.fail_reason)}>查看全部 + showFullContent(log.fail_reason)}>查看全部
: log.fail_reason || '无' }