refactor: standardize theme colors, update UI components, and refine auth redirection logic
This commit is contained in:
@@ -107,14 +107,15 @@ export enum STATUS_COLOR {
|
|||||||
|
|
||||||
// INACTIVE = '#6A252A',
|
// INACTIVE = '#6A252A',
|
||||||
// DEACTIVATED = '#792A2C',
|
// DEACTIVATED = '#792A2C',
|
||||||
INACTIVE = '#B52B24',
|
INACTIVE = '#BC1913',
|
||||||
DEACTIVATED = '#B52B24',
|
DEACTIVATED = '#BC1913',
|
||||||
CLOSE = '#883230',
|
CLOSE = '#883230',
|
||||||
CLOSED = '#973C35',
|
CLOSED = '#973C35',
|
||||||
|
|
||||||
// ACTIVE = '#518F00',
|
// ACTIVE = '#518F00',
|
||||||
ACTIVE = '#54BE05',
|
// ACTIVATED = '#539B01',
|
||||||
ACTIVATED = '#539B01',
|
ACTIVE = '#54B304',
|
||||||
|
ACTIVATED = '#54B304',
|
||||||
APPROVED = '#54A702',
|
APPROVED = '#54A702',
|
||||||
PROCESSED = '#54B304',
|
PROCESSED = '#54B304',
|
||||||
COMPLETED = '#54BE05',
|
COMPLETED = '#54BE05',
|
||||||
|
|||||||
@@ -678,7 +678,7 @@ export function EnterpriseDataTable<E extends BaseEntity>(props: EnterpriseDataT
|
|||||||
|
|
||||||
field: 'status' as any,
|
field: 'status' as any,
|
||||||
headerName: t('common:fields.status'),
|
headerName: t('common:fields.status'),
|
||||||
cellRenderer: ({ value }: any) => <StatusBadge status={value} size="sm" radius={'lg'} variant="filled" />,
|
cellRenderer: ({ value }: any) => <StatusBadge status={value} size="md" variant="light" />,
|
||||||
};
|
};
|
||||||
|
|
||||||
const prefixColumn: ColDef<E>[] = [
|
const prefixColumn: ColDef<E>[] = [
|
||||||
|
|||||||
@@ -698,8 +698,7 @@ export function EnterpriseDetailPageProvider<E extends BaseEntity = BaseEntity>(
|
|||||||
badges={
|
badges={
|
||||||
detailData ? (
|
detailData ? (
|
||||||
<StatusBadge
|
<StatusBadge
|
||||||
radius={'lg'}
|
variant="light"
|
||||||
variant="filled"
|
|
||||||
status={detailData[statusKey as keyof typeof detailData] as string}
|
status={detailData[statusKey as keyof typeof detailData] as string}
|
||||||
getCustomConfig={getCustomStatusBadgeConfig}
|
getCustomConfig={getCustomStatusBadgeConfig}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -534,8 +534,7 @@ export function EnterpriseFormPageProvider<E extends BaseEntity = BaseEntity>(pr
|
|||||||
badges={
|
badges={
|
||||||
detailData && formPageType === 'EDIT' ? (
|
detailData && formPageType === 'EDIT' ? (
|
||||||
<StatusBadge
|
<StatusBadge
|
||||||
radius={'lg'}
|
variant="light"
|
||||||
variant="filled"
|
|
||||||
status={detailData[statusKey as keyof typeof detailData] as string}
|
status={detailData[statusKey as keyof typeof detailData] as string}
|
||||||
getCustomConfig={getCustomStatusBadgeConfig}
|
getCustomConfig={getCustomStatusBadgeConfig}
|
||||||
/>
|
/>
|
||||||
|
|||||||
Reference in New Issue
Block a user