From 1e21b3e083ba0d35ef2b19cec627caf6ce7d2cc4 Mon Sep 17 00:00:00 2001 From: Carlson Date: Thu, 17 Nov 2022 09:30:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E7=BB=99supe?= =?UTF-8?q?rman=E6=A3=80=E6=B5=8B=E5=8A=A0=E4=B8=AA=E6=B3=A8=E9=87=8A=20&&?= =?UTF-8?q?=20=E5=8A=A0=E4=B8=AA=E8=80=83=E8=99=91=E5=88=B0=E6=9C=89?= =?UTF-8?q?=E4=BA=9B=E7=94=A8=E6=88=B7=E9=9C=80=E8=A6=81=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=8E=A7=E5=88=B6=E6=89=BE=E5=9B=9E=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E8=BF=98=E5=8E=9F=E4=B9=8B=E5=89=8D=E7=9A=84?= =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/mainframe/vcs/common/VcsHelper.java | 4 ---- .../chartx/component/correlation/AbstractCorrelationPane.java | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java index 4fec2080b9..980ccb5a3a 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java +++ b/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; diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/correlation/AbstractCorrelationPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/correlation/AbstractCorrelationPane.java index 195eb6085f..2cb52f4542 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/component/correlation/AbstractCorrelationPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/component/correlation/AbstractCorrelationPane.java @@ -127,6 +127,9 @@ public abstract class AbstractCorrelationPane extends BasicBeanPane { return StringUtils.EMPTY; } + /** + * 清空 “系列名使用字段名” 表格 + */ public void clearAllBoxList() { this.correlationPane.getTable().clear(); this.correlationPane.validate();