Browse Source

Merge pull request #127 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0

* commit '8ad59994a6b46c8c0a31e82cd1e8e065b4bde8c8':
  无JIRA任务 1、远程保存模板报错 2、其他小fix 3、加远程权限控制的改动较大,我习惯先写接口,想清楚之后再写实现了,所以又写了一套接口。。
master
ju 7 years ago
parent
commit
30b604be91
  1. 8
      designer-base/src/com/fr/design/mainframe/JTemplate.java
  2. 3
      designer-base/src/com/fr/env/RemoteEnv.java

8
designer-base/src/com/fr/design/mainframe/JTemplate.java

@ -60,6 +60,7 @@ import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.undo.UndoManager;
import java.awt.*;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
@ -654,10 +655,9 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
return false;
}
try {
if (!this.getTarget().export(editingFILE.asOutputStream())) {
return false;
}
ByteArrayOutputStream out = new ByteArrayOutputStream();
this.getTarget().export(out);
FRContext.getCurrentEnv().getFileOperator().write(out.toByteArray(), editingFILE.getPath());
} catch (Exception e) {
FRContext.getLogger().error(e.getMessage(), e);
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(), "Save Error", JOptionPane.ERROR_MESSAGE);

3
designer-base/src/com/fr/env/RemoteEnv.java vendored

@ -577,7 +577,8 @@ public class RemoteEnv extends AbstractEnv<RemoteEnvConfig> implements DesignAut
*/
@Override
public String getWebReportPath() {
return getPath().substring(0, getPath().lastIndexOf("/"));
return StableUtils.pathJoin(getPath(), getAppName());
}
public String[] getProcedureColumns(StoreProcedure storeProcedure, Map parameterMap) throws Exception {

Loading…
Cancel
Save