develop #1

Merged
zsq merged 17 commits from develop into main 2026-01-25 11:14:49 +08:00
2 changed files with 10 additions and 6 deletions
Showing only changes of commit 4ab3633afb - Show all commits

View File

@ -124,8 +124,13 @@ export default function Index({ title = '项目活动' }) {
{
title: '项目名称',
dataIndex: ['activity_projects', 'name'],
render: (_, record) =>
record?.activity_projects?.[0]?.asset_project?.name || '',
render: (_, record) => {
return (
record?.activity_projects
?.map((item: any) => item?.asset_project?.name)
.join(',') || ''
);
},
search: {
transform: (value) => {
return { project_name: value };

View File

@ -34,9 +34,7 @@ export default function Create(props: MyBetaModalFormProps) {
onFinish={async (values) =>
Apis.Activity.Activities.Store({
...values,
project_ids: values?.project_ids
? [values?.project_ids]
: [props.item?.id],
project_ids: values?.project_ids || [props.item?.id],
})
.then(() => {
props.reload?.();
@ -53,9 +51,10 @@ export default function Create(props: MyBetaModalFormProps) {
key: 'project_ids',
title: '关联项目',
colProps: { span: 24 },
required: true,
formItemProps: { ...rulesHelper.array },
fieldProps: {
showSearch: true,
mode: 'multiple',
fieldNames: {
label: 'label',
value: 'value',