修复代码生成复选框字典遗漏问题
This commit is contained in:
		
							parent
							
								
									16734b1d88
								
							
						
					
					
						commit
						64f6a69d9a
					
				| 
						 | 
				
			
			@ -274,7 +274,8 @@ public class VelocityUtils
 | 
			
		|||
        for (GenTableColumn column : columns)
 | 
			
		||||
        {
 | 
			
		||||
            if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(
 | 
			
		||||
                    column.getHtmlType(), new String[] { GenConstants.HTML_SELECT, GenConstants.HTML_RADIO }))
 | 
			
		||||
                    column.getHtmlType(),
 | 
			
		||||
                    new String[] { GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX }))
 | 
			
		||||
            {
 | 
			
		||||
                dicts.add("'" + column.getDictType() + "'");
 | 
			
		||||
            }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -108,7 +108,11 @@
 | 
			
		|||
#elseif($column.list && "" != $column.dictType)
 | 
			
		||||
      <el-table-column label="${comment}" align="center" prop="${javaField}">
 | 
			
		||||
        <template slot-scope="scope">
 | 
			
		||||
#if($column.htmlType == "checkbox")
 | 
			
		||||
          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
 | 
			
		||||
#else
 | 
			
		||||
          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
 | 
			
		||||
#end
 | 
			
		||||
        </template>
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
#elseif($column.list && "" != $javaField)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -136,7 +136,11 @@
 | 
			
		|||
#elseif($column.list && "" != $column.dictType)
 | 
			
		||||
      <el-table-column label="${comment}" align="center" prop="${javaField}">
 | 
			
		||||
        <template slot-scope="scope">
 | 
			
		||||
#if($column.htmlType == "checkbox")
 | 
			
		||||
          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
 | 
			
		||||
#else
 | 
			
		||||
          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
 | 
			
		||||
#end
 | 
			
		||||
        </template>
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
#elseif($column.list && "" != $javaField)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue