yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: render dict

pull/7/head
xingyu 2023-05-04 16:17:54 +08:00
parent 3ed4174aad
commit 30065de533
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/DictTag/src/DictTag.vue
View File

@ -51,11 +51,11 @@ export default defineComponent({
return null return null
} }
// 解决自定义字典标签值为零时标签不渲染的问题 // 解决自定义字典标签值为零时标签不渲染的问题
if (props.value === undefined) { if (props.value === undefined && props.value !== null) {
return null return null
} }
getDictObj(props.type, props.value.toString()) getDictObj(props.type, props.value.toString())
// 添加标签的文字颜色为白色，解决自定义背景颜色时标签文字看不清的问题 && isHexColor(dictData.value?.cssClass) // 添加标签的文字颜色为白色，解决自定义背景颜色时标签文字看不清的问题 && isHexColor(dictData.value?.cssClass)
return ( return (
<Tag <Tag
color={ color={

2
src/components/Table/src/hooks/useRender.ts
View File

@ -94,7 +94,7 @@ export const useRender = {
*/ */
renderDict: (text, type, dictType?) => { renderDict: (text, type, dictType?) => {
if (type) { if (type) {
return h(DictTag, { type: type, value: text || '', dictType: dictType || 'number' }) return h(DictTag, { type: type, value: text !== null ? text : '', dictType: dictType || 'number' })
} }
return '' return ''
}, },