Browse Source

style:Update the contribution guide to ensure the information is current.

pull/3802/head
Black Pan 12 months ago
parent
commit
764192c45a
  1. 12
      easyexcel-core/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
  2. BIN
      img/style/idea/step1.png
  3. BIN
      img/style/idea/step2.png
  4. BIN
      img/style/idea/step3.png
  5. 6
      style/STYLE.md

12
easyexcel-core/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java

@ -212,10 +212,10 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
if (analysisCell.getOnlyOneVariable()) { if (analysisCell.getOnlyOneVariable()) {
String variable = analysisCell.getVariableList().get(0); String variable = analysisCell.getVariableList().get(0);
Object value =null; if (!dataKeySet.contains(variable)) {
if (dataKeySet.contains(variable)) { continue;
value = dataMap.get(variable);
} }
Object value = dataMap.get(variable);
ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap, ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap,
writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable, writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable,
writeContext.currentWriteHolder()); writeContext.currentWriteHolder());
@ -247,10 +247,10 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
for (String variable : analysisCell.getVariableList()) { for (String variable : analysisCell.getVariableList()) {
cellValueBuild.append(analysisCell.getPrepareDataList().get(index++)); cellValueBuild.append(analysisCell.getPrepareDataList().get(index++));
Object value =null; if (!dataKeySet.contains(variable)) {
if (dataKeySet.contains(variable)) { continue;
value = dataMap.get(variable);
} }
Object value = dataMap.get(variable);
ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap, ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap,
writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable, writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable,
writeContext.currentWriteHolder()); writeContext.currentWriteHolder());

BIN
img/style/idea/step1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 61 KiB

BIN
img/style/idea/step2.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 76 KiB

BIN
img/style/idea/step3.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 102 KiB

6
style/STYLE.md

@ -16,12 +16,12 @@
* 点击`Apply`完成配置 * 点击`Apply`完成配置
![step](../img/style/eclipse/step.jpg) ![step](../img/style/eclipse/step.jpg)
#### idea #### idea
* 依次点击进入插件界面:`File->Settings->Plugins`,搜索 eclipse code formatter,如已有插件则不需安装,如没有,点击Search in repositories自动搜索线上插件。 * 依次点击进入插件界面:`File->Settings->Plugins`,搜索 Adapter for Eclipse Code Formatter ,如已有插件则不需安装,如没有,点击Search in repositories自动搜索线上插件。
![step1](../img/style/idea/step1.png) ![step1](../img/style/idea/step1.png)
* 导入`style/eclipse/codestyle.xml` 这里记住用的也是eclipse里面的 点击OK * 导入`style/eclipse/codestyle.xml` 这里记住用的也是eclipse里面的 点击OK
![step1](../img/style/idea/step2.png) ![step2](../img/style/idea/step2.png)
* 依次点击进入插件界面:`File->Settings->Editor->Code Style->Java->Import Scheme->Intellij IDEA code style XML`,导入`style/idea/codestyle.xml` 这里用的是idea的配置文件 * 依次点击进入插件界面:`File->Settings->Editor->Code Style->Java->Import Scheme->Intellij IDEA code style XML`,导入`style/idea/codestyle.xml` 这里用的是idea的配置文件
![step1](../img/style/idea/step3.png) ![step3](../img/style/idea/step3.png)
* 完成 * 完成
### 附 ### 附

Loading…
Cancel
Save