Browse Source

Revert "REPORT-91839 模板版本管理二期 完善一下判断逻辑,增加自动保存标签设置"

This reverts commit 4bd02cf06a.
newui
Destiny.Lin 2 years ago
parent
commit
e54b89675d
  1. 5
      designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java

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

@ -25,7 +25,6 @@ import com.fr.stable.project.ProjectConstants;
import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContext;
import com.fr.workspace.Workspace; import com.fr.workspace.Workspace;
import com.fr.workspace.WorkspaceEvent; import com.fr.workspace.WorkspaceEvent;
import com.fr.workspace.server.vcs.VcsConfig;
import com.fr.workspace.server.vcs.VcsOperator; import com.fr.workspace.server.vcs.VcsOperator;
import com.fr.workspace.server.vcs.filesystem.VcsFileSystem; import com.fr.workspace.server.vcs.filesystem.VcsFileSystem;
import com.fr.workspace.server.vcs.git.config.GcConfig; import com.fr.workspace.server.vcs.git.config.GcConfig;
@ -352,7 +351,7 @@ public class VcsHelper implements JTemplateActionListener {
* @return 支持返回true * @return 支持返回true
*/ */
public boolean checkV2FunctionSupport() { public boolean checkV2FunctionSupport() {
return VcsConfig.getInstance().isUseV2() && (WorkContext.getCurrent().isLocal() || WorkContext.getCurrent().isRoot()); return !VcsHelper.getInstance().isLegacyMode() && (WorkContext.getCurrent().isLocal() || WorkContext.getCurrent().isRoot());
} }
/** /**
@ -361,6 +360,6 @@ public class VcsHelper implements JTemplateActionListener {
* @return 支持返回true * @return 支持返回true
*/ */
public boolean checkMoveFunctionSupport() { public boolean checkMoveFunctionSupport() {
return !VcsConfig.getInstance().isUseV2() && (WorkContext.getCurrent().isLocal() || WorkContext.getCurrent().isRoot()); return VcsHelper.getInstance().isLegacyMode() && (WorkContext.getCurrent().isLocal() || WorkContext.getCurrent().isRoot());
} }
} }

Loading…
Cancel
Save