REPORT-2897 9.0设计器修改

权限编辑、缩放条部分视觉优化

designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java

@@ -31,6 +31,7 @@ import java.util.List;
 public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
 
     private static final int TITLE_HEIGHT = 19;
+    private static final int RIGHT_GAP = 10;
     private AuthorityEditPane authorityEditPane = null;
     private AuthorityToolBarPane authorityToolBarPane;
     private String[] selectedPathArray;
@@ -51,7 +52,7 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
         JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         northPane.add(authorityTitle, BorderLayout.CENTER);
         northPane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.LINE_COLOR));
-        this.add(northPane, BorderLayout.NORTH);
+//        this.add(northPane, BorderLayout.NORTH);
         authorityEditPane = new AuthorityEditPane(buttonlists);
         this.add(authorityEditPane, BorderLayout.CENTER);
     }
@@ -81,13 +82,13 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
 
     private class AuthorityEditPane extends JPanel {
         private static final int TOP_GAP = 11;
-        private static final int LEFT_GAP = 8;
-        private static final int ALIGNMENT_GAP = -3;
+        private static final int LEFT_GAP = 4;
+        private static final int LEFT_CHECKPANE = 3;
         private UILabel type = null;
         private UILabel name = null;
         private JPanel checkPane = null;
         private List<ToolBarButton> buttonlists;
-        private UICheckBox buttonVisible = new UICheckBox(Inter.getLocText("FR-Designer_Visible"));
+        private UICheckBox buttonVisible = new UICheckBox(Inter.getLocText("FR-Designer_Widget_Visible"));
         private ItemListener itemListener = new ItemListener() {
             public void itemStateChanged(ItemEvent e) {
                 String selectedRole = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
@@ -143,43 +144,30 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
         public AuthorityEditPane(List<ToolBarButton> buttonlists) {
             setLayout(new BorderLayout());
             type = new UILabel();
+            type.setBorder(BorderFactory.createLineBorder(Color.lightGray));
             name = new UILabel();
+            name.setBorder(BorderFactory.createLineBorder(Color.lightGray));
             checkPane = new JPanel();
             checkPane.setLayout(new BorderLayout());
-            this.add(layoutText(), BorderLayout.WEST);
-            this.add(layoutPane(), BorderLayout.CENTER);
-            this.setBorder(BorderFactory.createEmptyBorder(TOP_GAP, LEFT_GAP, 0, 0));
+            this.add(centerPane(), BorderLayout.NORTH);
+            this.setBorder(BorderFactory.createEmptyBorder(TOP_GAP, LEFT_GAP, 0, RIGHT_GAP));
             this.buttonlists = buttonlists;
             buttonVisible.addItemListener(itemListener);
         }
 
-        private JPanel layoutText() {
-            double p = TableLayout.PREFERRED;
-            Component[][] components = new Component[][]{
-                    new Component[]{new UILabel(Inter.getLocText("FR-Designer_Type") + ":", SwingConstants.RIGHT)},
-                    new Component[]{new UILabel(Inter.getLocText("FR-Designer_WF_Name") + ":", SwingConstants.RIGHT)},
-                    new Component[]{new UILabel(Inter.getLocText("FR-Designer_Permissions") + ":", SwingConstants
-                            .RIGHT)},
-            };
-            double[] rowSize = {p, p, p};
-            double[] columnSize = {p};
-            int[][] rowCount = {{1}, {1}, {1}};
-            return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
-        }
-
-
-        private JPanel layoutPane() {
+        private JPanel centerPane() {
             double f = TableLayout.FILL;
             double p = TableLayout.PREFERRED;
+            double[] rowSize = {p, p, p};
+            double[] columnSize = {p, f};
+            int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
             Component[][] components = new Component[][]{
-                    new Component[]{type},
-                    new Component[]{name},
-                    new Component[]{checkPane},
+                    new Component[]{new UILabel(" " + Inter.getLocText("FR-Designer_Type") + "        ", SwingConstants.LEFT), type},
+                    new Component[]{new UILabel(" " + Inter.getLocText("FR-Designer_WF_Name") + "        ", SwingConstants.LEFT), name},
+                    new Component[]{checkPane, null},
             };
-            double[] rowSize = {p, p, p};
-            double[] columnSize = {f};
-            int[][] rowCount = {{1}, {1}, {1}};
-            return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
+
+            return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM);
         }
 
         /**
@@ -212,7 +200,7 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
             if (name.getText() == "") {
                 type.setText("");
             } else {
-                type.setText(Inter.getLocText(new String[]{"ReportServerP-Toolbar", "FR-Designer_Form_Button"}));
+                type.setText(" " + Inter.getLocText(new String[]{"ReportServerP-Toolbar", "FR-Designer_Form_Button"}));
             }
         }
 
@@ -226,7 +214,7 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
             if (names != "") {
                 names = names.substring(1);
             }
-            name.setText(names);
+            name.setText(" " + names);
         }
 
         public void populateCheckPane() {
@@ -237,15 +225,14 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
             double f = TableLayout.FILL;
             double p = TableLayout.PREFERRED;
             Component[][] components = new Component[][]{
-                    new Component[]{new UILabel(Inter.getLocText("FR-Designer_Form_Button"), SwingConstants.LEFT),
-                            buttonVisible},
+                    new Component[]{buttonVisible},
             };
-            double[] rowSize = {p, p};
-            double[] columnSize = {p, p, f};
-            int[][] rowCount = {{1, 1, 1}, {1, 1, 1}};
-            JPanel check = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
+            double[] rowSize = {p};
+            double[] columnSize = {p};
+            int[][] rowCount = {{1}};
+            JPanel check = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_SMALL);
             checkPane.add(check, BorderLayout.CENTER);
-            checkPane.setBorder(BorderFactory.createEmptyBorder(ALIGNMENT_GAP, 0, 0, 0));
+            checkPane.setBorder(BorderFactory.createEmptyBorder(0, LEFT_CHECKPANE, 0, 0));
         }
     }
 }

designer/src/com/fr/design/mainframe/AuthoritySheetEditedPane.java

@@ -41,7 +41,7 @@ public class AuthoritySheetEditedPane extends AuthorityPropertyPane {
         JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         northPane.add(authorityTitle, BorderLayout.CENTER);
         northPane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.LINE_COLOR));
-        this.add(northPane, BorderLayout.NORTH);
+//        this.add(northPane, BorderLayout.NORTH);
         authorityEditPane = new SheetAuthorityEditPane(editingWorkBook, selectedIndex);
         this.add(authorityEditPane, BorderLayout.CENTER);
 

designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java

@@ -76,7 +76,9 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
                 }
             }
             authorityEditToolBarPane.populate();
-            EastRegionContainerPane.getInstance().replaceUpPane(authorityEditToolBarPane);
+            EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION);
+            EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(authorityEditToolBarPane);
+
         }
 
     };
@@ -114,8 +116,8 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
                 populateToolBarPane();
                 authorityEditToolBarPane = new AuthorityEditToolBarPane(toolBarPane.getToolBarButtons());
                 authorityEditToolBarPane.setAuthorityToolBarPane(AuthorityToolBarPane.this);
-                EastRegionContainerPane.getInstance().replaceUpPane(authorityEditToolBarPane);
-                EastRegionContainerPane.getInstance().replaceDownPane(RolesAlreadyEditedPane.getInstance());
+                EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(authorityEditToolBarPane);
+                EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(RolesAlreadyEditedPane.getInstance());
             }
         }
     };

designer/src/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java

@@ -5,6 +5,7 @@ import com.fr.design.editor.ValueEditorPane;
 import com.fr.design.editor.ValueEditorPaneFactory;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
@@ -30,6 +31,8 @@ import com.fr.stable.ColumnRow;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import javax.swing.tree.TreePath;
 import java.awt.*;
 import java.awt.event.ItemEvent;
@@ -50,20 +53,26 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
     private static final int NEW_VALUE = 4;
     //新值下面的编辑器的宽度
     private static final int NEW_PANE_WIDTH = 120;
+    private static final Dimension VALUEPANE_NEW_DIMENSION = new Dimension(154,20);
+    private static final Dimension VALUEPANE_OLD_DIMENSION = new Dimension(0,0);
 
 
-    private UICheckBox floatElementVisibleCheckBoxes = new UICheckBox(Inter.getLocText("FR-Designer_Visible"));
-    private UICheckBox cellElementVisibleCheckBoxes = new UICheckBox(Inter.getLocText("FR-Designer_Visible"));
-    private UICheckBox widgetVisible = new UICheckBox(Inter.getLocText("FR-Designer_Visible"));
-    private UICheckBox widgetAvailable = new UICheckBox(Inter.getLocText("FR-Designer_Enabled"));
+
+    private UICheckBox floatElementVisibleCheckBoxes = new UICheckBox(Inter.getLocText("FR-Designer_Float_Visible"));
+    private UICheckBox cellElementVisibleCheckBoxes = new UICheckBox(Inter.getLocText("FR-Designer_Cell_Visible"));
+    private UICheckBox widgetVisible = new UICheckBox(Inter.getLocText("FR-Designer_Widget_Visible"));
+    private UICheckBox widgetAvailable = new UICheckBox(Inter.getLocText("FR-Designer_Widget_Enabled"));
     private UICheckBox gridColumnRowVisible = new UICheckBox(Inter.getLocText("FR-Designer_Hide"));
     private UICheckBox newValue = new UICheckBox(Inter.getLocText("FR-Designer_New_Value"));
+    private UIButtonGroup oldNewValueButton = new UIButtonGroup(new String[]{Inter.getLocText("FR-Designer_CellWrite_InsertRow_COPY"),Inter.getLocText("FR-Designer_New_Value")});
+    private JPanel newValuePane;
     private ValueEditorPane valueEditor = ValueEditorPaneFactory.createBasicValueEditorPane(NEW_PANE_WIDTH);
     private UICheckBox[] hyperlinkCheckBoxes = null;
     private ElementCasePane elementCasePane = null;
     private int selectionType = CellSelection.NORMAL;
     private CellSelection cellSelection;
     private FloatSelection floatSelection;
+    private CardLayout newValueCard;
     private boolean isAllHasWidget;
     private boolean isAllHasHyperlink;
     private String[] selectedPathArray;
@@ -148,6 +157,22 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
             }
         }
     };
+    private ChangeListener buttonChangeListener = new ChangeListener() {
+        @Override
+        public void stateChanged(ChangeEvent e) {
+            if (oldNewValueButton.getSelectedIndex() == 1){
+                newValuePane.setPreferredSize(VALUEPANE_NEW_DIMENSION);
+                newValueCard.show(newValuePane,"new");
+                newValue.setSelected(true);
+                valueEditor.setEnabled(true);
+            }else {
+                newValue.setSelected(false);
+//                valueEditor.setEnabled(false);
+                newValuePane.setPreferredSize(VALUEPANE_OLD_DIMENSION);
+                newValueCard.show(newValuePane,"old");
+            }
+        }
+    };
 
     public ElementCasePaneAuthorityEditPane(ElementCasePane elementCasePane) {
         super(elementCasePane);
@@ -354,6 +379,7 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
         }
         widgetAvailable.setEnabled(cellElementVisibleCheckBoxes.isSelected());
         widgetVisible.setEnabled(cellElementVisibleCheckBoxes.isSelected());
+        oldNewValueButton.setSelectedIndex(0);
     }
 
     private void initListener() {
@@ -364,6 +390,7 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
         gridColumnRowVisible.addItemListener(columnRowAuthorityListener);
         newValue.addItemListener(newValuelistener);
         valueEditor.registerChangeListener(observerListener);
+        oldNewValueButton.addChangeListener(buttonChangeListener);
     }
 
     private void removeListener() {
@@ -374,6 +401,7 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
         gridColumnRowVisible.removeItemListener(columnRowAuthorityListener);
         newValue.removeItemListener(newValuelistener);
         valueEditor.registerChangeListener(null);
+        oldNewValueButton.removeChangeListener(buttonChangeListener);
     }
 
     private void addHyperlinkListener() {
@@ -399,13 +427,13 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
      */
     public void populateType() {
         if (selectionType == CellSelection.NORMAL) {
-            type.setText(Inter.getLocText("FR-Designer_Cell"));
+            type.setText(" "+Inter.getLocText("FR-Designer_Cell"));
         } else if (selectionType == CellSelection.CHOOSE_ROW) {
-            type.setText(Inter.getLocText("FR-Designer_Row"));
+            type.setText(" "+Inter.getLocText("FR-Designer_Row"));
         } else if (selectionType == CellSelection.CHOOSE_COLUMN) {
-            type.setText(Inter.getLocText("FR-Designer_Column"));
+            type.setText(" "+Inter.getLocText("FR-Designer_Column"));
         } else {
-            type.setText(Inter.getLocText("M_Insert-Float"));
+            type.setText(" "+Inter.getLocText("M_Insert-Float"));
         }
     }
 
@@ -414,11 +442,11 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
      */
     public void populateName() {
         if (selectionType == CellSelection.NORMAL) {
-            name.setText(getCellSelectionName());
+            name.setText(" "+getCellSelectionName());
         } else if (selectionType == CellSelection.CHOOSE_ROW || selectionType == CellSelection.CHOOSE_COLUMN) {
-            name.setText(getCellColumnRowName());
+            name.setText(" "+getCellColumnRowName());
         } else {
-            name.setText(getFloatSelectionName());
+            name.setText(" "+getFloatSelectionName());
         }
     }
 
@@ -506,7 +534,7 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
         } else if (selectionType == FLOAT_SELECTION) {
             populateFloatSelectionCheckPane(checkPane);
         }
-        checkPane.setBorder(BorderFactory.createEmptyBorder(ALIGNMENT_GAP, 0, 0, 0));
+        checkPane.setBorder(BorderFactory.createEmptyBorder(0, LEFT_CHECKPANE, 0, 0));
         return checkPane;
     }
 
@@ -538,17 +566,17 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
             }
             //单元格带控件
             if (cellElement.getCellWidgetAttr() != null) {
-                checkPane.add(populateWidgetCheckPane(), BorderLayout.WEST);
+                checkPane.add(populateWidgetCheckPane(), BorderLayout.CENTER);
             } else {
-                checkPane.add(populatCellCheckPane(), BorderLayout.WEST);
+                checkPane.add(populatCellCheckPane(), BorderLayout.CENTER);
             }
         } else {
             //批量选中单元格
             mutilRect(cellSelection);
             if (!isAllHasWidget && !isAllHasHyperlink) {
-                checkPane.add(populateMutilCellCheckPane(), BorderLayout.WEST);
+                checkPane.add(populateMutilCellCheckPane(), BorderLayout.CENTER);
             } else if (isAllHasWidget) {
-                checkPane.add(populateMutilWidgetCheckPane(), BorderLayout.WEST);
+                checkPane.add(populateMutilWidgetCheckPane(), BorderLayout.CENTER);
             }
         }
     }
@@ -609,28 +637,46 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("M_Insert-Float"), SwingConstants.LEFT), floatElementVisibleCheckBoxes}
+                new Component[]{floatElementVisibleCheckBoxes}
         };
         double[] rowSize = {p};
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}};
-        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
-    }
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_SMALL);
+    }
+
+//    private JPanel populateWidgetCheckPane() {
+//        double f = TableLayout.FILL;
+//        double p = TableLayout.PREFERRED;
+//        Component[][] components = new Component[][]{
+//                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Cell"), SwingConstants.LEFT), cellElementVisibleCheckBoxes},
+//                new Component[]{null, newValue},
+//                new Component[]{null, valueEditor},
+//                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget"), SwingConstants.LEFT), widgetVisible},
+//                new Component[]{null, widgetAvailable}
+//        };
+//        double[] rowSize = {p, p, p, p, p};
+//        double[] columnSize = {p, f};
+//        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
+//        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
+//    }
 
     private JPanel populateWidgetCheckPane() {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
+        UILabel cv = new UILabel(Inter.getLocText("FR-Designer_Cell_Value") + "    ");
+        cv.setBorder(BorderFactory.createEmptyBorder(0, LEFT_CHECKPANE, 0, 0));
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Cell"), SwingConstants.LEFT), cellElementVisibleCheckBoxes},
-                new Component[]{null, newValue},
-                new Component[]{null, valueEditor},
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget"), SwingConstants.LEFT), widgetVisible},
-                new Component[]{null, widgetAvailable}
+                new Component[]{cellElementVisibleCheckBoxes, null},
+                new Component[]{cv,valueGroup()},
+                new Component[]{null, newValuePane},
+                new Component[]{widgetVisible,null},
+                new Component[]{widgetAvailable,null}
         };
         double[] rowSize = {p, p, p, p, p};
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
-        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_SMALL);
     }
 
     private JPanel populateMutilWidgetCheckPane() {
@@ -659,18 +705,34 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
         return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
     }
 
