From 11d04115372076a625d1bba4993067562df09323 Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Sat, 16 Oct 2021 17:36:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=EF=BC=8C=E5=8D=95=E7=8B=AC=E6=89=93=E5=BC=80?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=9A=84=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/i18n/langs/en-US/translation.json | 2 ++ shared/i18n/langs/zh-CN/translation.json | 2 ++ web/src/App.tsx | 5 ++++ web/src/routes/Main/Provider.tsx | 6 ++--- web/src/routes/Panel/README.md | 1 + web/src/routes/Panel/index.tsx | 33 ++++++++++++++++++++++++ 6 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 web/src/routes/Panel/README.md create mode 100644 web/src/routes/Panel/index.tsx diff --git a/shared/i18n/langs/en-US/translation.json b/shared/i18n/langs/en-US/translation.json index 3c8ebfbd..ed9bf1f1 100644 --- a/shared/i18n/langs/en-US/translation.json +++ b/shared/i18n/langs/en-US/translation.json @@ -67,6 +67,7 @@ "k7437914b": "Panel Group", "k744ee9a": "Create Group", "k74aef1ad": "Members", + "k77d3028d": "Unknown Panel", "k78e52ed0": "Accept", "k7a2ccf9b": "Search Friends", "k7c232f9e": "Panel", @@ -94,6 +95,7 @@ "ka01a00eb": "System language", "ka0451c97": "Cancel", "ka14986f0": "Plugin install successed, need to be restarted to take effect", + "ka29e9508": "Send Image", "ka2c48894": "Customize your group", "ka49ec177": "Input somthing", "ka50c7408": "Please enter the JSON information manually, if you are not sure what you are doing, please do not use this function", diff --git a/shared/i18n/langs/zh-CN/translation.json b/shared/i18n/langs/zh-CN/translation.json index fe7ff9f7..9321d62b 100644 --- a/shared/i18n/langs/zh-CN/translation.json +++ b/shared/i18n/langs/zh-CN/translation.json @@ -67,6 +67,7 @@ "k7437914b": "面板分组", "k744ee9a": "创建群组", "k74aef1ad": "成员", + "k77d3028d": "未知的面板", "k78e52ed0": "接受", "k7a2ccf9b": "搜索好友", "k7c232f9e": "面板", @@ -94,6 +95,7 @@ "ka01a00eb": "系统语言", "ka0451c97": "取消", "ka14986f0": "插件安装成功, 需要重启后生效", + "ka29e9508": "发送图片", "ka2c48894": "自定义你的群组", "ka49ec177": "输入一些什么", "ka50c7408": "请手动输入JSON信息,如果你不明确你在做什么请不要使用该功能", diff --git a/web/src/App.tsx b/web/src/App.tsx index 4d157112..224f6b52 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -17,6 +17,10 @@ const EntryRoute = Loadable(() => import('./routes/Entry').then((module) => module.EntryRoute) ); +const PanelRoute = Loadable(() => + import('./routes/Panel').then((module) => module.PanelRoute) +); + const InviteRoute = Loadable(() => import('./routes/Invite').then((module) => module.InviteRoute) ); @@ -76,6 +80,7 @@ export const App: React.FC = React.memo(() => { + diff --git a/web/src/routes/Main/Provider.tsx b/web/src/routes/Main/Provider.tsx index 8b4b8789..29b8ae04 100644 --- a/web/src/routes/Main/Provider.tsx +++ b/web/src/routes/Main/Provider.tsx @@ -8,11 +8,11 @@ import { t, } from 'tailchat-shared'; import React from 'react'; -import { LoadingSpinner } from '../../components/LoadingSpinner'; +import { LoadingSpinner } from '@/components/LoadingSpinner'; import { Provider as ReduxProvider } from 'react-redux'; -import { getGlobalUserLoginInfo } from '../../utils/user-helper'; +import { getGlobalUserLoginInfo } from '@/utils/user-helper'; import _isNil from 'lodash/isNil'; -import { getUserJWT } from '../../utils/jwt-helper'; +import { getUserJWT } from '@/utils/jwt-helper'; import { useHistory } from 'react-router'; import { SidebarContextProvider } from './SidebarContext'; import { PortalHost } from '@/components/Portal'; diff --git a/web/src/routes/Panel/README.md b/web/src/routes/Panel/README.md new file mode 100644 index 00000000..b608d15b --- /dev/null +++ b/web/src/routes/Panel/README.md @@ -0,0 +1 @@ +该文件是用于独立窗口打开面板的功能 diff --git a/web/src/routes/Panel/index.tsx b/web/src/routes/Panel/index.tsx new file mode 100644 index 00000000..42f7de3c --- /dev/null +++ b/web/src/routes/Panel/index.tsx @@ -0,0 +1,33 @@ +import { useRecordMeasure } from '@/utils/measure-helper'; +import React from 'react'; +import { Route, Switch } from 'react-router'; +import { MainProvider } from '../Main/Provider'; +import { t } from 'tailchat-shared'; +import { PersonalConverse } from '../Main/Content/Personal/Converse'; +import { GroupPanelRender } from '../Main/Content/Group/Panel'; + +export const PanelRoute: React.FC = React.memo(() => { + useRecordMeasure('AppRouteRenderStart'); + + return ( +
+ + + + + + {t('未知的面板')} + + +
+ ); +}); +PanelRoute.displayName = 'PanelRoute';