REPORT-101740 【版本管理三期】版本中心打开被锁定的模板，没有提示

designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java

@@ -239,11 +239,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
         String reportPath = reportletsTree.getSelectedTemplatePath();
         final String selectedFilePath = StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, reportPath);
         String lock = node.getLock();
-        boolean showLockInfo = LockInfoUtils.isCompatibleOperator()
+        boolean showLockInfo = needShowLockInfo(lock, selectedFilePath, node);
-                                || LockInfoUtils.unableGetLockInfo()
-                                || WorkContext.getCurrent().get(LockInfoOperator.class).isTplUnLocked(selectedFilePath)
-                                ? (lock != null && !lock.equals(node.getUserID()))
-                                : WorkContext.getCurrent().get(LockInfoOperator.class).isTplLocked(selectedFilePath);
         if (showLockInfo) {
             UserInfo userInfo = WorkContext.getCurrent().get(LockInfoOperator.class).getUserInfo(selectedFilePath);
             node.setLock(UUID.randomUUID().toString());
@@ -257,6 +253,17 @@ public class TemplateTreePane extends JPanel implements FileOperations {
         DesignerContext.getDesignerFrame().openTemplate(new FileNodeFILE(new FileNode(selectedFilePath, false)));
     }
 
+    /**
+     * 是否需要展示锁定信息
+     */
+    public static boolean needShowLockInfo(String lock, String selectedFilePath, FileNode node) {
+        return LockInfoUtils.isCompatibleOperator()
+                || LockInfoUtils.unableGetLockInfo()
+                || WorkContext.getCurrent().get(LockInfoOperator.class).isTplUnLocked(selectedFilePath)
+                ? (lock != null && !lock.equals(node.getUserID()))
+                : WorkContext.getCurrent().get(LockInfoOperator.class).isTplLocked(selectedFilePath);
+    }
+
     private void checkDevelopForBiddenTemplate(String selectedFilePath) {
         JTemplate<?, ?> template = getOpenedTemplate(selectedFilePath);
         if (template != null && template.isForbidden()) {

designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java

@@ -4,6 +4,7 @@ import com.fr.base.svg.IconUtils;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.file.TemplateTreePane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.lock.LockInfoUtils;
@@ -165,11 +166,7 @@ public class VcsCenterPane extends VcsNewPane {
             protected Boolean doInBackground() throws Exception {
                 String selectedFilePath = getTemplateTruePath(filename);
                 String lock = node.getLock();
-                return LockInfoUtils.isCompatibleOperator()
+                return TemplateTreePane.needShowLockInfo(lock, selectedFilePath, node);
-                        || LockInfoUtils.unableGetLockInfo()
-                        || WorkContext.getCurrent().get(LockInfoOperator.class).isTplUnLocked(selectedFilePath)
-                        ? (lock != null && !lock.equals(node.getUserID()))
-                        : WorkContext.getCurrent().get(LockInfoOperator.class).isTplLocked(selectedFilePath);
             }
             @Override
             protected void done() {