Browse Source

Merge pull request #16048 in DESIGN/design from fbp/release to fbp/feature

* commit 'eff618f4edd5bbdd0cab3e93531735ad192b54f2':
  REPORT-145453 【fr-fbp】ssh和ssl的数据连接,去获取密钥等文件时,路径深的时候选择后路径有问题
  REPORT-145518 fix:修复模板树新建文件夹后显示空白
  REPORT-145453 【fr-fbp】ssh和ssl的数据连接,去获取密钥等文件时,路径深的时候选择后路径有问题
  REPORT-145518 fix:修复模板树新建文件夹后显示空白
  REPORT-145453 【fr-fbp】ssh和ssl的数据连接,去获取密钥等文件时,路径深的时候选择后路径有问题
fbp/feature
superman 3 months ago
parent
commit
51ff502797
  1. 8
      designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java
  2. 5
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

8
designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java

@ -25,6 +25,7 @@ import com.fr.file.FILE;
import com.fr.file.FILEChooserPane;
import com.fr.file.filter.ChooseFileFilter;
import com.fr.stable.StringUtils;
import com.fr.stable.project.ProjectConstants;
import com.fr.third.guava.collect.HashBiMap;
import javax.swing.JPanel;
@ -67,6 +68,7 @@ public class SshPane extends BasicPane {
private SimpleCardPane verifyCardPane;
private final UIButton fileChooserButton = new UIButton();
private static final String TRIM = SslUtils.CERTIFICATES + ProjectConstants.FORWARD_SLASH;
private static final String USE_PASSWORD = "usePassword";
private static final String USE_KEY = "useKey";
@ -104,7 +106,11 @@ public class SshPane extends BasicPane {
if (file == null) {
keyPath.setText(StringUtils.EMPTY);
} else {
keyPath.setText(file.getPath());
String path = file.getPath();
if (path.startsWith(TRIM)) {
path = path.substring(TRIM.length());
}
keyPath.setText(path);
}
}
fileChooser.removeAllFilter();

5
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@ -29,6 +29,7 @@ import com.fr.design.file.FileToolbarStateChangeListener;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.file.MultiTemplateTabPane;
import com.fr.design.file.NodeAuthProcessor;
import com.fr.design.file.TemplateTreePane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ilable.UILabel;
@ -755,8 +756,10 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
}
String targetPath = FilenameUtils.standard(parentPath + CoreConstants.SEPARATOR + userInput);
boolean success = selectedOperation.mkdir(targetPath);
selectedOperation.refresh();
NodeAuthProcessor.getInstance().refresh();
DesignerFrameFileDealerPane.getInstance().refreshRightToolBarBy(null);
this.dispose();
// 定位模板流程中刷新模板树
LocateAction.gotoEditingTemplateLeaf(targetPath);
if (!success) {
FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),

Loading…
Cancel
Save