+//    private JPanel populatCellCheckPane() {
+//        double f = TableLayout.FILL;
+//        double p = TableLayout.PREFERRED;
+//        Component[][] components = new Component[][]{
+//                new Component[]{cellElementVisibleCheckBoxes},
+//                new Component[]{newValue},
+//                new Component[]{valueEditor}
+//        };
+//        double[] rowSize = {p, p, p};
+//        double[] columnSize = {f};
+//        int[][] rowCount = {{1}, {1}, {1}};
+//        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
+//    }
+
     private JPanel populatCellCheckPane() {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
+        double[] rowSize = {p, p, p};
+        double[] columnSize = {p, f};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
+        UILabel cv = new UILabel(Inter.getLocText("FR-Designer_Cell_Value") + "    ");
+        cv.setBorder(BorderFactory.createEmptyBorder(0, LEFT_CHECKPANE, 0, 0));
         Component[][] components = new Component[][]{
-                new Component[]{cellElementVisibleCheckBoxes},
-                new Component[]{newValue},
-                new Component[]{valueEditor}
+                new Component[]{cellElementVisibleCheckBoxes,null},
+                new Component[]{cv,valueGroup()},
+                new Component[]{null,newValuePane}
         };
-        double[] rowSize = {p, p, p};
-        double[] columnSize = {f};
-        int[][] rowCount = {{1}, {1}, {1}};
-        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_SMALL);
     }
 
     public TemplateCellElement getFirstCell() {
@@ -719,12 +781,30 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
         if (!firstCell.isDoneAuthority(selected)) {
             newValue.setSelected(firstCell.isDoneNewValueAuthority(selected));
             if (newValue.isSelected()) {
+                oldNewValueButton.setSelectedIndex(1);
+                if (newValuePane != null){
+                    newValuePane.setPreferredSize(VALUEPANE_NEW_DIMENSION);
+                    newValueCard.show(newValuePane,"new");
+                    newValuePane.setVisible(true);
+                }
                 valueEditor.setEnabled(true);
                 valueEditor.populate(firstCell.getCellPrivilegeControl().getNewValueMap().get(selected));
             } else {
+                if (newValuePane != null){
+                    oldNewValueButton.setSelectedIndex(0);
+                    newValuePane.setPreferredSize(VALUEPANE_OLD_DIMENSION);
+                    newValueCard.show(newValuePane,"old");
+                    newValuePane.setVisible(false);
+                }
                 valueEditor.setEnabled(false);
             }
         } else {
+            oldNewValueButton.setSelectedIndex(0);
+            if (newValuePane != null){
+                newValuePane.setPreferredSize(new Dimension(0,0));
+                newValueCard.show(newValuePane,"old");
+                newValuePane.setVisible(false);
+            }
             newValue.setSelected(false);
             valueEditor.setEnabled(false);
         }
@@ -756,6 +836,7 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
         widgetAvailable.setEnabled(true);
         newValue.setSelected(false);
         valueEditor.setEnabled(false);
+        oldNewValueButton.setSelectedIndex(0);
     }
 
     private void checkColumnRowCheckBoxes(String selected) {
@@ -826,4 +907,14 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
         int[][] rowCount = {{1, 1}, {1, 1}};
         return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
     }
+
+    private JPanel valueGroup(){
+        newValueCard = new CardLayout();
+        newValuePane = new JPanel(newValueCard);
+        newValuePane.add(valueEditor, "new");
+        newValuePane.add(new JPanel(), "old");
+        newValuePane.setPreferredSize(VALUEPANE_OLD_DIMENSION);
+        oldNewValueButton.setPreferredSize(VALUEPANE_NEW_DIMENSION);
+        return oldNewValueButton;
+    }
 }

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

@@ -879,8 +879,9 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
             }
         }
         if (BaseUtils.isAuthorityEditing()) {
-            EastRegionContainerPane.getInstance().replaceUpPane(allowAuthorityUpPane());
-            EastRegionContainerPane.getInstance().replaceDownPane(RolesAlreadyEditedPane.getInstance());
+            EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION);
+            EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(allowAuthorityUpPane());
+            EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(RolesAlreadyEditedPane.getInstance());
         }
 
         centerPane.needToShowCoverAndHidPane();

designer/src/com/fr/design/mainframe/SheetAuthorityEditPane.java

@@ -28,10 +28,10 @@ import java.awt.event.ItemListener;
  */
 public class SheetAuthorityEditPane extends AuthorityEditPane {
     private static final int TOP_GAP = 11;
-    private static final int LEFT_GAP = 8;
+    private static final int LEFT_GAP = 4;
     private static final int ALIGNMENT_GAP = -3;
 
-    private UICheckBox sheetVisible = new UICheckBox(Inter.getLocText("Widget-Visible"));
+    private UICheckBox sheetVisible = new UICheckBox("sheet" + Inter.getLocText("Widget-Visible"));
     private WorkBook workBook = null;
     private int selectedIndex = -1;
 
@@ -66,17 +66,34 @@ public class SheetAuthorityEditPane extends AuthorityEditPane {
         super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
         setLayout(new BorderLayout());
         type = new UILabel();
+        type.setBorder(BorderFactory.createLineBorder(Color.lightGray));
         name = new UILabel();
+        name.setBorder(BorderFactory.createLineBorder(Color.lightGray));
         checkPane = new JPanel();
         checkPane.setLayout(new BorderLayout());
-        this.add(layoutText(), BorderLayout.WEST);
-        this.add(layoutPane(), BorderLayout.CENTER);
-        this.setBorder(BorderFactory.createEmptyBorder(TOP_GAP, LEFT_GAP, 0, 0));
+//        this.add(layoutText(), BorderLayout.WEST);
+//        this.add(layoutPane(), BorderLayout.CENTER);
+        this.add(centerPane(), BorderLayout.CENTER);
+        this.setBorder(BorderFactory.createEmptyBorder(TOP_GAP, LEFT_GAP, 0, RIGHT_GAP));
         this.workBook = editingWorkBook;
         sheetVisible.addItemListener(itemListener);
         this.selectedIndex = selectedIndex;
     }
 
+    private JPanel centerPane() {
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        double[] rowSize = {p, p, p};
+        double[] columnSize = {p, f};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(" " + Inter.getLocText("FR-Designer_Type") + "        ", SwingConstants.LEFT), type},
+                new Component[]{new UILabel(" " + Inter.getLocText("FR-Designer_WF_Name") + "        ", SwingConstants.LEFT), name},
+                new Component[]{checkPane, null},
+        };
+
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM);
+    }
 
     private JPanel layoutText() {
         double p = TableLayout.PREFERRED;
@@ -121,7 +138,7 @@ public class SheetAuthorityEditPane extends AuthorityEditPane {
             return;
         }
         checkPane.add(populateCheckPane(), BorderLayout.CENTER);
-        checkPane.setBorder(BorderFactory.createEmptyBorder(ALIGNMENT_GAP, 0, 0, 0));
+        checkPane.setBorder(BorderFactory.createEmptyBorder(0, LEFT_CHECKPANE, 0, 0));
         checkVisibleCheckBoxes();
     }
 
@@ -129,14 +146,14 @@ public class SheetAuthorityEditPane extends AuthorityEditPane {
      * 刷新类型
      */
     public void populateType() {
-        type.setText("sheet");
+        type.setText(" " + "sheet");
     }
 
     /**
      * 更新名字
      */
     public void populateName() {
-        name.setText(workBook.getReportName(selectedIndex));
+        name.setText(" " + workBook.getReportName(selectedIndex));
     }
 
     /**

designer/src/com/fr/design/mainframe/SheetNameTabPane.java

@@ -215,8 +215,9 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
     private void doWithAuthority() {
         AuthoritySheetEditedPane sheetEditedPane = new AuthoritySheetEditedPane(reportComposite.getEditingWorkBook(), selectedIndex);
         sheetEditedPane.populate();
-        EastRegionContainerPane.getInstance().replaceUpPane(sheetEditedPane);
-        EastRegionContainerPane.getInstance().replaceDownPane(RolesAlreadyEditedPane.getInstance());
+        EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION);
+        EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(sheetEditedPane);
+        EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(RolesAlreadyEditedPane.getInstance());
     }
 
 

designer/src/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java

@@ -84,8 +84,8 @@ public class CellExpandAttrPane extends AbstractCellAttrPane {
 		layoutPane = new JPanel(new BorderLayout());
 		basicPane = new JPanel();
 		seniorPane = new JPanel();
-		basicPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Basic"),290,20,basicPane());
-		seniorPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"),290,20,seniorPane());
+		basicPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Basic"),290,24,basicPane());
+		seniorPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"),290,24,seniorPane());
 		layoutPane.add(basicPane,BorderLayout.NORTH);
 		layoutPane.add(seniorPane,BorderLayout.CENTER);
 		return layoutPane;

designer/src/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

@@ -36,7 +36,7 @@ import java.awt.event.ItemListener;
 public class CellOtherSetPane extends AbstractCellAttrPane {
 
     private static final int HEAD_WDITH = 290;
-    private static final int HEAD_HEIGTH = 20;
+    private static final int HEAD_HEIGTH = 24;
     // normal
     private UIButtonGroup autoshrik;
 

designer/src/com/fr/poly/PolyDesigner.java

@@ -395,7 +395,8 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
      * 不支持权限编辑
      */
     public void noAuthorityEdit() {
-        EastRegionContainerPane.getInstance().replaceUpPane(new NoSupportAuthorityEdit());
+        EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION);
+        EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(new NoSupportAuthorityEdit());
         HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setAuthorityMode(false);
     }
 
@@ -738,7 +739,8 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
             startEditing(blockName);
             if (selection == null) {
                 if (BaseUtils.isAuthorityEditing()) {
-                    EastRegionContainerPane.getInstance().replaceUpPane(new NoSupportAuthorityEdit());
+                    EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION_DISABLED);
+                    EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(new NoSupportAuthorityEdit());
                 } else {
                     EastRegionContainerPane.getInstance().replaceDownPane(new JPanel());
                     QuickEditorRegion.getInstance().populate(QuickEditor.DEFAULT_EDITOR);

designer/src/com/fr/poly/creator/ChartBlockEditor.java

@@ -274,7 +274,8 @@ public class ChartBlockEditor extends BlockEditor<MiddleChartComponent, PolyChar
 				//清参数面板
 				jTemplate.removeParameterPaneSelection();
 			}
