Skip to content

Commit e05c296

Browse files
authored
fix(cluster): correct the parameter range render (#121)
1 parent 1e1ad98 commit e05c296

File tree

4 files changed

+16
-36
lines changed
  • apps/main/[3]cluster

4 files changed

+16
-36
lines changed

apps/main/[3]cluster/[1]instances/[-2]_clusterId/[4]params/components/ParamsTable/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ function getColumns(t: TFunction<''>, form: FormInstance) {
223223
key: 'range',
224224
renderText(_, record) {
225225
return isArray(record.range) && record.range.length > 0
226-
? renderRange(record.type!, record.range, record.rangeType!)
226+
? renderRange(record.range, record.rangeType!)
227227
: null
228228
},
229229
editable: false,

apps/main/[3]cluster/[3]param-group/[-2]_paramGroupId/components/ParamCard/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function getColumns(t: TFunction<''>) {
4242
key: 'range',
4343
renderText(_, record) {
4444
return isArray(record.range) && record.range.length > 0
45-
? renderRange(record.type!, record.range, record.rangeType!)
45+
? renderRange(record.range, record.rangeType!)
4646
: null
4747
},
4848
},
Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,32 @@
1-
import { ParamValueDataType, ParamRangeType } from '@/api/model'
1+
import { ParamRangeType } from '@/api/model'
22

33
const rangeRenderTable = [
44
{
5-
valueType: (type: number) =>
6-
[ParamValueDataType.int, ParamValueDataType.float].includes(type),
75
rangeType: (type: number) => type === ParamRangeType.continuous,
8-
render: (range: string[]) => `${range[0]} ~ ${range[1]}`,
6+
render: (range: string[]) => {
7+
const [start, end] = range
8+
9+
return [start, end].filter((el) => el !== undefined).join(' ~ ')
10+
},
911
},
1012
{
11-
valueType: (type: number) =>
12-
[ParamValueDataType.int, ParamValueDataType.float].includes(type),
1313
rangeType: (type: number) => type === ParamRangeType.discrete,
1414
render: (range: string[]) =>
1515
range.filter((el) => el !== undefined).join(', '),
1616
},
1717
{
18-
valueType: (type: number) =>
19-
[ParamValueDataType.string, ParamValueDataType.array].includes(type),
20-
rangeType: (type: number) =>
21-
type === ParamRangeType.discrete || type === ParamRangeType.none,
22-
render: (range: string[]) =>
23-
range.filter((el) => el !== undefined).join(', '),
24-
},
25-
{
26-
valueType: (type: number) => type === ParamValueDataType.boolean,
27-
rangeType: (type: number) =>
28-
type === ParamRangeType.discrete || type === ParamRangeType.none,
29-
render: (range: string[]) => {
30-
const [first, second] = range
31-
32-
return [first, second].filter((el) => el !== undefined).join(', ')
33-
},
18+
rangeType: (type: number) => type === ParamRangeType.none,
19+
render: () => undefined,
3420
},
3521
]
3622

3723
/**
38-
* Render parameter range
39-
* @param type parameter type
40-
* @param range parameter range
24+
* Render the parameter range
25+
* @param range parameter range value
26+
* @param rangeType parameter range type
4127
*/
42-
export const renderRange = (
43-
valType: number,
44-
range: string[],
45-
rangeType: number
46-
) => {
47-
const target = rangeRenderTable.find(
48-
(config) => config.valueType(valType) && config.rangeType(rangeType)
49-
)
28+
export const renderRange = (range: string[], rangeType: number) => {
29+
const target = rangeRenderTable.find((config) => config.rangeType(rangeType))
5030

5131
return target?.render(range)
5232
}

apps/main/[3]cluster/[3]param-group/components/EditableParamCard/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function getColumns(
5353
key: 'range',
5454
renderText(_, record) {
5555
return isArray(record.range) && record.range.length > 0
56-
? renderRange(record.type!, record.range, record.rangeType!)
56+
? renderRange(record.range, record.rangeType!)
5757
: null
5858
},
5959
editable: false,

0 commit comments

Comments
 (0)