新增:字典管理添加标签颜色功能
parent
54c63e6443
commit
220896507b
|
@ -182,6 +182,7 @@ class Dictionary(CoreModel):
|
||||||
parent = models.ForeignKey(to='self', related_name='sublist', db_constraint=False, on_delete=models.PROTECT,
|
parent = models.ForeignKey(to='self', related_name='sublist', db_constraint=False, on_delete=models.PROTECT,
|
||||||
blank=True, null=True, verbose_name="父级", help_text="父级")
|
blank=True, null=True, verbose_name="父级", help_text="父级")
|
||||||
type = models.IntegerField(choices=TYPE_LIST, default=0, verbose_name="数据值类型", help_text="数据值类型")
|
type = models.IntegerField(choices=TYPE_LIST, default=0, verbose_name="数据值类型", help_text="数据值类型")
|
||||||
|
color = models.CharField(max_length=20, blank=True, null=True, verbose_name="颜色", help_text="颜色")
|
||||||
is_value = models.BooleanField(default=False, verbose_name="是否为value值", help_text="是否为value值,用来做具体值存放")
|
is_value = models.BooleanField(default=False, verbose_name="是否为value值", help_text="是否为value值,用来做具体值存放")
|
||||||
status = models.BooleanField(default=True, verbose_name="状态", help_text="状态")
|
status = models.BooleanField(default=True, verbose_name="状态", help_text="状态")
|
||||||
sort = models.IntegerField(default=1, verbose_name="显示排序", null=True, blank=True, help_text="显示排序")
|
sort = models.IntegerField(default=1, verbose_name="显示排序", null=True, blank=True, help_text="显示排序")
|
||||||
|
|
|
@ -18,7 +18,7 @@ export function getButtonSettings (objectSettings) {
|
||||||
return {
|
return {
|
||||||
label: item.label,
|
label: item.label,
|
||||||
value: item.value,
|
value: item.value,
|
||||||
color: BUTTON_VALUE_TO_COLOR_MAPPING[item.value]
|
color: item.color || BUTTON_VALUE_TO_COLOR_MAPPING[item.value]
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -223,9 +223,7 @@ export const crudOptions = (vm) => {
|
||||||
class: { yxtInput: true }
|
class: { yxtInput: true }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
}, {
|
||||||
|
|
||||||
{
|
|
||||||
title: '状态',
|
title: '状态',
|
||||||
key: 'status',
|
key: 'status',
|
||||||
width: 80,
|
width: 80,
|
||||||
|
@ -264,6 +262,33 @@ export const crudOptions = (vm) => {
|
||||||
class: { yxtInput: true }
|
class: { yxtInput: true }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}, {
|
||||||
|
title: '标签颜色',
|
||||||
|
key: 'color',
|
||||||
|
width: 90,
|
||||||
|
search: {
|
||||||
|
disabled: true
|
||||||
|
},
|
||||||
|
type: 'select',
|
||||||
|
dict: {
|
||||||
|
data: [
|
||||||
|
{ label: 'success', value: 'success', color: 'success' },
|
||||||
|
{ label: 'primary', value: 'primary', color: 'primary' },
|
||||||
|
{ label: 'info', value: 'info', color: 'info' },
|
||||||
|
{ label: 'danger', value: 'danger', color: 'danger' },
|
||||||
|
{ label: 'warning', value: 'warning', color: 'warning' }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
form: {
|
||||||
|
component: {
|
||||||
|
props: {
|
||||||
|
clearable: true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
itemProps: {
|
||||||
|
class: { yxtInput: true }
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
].concat(vm.commonEndColumns({
|
].concat(vm.commonEndColumns({
|
||||||
update_datetime: {
|
update_datetime: {
|
||||||
|
|
Loading…
Reference in New Issue