-			EastRegionContainerPane.getInstance().replaceUpPane(new NoSupportAuthorityEdit());
+			EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION_DISABLED);
+			EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(new NoSupportAuthorityEdit());
 		}
 		QuickEditorRegion.getInstance().populate(creator.getQuickEditor(designer));
 	}

designer/src/com/fr/poly/creator/ECBlockPane.java

@@ -53,13 +53,15 @@ public class ECBlockPane extends PolyElementCasePane {
             public void selectionChanged(SelectionEvent e) {
                 if (BaseUtils.isAuthorityEditing()) {
                     if (designer.getSelection().getEditingElementCasePane() == null) {
-                        EastRegionContainerPane.getInstance().replaceUpPane(new NoSupportAuthorityEdit());
+                        EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION_DISABLED);
+                        EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(new NoSupportAuthorityEdit());
                         HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setAuthorityMode(false);
                         return;
                     }
                     AuthorityPropertyPane authorityPropertyPane = new AuthorityPropertyPane(designer);
                     authorityPropertyPane.populate();
-                    EastRegionContainerPane.getInstance().replaceUpPane(authorityPropertyPane);
+                    EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION);
+                    EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(authorityPropertyPane);
                     return;
                 }
 

designer_base/src/com/fr/design/foldablepane/HeaderPane.java

@@ -2,9 +2,9 @@ package com.fr.design.foldablepane;
 
 import com.fr.design.constants.UIConstants;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import javax.swing.JPanel;
 
 /**
  * Created by MoMeak on 2017/7/5.
@@ -18,12 +18,12 @@ public class HeaderPane extends JPanel {
     private String title;
     private Image image;
     private int fontSize = 13;
+
     public void setShow(boolean isShow) {
         this.isShow = isShow;
     }
 
-    public void setTitle(String title)
-    {
+    public void setTitle(String title) {
         this.title = title;
     }
 
@@ -55,17 +55,14 @@ public class HeaderPane extends JPanel {
 
         g2d.fillRect(0, 0, headWidth, headHeight);
         g2d.drawImage(UIConstants.DRAG_BAR, 0, 0, headWidth, headHeight, null);
-        g2d.setFont(new Font("SimSun", 0, fontSize));
+        g2d.setFont(new Font("OpenSans", 0, fontSize));
         g2d.setPaint(bgColor);
 //        g2d.drawString(this.title, fontSize/2, headHeight-fontSize/3);
-        g2d.drawString(this.title, 0, headHeight-fontSize/3);
-        if(this.isShow)
-        {
+        g2d.drawString(this.title, 0, headHeight - fontSize / 2 - 1);
+        if (this.isShow) {
             image = UIConstants.DRAG_DOWN_PRESS;
             g2d.drawImage(image, title.length() * fontSize, headHeight / 2 - 1, null);
-        }
-        else
-        {
+        } else {
             image = UIConstants.DRAG_RIGHT_PRESS;
             g2d.drawImage(image, title.length() * fontSize, headHeight / 3, null);
         }
@@ -97,11 +94,10 @@ public class HeaderPane extends JPanel {
         this.headWidth = headWidth;
     }
 
-    public static void main(String[] args)
-    {
+    public static void main(String[] args) {
 //        JFrame mainFrame = new JFrame("UI Demo - Gloomyfish");
 //        mainFrame.getContentPane().setLayout(new BorderLayout());
-//        mainFrame.getContentPane().add(new HeaderPane(Color.black, "基本",280,25), BorderLayout.CENTER);
+//        mainFrame.getContentPane().add(new HeaderPane(Color.black, "基本", 280, 24), BorderLayout.CENTER);
 //        mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 //        mainFrame.pack();
 //        mainFrame.setSize(280, 400);

designer_base/src/com/fr/design/gui/ibutton/UIButton.java

@@ -135,6 +135,7 @@ public class UIButton extends JButton implements UIObserver {
 
 
 	private void init() {
+		setOpaque(false);
 		setBackground(null);
 		setRolloverEnabled(true);
 		initListener();

designer_base/src/com/fr/design/gui/style/AlignmentPane.java

@@ -164,8 +164,8 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         JPanel jp1 = new JPanel(new BorderLayout());
         basicPane = new JPanel();
         seniorPane = new JPanel();
-        basicPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Basic"), 290, 20, basicPane());
-        seniorPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 290, 20, seniorPane());
+        basicPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Basic"), 290, 24, basicPane());
+        seniorPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 290, 24, seniorPane());
 
         jp1.add(basicPane, BorderLayout.NORTH);
         jp1.add(seniorPane, BorderLayout.CENTER);

designer_base/src/com/fr/design/gui/style/BorderPane.java

@@ -94,11 +94,11 @@ public class BorderPane extends AbstractBasicStylePane {
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
         panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM);
-        borderPanel = new UIExpandablePane(Inter.getLocText("FR-Designer_Border"), 280, 20, panel);
+        borderPanel = new UIExpandablePane(Inter.getLocText("FR-Designer_Border"), 280, 24, panel);
         this.add(borderPanel, BorderLayout.NORTH);
 
         backgroundPane = new BackgroundPane();
-        backgroundPanel = new UIExpandablePane(Inter.getLocText("FR-Designer_Background"), 280, 20, backgroundPane);
+        backgroundPanel = new UIExpandablePane(Inter.getLocText("FR-Designer_Background"), 280, 24, backgroundPane);
         this.add(backgroundPanel, BorderLayout.CENTER);
 
         outerToggleButton.addChangeListener(outerToggleButtonChangeListener);

designer_base/src/com/fr/design/locale/designer.properties

@@ -2092,16 +2092,9 @@ FR-Designer_CellWrite_Show_As_HTML=CellWrite_Show_As_HTML
 FR-Designer_Datasource_Other_Attributes=Other_Attributes
 FR-Designer_Not_use_a_cell_attribute_table_editing=Not_use_a_cell_attribute_table_editing
 FR-Designer_CellElement_Property_Table=CellElement_Property_Table
-FR-Designer_Add_Condition=Add Condition
-FR-Designer_Use_Params_Template=
-FR-Designer_Label_Name=
 FR-Designer_T_Insert_Float=Insert_Float
 FR-Designer_Add_FloatElement=Add_FloatElement
 FR-Designer_Insert_Image=Insert_Image
 FR-Designer_Insert-Chart=Insert-Chart
 FR-Designer_Insert-Text=Insert-Text
 FR-Designer_Insert_Formula=Insert_Formula
-
-FR-Designer_Insert_Chart=
-FR-Designer_Insert_Text=
-FR-Designer_Double=

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -2093,16 +2093,9 @@ FR-Designer_CellWrite_Show_As_HTML=CellWrite_Show_As_HTML
 FR-Designer_Datasource_Other_Attributes=Other_Attributes
 FR-Designer_Not_use_a_cell_attribute_table_editing=Not_use_a_cell_attribute_table_editing
 FR-Designer_CellElement_Property_Table=CellElement_Property_Table
-FR-Designer_Add_Condition=Add Condition
-FR-Designer_Use_Params_Template=use parameter template
-FR-Designer_Label_Name=label name
 FR-Designer_T_Insert_Float=Insert_Float
 FR-Designer_Add_FloatElement=Add_FloatElement
 FR-Designer_Insert_Image=Insert_Image
 FR-Designer_Insert_Chart=Insert-Chart
 FR-Designer_Insert_Text=Insert-Text
 FR-Designer_Insert_Formula=Insert_Formula
-
-FR-Designer_Insert-Chart=
-FR-Designer_Insert-Text=
-FR-Designer_Double=

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -1982,6 +1982,7 @@ FR-Base_UnSignIn=\ \u672A\u30ED\u30B0\u30A4\u30F3
 Every=\u6BCE
 CellWrite-Preview_Cell_Content=\u30BB\u30EB\u5185\u5BB9
 FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9
+FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9
 FR-Designer_Permissions=\u6A29\u9650
 FR-Designer_Form_Button=\u30DC\u30BF\u30F3
 FR-Designer_WF_Name=\u540D
@@ -2074,36 +2075,8 @@ FR-Designer_CellWrite_Show_As_HTML=
 FR-Designer_Datasource_Other_Attributes=
 FR-Designer_Not_use_a_cell_attribute_table_editing=
 FR-Designer_CellElement_Property_Table=
-FR-Designer_Add_Condition=
 FR-Designer_T_Insert_Float=
 FR-Designer_Add_FloatElement=
 FR-Designer_Insert_Image=
 FR-Designer_Insert_Chart=
 FR-Designer_Insert_Text=
-
-FR-Designer_AlphaFine_Enable=
-FR-Designer_AlphaFine_EnableAlphaFine=
-FR-Designer_AlphaFine_EnableInternet=
-FR-Designer_AlphaFine_EnableInternetSearch=
-FR-Designer_AlphaFine_Shortcut_Config=
-FR-Designer_AlphaFine_SearchRange=
-FR-Designer_AlphaFine_Recommend=
-FR-Designer-Plugin_Addon=
-FR-Designer_Templates=
-FR-Designer_Templates_Content=
-FR-Designer_AlphaFine_ShowAll=
-FR-Designer_AlphaFine_Latest=
-FR-Designer_AlphaFine_ShowLess=
-FR-Designer_AlphaFine=
-FR-Designer-Alphafine_No_Remind=
-FR-Designer_AlphaFine_NoResult=
-FR-Designer_ConnectionFailed=
-FR-Designer_NoResult=
-FR-Designer-AlphaFine_SetShortcuts=
-FR-Designer_Write_Enhance_Preview=
-FR-Designer-StyleAlignment_Style_PartSpacing=
-FR-Designer_Use_Params_Template=
-FR-Designer_Label_Name=
-FR-Designer_Insert-Chart=
-FR-Designer_Insert-Text=
-FR-Designer_Insert_Formula=

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -2073,37 +2073,9 @@ FR-Designer_CellWrite_Show_As_HTML=
 FR-Designer_Datasource_Other_Attributes=
 FR-Designer_Not_use_a_cell_attribute_table_editing=
 FR-Designer_CellElement_Property_Table=
-FR-Designer_Add_Condition=
 FR-Designer_T_Insert_Float=
 FR-Designer_Add_FloatElement=
 FR-Designer_Insert_Image=
 FR-Designer_Insert_Chart=
 FR-Designer_Insert_Text=
 FR-Designer_Insert_Formula=
-
-FR-Designer_AlphaFine_Enable=
-FR-Designer_AlphaFine_EnableAlphaFine=
-FR-Designer_AlphaFine_EnableInternet=
-FR-Designer_AlphaFine_EnableInternetSearch=
-FR-Designer_AlphaFine_Shortcut_Config=
-FR-Designer_AlphaFine_SearchRange=
-FR-Designer_AlphaFine_Recommend=
-FR-Designer-Plugin_Addon=
-FR-Designer_Templates=
-FR-Designer_Templates_Content=
-FR-Designer_AlphaFine_ShowAll=
-FR-Designer_AlphaFine_Latest=
-FR-Designer_AlphaFine_ShowLess=
-FR-Designer_AlphaFine=
-FR-Designer-Alphafine_No_Remind=
-FR-Designer_AlphaFine_NoResult=
-FR-Designer_ConnectionFailed=
-FR-Designer_NoResult=
-FR-Designer-AlphaFine_SetShortcuts=
-FR-Designer_Write_Enhance_Preview=
-FR-Designer_Scale_customButton=
-FR-Designer-StyleAlignment_Style_PartSpacing=
-FR-Designer_Use_Params_Template=
-FR-Designer_Label_Name=
-FR-Designer_Insert-Chart=
-FR-Designer_Insert-Text=

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -2101,3 +2101,8 @@ FR-Designer_Insert_Image=\u63D2\u5165\u56FE\u7247
 FR-Designer_Insert_Chart=\u63D2\u5165\u56FE\u8868
 FR-Designer_Insert_Text=\u63D2\u5165\u666E\u901A\u6587\u672C
 FR-Designer_Insert_Formula=\u63D2\u5165\u516C\u5F0F
+FR-Designer_Cell_Visible=\u5355\u5143\u683C\u53EF\u89C1
+FR-Designer_Float_Visible=\u60AC\u6D6E\u5143\u7D20\u53EF\u89C1
+FR-Designer_Cell_Value=\u5355\u5143\u683C\u503C
+FR-Designer_Widget_Visible=\u63A7\u4EF6\u53EF\u89C1
+FR-Designer_Widget_Enabled=\u63A7\u4EF6\u53EF\u7528

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -2092,18 +2092,9 @@ FR-Designer_CellWrite_Show_As_HTML=
 FR-Designer_Datasource_Other_Attributes=
 FR-Designer_Not_use_a_cell_attribute_table_editing=
 FR-Designer_CellElement_Property_Table=
-FR-Designer_Add_Condition=
 FR-Designer_T_Insert_Float=
 FR-Designer_Add_FloatElement=
 FR-Designer_Insert_Image=
 FR-Designer_Insert_Chart=
 FR-Designer_Insert_Text=
 FR-Designer_Insert_Formula=
-
-FR-Designer_AlphaFine_EnableInternet=
-FR-Designer_Scale_EnlargeOrReduce=
-FR-Designer-StyleAlignment_Style_PartSpacing=
-FR-Designer_Use_Params_Template=
-FR-Designer_Label_Name=
-FR-Designer_Insert-Chart=
-FR-Designer_Insert-Text=

designer_base/src/com/fr/design/mainframe/AuthorityEditPane.java

@@ -1 +1 @@
-package com.fr.design.mainframe;

import com.fr.design.constants.LayoutConstants;
import com.fr.design.designer.TargetComponent;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.general.Inter;

import javax.swing.*;
import java.awt.*;

/**
 * Author : daisy
 * Date: 13-9-12
 * Time: 下午6:21
 */
