Browse Source

控件管理/报表填报属性/超级链接/服务器参数

newui
renekton 4 months ago
parent
commit
b903883399
  1. 5
      designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java
  2. 5
      designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java
  3. 1
      designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
  4. 4
      designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java
  5. 9
      designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
  6. 2
      designer-realize/src/main/java/com/fr/design/actions/server/WidgetManagerAction.java
  7. 4
      designer-realize/src/main/java/com/fr/design/cell/smartaction/SmartJTablePane.java
  8. 14
      designer-realize/src/main/java/com/fr/design/report/WriteShortCutsPane.java
  9. 4
      designer-realize/src/main/java/com/fr/design/widget/UserDefinedWidgetConfigPane.java
  10. 7
      designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

5
designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java

@ -8,9 +8,10 @@ import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import sun.swing.table.DefaultTableCellHeaderRenderer;
import javax.swing.*;
import javax.swing.JPanel;
import javax.swing.JTable;
import javax.swing.SwingConstants;
import javax.swing.event.TableModelListener;
import javax.swing.table.DefaultTableCellRenderer;
import java.awt.BorderLayout;
import java.awt.GridLayout;
import java.awt.Insets;

5
designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java

@ -1,12 +1,10 @@
package com.fr.design.hyperlink;
import com.fine.theme.light.ui.FineRoundBorder;
import com.fr.base.BaseUtils;
import com.fr.base.Parameter;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.frpane.ReportletParameterViewPane;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.itableeditorpane.ParameterTableModel;
import com.fr.design.gui.itableeditorpane.UITableEditAction;
import com.fr.design.i18n.Toolkit;
@ -18,7 +16,8 @@ import com.fr.js.ReportletHyperlink;
import com.fr.stable.ParameterProvider;
import com.fr.stable.StringUtils;
import javax.swing.*;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import java.awt.event.ActionEvent;
import java.util.HashMap;
import java.util.List;

1
designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@ -890,7 +890,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
propertyPanel = new JPanel();
contentPane = generateContentPane();
popupToolPane = new PopupToolPane(this, PopupToolPane.DOWN_BUTTON);
popupToolPane.setPreferredSize(new Dimension(0, 34));
headerPane = new JPanel();
headerPane.setPreferredSize(new Dimension(headerPane.getPreferredSize().width, 0)); // 默认隐藏
contentArea = new JPanel(new BorderLayout());

4
designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java

@ -12,8 +12,8 @@ import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.editor.editor.Editor;
import com.fr.form.data.DataTableConfig;
import java.awt.*;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;

9
designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java

@ -41,7 +41,6 @@ public abstract class CustomJobPane extends BasicBeanPane {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel reportletNamePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
classNameTextField = new UITextField();
//reportletNamePane.add(classNameTextField);
UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select"));
browserButton.setPreferredSize(new Dimension(
@ -53,8 +52,6 @@ public abstract class CustomJobPane extends BasicBeanPane {
GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")) + 40,
classNameTextField.getPreferredSize().height));
/*reportletNamePane.add(browserButton);
reportletNamePane.add(editButton);*/
UITextArea area = new UITextArea(2, 1);
browserButton.addActionListener(new ActionListener() {
@ -101,18 +98,12 @@ public abstract class CustomJobPane extends BasicBeanPane {
cell(browserButton).weight(0.1),
cell(editButton).weight(0.1)
).getComponent());
//this.add(reportletNamePane, BorderLayout.NORTH);
objectProperiesPane = new ObjectProperiesPane();
objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"), null));
//this.add(objectProperiesPane, BorderLayout.CENTER);
//UITextArea area = new UITextArea(2, 1);
//area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Extend_Class", "com.fr.data.AbstractSubmitTask"));
JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
dsPane.add(area);
dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Job_Description"), null));
//this.add(dsPane, BorderLayout.SOUTH);
this.add(column(
cell(reportletNamePane),
cell(objectProperiesPane).weight(1.0),

2
designer-realize/src/main/java/com/fr/design/actions/server/WidgetManagerAction.java

@ -16,7 +16,7 @@ import com.fr.transaction.Configurations;
import com.fr.transaction.WorkerFacade;
import javax.swing.KeyStroke;
import java.awt.*;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;

4
designer-realize/src/main/java/com/fr/design/cell/smartaction/SmartJTablePane.java

@ -5,7 +5,9 @@ import java.awt.Window;
import com.fr.design.gui.ilable.UILabel;
import javax.swing.*;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.SwingConstants;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.AbstractTableModel;

14
designer-realize/src/main/java/com/fr/design/report/WriteShortCutsPane.java

@ -14,16 +14,16 @@ import com.fr.transaction.WorkerAdaptor;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import java.awt.*;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import static com.fine.swing.ui.layout.Layouts.column;
import static com.fine.swing.ui.layout.Layouts.cell;
import static com.fine.swing.ui.layout.Layouts.flex;
import static com.fine.swing.ui.layout.Layouts.row;
public class WriteShortCutsPane extends JPanel{
private static final int V_GAP = 20;
private static final int MAX_LABEL_WIDTH = 100;

4
designer-realize/src/main/java/com/fr/design/widget/UserDefinedWidgetConfigPane.java

@ -1,13 +1,11 @@
package com.fr.design.widget;
import java.awt.*;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.form.ui.UserDefinedWidgetConfig;
import javax.swing.*;
import java.awt.BorderLayout;
public class UserDefinedWidgetConfigPane extends BasicBeanPane<UserDefinedWidgetConfig> {
private ValueWidgetPane editorDefPane;

7
designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

@ -33,7 +33,12 @@ import com.fr.stable.ColumnRowGroup;
import com.fr.stable.StringUtils;
import com.fr.write.DMLConfigJob;
import javax.swing.*;
import javax.swing.BorderFactory;
import javax.swing.JDialog;
import javax.swing.JTable;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableColumn;
import java.awt.BorderLayout;

Loading…
Cancel
Save