Browse Source

无JIRA任务 给superman检测加个注释 && 加个考虑到有些用户需要通过版本控制找回模板,还原之前的改动

release/11.0
Carlson 2 years ago
parent
commit
1e21b3e083
  1. 4
      designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java
  2. 3
      designer-chart/src/main/java/com/fr/design/chartx/component/correlation/AbstractCorrelationPane.java

4
designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java

@ -1,7 +1,6 @@
package com.fr.design.mainframe.vcs.common;
import com.fr.base.extension.FileExtension;
import com.fr.concurrent.NamedThreadFactory;
import com.fr.design.DesignerEnvManager;
import com.fr.design.file.HistoryTemplateListCache;
@ -136,9 +135,6 @@ public class VcsHelper implements JTemplateActionListener {
public void run() {
String fileName = getEditingFilename();
if (FileExtension.VIS.matchExtension(fileName)) { // fvs文件先不做版本控制
return;
}
VcsOperator operator = WorkContext.getCurrent().get(VcsOperator.class);
VcsEntity entity = operator.getFileVersionByIndex(fileName, 0);
int latestFileVersion = 0;

3
designer-chart/src/main/java/com/fr/design/chartx/component/correlation/AbstractCorrelationPane.java

@ -127,6 +127,9 @@ public abstract class AbstractCorrelationPane<T> extends BasicBeanPane<T> {
return StringUtils.EMPTY;
}
/**
* 清空 系列名使用字段名 表格
*/
public void clearAllBoxList() {
this.correlationPane.getTable().clear();
this.correlationPane.validate();

Loading…
Cancel
Save