欧阳子桐 / RuoYi · 提交

转到一个项目

作者 RuoYi
提交 006d46ad07ba9a524eb7bb5aa2fe37e37c854594 1 个父辈 f5a1b0c5

修复自定义字典样式不生效的问题(I81F03)

内嵌 并排对比
正在显示 2 个修改的文件 包含 3 行增加 和 3 行删除
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <template v-for="(item, index) in options"> 3 <template v-for="(item, index) in options">
4 <template v-if="values.includes(item.value)"> 4 <template v-if="values.includes(item.value)">
5 <span 5 <span
6 - v-if="item.raw.listClass == 'default' || item.raw.listClass == ''" 6 + v-if="(item.raw.listClass == 'default' || item.raw.listClass == '') && (item.raw.cssClass == '' || item.raw.cssClass == null)"
7 :key="item.value" 7 :key="item.value"
8 :index="index" 8 :index="index"
9 :class="item.raw.cssClass" 9 :class="item.raw.cssClass"
@@ -95,8 +95,8 @@ @@ -95,8 +95,8 @@
95 <el-table-column label="字典编码" align="center" prop="dictCode" /> 95 <el-table-column label="字典编码" align="center" prop="dictCode" />
96 <el-table-column label="字典标签" align="center" prop="dictLabel"> 96 <el-table-column label="字典标签" align="center" prop="dictLabel">
97 <template slot-scope="scope"> 97 <template slot-scope="scope">
98 - <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.dictLabel}}</span>  
99 - <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.dictLabel}}</el-tag> 98 + <span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
  99 + <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
100 </template> 100 </template>
101 </el-table-column> 101 </el-table-column>
102 <el-table-column label="字典键值" align="center" prop="dictValue" /> 102 <el-table-column label="字典键值" align="center" prop="dictValue" />