refactor: 移除群组名限制,增加群组名的容忍度

release/desktop
moonrailgun 4 years ago
parent 89eac2c904
commit ed107d17bf

@ -98,7 +98,6 @@
"k8abdba5c": "Has been sent", "k8abdba5c": "Has been sent",
"k8acbe00": "Current service available", "k8acbe00": "Current service available",
"k8b501189": "Service Status", "k8b501189": "Service Status",
"k8bca9ffb": "Group Name",
"k8caee957": "Invite friends to converse", "k8caee957": "Invite friends to converse",
"k8dc86b13": "Pin", "k8dc86b13": "Pin",
"k8f6dfd40": "Current members", "k8f6dfd40": "Current members",

@ -98,7 +98,6 @@
"k8abdba5c": "已发送", "k8abdba5c": "已发送",
"k8acbe00": "当前服务可用", "k8acbe00": "当前服务可用",
"k8b501189": "服务状态", "k8b501189": "服务状态",
"k8bca9ffb": "群组名",
"k8caee957": "邀请好友加入会话", "k8caee957": "邀请好友加入会话",
"k8dc86b13": "Pin", "k8dc86b13": "Pin",
"k8f6dfd40": "当前成员数", "k8f6dfd40": "当前成员数",

@ -20,7 +20,7 @@ const GroupWebPanelRender: React.FC<{ panelInfo: any }> = (props) => {
}; };
regGroupPanel({ regGroupPanel({
name: `${PLUGIN_NAME}/grouppanel`, name: `${PLUGIN_NAME}/webpanel`,
label: Translate.webpanel, label: Translate.webpanel,
provider: PLUGIN_NAME, provider: PLUGIN_NAME,
extraFormMeta: [{ type: 'text', name: 'url', label: '网址' }], extraFormMeta: [{ type: 'text', name: 'url', label: '网址' }],

@ -77,28 +77,32 @@ const FullModalFieldEditor: React.FC<FullModalFieldProps> = React.memo(
const EditorComponent = props.renderEditor; const EditorComponent = props.renderEditor;
return ( return (
<Space className="flex w-full"> <div className="flex w-full">
{isEditing && !_isNil(EditorComponent) ? ( <div className="truncate">
<EditorComponent value={editingValue} onChange={setEditingValue} /> {isEditing && !_isNil(EditorComponent) ? (
) : ( <EditorComponent value={editingValue} onChange={setEditingValue} />
<span title={valueTitle}>{props.content ?? props.value}</span> ) : (
)} <span title={valueTitle}>{props.content ?? props.value}</span>
)}
{!isEditing ? ( </div>
<DelayTip title={t('编辑')}>
<IconBtn icon="mdi:square-edit-outline" onClick={handleEditing} /> <div className="ml-2">
</DelayTip> {!isEditing ? (
) : ( <DelayTip title={t('编辑')}>
<> <IconBtn icon="mdi:square-edit-outline" onClick={handleEditing} />
<DelayTip title={t('取消')}>
<IconBtn icon="mdi:close" onClick={handleEditing} />
</DelayTip>
<DelayTip title={t('保存变更')}>
<IconBtn type="primary" icon="mdi:check" onClick={handleSave} />
</DelayTip> </DelayTip>
</> ) : (
)} <Space>
</Space> <DelayTip title={t('取消')}>
<IconBtn icon="mdi:close" onClick={handleEditing} />
</DelayTip>
<DelayTip title={t('保存变更')}>
<IconBtn type="primary" icon="mdi:check" onClick={handleSave} />
</DelayTip>
</Space>
)}
</div>
</div>
); );
} }
); );

@ -14,6 +14,7 @@ export const SectionHeader: React.FC<SectionHeaderProps> = React.memo(
<div className="h-12 relative flex items-center py-0 text-base font-bold flex-shrink-0 thin-line-bottom"> <div className="h-12 relative flex items-center py-0 text-base font-bold flex-shrink-0 thin-line-bottom">
{React.isValidElement(props.menu) ? ( {React.isValidElement(props.menu) ? (
<Dropdown <Dropdown
className="overflow-hidden"
onVisibleChange={setVisible} onVisibleChange={setVisible}
overlay={props.menu} overlay={props.menu}
placement="topRight" placement="topRight"

@ -136,7 +136,7 @@ export const ModalCreateGroup: React.FC = React.memo(() => {
</Typography.Paragraph> </Typography.Paragraph>
<div className="text-center mb-2"> <div className="text-center mb-2">
{/* TODO: update avatar */} {/* TODO: upload avatar */}
<Avatar size={80} name={name} /> <Avatar size={80} name={name} />
</div> </div>
@ -146,6 +146,7 @@ export const ModalCreateGroup: React.FC = React.memo(() => {
<Input <Input
className="shadow-none" className="shadow-none"
size="large" size="large"
maxLength={100}
value={name} value={name}
onChange={(e) => setName(e.target.value)} onChange={(e) => setName(e.target.value)}
/> />

@ -58,7 +58,7 @@ export const GroupSummary: React.FC<{
<div className="w-2/3"> <div className="w-2/3">
<FullModalField <FullModalField
title={t('群组名')} title={t('群组名')}
value={groupInfo.name} value={groupInfo.name}
editable={true} editable={true}
renderEditor={DefaultFullModalInputEditorRender} renderEditor={DefaultFullModalInputEditorRender}

Loading…
Cancel
Save