public abstract class AuthorityEditPane extends JPanel {
	protected static final int TOP_GAP = 11;
	protected static final int LEFT_GAP = 8;
	protected static final int ALIGNMENT_GAP = -3;

	protected UILabel type = null;
	protected UILabel name = null;
	protected JPanel checkPane = null;
	private TargetComponent target;

	public AuthorityEditPane(TargetComponent target) {
	protected static final int TOP_GAP = 11;
	protected static final int TOP_GAP = 11;
	protected static final int TOP_GAP = 11;
	protected static final int TOP_GAP = 11;
	protected static final int LEFT_GAP = 8;
	protected static final int TOP_GAP = 11;
	protected static final int ALIGNMENT_GAP = -3;
	protected static final int TOP_GAP = 11;

	protected static final int TOP_GAP = 11;
	protected UILabel type = null;
	protected static final int TOP_GAP = 11;
	protected UILabel name = null;
	protected static final int TOP_GAP = 11;
	protected JPanel checkPane = null;
	protected static final int TOP_GAP = 11;
	private TargetComponent target;
	protected static final int TOP_GAP = 11;
	public AuthorityEditPane(TargetComponent target) {

	protected static final int LEFT_GAP = 8;
	protected static final int LEFT_GAP = 8;
	protected static final int TOP_GAP = 11;
	protected static final int LEFT_GAP = 8;
	protected static final int LEFT_GAP = 8;
	protected static final int LEFT_GAP = 8;
	protected static final int ALIGNMENT_GAP = -3;
	protected static final int LEFT_GAP = 8;

	protected static final int LEFT_GAP = 8;
	protected UILabel type = null;
	protected static final int LEFT_GAP = 8;
	protected UILabel name = null;
	protected static final int LEFT_GAP = 8;
	protected JPanel checkPane = null;
	protected static final int LEFT_GAP = 8;
	private TargetComponent target;
	protected static final int LEFT_GAP = 8;
	public AuthorityEditPane(TargetComponent target) {
	protected static final int ALIGNMENT_GAP = -3;
	protected static final int TOP_GAP = 11;
	public AuthorityEditPane(TargetComponent target) {


	protected static final int ALIGNMENT_GAP = -3;
	protected static final int TOP_GAP = 11;
		double f = TableLayout.FILL;
		double p = TableLayout.PREFERRED;
	protected static final int LEFT_GAP = 8;
	protected static final int LEFT_GAP = 8;
				new Component[]{type},
	protected static final int ALIGNMENT_GAP = -3;

	protected static final int ALIGNMENT_GAP = -3;
	protected UILabel type = null;
	protected static final int LEFT_GAP = 8;
	protected UILabel name = null;
	protected static final int LEFT_GAP = 8;
	protected JPanel checkPane = null;
		double[] columnSize = {f};
	protected static final int LEFT_GAP = 8;
	public AuthorityEditPane(TargetComponent target) {
	protected static final int ALIGNMENT_GAP = -3;
	protected static final int TOP_GAP = 11;
	public AuthorityEditPane(TargetComponent target) {

	protected static final int ALIGNMENT_GAP = -3;
	protected JPanel checkPane = null;
	 * 更新权限编辑面板的具体内容：类型、名称、权限面板
	 */
	public void populateDetials() {
		populateType();

	protected static final int LEFT_GAP = 8;

	protected static final int ALIGNMENT_GAP = -3;



	protected UILabel type = null;
	protected static final int TOP_GAP = 11;
	public AuthorityEditPane(TargetComponent target) {


	protected UILabel name = null;

	public abstract void populateName();

	public abstract JPanel populateCheckPane();

}
+package com.fr.design.mainframe;

import com.fr.design.constants.LayoutConstants;
import com.fr.design.designer.TargetComponent;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.general.Inter;

import javax.swing.*;
import java.awt.*;

/**
 * Author : daisy
 * Date: 13-9-12
 * Time: 下午6:21
 */
public abstract class AuthorityEditPane extends JPanel {
    protected static final int TOP_GAP = 11;
    protected static final int LEFT_GAP = 4;
	protected UILabel type = null;
	protected static final int TOP_GAP = 11;
	protected UILabel type = null;
	protected static final int LEFT_GAP = 8;
	protected UILabel type = null;
	protected static final int ALIGNMENT_GAP = -3;
	protected UILabel type = null;

	protected UILabel type = null;
	protected UILabel type = null;
	protected UILabel type = null;
	protected UILabel name = null;
	protected UILabel type = null;
	protected JPanel checkPane = null;
	protected UILabel type = null;
	private TargetComponent target;
	protected UILabel type = null;

	protected UILabel type = null;
	public AuthorityEditPane(TargetComponent target) {
	protected UILabel name = null;
	protected UILabel name = null;
	protected static final int TOP_GAP = 11;
	protected UILabel name = null;
	protected static final int LEFT_GAP = 8;
	protected UILabel name = null;
	protected static final int ALIGNMENT_GAP = -3;
	protected UILabel name = null;

	protected UILabel name = null;
	protected UILabel type = null;
	protected UILabel name = null;
	protected UILabel name = null;
	protected UILabel name = null;
	protected JPanel checkPane = null;
	protected UILabel name = null;
	private TargetComponent target;
	protected UILabel name = null;
	public AuthorityEditPane(TargetComponent target) {
	protected JPanel checkPane = null;
	protected JPanel checkPane = null;
	protected static final int TOP_GAP = 11;
	protected JPanel checkPane = null;
	protected static final int LEFT_GAP = 8;

	protected JPanel checkPane = null;
	protected static final int ALIGNMENT_GAP = -3;
	protected JPanel checkPane = null;

	protected JPanel checkPane = null;
	protected UILabel type = null;
	protected JPanel checkPane = null;
	protected UILabel name = null;
	protected JPanel checkPane = null;
	protected JPanel checkPane = null;
	protected JPanel checkPane = null;
	private TargetComponent target;
	protected JPanel checkPane = null;
	public AuthorityEditPane(TargetComponent target) {
	private TargetComponent target;
	private TargetComponent target;
	protected static final int TOP_GAP = 11;
                new Component[]{checkPane, null},
	private TargetComponent target;
	protected static final int ALIGNMENT_GAP = -3;

        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM);
	protected JPanel checkPane = null;
	protected static final int LEFT_GAP = 8;
	protected UILabel type = null;

	private TargetComponent target;
	protected UILabel type = null;
	private TargetComponent target;
	protected UILabel name = null;
	private TargetComponent target;
	protected JPanel checkPane = null;
    public void populateDetials() {
	private TargetComponent target;
	public AuthorityEditPane(TargetComponent target) {
	public AuthorityEditPane(TargetComponent target) {
	public AuthorityEditPane(TargetComponent target) {
	protected static final int TOP_GAP = 11;
	public AuthorityEditPane(TargetComponent target) {
	protected static final int LEFT_GAP = 8;
	public AuthorityEditPane(TargetComponent target) {
	protected static final int ALIGNMENT_GAP = -3;
	protected JPanel checkPane = null;
	protected static final int LEFT_GAP = 8;
	protected UILabel type = null;

	public AuthorityEditPane(TargetComponent target) {

	protected UILabel type = null;

	public AuthorityEditPane(TargetComponent target) {
	protected UILabel type = null;
	protected UILabel type = null;

	public AuthorityEditPane(TargetComponent target) {
	protected UILabel name = null;
public abstract JPanel populateCheckPane();

}

designer_base/src/com/fr/design/mainframe/AuthorityPropertyPane.java

@@ -1 +1 @@
-package com.fr.design.mainframe;

import com.fr.design.constants.UIConstants;
import com.fr.design.designer.TargetComponent;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.Inter;

import javax.swing.*;
import java.awt.*;

/**
 * Author : daisy
 * Date: 13-9-12
 * Time: 下午6:14
 */
public class AuthorityPropertyPane extends JPanel {
	private static final int TITLE_HEIGHT = 19;
	private AuthorityEditPane authorityEditPane = null;

	public AuthorityPropertyPane(TargetComponent t) {
		this.setLayout(new BorderLayout());
		this.setBorder(null);
		UILabel authorityTitle = new UILabel(Inter.getLocText(new String[]{"DashBoard-Potence", "Edit"})) {
			@Override
			public Dimension getPreferredSize() {
				return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);
			}
		};
		authorityTitle.setHorizontalAlignment(SwingConstants.CENTER);
		authorityTitle.setVerticalAlignment(SwingConstants.CENTER);
		JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
		northPane.add(authorityTitle, BorderLayout.CENTER);
		northPane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.LINE_COLOR));
		this.add(northPane, BorderLayout.NORTH);
		authorityEditPane = t.createAuthorityEditPane();
		UIScrollPane scrollPane = new UIScrollPane(authorityEditPane);
		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
		this.add(scrollPane, BorderLayout.CENTER);
	}

	public void populate() {
		authorityEditPane.populateDetials();
	}


}
+package com.fr.design.mainframe;

import com.fr.design.constants.UIConstants;
import com.fr.design.designer.TargetComponent;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.Inter;

import javax.swing.*;
import java.awt.*;

/**
 * Author : daisy
 * Date: 13-9-12
 * Time: 下午6:14
 */
public class AuthorityPropertyPane extends JPanel {
	private static final int TITLE_HEIGHT = 19;
	private AuthorityEditPane authorityEditPane = null;

	public AuthorityPropertyPane(TargetComponent t) {
		this.setLayout(new BorderLayout());
		this.setBorder(null);
		UILabel authorityTitle = new UILabel(Inter.getLocText(new String[]{"DashBoard-Potence", "Edit"})) {
			@Override
			public Dimension getPreferredSize() {
				return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);
			}
		};
		authorityTitle.setHorizontalAlignment(SwingConstants.CENTER);
		authorityTitle.setVerticalAlignment(SwingConstants.CENTER);
		JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
		northPane.add(authorityTitle, BorderLayout.CENTER);
		northPane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.LINE_COLOR));
//		this.add(northPane, BorderLayout.NORTH);
		authorityEditPane = t.createAuthorityEditPane();
		UIScrollPane scrollPane = new UIScrollPane(authorityEditPane);
		scrollPane.setBorder(null);
		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
		this.add(scrollPane, BorderLayout.CENTER);
	}

	public void populate() {
		authorityEditPane.populateDetials();
	}


}

designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -54,7 +54,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         POLY,  // 聚合报表
         POLY_REPORT,  // 聚合报表-报表块
         POLY_CHART,  // 聚合报表-图表块
-        AUTHORITY_EDITION  // 权限编辑
+        AUTHORITY_EDITION,  // 权限编辑
+        AUTHORITY_EDITION_DISABLED  // 权限编辑
     }
     private PropertyMode currentMode;  // 当前模式（根据不同模式，显示不同的可用面板）
 
@@ -115,11 +116,11 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 new PropertyMode[]{PropertyMode.FORM});
         // 权限编辑
         PropertyItem authorityEdition = new PropertyItem(KEY_AUTHORITY_EDITION, Inter.getLocText("FR-Designer_Permissions_Edition"),
-                "authorityedit", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION},
+                "authorityedit", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION_DISABLED},
                 new PropertyMode[]{PropertyMode.AUTHORITY_EDITION});
         // 已配置角色
         PropertyItem configuredRoles = new PropertyItem(KEY_CONFIGURED_ROLES, Inter.getLocText("FR-Designer_Configured_Roles"),
-                "configuredroles", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION},
+                "configuredroles", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION_DISABLED},
                 new PropertyMode[]{PropertyMode.AUTHORITY_EDITION});
 
         propertyItemMap.put(KEY_CELL_ELEMENT, cellElement);

designer_base/src/com/fr/design/mainframe/JSliderPane.java

@@ -16,12 +16,14 @@ import javax.swing.*;
 import javax.swing.border.MatteBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.basic.BasicSliderUI;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.awt.geom.RoundRectangle2D;
 import java.math.BigDecimal;
 
 /**
@@ -35,7 +37,7 @@ public class JSliderPane extends JPanel {
     private static final int ONE_EIGHT = 18;
     private static final int FONT_SIZE = 14;
     private static final int SPINNER_WIDTH = 45;
-    private static final int SPINNER_HEIGHT = 20;
+    private static final int SPINNER_HEIGHT = 16;
     private static final int HALF_HUNDRED = 50;
     private static final int HUNDRED = 100;
     private static final int TWO_HUNDRED = 200;
@@ -43,8 +45,12 @@ public class JSliderPane extends JPanel {
     private static final int FOUR_HUNDRED = 400;
     private static final int DIALOG_WIDTH = 150;
     private static final int DIALOG_HEIGHT = 240;
-    private static final int SHOWVALBUTTON_WIDTH = 70;
-    private static final int SHOWVALBUTTON_HEIGHTH = 25;
+    private static final int SLIDER_WIDTH = 220;
+    private static final int SLIDER_HEIGHT = 20;
+    private static final int SHOWVALBUTTON_WIDTH = 40;
+    private static final int SHOWVALBUTTON_HEIGHTH = 20;
+    private static final int SLIDER_GAP = 5;
+    private static final Color BACK_COLOR = new Color(245,245,247);
     public int showValue = 100;
     public double resolutionTimes = 1.0;
     private static JSliderPane THIS;
@@ -55,7 +61,7 @@ public class JSliderPane extends JPanel {
     private int sliderValue;
     private UIButton downButton;
     private UIButton upButton;
-    private UIButton showValButton;
+    private JButton showValButton;
     private UIRadioButton twoHundredButton;
     private UIRadioButton oneHundredButton;
     private UIRadioButton SevenFiveButton;
@@ -75,7 +81,9 @@ public class JSliderPane extends JPanel {
         slider = new UISlider(0, HUNDRED, HALF_HUNDRED);
         slider.setUI(new JSliderPaneUI(slider));
         slider.addChangeListener(listener);
-
+        slider.setPreferredSize(new Dimension(220, 20));
+        //去掉虚线框
+        slider.setFocusable(false);
         showValSpinner = new UIBasicSpinner(new SpinnerNumberModel(HUNDRED, TEN, FOUR_HUNDRED, 1));
         showValSpinner.setEnabled(true);
         showValSpinner.addChangeListener(showValSpinnerChangeListener);
@@ -88,26 +96,37 @@ public class JSliderPane extends JPanel {
 //        DefaultFormatterFactory factory = (DefaultFormatterFactory) textField .getFormatterFactory();
 //        NumberFormatter formatter = (NumberFormatter) factory.getDefaultFormatter();
 //        formatter.setAllowsInvalid(false);
-        downButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/moveDown.png"));
-        upButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/moveUp.png"));
+        downButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/normalDown20.png"),BaseUtils.readIcon("com/fr/design/images/data/source/hoverDown20.png"),BaseUtils.readIcon("com/fr/design/images/data/source/hoverDown20.png"));
+//        downButton.setPreferredSize(new Dimension(16,16));
+        downButton.setOpaque(false);
+        downButton.setBorderPainted(false);
+        upButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/normalUp20.png"),BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png"),BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png"));
+//        upButton.setPreferredSize(new Dimension(21,21));
+        upButton.setOpaque(false);
+        upButton.setBorderPainted(false);
         downButton.setActionCommand("less");
         upButton.setActionCommand("more");
         downButton.addActionListener(buttonActionListener);
         upButton.addActionListener(buttonActionListener);
 
-        showValButton = new UIButton(showValSpinner.getValue() + "%");
+        showValButton = new JButton(showValSpinner.getValue() + "%");
+        showValButton.setOpaque(false);
+        showValButton.setMargin(new Insets(0,0,0,0));
+        showValButton.setFont(new Font("OpenSans", Font.PLAIN, 12));
+        showValButton.setBackground(BACK_COLOR);
         showValButton.setBorderPainted(false);
         showValButton.setPreferredSize(new Dimension(SHOWVALBUTTON_WIDTH, SHOWVALBUTTON_HEIGHTH));
         showValButton.addActionListener(showValButtonActionListener);
         initUIRadioButton();
         initPane();
-        JPanel panel = new JPanel(new FlowLayout(1, 1, 0));
+        JPanel panel = new JPanel(new FlowLayout(1, 5, 0));
         panel.add(downButton);
         panel.add(slider);
         panel.add(upButton);
         panel.add(showValButton);
+        panel.setBackground(BACK_COLOR);
         this.add(panel, BorderLayout.NORTH);
-        this.setBounds(0, 0, THREE_HUNDRED, ONE_EIGHT);
+//        this.setBounds(0, 0, THREE_HUNDRED, ONE_EIGHT);
     }
 
     public static final JSliderPane getInstance() {
@@ -314,14 +333,14 @@ public class JSliderPane extends JPanel {
             dialog = new PopupPane(upButton, dialogContentPanel);
             if (upButtonX == 0) {
                 upButtonX = btnCoords.x;
-                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH + SLIDER_GAP * 2, -DIALOG_HEIGHT);
             }
         } else {
             if (upButtonX == 0) {
                 upButtonX = btnCoords.x;
-                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH + SLIDER_GAP * 2, -DIALOG_HEIGHT);
             } else {
-                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH + SLIDER_GAP * 2, -DIALOG_HEIGHT);
             }
         }
     }
@@ -341,6 +360,7 @@ public class JSliderPane extends JPanel {
 
 class JSliderPaneUI extends BasicSliderUI {
 
+    private static final Color BACK_COLOR = new Color(245,245,247);
     private static final int VERTICAL_WIDTH = 11;
     private static final int VERTICAL_HEIGHT = 16;
     private static final int FOUR = 4;
@@ -356,33 +376,18 @@ class JSliderPaneUI extends BasicSliderUI {
      * 绘制指示物
      */
 
-    public Dimension getThumbSize() {
-        Dimension size = new Dimension();
-
-        if (slider.getOrientation() == JSlider.VERTICAL) {
-            size.width = VERTICAL_WIDTH;
-            size.height = VERTICAL_HEIGHT;
-        } else {
-            size.width = VERTICAL_WIDTH;
-            size.height = VERTICAL_HEIGHT;
-        }
-
-        return size;
-    }
-
     public void paintThumb(Graphics g) {
         Rectangle knobBounds = thumbRect;
         int w = knobBounds.width;
         int h = knobBounds.height;
+        Graphics2D g2d = (Graphics2D) g;
 
-        g.translate(knobBounds.x, knobBounds.y);
-        if (slider.isEnabled()) {
-            g.setColor(slider.getBackground());
-        } else {
-            g.setColor(slider.getBackground().darker());
-        }
-        g.setColor(Color.darkGray);
-        g.fillRect(0, 1, w - SIX, h + 1);
+        g2d.translate(knobBounds.x, knobBounds.y);
+//        g2d.setColor(slider.getBackground());
+//        g2d.fillRect(0, FOUR, FOUR, 9);
+        g2d.setColor(new Color(51,51,52));
+        g2d.drawRoundRect(0,SIX,FOUR,9,2,2);
+        g2d.fillRoundRect(0,SIX,FOUR,9,2,2);
     }
 
     /** */
@@ -396,8 +401,10 @@ class JSliderPaneUI extends BasicSliderUI {
             Graphics2D g2 = (Graphics2D) g;
             cy = (trackBounds.height / 2);
             cw = trackBounds.width;
-            g.setColor(Color.lightGray);
-            g.drawLine(0, cy, cw + FIVE, cy);
+            g2.setPaint(BACK_COLOR);
+            g2.fillRect(0, -cy, cw + 10, cy * 4);
+            g.setColor(new Color(216,216,216));
+            g.drawLine(0, cy, cw +3, cy);
             g.drawLine(FIVE + cw / 2, cy - FOUR, FIVE + cw / 2, cy + FOUR);
         } else {
             super.paintTrack(g);
@@ -409,13 +416,13 @@ class JSliderPaneUI extends BasicSliderUI {
 class PopupPane extends JPopupMenu {
     private JComponent contentPane;
     private static final int UPLABEL_HEIGHT = 25;
-    private static final int DIALOG_WIDTH = 150;
+    private static final int DIALOG_WIDTH = 157;
     private static final int DIALOG_HEIGHT = 240;
     private static final int UPLABEL_WIDTH = 300;
     private JComponent centerPane;
     private UILabel upLabel;
 
-    PopupPane(UIButton b, JPanel dialogContentPanel) {
+    PopupPane(JButton b, JPanel dialogContentPanel) {
         contentPane = new JPanel(new BorderLayout());
         centerPane = new JPanel(new BorderLayout());
         upLabel = new UILabel(" " + Inter.getLocText("FR-Designer_Scale_EnlargeOrReduce"));

designer_base/src/com/fr/design/mainframe/NoSupportAuthorityEdit.java

@@ -1 +1 @@
-package com.fr.design.mainframe;

import com.fr.design.constants.UIConstants;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.Inter;

import javax.swing.*;
import java.awt.*;

/**
 * Author : daisy
 * Date: 13-9-22
 * Time: 上午10:05
 */
public class NoSupportAuthorityEdit extends AuthorityEditPane {

    private static final int TITLE_HEIGHT = 19;

    public NoSupportAuthorityEdit() {
        super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
        this.setLayout(new BorderLayout());
        this.setBorder(null);
        UILabel title = new UILabel(Inter.getLocText(new String[]{"DashBoard-Potence", "Edit"})) {
            @Override
            public Dimension getPreferredSize() {
                return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);
            }
        };
        title.setHorizontalAlignment(SwingConstants.CENTER);
        title.setVerticalAlignment(SwingConstants.CENTER);
        JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
        northPane.add(title, BorderLayout.CENTER);
        northPane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.LINE_COLOR));
        this.add(northPane, BorderLayout.NORTH);
        this.add(createTextPane(), BorderLayout.CENTER);
    }


    private JPanel createTextPane() {
        JPanel panel = new JPanel(new BorderLayout());
        UILabel uiLabel = new UILabel(Inter.getLocText("not_support_authority_edit"));
        uiLabel.setHorizontalAlignment(SwingConstants.CENTER);
        uiLabel.setVerticalAlignment(SwingConstants.CENTER);
        panel.add(uiLabel, BorderLayout.CENTER);
        return panel;
    }

    @Override
    public void populateType() {
    }

    @Override
    public void populateName() {
    }

    @Override
    public JPanel populateCheckPane() {
        return null;
    }
}
+package com.fr.design.mainframe;

import com.fr.design.constants.UIConstants;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.Inter;

import javax.swing.*;
import java.awt.*;

/**
 * Author : daisy
 * Date: 13-9-22
 * Time: 上午10:05
 */
public class NoSupportAuthorityEdit extends AuthorityEditPane {

    private static final int TITLE_HEIGHT = 19;

    public NoSupportAuthorityEdit() {
        super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
        this.setLayout(new BorderLayout());
        this.setBorder(null);
        UILabel title = new UILabel(Inter.getLocText(new String[]{"DashBoard-Potence", "Edit"})) {
            @Override
            public Dimension getPreferredSize() {
                return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);
            }
        };
        title.setHorizontalAlignment(SwingConstants.CENTER);
        title.setVerticalAlignment(SwingConstants.CENTER);
        JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
        northPane.add(title, BorderLayout.CENTER);
        northPane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.LINE_COLOR));
//        this.add(northPane, BorderLayout.NORTH);
        this.add(createTextPane(), BorderLayout.CENTER);
    }


    private JPanel createTextPane() {
        JPanel panel = new JPanel(new BorderLayout());
        UILabel uiLabel = new UILabel(Inter.getLocText("not_support_authority_edit"));
        uiLabel.setHorizontalAlignment(SwingConstants.CENTER);
        uiLabel.setVerticalAlignment(SwingConstants.CENTER);
        panel.add(uiLabel, BorderLayout.CENTER);
        return panel;
    }

    @Override
    public void populateType() {
    }

    @Override
    public void populateName() {
    }

    @Override
    public JPanel populateCheckPane() {
        return null;
    }
}

designer_base/src/com/fr/start/BaseDesigner.java

@@ -57,10 +57,10 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
 
         DesignUtils.setPort(getStartPort());
         // 如果端口被占用了 说明程序已经运行了一次,也就是说，已经建立一个监听服务器，现在只要给服务器发送命令就好了
-        if (DesignUtils.isStarted()) {
-            DesignUtils.clientSend(args);
-            return;
-        }
+//        if (DesignUtils.isStarted()) {
+//            DesignUtils.clientSend(args);
+//            return;
+//        }
         BuildContext.setBuildFilePath(buildPropertiesPath());
 
         //下面这两句的位置不能随便调换，因为会影响语言切换的问题

designer_form/src/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java

@@ -34,8 +34,8 @@ import com.fr.general.Inter;
 public class FormWidgetAuthorityEditPane extends AuthorityEditPane {
     private FormDesigner designer;
     private Widget[] widgets = null;
-    private UICheckBox widgetVisible = new UICheckBox(Inter.getLocText("FR-Designer_Visible"));
-    private UICheckBox widgetAvailable = new UICheckBox(Inter.getLocText("FR-Designer_Enabled"));
+    private UICheckBox widgetVisible = new UICheckBox(Inter.getLocText("FR-Designer_Widget_Visible"));
+    private UICheckBox widgetAvailable = new UICheckBox(Inter.getLocText("FR-Designer_Widget_Enabled"));
     private ItemListener visibleItemListener = new ItemListener() {
         public void itemStateChanged(ItemEvent e) {
             String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
@@ -90,20 +90,16 @@ public class FormWidgetAuthorityEditPane extends AuthorityEditPane {
     /**
      * 更新类型面板
      *
-	 *
      * @date 2014-12-21-下午6:19:43
-	 * 
      */
     public void populateType() {
-        type.setText(Inter.getLocText("Widget-Form_Widget_Config"));
+        type.setText(" " + Inter.getLocText("Widget-Form_Widget_Config"));
     }
 
     /**
      * 更新名称面板
      *
-	 *
      * @date 2014-12-21-下午7:12:27
-	 * 
      */
     public void populateName() {
         String nameText = "";
@@ -113,33 +109,31 @@ public class FormWidgetAuthorityEditPane extends AuthorityEditPane {
         for (int i = 0; i < widgets.length; i++) {
             nameText += "," + widgets[i].getClass().getSimpleName();
         }
-        name.setText(nameText.substring(1));
+        name.setText(" " + nameText.substring(1));
     }
 
     /**
      * 更新checkbox所在的面板
      *
      * @return 面板
-	 * 
-	 *
      * @date 2014-12-21-下午6:19:03
-	 * 
      */
     public JPanel populateCheckPane() {
-        checkPane.add(populateWidgetCheckPane(), BorderLayout.WEST);
+        checkPane.add(populateWidgetCheckPane(), BorderLayout.CENTER);
+        checkPane.setBorder(BorderFactory.createEmptyBorder(0, LEFT_CHECKPANE, 0, 0));
         return checkPane;
     }
 
     private JPanel populateWidgetCheckPane() {
-        double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget"), SwingConstants.LEFT), widgetVisible, widgetAvailable}
+                new Component[]{widgetVisible},
+                new Component[]{widgetAvailable}
         };
-        double[] rowSize = {p};
-        double[] columnSize = {p, p, f};
-        int[][] rowCount = {{1, 1, 1}};
-        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
+        double[] rowSize = {p, p};
+        double[] columnSize = {p};
+        int[][] rowCount = {{1},{1}};
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_SMALL);
     }
 
 
@@ -157,7 +151,7 @@ public class FormWidgetAuthorityEditPane extends AuthorityEditPane {
         populateName();
         checkPane.removeAll();
         populateCheckPane();
-        checkPane.setBorder(BorderFactory.createEmptyBorder(ALIGNMENT_GAP, 0, 0, 0));
+        checkPane.setBorder(BorderFactory.createEmptyBorder(0, LEFT_CHECKPANE, 0, 0));
         checkCheckBoxes();
     }
 

designer_form/src/com/fr/design/mainframe/FormDesigner.java

@@ -475,7 +475,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         paraHeight = 0;
         paraComponent = null;
         formLayoutContainer.setSize(rootComponent.getWidth(), rootComponent.getHeight());
-        EastRegionContainerPane.getInstance().replaceDownPane(this.getEastDownPane());
+        EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(this.getEastDownPane());
         //atat
         //EastRegionContainerPane.getInstance().addTitlePane(ParameterPropertyPane.getInstance(FormDesigner.this));
         //删除后重绘下
@@ -1042,11 +1042,13 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         if (isSupportAuthority()) {
             AuthorityPropertyPane authorityPropertyPane = new AuthorityPropertyPane(this);
             authorityPropertyPane.populate();
-            EastRegionContainerPane.getInstance().replaceUpPane(authorityPropertyPane);
+            EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION);
+            EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(authorityPropertyPane);
         } else {
-            EastRegionContainerPane.getInstance().replaceUpPane(new NoSupportAuthorityEdit());
+            EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION_DISABLED);
+            EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(new NoSupportAuthorityEdit());
         }
-        EastRegionContainerPane.getInstance().replaceDownPane(RolesAlreadyEditedPane.getInstance());
+        EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(RolesAlreadyEditedPane.getInstance());
     }
 
     /**
@@ -1259,13 +1261,13 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
 
                     pane.setLayout(new BorderLayout());
                     pane.add(FormWidgetDetailPane.getInstance(FormDesigner.this), BorderLayout.CENTER);
-                    EastRegionContainerPane.getInstance().replaceDownPane(pane);
+                    EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(pane);
                 }
             }.start();
         } else {
             pane.setLayout(new BorderLayout());
             pane.add(FormWidgetDetailPane.getInstance(this), BorderLayout.CENTER);
-            EastRegionContainerPane.getInstance().replaceDownPane(pane);
+            EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(pane);
         }
 
         return pane;

designer_form/src/com/fr/design/mainframe/JForm.java

@@ -649,11 +649,13 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
         WidgetToolBarPane.getInstance(formDesign);
         if (BaseUtils.isAuthorityEditing()) {
             if (formDesign.isSupportAuthority()) {
-                EastRegionContainerPane.getInstance().replaceUpPane(new AuthorityPropertyPane(this));
+                EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION);
+                EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(new AuthorityPropertyPane(this));
             } else {
-                EastRegionContainerPane.getInstance().replaceUpPane(new NoSupportAuthorityEdit());
+                EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION_DISABLED);
+                EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(new NoSupportAuthorityEdit());
             }
-            EastRegionContainerPane.getInstance().replaceDownPane(RolesAlreadyEditedPane.getInstance());
+            EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(RolesAlreadyEditedPane.getInstance());
             return;
         }