Browse Source

Merge pull request #183 in DESIGN/design from ~JU/design:release/10.0 to release/10.0

* commit '7af4028dff646edd312033f9635f4705efec52e5':
  REPORT-8926 【10.0一轮回归】设计器默认的工作目录名称有问题 fix
  REPORT-8926 【10.0一轮回归】设计器默认的工作目录名称有问题 检查放到basic启动完成,切环境之前
  REPORT-8926 【10.0一轮回归】设计器默认的工作目录名称有问题 检查放到basic启动完成,切环境之前
  REPORT-9314 【10.0一轮回归】模板目录无法显示excel文件也无法打开,9.0可以 后面有过滤的
master
ju 6 years ago
parent
commit
5a71bd61c1
  1. 2
      designer-base/src/com/fr/design/gui/itree/filetree/TemplateFileTree.java
  2. 7
      designer-base/src/com/fr/file/FILEChooserPane.java
  3. 2
      designer-realize/src/com/fr/start/module/DesignerWorkspaceProvider.java
  4. 1
      designer-realize/src/com/fr/start/module/PreStartActivator.java

2
designer-base/src/com/fr/design/gui/itree/filetree/TemplateFileTree.java

@ -103,7 +103,7 @@ public class TemplateFileTree extends EnvFileTree {
public FileNode[] listFile(String path) throws Exception {
return FRContext.getFileNodes().list(
path,
new FileExtension[]{FileExtension.CPT, FileExtension.FRM, FileExtension.CPTX, FileExtension.FRMX});
new FileExtension[]{FileExtension.CPT, FileExtension.FRM, FileExtension.CHT,FileExtension.XLS,FileExtension.XLSX});
}
/*

7
designer-base/src/com/fr/file/FILEChooserPane.java

@ -33,6 +33,7 @@ import com.fr.stable.ProductConstants;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import com.fr.stable.project.ProjectConstants;
import com.fr.workspace.WorkContext;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
@ -548,7 +549,7 @@ public class FILEChooserPane extends BasicPane {
String[] fileSuffix_local = LocalFileNodes.FILE_TYPE;
EnumSet<FileExtension> fileExtensions = EnumSet.of(FileExtension.CPT, FileExtension.CPTX, FileExtension.FRM, FileExtension.FRMX, FileExtension.CHT);
if (type == JFileChooser.OPEN_DIALOG) {
if (FRContext.getFileNodes().isSupportLocalFileOperate()) { //本地连接
if (WorkContext.getCurrent().isLocal()) { //本地连接
this.addChooseFILEFilter(new ChooseFileFilter(fileSuffix_local, appName + Inter.getLocText(new String[]{"FR-App-Report_Template", "FR-App-All_File"})));
} else {
this.addChooseFILEFilter(new ChooseFileFilter(fileExtensions, appName + Inter.getLocText(new String[]{"FR-App-Report_Template", "FR-App-All_File"})));
@ -569,7 +570,7 @@ public class FILEChooserPane extends BasicPane {
}
// 添加 xls 文件类型过滤 kt
if (FRContext.getFileNodes().isSupportLocalFileOperate()) { //本地连接
if (WorkContext.getCurrent().isLocal()) { //本地连接
this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.XLS, Inter.getLocText("Import-Excel_Source")));
this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.XLSX, Inter.getLocText("Import-Excel2007_Source")));
}
@ -592,7 +593,7 @@ public class FILEChooserPane extends BasicPane {
for (FILEFilter aFilterList : filterList) {
defaultComboBoxModel.addElement(aFilterList);
}
if (FRContext.getFileNodes().isSupportLocalFileOperate()) { //本地连接
if (WorkContext.getCurrent().isLocal()) { //本地连接
if (!showWebReport) {
defaultComboBoxModel.addElement(Inter.getLocText("FR-Utils-App_AllFiles") + "(*.*)");
}

2
designer-realize/src/com/fr/start/module/DesignerWorkspaceProvider.java

@ -14,6 +14,8 @@ public class DesignerWorkspaceProvider extends Activator {
@Override
public void start() {
//检查环境
DesignerEnvManager.checkNameEnvMap();
String[] args = getModule().upFindSingleton(StartupArgs.class).get();
if (args != null) {

1
designer-realize/src/com/fr/start/module/PreStartActivator.java

@ -65,7 +65,6 @@ public class PreStartActivator extends Activator {
private void initLanguage() {
//这两句的位置不能随便调换,因为会影响语言切换的问题
FRContext.setLanguage(DesignerEnvManager.getEnvManager(false).getLanguage());
DesignerEnvManager.checkNameEnvMap();
}
@Override

Loading…
Cancel
Save