Commit 78e4cb3c by CaIon

feat(web): redesign group ratio rules with collapsible grouped layout

Rewrite GroupGroupRatioRules and GroupSpecialUsableRules to group rules
by user group in collapsible sections instead of a flat table. Default
collapsed to reduce visual clutter when many rules exist. Fix i18n
translations for ja, zh-TW with proper native text; add missing keys.
parent c734db34
import React, { useState, useCallback, useMemo } from 'react'; import React, { useState, useCallback, useMemo } from 'react';
import { import {
Button, Button,
Collapsible,
Input,
InputNumber, InputNumber,
Select, Select,
Tag,
Typography, Typography,
Popconfirm, Popconfirm,
} from '@douyinfe/semi-ui'; } from '@douyinfe/semi-ui';
import { IconPlus, IconDelete } from '@douyinfe/semi-icons'; import {
IconPlus,
IconDelete,
IconChevronDown,
IconChevronUp,
} from '@douyinfe/semi-icons';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import CardTable from '../../../../components/common/ui/CardTable';
const { Text } = Typography; const { Text } = Typography;
...@@ -57,14 +64,106 @@ export function serializeGroupGroupRatio(rules) { ...@@ -57,14 +64,106 @@ export function serializeGroupGroupRatio(rules) {
: JSON.stringify(nested, null, 2); : JSON.stringify(nested, null, 2);
} }
function GroupSection({ groupName, items, groupOptions, onUpdate, onRemove, onAdd, t }) {
const [open, setOpen] = useState(false);
return (
<div
style={{
border: '1px solid var(--semi-color-border)',
borderRadius: 8,
overflow: 'hidden',
}}
>
<div
className='flex items-center justify-between cursor-pointer'
style={{
padding: '8px 12px',
background: 'var(--semi-color-fill-0)',
}}
onClick={() => setOpen(!open)}
>
<div className='flex items-center gap-2'>
{open ? <IconChevronUp size='small' /> : <IconChevronDown size='small' />}
<Text strong>{groupName}</Text>
<Tag size='small' color='blue'>{items.length} {t('条规则')}</Tag>
</div>
<div className='flex items-center gap-1' onClick={(e) => e.stopPropagation()}>
<Button
icon={<IconPlus />}
size='small'
theme='borderless'
onClick={() => onAdd(groupName)}
/>
<Popconfirm
title={t('确认删除该分组的所有规则?')}
onConfirm={() => items.forEach((item) => onRemove(item._id))}
position='left'
>
<Button
icon={<IconDelete />}
size='small'
type='danger'
theme='borderless'
/>
</Popconfirm>
</div>
</div>
<Collapsible isOpen={open} keepDOM>
<div style={{ padding: '8px 12px' }}>
{items.map((rule) => (
<div
key={rule._id}
className='flex items-center gap-2'
style={{ marginBottom: 6 }}
>
<Select
size='small'
filter
value={rule.usingGroup || undefined}
placeholder={t('选择使用分组')}
optionList={groupOptions}
onChange={(v) => onUpdate(rule._id, 'usingGroup', v)}
style={{ flex: 1 }}
allowCreate
position='bottomLeft'
/>
<InputNumber
size='small'
min={0}
step={0.1}
value={rule.ratio}
style={{ width: 100 }}
onChange={(v) => onUpdate(rule._id, 'ratio', v ?? 0)}
/>
<Popconfirm
title={t('确认删除该规则?')}
onConfirm={() => onRemove(rule._id)}
position='left'
>
<Button
icon={<IconDelete />}
type='danger'
theme='borderless'
size='small'
/>
</Popconfirm>
</div>
))}
</div>
</Collapsible>
</div>
);
}
export default function GroupGroupRatioRules({ export default function GroupGroupRatioRules({
value, value,
groupNames = [], groupNames = [],
onChange, onChange,
}) { }) {
const { t } = useTranslation(); const { t } = useTranslation();
const [rules, setRules] = useState(() => flattenRules(parseJSON(value))); const [rules, setRules] = useState(() => flattenRules(parseJSON(value)));
const [newGroupName, setNewGroupName] = useState('');
const emitChange = useCallback( const emitChange = useCallback(
(newRules) => { (newRules) => {
...@@ -76,21 +175,11 @@ export default function GroupGroupRatioRules({ ...@@ -76,21 +175,11 @@ export default function GroupGroupRatioRules({
const updateRule = useCallback( const updateRule = useCallback(
(id, field, val) => { (id, field, val) => {
const next = rules.map((r) => emitChange(rules.map((r) => (r._id === id ? { ...r, [field]: val } : r)));
r._id === id ? { ...r, [field]: val } : r,
);
emitChange(next);
}, },
[rules, emitChange], [rules, emitChange],
); );
const addRule = useCallback(() => {
emitChange([
...rules,
{ _id: uid(), userGroup: '', usingGroup: '', ratio: 1 },
]);
}, [rules, emitChange]);
const removeRule = useCallback( const removeRule = useCallback(
(id) => { (id) => {
emitChange(rules.filter((r) => r._id !== id)); emitChange(rules.filter((r) => r._id !== id));
...@@ -98,107 +187,99 @@ export default function GroupGroupRatioRules({ ...@@ -98,107 +187,99 @@ export default function GroupGroupRatioRules({
[rules, emitChange], [rules, emitChange],
); );
const addRuleToGroup = useCallback(
(groupName) => {
emitChange([
...rules,
{ _id: uid(), userGroup: groupName, usingGroup: '', ratio: 1 },
]);
},
[rules, emitChange],
);
const addNewGroup = useCallback(() => {
const name = newGroupName.trim();
if (!name) return;
emitChange([
...rules,
{ _id: uid(), userGroup: name, usingGroup: '', ratio: 1 },
]);
setNewGroupName('');
}, [rules, emitChange, newGroupName]);
const groupOptions = useMemo( const groupOptions = useMemo(
() => groupNames.map((n) => ({ value: n, label: n })), () => groupNames.map((n) => ({ value: n, label: n })),
[groupNames], [groupNames],
); );
const columns = useMemo( const grouped = useMemo(() => {
() => [ const map = {};
{ const order = [];
title: t('用户分组'), rules.forEach((r) => {
dataIndex: 'userGroup', if (!r.userGroup) return;
key: 'userGroup', if (!map[r.userGroup]) {
width: 200, map[r.userGroup] = [];
render: (_, record) => ( order.push(r.userGroup);
}
map[r.userGroup].push(r);
});
return order.map((name) => ({ name, items: map[name] }));
}, [rules]);
if (grouped.length === 0 && rules.length === 0) {
return (
<div>
<Text type='tertiary' className='block text-center py-4'>
{t('暂无规则,点击下方按钮添加')}
</Text>
<div className='mt-2 flex justify-center gap-2'>
<Select <Select
size='small' size='small'
filter filter
value={record.userGroup || undefined}
placeholder={t('选择用户分组')}
optionList={groupOptions}
onChange={(v) => updateRule(record._id, 'userGroup', v)}
style={{ width: '100%' }}
allowCreate allowCreate
position='bottomLeft' placeholder={t('选择用户分组')}
/>
),
},
{
title: t('使用分组'),
dataIndex: 'usingGroup',
key: 'usingGroup',
width: 200,
render: (_, record) => (
<Select
size='small'
filter
value={record.usingGroup || undefined}
placeholder={t('选择使用分组')}
optionList={groupOptions} optionList={groupOptions}
onChange={(v) => updateRule(record._id, 'usingGroup', v)} value={newGroupName || undefined}
style={{ width: '100%' }} onChange={setNewGroupName}
allowCreate style={{ width: 200 }}
position='bottomLeft' position='bottomLeft'
/> />
), <Button icon={<IconPlus />} theme='outline' onClick={addNewGroup}>
}, {t('添加分组规则')}
{ </Button>
title: t('倍率'), </div>
dataIndex: 'ratio', </div>
key: 'ratio', );
width: 140, }
render: (_, record) => (
<InputNumber
size='small'
min={0}
step={0.1}
value={record.ratio}
style={{ width: '100%' }}
onChange={(v) => updateRule(record._id, 'ratio', v ?? 0)}
/>
),
},
{
title: '',
key: 'actions',
width: 50,
render: (_, record) => (
<Popconfirm
title={t('确认删除该规则?')}
onConfirm={() => removeRule(record._id)}
position='left'
>
<Button
icon={<IconDelete />}
type='danger'
theme='borderless'
size='small'
/>
</Popconfirm>
),
},
],
[t, groupOptions, updateRule, removeRule],
);
return ( return (
<div> <div className='space-y-2'>
<CardTable {grouped.map((group) => (
columns={columns} <GroupSection
dataSource={rules} key={group.name}
rowKey='_id' groupName={group.name}
hidePagination items={group.items}
size='small' groupOptions={groupOptions}
empty={ onUpdate={updateRule}
<Text type='tertiary'> onRemove={removeRule}
{t('暂无规则,点击下方按钮添加')} onAdd={addRuleToGroup}
</Text> t={t}
} />
/> ))}
<div className='mt-3 flex justify-center'> <div className='mt-3 flex justify-center gap-2'>
<Button icon={<IconPlus />} theme='outline' onClick={addRule}> <Select
{t('添加规则')} size='small'
filter
allowCreate
placeholder={t('选择用户分组')}
optionList={groupOptions}
value={newGroupName || undefined}
onChange={setNewGroupName}
style={{ width: 200 }}
position='bottomLeft'
/>
<Button icon={<IconPlus />} theme='outline' onClick={addNewGroup}>
{t('添加分组规则')}
</Button> </Button>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment