Browse Source

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

This reverts commit e54b89675d.
feature/x
Destiny.Lin 1 year ago
parent
commit
cda76945a6
  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,6 +25,7 @@ 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;
@ -351,7 +352,7 @@ public class VcsHelper implements JTemplateActionListener {
* @return 支持返回true * @return 支持返回true
*/ */
public boolean checkV2FunctionSupport() { public boolean checkV2FunctionSupport() {
return !VcsHelper.getInstance().isLegacyMode() && (WorkContext.getCurrent().isLocal() || WorkContext.getCurrent().isRoot()); return VcsConfig.getInstance().isUseV2() && (WorkContext.getCurrent().isLocal() || WorkContext.getCurrent().isRoot());
} }
/** /**
@ -360,6 +361,6 @@ public class VcsHelper implements JTemplateActionListener {
* @return 支持返回true * @return 支持返回true
*/ */
public boolean checkMoveFunctionSupport() { public boolean checkMoveFunctionSupport() {
return VcsHelper.getInstance().isLegacyMode() && (WorkContext.getCurrent().isLocal() || WorkContext.getCurrent().isRoot()); return !VcsConfig.getInstance().isUseV2() && (WorkContext.getCurrent().isLocal() || WorkContext.getCurrent().isRoot());
} }
} }

Loading…
Cancel
Save