fix: 路由策略key类型为string

This commit is contained in:
dhb52 2024-05-04 19:00:56 +08:00
parent 0dc29b8ed5
commit ca112f4467
6 changed files with 41 additions and 26 deletions

View File

@ -117,12 +117,12 @@ export const backOffRecord: Record<Api.RetryScene.BackOff, App.I18n.I18nKey> = {
export const backOffRecordOptions = transformRecordToNumberOption(backOffRecord, true); export const backOffRecordOptions = transformRecordToNumberOption(backOffRecord, true);
export const routeKeyRecord: Record<Api.Common.RouteKey, App.I18n.I18nKey> = { export const routeKeyRecord: Record<Api.Common.RouteKey, App.I18n.I18nKey> = {
1: 'common.routeKey.items.consistentHash', '1': 'common.routeKey.items.consistentHash',
2: 'common.routeKey.items.random', '2': 'common.routeKey.items.random',
3: 'common.routeKey.items.lru', '3': 'common.routeKey.items.lru',
4: 'common.routeKey.items.round' '4': 'common.routeKey.items.round'
}; };
export const routeKeyRecordOptions = transformRecordToNumberOption(routeKeyRecord, true); export const routeKeyRecordOptions = transformRecordToOption(routeKeyRecord);
/** 阻塞策略 */ /** 阻塞策略 */
export const blockStrategyRecord: Record<Api.Common.BlockStrategy, App.I18n.I18nKey> = { export const blockStrategyRecord: Record<Api.Common.BlockStrategy, App.I18n.I18nKey> = {

View File

@ -71,7 +71,7 @@ declare namespace Api {
} & T; } & T;
/** 1: 一致性Hash 2: 随机 3: LRU 4: 轮询 */ /** 1: 一致性Hash 2: 随机 3: LRU 4: 轮询 */
type RouteKey = 1 | 2 | 3 | 4; type RouteKey = '1' | '2' | '3' | '4';
/** 阻塞策略 1:丢弃 2:覆盖 3:并行 */ /** 阻塞策略 1:丢弃 2:覆盖 3:并行 */
type BlockStrategy = 1 | 2 | 3; type BlockStrategy = 1 | 2 | 3;

View File

@ -69,7 +69,9 @@ export function translateOptions2(options: string[]) {
* *
* @param index * @param index
*/ */
export function tagColor(index: number) { export function tagColor(index: number | string) {
const indexNumber = Number(index);
const tagMap: Record<number, NaiveUI.ThemeColor> = { const tagMap: Record<number, NaiveUI.ThemeColor> = {
0: 'error', 0: 'error',
1: 'info', 1: 'info',
@ -78,9 +80,9 @@ export function tagColor(index: number) {
4: 'primary' 4: 'primary'
}; };
if (index === null || index < 0) { if (indexNumber === null || indexNumber < 0) {
return tagMap[1]; return tagMap[1];
} }
return tagMap[index % 5]; return tagMap[indexNumber % 5];
} }

View File

@ -53,27 +53,33 @@ const { columns, data, getData, loading, mobilePagination, searchParams, resetSe
return null; return null;
} }
const tagMap: Record<Api.Common.OperationReason, NaiveUI.ThemeColor> = { const tagMap: Record<Api.Common.OperationReason, NaiveUI.ThemeColor> = {
0: 'default', 0: 'warning',
1: 'default', 1: 'warning',
2: 'error', 2: 'warning',
3: 'default', 3: 'warning',
4: 'default', 4: 'warning',
5: 'default', 5: 'warning',
6: 'default', 6: 'warning',
7: 'default', 7: 'warning',
8: 'default', 8: 'warning',
9: 'default', 9: 'warning',
10: 'default', 10: 'warning',
11: 'default', 11: 'warning',
12: 'default', 12: 'warning',
13: 'default', 13: 'warning',
14: 'default' 14: 'warning'
}; };
const label = $t(operationReasonRecord[row.operationReason!]); const label = $t(operationReasonRecord[row.operationReason!]);
return <NTag type={tagMap[row.operationReason!]}>{label}</NTag>; return <NTag type={tagMap[row.operationReason!]}>{label}</NTag>;
} }
}, },
{
key: 'createDt',
title: $t('common.createDt'),
align: 'center',
minWidth: 120
},
{ {
key: 'operate', key: 'operate',
title: $t('common.operate'), title: $t('common.operate'),
@ -84,6 +90,9 @@ const { columns, data, getData, loading, mobilePagination, searchParams, resetSe
<NButton type="primary" ghost size="small" onClick={() => detail(row.id!)}> <NButton type="primary" ghost size="small" onClick={() => detail(row.id!)}>
{$t('common.detail')} {$t('common.detail')}
</NButton> </NButton>
<NButton type="primary" ghost size="small" onClick={() => handleExecute(row.id!)}>
{$t('common.execute')}
</NButton>
</div> </div>
) )
} }
@ -93,6 +102,10 @@ const { columns, data, getData, loading, mobilePagination, searchParams, resetSe
function detail(id: string) { function detail(id: string) {
console.log(id); console.log(id);
} }
function handleExecute(id: string) {
console.log(id);
}
</script> </script>
<template> <template>

View File

@ -80,7 +80,7 @@ function createDefaultModel(): Model {
argsStr: '', argsStr: '',
argsType: 1, argsType: 1,
jobStatus: 1, jobStatus: 1,
routeKey: 1, routeKey: '1',
executorType: 1, executorType: 1,
triggerType: 2, triggerType: 2,
executorInfo: '', executorInfo: '',

View File

@ -76,7 +76,7 @@ function createDefaultModel(): Model {
deadlineRequest: 60000, deadlineRequest: 60000,
executorTimeout: 60, executorTimeout: 60,
description: '', description: '',
routeKey: 4 routeKey: '4'
}; };
} }