欧阳子桐 / RuoYi · 提交

转到一个项目

作者 马小法
提交 c628aa5be83394f14b0c5f3e26eed49127c4d62b 1 个父辈 4e8c6fb7

修改代码生成字典回显样式

内嵌 并排对比
正在显示 2 个修改的文件 包含 10 行增加 和 30 行删除
@@ -106,7 +106,11 @@ @@ -106,7 +106,11 @@
106 </template> 106 </template>
107 </el-table-column> 107 </el-table-column>
108 #elseif($column.list && "" != $column.dictType) 108 #elseif($column.list && "" != $column.dictType)
109 - <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" /> 109 + <el-table-column label="${comment}" align="center" prop="${javaField}">
  110 + <template slot-scope="scope">
  111 + <dict-tag :options="${javaField}Options" :value="scope.row.${javaField}"/>
  112 + </template>
  113 + </el-table-column>
110 #elseif($column.list && "" != $javaField) 114 #elseif($column.list && "" != $javaField)
111 #if(${foreach.index} == 1) 115 #if(${foreach.index} == 1)
112 <el-table-column label="${comment}" prop="${javaField}" /> 116 <el-table-column label="${comment}" prop="${javaField}" />
@@ -378,20 +382,6 @@ export default { @@ -378,20 +382,6 @@ export default {
378 this.${businessName}Options.push(data); 382 this.${businessName}Options.push(data);
379 }); 383 });
380 }, 384 },
381 -#foreach ($column in $columns)  
382 -#if(${column.dictType} != '')  
383 -#set($parentheseIndex=$column.columnComment.indexOf("（"))  
384 -#if($parentheseIndex != -1)  
385 -#set($comment=$column.columnComment.substring(0, $parentheseIndex))  
386 -#else  
387 -#set($comment=$column.columnComment)  
388 -#end  
389 - // $comment字典翻译  
390 - ${column.javaField}Format(row, column) {  
391 - return this.selectDictLabel#if($column.htmlType == "checkbox")s#end(this.${column.javaField}Options, row.${column.javaField});  
392 - },  
393 -#end  
394 -#end  
395 // 取消按钮 385 // 取消按钮
396 cancel() { 386 cancel() {
397 this.open = false; 387 this.open = false;
@@ -135,7 +135,11 @@ @@ -135,7 +135,11 @@
135 </template> 135 </template>
136 </el-table-column> 136 </el-table-column>
137 #elseif($column.list && "" != $column.dictType) 137 #elseif($column.list && "" != $column.dictType)
138 - <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" /> 138 + <el-table-column label="${comment}" align="center" prop="${javaField}">
  139 + <template slot-scope="scope">
  140 + <dict-tag :options="${javaField}Options" :value="scope.row.${javaField}"/>
  141 + </template>
  142 + </el-table-column>
139 #elseif($column.list && "" != $javaField) 143 #elseif($column.list && "" != $javaField)
140 <el-table-column label="${comment}" align="center" prop="${javaField}" /> 144 <el-table-column label="${comment}" align="center" prop="${javaField}" />
141 #end 145 #end
@@ -426,20 +430,6 @@ export default { @@ -426,20 +430,6 @@ export default {
426 this.loading = false; 430 this.loading = false;
427 }); 431 });
428 }, 432 },
429 -#foreach ($column in $columns)  
430 -#if(${column.dictType} != '')  
431 -#set($parentheseIndex=$column.columnComment.indexOf("（"))  
432 -#if($parentheseIndex != -1)  
433 -#set($comment=$column.columnComment.substring(0, $parentheseIndex))  
434 -#else  
435 -#set($comment=$column.columnComment)  
436 -#end  
437 - // $comment字典翻译  
438 - ${column.javaField}Format(row, column) {  
439 - return this.selectDictLabel#if($column.htmlType == "checkbox")s#end(this.${column.javaField}Options, row.${column.javaField});  
440 - },  
441 -#end  
442 -#end  
443 // 取消按钮 433 // 取消按钮
444 cancel() { 434 cancel() {
445 this.open = false; 435 this.open = false;