From fa2c157af73bd00e9065930953ce494726157ace Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Fri, 14 Jan 2022 19:04:08 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E5=A2=9E=E5=8A=A0=E7=BE=A4=E7=BB=84?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E4=B8=8E=E9=9D=A2=E6=9D=BF=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 ++ pnpm-lock.yaml | 4 ++++ shared/i18n/langs/en-US/translation.json | 3 +++ shared/i18n/langs/zh-CN/translation.json | 3 +++ web/src/routes/Main/Content/Group/Panel.tsx | 16 ++++++++++++++-- 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8bdae345..4e5c3490 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,8 @@ "vinyl-fs": "^3.0.3" }, "dependencies": { + "crc": "^3.8.0", + "lodash": "^4.17.21", "react": "17.0.2" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 756079d9..f80fd945 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,6 +9,7 @@ importers: '@typescript-eslint/eslint-plugin': ^4.28.1 '@typescript-eslint/parser': ^4.28.1 commitlint: ^12.1.4 + crc: ^3.8.0 dayjs: ^1.10.6 esbuild: ^0.12.25 eslint: ^7.30.0 @@ -21,11 +22,14 @@ importers: i18next-scanner: ^3.0.0 identity-obj-proxy: ^3.0.0 lint-staged: ^11.0.0 + lodash: ^4.17.21 prettier: ^2.3.2 react: 17.0.2 typescript: ^4.5.2 vinyl-fs: ^3.0.3 dependencies: + crc: registry.npmmirror.com/crc/3.8.0 + lodash: registry.npmmirror.com/lodash/4.17.21 react: registry.npmmirror.com/react/17.0.2 devDependencies: '@commitlint/cli': registry.npmmirror.com/@commitlint/cli/12.1.4 diff --git a/shared/i18n/langs/en-US/translation.json b/shared/i18n/langs/en-US/translation.json index 85260a8e..b7bcf745 100644 --- a/shared/i18n/langs/en-US/translation.json +++ b/shared/i18n/langs/en-US/translation.json @@ -48,6 +48,7 @@ "k42a98418": "File Service", "k4603baea": "Create Group Panel", "k47489688": "Group Service", + "k48a38bc1": "Group not found", "k4d32a754": "Group Name", "k50504f9e": "Upload picture to converse", "k50d471b2": "Reset", @@ -145,6 +146,7 @@ "kcb8e662f": "Converse Service", "kceea83fc": "Join Group", "kcefdbe2d": "Modify avatar success", + "kd1af615e": "Panel not found", "kd28c05df": "Create Success", "kd2c1a316": "Login", "kd2e5e126": "Panel Manage", @@ -167,6 +169,7 @@ "ked2baf28": "Loading...", "ked5385d5": "Create Panel", "keda14478": "You are the group manager, leaving the group will cause the group to be dissolved", + "kee9108f1": "Modify success", "kef25594f": "Nickname#0000", "kefc07278": "Back to login", "kf02c6db": "Friend List", diff --git a/shared/i18n/langs/zh-CN/translation.json b/shared/i18n/langs/zh-CN/translation.json index 6f497dd6..523684de 100644 --- a/shared/i18n/langs/zh-CN/translation.json +++ b/shared/i18n/langs/zh-CN/translation.json @@ -48,6 +48,7 @@ "k42a98418": "文件服务", "k4603baea": "创建群组面板", "k47489688": "群组服务", + "k48a38bc1": "群组不存在", "k4d32a754": "群组名称", "k50504f9e": "上传图片到会话", "k50d471b2": "重置", @@ -145,6 +146,7 @@ "kcb8e662f": "会话服务", "kceea83fc": "加入群组", "kcefdbe2d": "修改头像成功", + "kd1af615e": "面板不存在", "kd28c05df": "创建成功", "kd2c1a316": "登录", "kd2e5e126": "面板管理", @@ -167,6 +169,7 @@ "ked2baf28": "加载中...", "ked5385d5": "创建面板", "keda14478": "您是群组管理者,退出群组会导致解散群组", + "kee9108f1": "修改成功", "kef25594f": "用户昵称#0000", "kefc07278": "返回登录", "kf02c6db": "好友列表", diff --git a/web/src/routes/Main/Content/Group/Panel.tsx b/web/src/routes/Main/Content/Group/Panel.tsx index 18661698..ab06def4 100644 --- a/web/src/routes/Main/Content/Group/Panel.tsx +++ b/web/src/routes/Main/Content/Group/Panel.tsx @@ -17,11 +17,23 @@ export const GroupPanelRender: React.FC = React.memo(() => { const panelInfo = useGroupPanel(groupId, panelId); if (groupInfo === null) { - return null; + return ( + + ); } if (panelInfo === null) { - return null; + return ( + + ); } if (panelInfo.type === GroupPanelType.TEXT) {