修复Excel注解prompt/combo同时使用不生效问题
This commit is contained in:
		
							parent
							
								
									3bc5ef38d3
								
							
						
					
					
						commit
						d311d56bbf
					
				@ -786,17 +786,10 @@ public class ExcelUtil<T>
 | 
			
		||||
            // 设置列宽
 | 
			
		||||
            sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
 | 
			
		||||
        }
 | 
			
		||||
        // 如果设置了提示信息则鼠标放上去提示.
 | 
			
		||||
        if (StringUtils.isNotEmpty(attr.prompt()))
 | 
			
		||||
        if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0)
 | 
			
		||||
        {
 | 
			
		||||
            // 这里默认设了2-101列提示.
 | 
			
		||||
            setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
 | 
			
		||||
        }
 | 
			
		||||
        // 如果设置了combo属性则本列只能选择不能输入
 | 
			
		||||
        if (attr.combo().length > 0)
 | 
			
		||||
        {
 | 
			
		||||
            // 这里默认设了2-101列只能选择不能输入.
 | 
			
		||||
            setXSSFValidation(sheet, attr.combo(), 1, 100, column, column);
 | 
			
		||||
            // 提示信息或只能选择不能输入的列内容.
 | 
			
		||||
            setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@ -860,48 +853,29 @@ public class ExcelUtil<T>
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 设置 POI XSSFSheet 单元格提示
 | 
			
		||||
     * 设置 POI XSSFSheet 单元格提示或选择框
 | 
			
		||||
     * 
 | 
			
		||||
     * @param sheet 表单
 | 
			
		||||
     * @param promptTitle 提示标题
 | 
			
		||||
     * @param textlist 下拉框显示的内容
 | 
			
		||||
     * @param promptContent 提示内容
 | 
			
		||||
     * @param firstRow 开始行
 | 
			
		||||
     * @param endRow 结束行
 | 
			
		||||
     * @param firstCol 开始列
 | 
			
		||||
     * @param endCol 结束列
 | 
			
		||||
     */
 | 
			
		||||
    public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow,
 | 
			
		||||
    public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow,
 | 
			
		||||
            int firstCol, int endCol)
 | 
			
		||||
    {
 | 
			
		||||
        DataValidationHelper helper = sheet.getDataValidationHelper();
 | 
			
		||||
        DataValidationConstraint constraint = helper.createCustomConstraint("DD1");
 | 
			
		||||
        DataValidationConstraint constraint = textlist.length > 0 ? helper.createExplicitListConstraint(textlist) : helper.createCustomConstraint("DD1");
 | 
			
		||||
        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
 | 
			
		||||
        DataValidation dataValidation = helper.createValidation(constraint, regions);
 | 
			
		||||
        dataValidation.createPromptBox(promptTitle, promptContent);
 | 
			
		||||
        dataValidation.setShowPromptBox(true);
 | 
			
		||||
        sheet.addValidationData(dataValidation);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 设置某些列的值只能输入预制的数据,显示下拉框.
 | 
			
		||||
     * 
 | 
			
		||||
     * @param sheet 要设置的sheet.
 | 
			
		||||
     * @param textlist 下拉框显示的内容
 | 
			
		||||
     * @param firstRow 开始行
 | 
			
		||||
     * @param endRow 结束行
 | 
			
		||||
     * @param firstCol 开始列
 | 
			
		||||
     * @param endCol 结束列
 | 
			
		||||
     * @return 设置好的sheet.
 | 
			
		||||
     */
 | 
			
		||||
    public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol)
 | 
			
		||||
    {
 | 
			
		||||
        DataValidationHelper helper = sheet.getDataValidationHelper();
 | 
			
		||||
        // 加载下拉列表内容
 | 
			
		||||
        DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist);
 | 
			
		||||
        // 设置数据有效性加载在哪个单元格上,四个参数分别是:起始行、终止行、起始列、终止列
 | 
			
		||||
        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
 | 
			
		||||
        // 数据有效性对象
 | 
			
		||||
        DataValidation dataValidation = helper.createValidation(constraint, regions);
 | 
			
		||||
        if (StringUtils.isNotEmpty(promptContent))
 | 
			
		||||
        {
 | 
			
		||||
            // 如果设置了提示信息则鼠标放上去提示
 | 
			
		||||
            dataValidation.createPromptBox("", promptContent);
 | 
			
		||||
            dataValidation.setShowPromptBox(true);
 | 
			
		||||
        }
 | 
			
		||||
        // 处理Excel兼容性问题
 | 
			
		||||
        if (dataValidation instanceof XSSFDataValidation)
 | 
			
		||||
        {
 | 
			
		||||
@ -912,7 +886,6 @@ public class ExcelUtil<T>
 | 
			
		||||
        {
 | 
			
		||||
            dataValidation.setSuppressDropDownArrow(false);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        sheet.addValidationData(dataValidation);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user