This commit is contained in:
@@ -2,10 +2,12 @@ import type {
|
||||
ProColumns,
|
||||
ProFormColumnsType,
|
||||
} from '@ant-design/pro-components';
|
||||
import { Tag } from 'antd';
|
||||
|
||||
import dayjs from 'dayjs';
|
||||
import DictTag from '@/components/XTag';
|
||||
import { tenantStatus } from '@/constants';
|
||||
import type { DictTypeVO } from '@/services/system/dict/dict.type';
|
||||
import { DICT_TYPE } from '@/utils/dict';
|
||||
|
||||
export const baseDictTypeColumns: ProColumns<DictTypeVO>[] = [
|
||||
{
|
||||
@@ -29,14 +31,12 @@ export const baseDictTypeColumns: ProColumns<DictTypeVO>[] = [
|
||||
title: '状态',
|
||||
dataIndex: 'status',
|
||||
width: 100,
|
||||
render: (_, record) => (
|
||||
<Tag
|
||||
key={record.status}
|
||||
color={record.status === 1 ? 'default' : 'processing'}
|
||||
>
|
||||
{record.status === 1 ? '正常' : '禁用'}
|
||||
</Tag>
|
||||
),
|
||||
valueType: 'select',
|
||||
render: (_, record) => {
|
||||
return (
|
||||
<DictTag type={DICT_TYPE.COMMON_STATUS} value={record.status}></DictTag>
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '备注',
|
||||
|
||||
@@ -47,6 +47,7 @@ export const baseDictDataColumns: ProColumns<DictDataVO>[] = [
|
||||
},
|
||||
{
|
||||
title: 'CSS Class',
|
||||
|
||||
dataIndex: 'cssClass',
|
||||
width: 120,
|
||||
},
|
||||
@@ -133,11 +134,11 @@ export const formColumns = (_type: string): ProFormColumnsType[] => [
|
||||
options: [
|
||||
{
|
||||
label: '启用',
|
||||
value: 1,
|
||||
value: 0,
|
||||
},
|
||||
{
|
||||
label: '禁用',
|
||||
value: 0,
|
||||
value: 1,
|
||||
},
|
||||
],
|
||||
},
|
||||
@@ -181,6 +182,7 @@ export const formColumns = (_type: string): ProFormColumnsType[] => [
|
||||
{
|
||||
title: 'CSS Class',
|
||||
dataIndex: 'cssClass',
|
||||
tooltip: '输入rgb颜色值或#16进制颜色值',
|
||||
},
|
||||
{
|
||||
title: '备注',
|
||||
|
||||
@@ -2,10 +2,10 @@ import type {
|
||||
ProColumns,
|
||||
ProFormColumnsType,
|
||||
} from '@ant-design/pro-components';
|
||||
import { DatePicker, Modal, Popconfirm } from 'antd';
|
||||
import { FormInstance } from 'antd/lib';
|
||||
import { Tag } from 'antd';
|
||||
|
||||
import dayjs from 'dayjs';
|
||||
import { deleteTenant, type TenantVO } from '@/services/system/tenant/list';
|
||||
import type { TenantVO } from '@/services/system/tenant/list';
|
||||
import { getTenantPackageList } from '@/services/system/tenant/package';
|
||||
|
||||
export const baseTenantColumns: ProColumns<TenantVO>[] = [
|
||||
@@ -29,8 +29,22 @@ export const baseTenantColumns: ProColumns<TenantVO>[] = [
|
||||
request: async () => {
|
||||
const packageList: { id: number; name: string }[] =
|
||||
await getTenantPackageList();
|
||||
packageList.map((item) => ({ label: item.name, value: item.id }));
|
||||
return packageList.map((item) => ({ label: item.name, value: item.id }));
|
||||
const newData = packageList.map((item) => ({
|
||||
label: item.name,
|
||||
value: item.id,
|
||||
}));
|
||||
const defData = [{ value: 0, label: '系统' }];
|
||||
return [...defData, ...newData];
|
||||
},
|
||||
render: (dom, record) => {
|
||||
return (
|
||||
<Tag
|
||||
key={record.id}
|
||||
color={record.packageId === 0 ? 'error' : 'success'}
|
||||
>
|
||||
{dom}
|
||||
</Tag>
|
||||
);
|
||||
},
|
||||
// valueEnum: {
|
||||
// all: { text: "全部", status: "Default" },
|
||||
|
||||
Reference in New Issue
Block a user