Browse Source

Merge pull request #1538 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0

* commit 'da708fd8d3845e57525eeb4f90048f34fca19696':
  代码质量-开发工具配置规范
  REPORT-6123 取色框缩放问题
  REPORT-6095 9.0设计器远程设计无法通过设计器查看日志 REPORT-6123 取色框缩放问题 REPORT-6217 【9.0】本地切换目录后设计器没有日志信息打印
superman 8 years ago
parent
commit
4692a5c679
  1. 5
      designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java
  2. 2
      designer_base/src/com/fr/design/style/color/ColorSelectDialog.java
  3. 3
      designer_base/src/com/fr/env/RemoteEnv.java

5
designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java

@ -11,6 +11,7 @@ import com.fr.general.FRLogLevel;
import com.fr.general.FRLogger;
import com.fr.general.GeneralContext;
import com.fr.general.Inter;
import com.fr.general.LogRecordTime;
import com.fr.log.LogHandler;
import com.fr.stable.EnvChangedListener;
import com.fr.stable.xml.LogRecordTimeProvider;
@ -159,6 +160,10 @@ public class DesignerLogHandler {
logHandlerArea.printStackTrace(message, level, date);
}
public void printRemoteLog(LogRecordTime logRecordTime) {
logHandlerArea.printStackTrace(logRecordTime);
}
private class LogHandlerArea extends JPanel {
private static final long serialVersionUID = 8215630927304621660L;

2
designer_base/src/com/fr/design/style/color/ColorSelectDialog.java

@ -84,7 +84,7 @@ public class ColorSelectDialog extends MiddleChartDialog{
this.setLayout(new BorderLayout());
this.add(pane,BorderLayout.NORTH);
this.setBasicDialogSize(545,500);
this.setResizable(false);
JPanel buttonPane = new JPanel();
buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

3
designer_base/src/com/fr/env/RemoteEnv.java vendored

@ -25,6 +25,7 @@ import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.fun.DesignerEnvProcessor;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.DesignerFrameFileDealerPane;
import com.fr.design.mainframe.loghandler.DesignerLogHandler;
import com.fr.file.CacheManager;
import com.fr.file.DatasourceManager;
import com.fr.file.DatasourceManagerProvider;
@ -1838,7 +1839,7 @@ public class RemoteEnv extends AbstractEnv {
}
LogRecordTime[] records = LogUtils.readXMLLogRecords(input);
for (LogRecordTime logRecordTime : records) {
//TODO
DesignerLogHandler.getInstance().printRemoteLog(logRecordTime);
}
}

Loading…
Cancel
Save