mirror of
https://github.com/labring/FastGPT.git
synced 2025-10-15 15:41:05 +00:00

* perf: system toolset & mcp (#5200) * feat: support system toolset * fix: type * fix: system tool config * chore: mcptool config migrate * refactor: mcp toolset * fix: fe type error * fix: type error * fix: show version * chore: support extract tool's secretInputConfig out of inputs * chore: compatible with old version mcp * chore: adjust * deps: update dependency @fastgpt-skd/plugin * fix: version * fix: some bug (#5316) * chore: compatible with old version mcp * fix: version * fix: compatible bug * fix: mcp object params * fix: type error * chore: update test cases * chore: remove log * fix: toolset node name * optimize app logs sort (#5310) * log keys config modal * multiple select * api * fontsize * code * chatid * fix build * fix * fix component * change name * log keys config * fix * delete unused * fix * perf: log code * perf: send auth code modal enter press * fix log (#5328) * perf: mcp toolset comment * perf: log ui * remove log (#5347) * doc * fix: action * remove log * fix: Table Optimization (#5319) * feat: table test: 1 * feat: table test: 2 * feat: table test: 3 * feat: table test: 4 * feat: table test : 5 把maxSize改回chunkSize * feat: table test : 6 都删了,只看maxSize * feat: table test : 7 恢复初始,接下来删除标签功能 * feat: table test : 8 删除标签功能 * feat: table test : 9 删除标签功能成功 * feat: table test : 10 继续调试,修改trainingStates * feat: table test : 11 修改第一步 * feat: table test : 12 修改第二步 * feat: table test : 13 修改了HtmlTable2Md * feat: table test : 14 修改表头分块规则 * feat: table test : 15 前面表格分的太细了 * feat: table test : 16 改着改着表头又不加了 * feat: table test : 17 用CUSTOM_SPLIT_SIGN不行,重新改 * feat: table test : 18 表头仍然还会多加,但现在分块搞的合理了终于 * feat: table test : 19 还是需要搞好表头问题,先保存一下调试情况 * feat: table test : 20 调试结束,看一下replace有没有问题,没问题就pr * feat: table test : 21 先把注释删了 * feat: table test : 21 注释replace都改了,下面切main分支看看情况 * feat: table test : 22 修改旧文件 * feat: table test : 23 修改测试文件 * feat: table test : 24 xlsx表格处理 * feat: table test : 25 刚才没保存先com了 * feat: table test : 26 fix * feat: table test : 27 先com一版调试 * feat: table test : 28 试试放format2csv里 * feat: table test : 29 xlsx解决 * feat: table test : 30 tablesplit解决 * feat: table test : 31 * feat: table test : 32 * perf: table split * perf: mcp old version compatibility (#5342) * fix: system-tool secret inputs * fix: rewrite runtime node i18n for system tool * perf: mcp old version compatibility * fix: splitPluginId * fix: old mcp toolId * fix: filter secret key * feat: support system toolset activation * chore: remove log * perf: mcp update * perf: rewrite toolset * fix:delete variable id (#5335) * perf: variable update * fix: multiple select ui * perf: model config move to plugin * fix: var conflit * perf: variable checker * Avoid empty number * update doc time * fix: test * fix: mcp object * update count app * update count app --------- Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com> Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: heheer <zhiyu44@qq.com> Co-authored-by: colnii <1286949794@qq.com> Co-authored-by: dreamer6680 <1468683855@qq.com>
107 lines
3.0 KiB
TypeScript
107 lines
3.0 KiB
TypeScript
import dayjs from 'dayjs';
|
||
import cronParser from 'cron-parser';
|
||
import utc from 'dayjs/plugin/utc';
|
||
import timezone from 'dayjs/plugin/timezone';
|
||
import { i18nT } from '../../../web/i18n/utils';
|
||
|
||
dayjs.extend(utc);
|
||
dayjs.extend(timezone);
|
||
|
||
export const formatTime2YMDHMW = (time?: Date | number) =>
|
||
dayjs(time).format('YYYY-MM-DD HH:mm:ss dddd');
|
||
export const formatTime2YMDHMS = (time?: Date | number) =>
|
||
time ? dayjs(time).format('YYYY-MM-DD HH:mm:ss') : '';
|
||
export const formatTime2YMDHM = (time?: Date | number) =>
|
||
time ? dayjs(time).format('YYYY-MM-DD HH:mm') : '';
|
||
export const formatTime2YMD = (time?: Date | number) =>
|
||
time ? dayjs(time).format('YYYY-MM-DD') : '';
|
||
export const formatTime2HM = (time: Date = new Date()) => dayjs(time).format('HH:mm');
|
||
|
||
/**
|
||
* 格式化时间成聊天格式
|
||
*/
|
||
export const formatTimeToChatTime = (time: Date) => {
|
||
const now = dayjs();
|
||
const target = dayjs(time);
|
||
|
||
// 如果传入时间小于60秒,返回刚刚
|
||
if (now.diff(target, 'second') < 60) {
|
||
return i18nT('common:just_now');
|
||
}
|
||
|
||
// 如果时间是今天,展示几时:几分
|
||
//用#占位,i18n生效后replace成:
|
||
if (now.isSame(target, 'day')) {
|
||
return target.format('HH#mm');
|
||
}
|
||
|
||
// 如果是昨天,展示昨天
|
||
if (now.subtract(1, 'day').isSame(target, 'day')) {
|
||
return i18nT('common:yesterday');
|
||
}
|
||
|
||
// 如果是今年,展示某月某日
|
||
if (now.isSame(target, 'year')) {
|
||
return target.format('MM-DD');
|
||
}
|
||
|
||
// 如果是更久之前,展示某年某月某日
|
||
return target.format('YYYY-M-D');
|
||
};
|
||
|
||
export const formatTimeToChatItemTime = (time: Date) => {
|
||
const now = dayjs();
|
||
const target = dayjs(time);
|
||
const detailTime = target.format('HH#mm');
|
||
|
||
// 如果时间是今天,展示几时:几分
|
||
if (now.isSame(target, 'day')) {
|
||
return detailTime;
|
||
}
|
||
|
||
// 如果是昨天,展示昨天+几时:几分
|
||
if (now.subtract(1, 'day').isSame(target, 'day')) {
|
||
return i18nT('common:yesterday_detail_time');
|
||
}
|
||
|
||
// 如果是今年,展示某月某日+几时:几分
|
||
if (now.isSame(target, 'year')) {
|
||
return target.format('MM-DD') + ' ' + detailTime;
|
||
}
|
||
|
||
// 如果是更久之前,展示某年某月某日+几时:几分
|
||
return target.format('YYYY-M-D') + ' ' + detailTime;
|
||
};
|
||
|
||
/* cron time parse */
|
||
export const cronParser2Fields = (cronString: string) => {
|
||
try {
|
||
const cronField = cronParser.parseExpression(cronString).fields;
|
||
return cronField;
|
||
} catch (error) {
|
||
return null;
|
||
}
|
||
};
|
||
// 根据cron表达式和时区获取下一个时间
|
||
export const getNextTimeByCronStringAndTimezone = ({
|
||
cronString,
|
||
timezone
|
||
}: {
|
||
cronString: string;
|
||
timezone: string;
|
||
}) => {
|
||
try {
|
||
const options = {
|
||
currentDate: dayjs().tz(timezone).format(),
|
||
tz: timezone
|
||
};
|
||
const interval = cronParser.parseExpression(cronString, options);
|
||
const date = String(interval.next());
|
||
|
||
return new Date(date);
|
||
} catch (error) {
|
||
console.log('getNextTimeByCronStringAndTimezone error', error);
|
||
return new Date();
|
||
}
|
||
};
|