Browse Source

Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0

master
ju 7 years ago
parent
commit
bd2a7e51ff
  1. 5
      designer/src/com/fr/design/mainframe/JWorkBook.java
  2. 6
      designer_base/src/com/fr/design/actions/file/WebPreviewUtils.java
  3. 1
      designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java
  4. 50
      designer_base/src/com/fr/design/style/FormatPane.java
  5. 1
      designer_base/src/com/fr/start/server/TomcatHost.java

5
designer/src/com/fr/design/mainframe/JWorkBook.java

@ -51,7 +51,7 @@ import com.fr.file.filetree.FileNode;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.general.ModuleContext; import com.fr.general.ModuleContext;
import com.fr.general.web.ParameterConsts; import com.fr.general.web.ParameterConstants;
import com.fr.grid.Grid; import com.fr.grid.Grid;
import com.fr.grid.GridUtils; import com.fr.grid.GridUtils;
import com.fr.io.exporter.EmbeddedTableDataExporter; import com.fr.io.exporter.EmbeddedTableDataExporter;
@ -62,7 +62,6 @@ import com.fr.poly.PolyDesigner;
import com.fr.poly.creator.BlockCreator; import com.fr.poly.creator.BlockCreator;
import com.fr.privilege.finegrain.WorkSheetPrivilegeControl; import com.fr.privilege.finegrain.WorkSheetPrivilegeControl;
import com.fr.report.ReportHelper; import com.fr.report.ReportHelper;
import com.fr.report.elementcase.ElementCase;
import com.fr.report.elementcase.TemplateElementCase; import com.fr.report.elementcase.TemplateElementCase;
import com.fr.report.poly.PolyWorkSheet; import com.fr.report.poly.PolyWorkSheet;
import com.fr.report.worksheet.WorkSheet; import com.fr.report.worksheet.WorkSheet;
@ -844,7 +843,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
*/ */
public void previewMenuActionPerformed(PreviewProvider provider) { public void previewMenuActionPerformed(PreviewProvider provider) {
setPreviewType(provider); setPreviewType(provider);
WebPreviewUtils.actionPerformed(this, provider.parametersForPreview(), ParameterConsts.REPORTLET); WebPreviewUtils.actionPerformed(this, provider.parametersForPreview(), ParameterConstants.REPORTLET);
} }
/** /**

6
designer_base/src/com/fr/design/actions/file/WebPreviewUtils.java

@ -7,7 +7,7 @@ import com.fr.file.FILE;
import com.fr.file.FileNodeFILE; import com.fr.file.FileNodeFILE;
import com.fr.general.GeneralUtils; import com.fr.general.GeneralUtils;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.general.web.ParameterConsts; import com.fr.general.web.ParameterConstants;
import com.fr.stable.project.ProjectConstants; import com.fr.stable.project.ProjectConstants;
import javax.swing.*; import javax.swing.*;
@ -16,11 +16,11 @@ import java.util.Map;
public final class WebPreviewUtils { public final class WebPreviewUtils {
public static void onWorkbookPreview(JTemplate<?, ?> jt) { public static void onWorkbookPreview(JTemplate<?, ?> jt) {
actionPerformed(jt, jt.getPreviewType().parametersForPreview(), ParameterConsts.REPORTLET); actionPerformed(jt, jt.getPreviewType().parametersForPreview(), ParameterConstants.REPORTLET);
} }
public static void onFormPreview(JTemplate<?, ?> jt) { public static void onFormPreview(JTemplate<?, ?> jt) {
actionPerformed(jt, null, ParameterConsts.FORMLET); actionPerformed(jt, null, ParameterConstants.FORMLET);
} }
public static void actionPerformed(JTemplate<?, ?> jt, Map<String, Object> map, String actionType) { public static void actionPerformed(JTemplate<?, ?> jt, Map<String, Object> map, String actionType) {

1
designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java

@ -5,7 +5,6 @@ import com.fr.design.actions.UpdateAction;
import com.fr.design.menu.MenuKeySet; import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.DesignUtils; import com.fr.design.utils.DesignUtils;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.general.web.ParameterConsts;
import javax.swing.*; import javax.swing.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;

50
designer_base/src/com/fr/design/style/FormatPane.java

@ -3,15 +3,20 @@
*/ */
package com.fr.design.style; package com.fr.design.style;
import java.awt.BorderLayout; import com.fr.base.FRContext;
import java.awt.Color; import com.fr.base.TextFormat;
import java.awt.FlowLayout; import com.fr.data.core.FormatField;
import java.awt.event.ActionEvent; import com.fr.data.core.FormatField.FormatContents;
import java.awt.event.ActionListener; import com.fr.design.dialog.BasicPane;
import java.text.DecimalFormat; import com.fr.design.gui.ibutton.UIRadioButton;
import java.text.Format; import com.fr.design.gui.ilable.UILabel;
import java.text.SimpleDateFormat; import com.fr.design.gui.itextfield.UITextField;
import java.util.Date; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;
import com.fr.stable.ArrayUtils;
import com.fr.stable.StringUtils;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.ButtonGroup; import javax.swing.ButtonGroup;
@ -25,21 +30,15 @@ import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener; import javax.swing.event.DocumentListener;
import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionListener;
import java.awt.BorderLayout;
import com.fr.base.FRContext; import java.awt.Color;
import com.fr.base.TextFormat; import java.awt.FlowLayout;
import com.fr.data.core.FormatField; import java.awt.event.ActionEvent;
import com.fr.data.core.FormatField.FormatContents; import java.awt.event.ActionListener;
import com.fr.design.gui.ibutton.UIRadioButton; import java.text.DecimalFormat;
import com.fr.design.gui.ilable.UILabel; import java.text.Format;
import com.fr.design.gui.itextfield.UITextField; import java.text.SimpleDateFormat;
import com.fr.design.layout.FRGUIPaneFactory; import java.util.Date;
import com.fr.design.dialog.BasicPane;
import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;
import com.fr.stable.ArrayUtils;
import com.fr.stable.StringUtils;
import com.fr.design.utils.gui.GUICoreUtils;
/** /**
* 属性界面中的格式面板 * 属性界面中的格式面板
@ -316,6 +315,9 @@ public class FormatPane extends BasicPane {
*/ */
public Format update() { public Format update() {
String text = patternTextField.getText(); String text = patternTextField.getText();
if (getFormatContents() == FormatContents.TEXT) {
return FormatField.getInstance().getFormat(getFormatContents(), text);
}
if(StringUtils.isEmpty(text)) { if(StringUtils.isEmpty(text)) {
return null; return null;
} }

1
designer_base/src/com/fr/start/server/TomcatHost.java

@ -71,6 +71,7 @@ public class TomcatHost {
this.listener = new AprLifecycleListener(); this.listener = new AprLifecycleListener();
this.server.addLifecycleListener(listener); this.server.addLifecycleListener(listener);
this.tomcat.getHost().setAppBase(StableUtils.getInstallHome() + File.separator + "."); this.tomcat.getHost().setAppBase(StableUtils.getInstallHome() + File.separator + ".");
this.tomcat.getConnector().setURIEncoding("UTF-8");
} catch (Exception e) { } catch (Exception e) {
//todo 最好加一个用server.xml //todo 最好加一个用server.xml
FRContext.getLogger().error(e.getMessage(), e); FRContext.getLogger().error(e.getMessage(), e);

Loading…
Cancel
Save