feat:【system 系统管理】租户管理时,支持填写多个域名 websites
parent
fb8179fef2
commit
3b2b0d5438
|
@ -12,7 +12,7 @@ export namespace SystemTenantApi {
|
||||||
contactMobile: string;
|
contactMobile: string;
|
||||||
accountCount: number;
|
accountCount: number;
|
||||||
expireTime: Date;
|
expireTime: Date;
|
||||||
website: string;
|
websites: string[];
|
||||||
status: number;
|
status: number;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,9 +90,13 @@ export function useFormSchema(): VbenFormSchema[] {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '绑定域名',
|
label: '绑定域名',
|
||||||
fieldName: 'website',
|
fieldName: 'websites',
|
||||||
component: 'Input',
|
component: 'Textarea',
|
||||||
rules: 'required',
|
componentProps: {
|
||||||
|
placeholder: '请输入绑定域名,多个域名请换行分隔',
|
||||||
|
rows: 3,
|
||||||
|
allowClear: true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
fieldName: 'status',
|
fieldName: 'status',
|
||||||
|
@ -195,7 +199,7 @@ export function useGridColumns(
|
||||||
formatter: 'formatDateTime',
|
formatter: 'formatDateTime',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
field: 'website',
|
field: 'websites',
|
||||||
title: '绑定域名',
|
title: '绑定域名',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -42,7 +42,16 @@ const [Modal, modalApi] = useVbenModal({
|
||||||
}
|
}
|
||||||
modalApi.lock();
|
modalApi.lock();
|
||||||
// 提交表单
|
// 提交表单
|
||||||
const data = (await formApi.getValues()) as SystemTenantApi.Tenant;
|
const formValues = (await formApi.getValues()) as SystemTenantApi.Tenant & {
|
||||||
|
websites: string;
|
||||||
|
};
|
||||||
|
// 将换行符分隔的字符串转换为数组
|
||||||
|
const data: SystemTenantApi.Tenant = {
|
||||||
|
...formValues,
|
||||||
|
websites: formValues.websites
|
||||||
|
? formValues.websites.split('\n').filter((item) => item.trim())
|
||||||
|
: [],
|
||||||
|
};
|
||||||
try {
|
try {
|
||||||
await (formData.value ? updateTenant(data) : createTenant(data));
|
await (formData.value ? updateTenant(data) : createTenant(data));
|
||||||
// 关闭并提示
|
// 关闭并提示
|
||||||
|
@ -66,8 +75,15 @@ const [Modal, modalApi] = useVbenModal({
|
||||||
modalApi.lock();
|
modalApi.lock();
|
||||||
try {
|
try {
|
||||||
formData.value = await getTenant(data.id as number);
|
formData.value = await getTenant(data.id as number);
|
||||||
|
// 将数组转换为换行符分隔的字符串
|
||||||
|
const formValues = {
|
||||||
|
...formData.value,
|
||||||
|
websites: Array.isArray(formData.value.websites)
|
||||||
|
? formData.value.websites.join('\n')
|
||||||
|
: formData.value.websites || '',
|
||||||
|
};
|
||||||
// 设置到 values
|
// 设置到 values
|
||||||
await formApi.setValues(formData.value);
|
await formApi.setValues(formValues);
|
||||||
} finally {
|
} finally {
|
||||||
modalApi.unlock();
|
modalApi.unlock();
|
||||||
}
|
}
|
||||||
|
@ -75,7 +91,7 @@ const [Modal, modalApi] = useVbenModal({
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<Modal :title="getTitle" class="w-1/3">
|
<Modal :title="getTitle" class="w-1/2">
|
||||||
<Form class="mx-4" />
|
<Form class="mx-4" />
|
||||||
</Modal>
|
</Modal>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -12,7 +12,7 @@ export namespace SystemTenantApi {
|
||||||
contactMobile: string;
|
contactMobile: string;
|
||||||
accountCount: number;
|
accountCount: number;
|
||||||
expireTime: Date;
|
expireTime: Date;
|
||||||
website: string;
|
websites: string[];
|
||||||
status: number;
|
status: number;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -95,9 +95,13 @@ export function useFormSchema(): VbenFormSchema[] {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '绑定域名',
|
label: '绑定域名',
|
||||||
fieldName: 'website',
|
fieldName: 'websites',
|
||||||
component: 'Input',
|
component: 'Textarea',
|
||||||
rules: 'required',
|
componentProps: {
|
||||||
|
placeholder: '请输入绑定域名,多个域名请换行分隔',
|
||||||
|
rows: 3,
|
||||||
|
allowClear: true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
fieldName: 'status',
|
fieldName: 'status',
|
||||||
|
@ -211,7 +215,7 @@ export function useGridColumns<T = SystemTenantApi.Tenant>(
|
||||||
formatter: 'formatDateTime',
|
formatter: 'formatDateTime',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
field: 'website',
|
field: 'websites',
|
||||||
title: '绑定域名',
|
title: '绑定域名',
|
||||||
minWidth: 180,
|
minWidth: 180,
|
||||||
},
|
},
|
||||||
|
|
|
@ -42,7 +42,16 @@ const [Modal, modalApi] = useVbenModal({
|
||||||
}
|
}
|
||||||
modalApi.lock();
|
modalApi.lock();
|
||||||
// 提交表单
|
// 提交表单
|
||||||
const data = (await formApi.getValues()) as SystemTenantApi.Tenant;
|
const formValues = (await formApi.getValues()) as SystemTenantApi.Tenant & {
|
||||||
|
websites: string;
|
||||||
|
};
|
||||||
|
// 将换行符分隔的字符串转换为数组
|
||||||
|
const data: SystemTenantApi.Tenant = {
|
||||||
|
...formValues,
|
||||||
|
websites: formValues.websites
|
||||||
|
? formValues.websites.split('\n').filter((item) => item.trim())
|
||||||
|
: [],
|
||||||
|
};
|
||||||
try {
|
try {
|
||||||
await (formData.value ? updateTenant(data) : createTenant(data));
|
await (formData.value ? updateTenant(data) : createTenant(data));
|
||||||
// 关闭并提示
|
// 关闭并提示
|
||||||
|
@ -66,8 +75,15 @@ const [Modal, modalApi] = useVbenModal({
|
||||||
modalApi.lock();
|
modalApi.lock();
|
||||||
try {
|
try {
|
||||||
formData.value = await getTenant(data.id as number);
|
formData.value = await getTenant(data.id as number);
|
||||||
|
// 将数组转换为换行符分隔的字符串
|
||||||
|
const formValues = {
|
||||||
|
...formData.value,
|
||||||
|
websites: Array.isArray(formData.value.websites)
|
||||||
|
? formData.value.websites.join('\n')
|
||||||
|
: formData.value.websites || '',
|
||||||
|
};
|
||||||
// 设置到 values
|
// 设置到 values
|
||||||
await formApi.setValues(formData.value);
|
await formApi.setValues(formValues);
|
||||||
} finally {
|
} finally {
|
||||||
modalApi.unlock();
|
modalApi.unlock();
|
||||||
}
|
}
|
||||||
|
@ -75,7 +91,7 @@ const [Modal, modalApi] = useVbenModal({
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<Modal :title="getTitle">
|
<Modal :title="getTitle" class="w-1/2">
|
||||||
<Form class="mx-4" />
|
<Form class="mx-4" />
|
||||||
</Modal>
|
</Modal>
|
||||||
</template>
|
</template>
|
||||||
|
|
Loading…
Reference in New Issue