diff --git a/designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java b/designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java
index d0534f9f2..d464d8f48 100644
--- a/designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java
+++ b/designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java
@@ -1 +1 @@
-package com.fr.design.mainframe;

import com.fr.design.constants.LayoutConstants;
import com.fr.design.constants.UIConstants;
import com.fr.design.roleAuthority.ReportAndFSManagePane;
import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.webattr.ToolBarButton;
import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;

import javax.swing.*;
import java.awt.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.List;

/**
 * 用于在权限编辑状态对工具栏的元素进行权限编辑的面板
 * Author : daisy
 * Date: 13-9-18
 * Time: 下午2:15
 */
public class AuthorityEditToolBarPane extends AuthorityPropertyPane {

    private static final int TITLE_HEIGHT = 19;
    private AuthorityEditPane authorityEditPane = null;
    private AuthorityToolBarPane authorityToolBarPane;

    public AuthorityEditToolBarPane(List<ToolBarButton> buttonlists) {
        super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
        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 = new AuthorityEditPane(buttonlists);
        this.add(authorityEditPane, BorderLayout.CENTER);
    }

    public void setAuthorityToolBarPane(AuthorityToolBarPane authorityToolBarPane) {
        this.authorityToolBarPane = authorityToolBarPane;
    }


    public void populate() {
        authorityToolBarPane.populateAuthority();
        signelSelection();
        authorityEditPane.populateDetials();
    }


    private void signelSelection() {
        JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
        if (jTemplate.isJWorkBook()) {
            //清参数面板
            jTemplate.removeParameterPaneSelection();

            //清报表主体
            jTemplate.removeTemplateSelection();
        }
    }


    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 UILabel type = null;
        private UILabel name = null;
        private JPanel checkPane = null;
        private List<ToolBarButton> buttonlists;
        private UICheckBox buttonVisible = new UICheckBox(Inter.getLocText("Widget-Visible"));
        private ItemListener itemListener = new ItemListener() {
            public void itemStateChanged(ItemEvent e) {
                String selectedRole = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
                if (ComparatorUtils.equals(selectedRole, Inter.getLocText("Role"))) {
                    return;
                }
                if (selectedRole == null) {
                    return;
                }
                for (int i = 0; i < buttonlists.size(); i++) {
                    if (buttonlists.get(i).isSelected()) {
                        buttonlists.get(i).changeAuthorityState(selectedRole, buttonVisible.isSelected());
                        authorityToolBarPane.repaint();
                    }
                }
                HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().fireTargetModified();
                RolesAlreadyEditedPane.getInstance().refreshDockingView();
                UICheckBox checkbox = (UICheckBox) e.getSource();
                List<ToolBarButton> _buttonlists = AuthorityEditPane.this.buttonlists;
                for (int j = 0; j < _buttonlists.size(); j++) {
                    if (_buttonlists.get(j).isSelected()) {
                        //由引擎实现保存进模板报表
                        authorityToolBarPane.setAuthorityWebAttr(_buttonlists.get(j).getWidget(), checkbox.isSelected(), selectedRole);
                    }
                }
            }
        };

        public AuthorityEditPane(List<ToolBarButton> buttonlists) {
            setLayout(new BorderLayout());
            type = new UILabel();
            name = new UILabel();
            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.buttonlists = buttonlists;
            buttonVisible.addItemListener(itemListener);
        }

        private JPanel layoutText() {
            double p = TableLayout.PREFERRED;
            Component[][] components = new Component[][]{
                    new Component[]{new UILabel(Inter.getLocText("Type") + ":", SwingConstants.RIGHT)},
                    new Component[]{new UILabel(Inter.getLocText("WF-Name") + ":", SwingConstants.RIGHT)},
                    new Component[]{new UILabel(Inter.getLocText("DashBoard-Potence") + ":", 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() {
            double f = TableLayout.FILL;
            double p = TableLayout.PREFERRED;
            Component[][] components = new Component[][]{
                    new Component[]{type},
                    new Component[]{name},
                    new Component[]{checkPane},
            };
            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);
        }

        /**
         * 更新权限编辑面板的具体内容：类型、名称、权限面板
         */
        public void populateDetials() {
            populateName();
            populateType();
            populateCheckPane();
            checkVisibleCheckBoxes();
        }

        private void checkVisibleCheckBoxes() {
            buttonVisible.removeItemListener(itemListener);
            String selected = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
            if (selected == null) {
                buttonVisible.setSelected(true);
            }
            for (int i = 0; i < buttonlists.size(); i++) {
                if (buttonlists.get(i).isSelected()) {
                    buttonVisible.setSelected(!buttonlists.get(i).isDoneAuthorityEdited(selected));
                    break;
                }
            }
            buttonVisible.addItemListener(itemListener);
        }


        public void populateType() {
            if (name.getText() == "") {
                type.setText("");
            } else {
                type.setText(Inter.getLocText(new String[]{"ReportServerP-Toolbar", "Form-Button"}));
            }
        }

        public void populateName() {
            String names = "";
            for (int i = 0; i < buttonlists.size(); i++) {
                if (buttonlists.get(i).isSelected()) {
                    names += "," + buttonlists.get(i).getNameOption().optionName();
                }
            }
            if (names != "") {
                names = names.substring(1);
            }
            name.setText(names);
        }

        public void populateCheckPane() {
            checkPane.removeAll();
            if (name.getText() == "") {
                return;
            }
            double f = TableLayout.FILL;
            double p = TableLayout.PREFERRED;
            Component[][] components = new Component[][]{
                    new Component[]{new UILabel(Inter.getLocText("Form-Button"), SwingConstants.LEFT), 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);
            checkPane.add(check, BorderLayout.CENTER);
            checkPane.setBorder(BorderFactory.createEmptyBorder(ALIGNMENT_GAP, 0, 0, 0));
        }
    }
}
\ No newline at end of file
+package com.fr.design.mainframe;

import com.fr.design.constants.LayoutConstants;
import com.fr.design.constants.UIConstants;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.roleAuthority.ReportAndFSManagePane;
import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
import com.fr.design.webattr.ToolBarButton;
import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;
import com.fr.stable.StringUtils;

import javax.swing.*;
import javax.swing.tree.TreePath;
import java.awt.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.List;

/**
 * 用于在权限编辑状态对工具栏的元素进行权限编辑的面板
 * Author : daisy
 * Date: 13-9-18
 * Time: 下午2:15
 */
public class AuthorityEditToolBarPane extends AuthorityPropertyPane {

    private static final int TITLE_HEIGHT = 19;
    private AuthorityEditPane authorityEditPane = null;
    private AuthorityToolBarPane authorityToolBarPane;
    private String[] selectedPathArray;

    public AuthorityEditToolBarPane(List<ToolBarButton> buttonlists) {
        super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
        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 = new AuthorityEditPane(buttonlists);
        this.add(authorityEditPane, BorderLayout.CENTER);
    }

    public void setAuthorityToolBarPane(AuthorityToolBarPane authorityToolBarPane) {
        this.authorityToolBarPane = authorityToolBarPane;
    }


    public void populate() {
        authorityToolBarPane.populateAuthority();
        signelSelection();
        authorityEditPane.populateDetials();
    }


    private void signelSelection() {
        JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
        if (jTemplate.isJWorkBook()) {
            //清参数面板
            jTemplate.removeParameterPaneSelection();

            //清报表主体
            jTemplate.removeTemplateSelection();
        }
    }


    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 UILabel type = null;
        private UILabel name = null;
        private JPanel checkPane = null;
        private List<ToolBarButton> buttonlists;
        private UICheckBox buttonVisible = new UICheckBox(Inter.getLocText("Widget-Visible"));
        private ItemListener itemListener = new ItemListener() {
            public void itemStateChanged(ItemEvent e) {
                String selectedRole = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
                initSelectedselectedPathArray();
                if (ComparatorUtils.equals(selectedRole, Inter.getLocText("Role"))) {
                    return;
                }
                if (selectedRole == null) {
                    return;
                }
                if (selectedPathArray == null) {
                    return;
                }
                for (int t = 0; t<selectedPathArray.length; t++){
                    for (int i = 0; i < buttonlists.size(); i++) {
                        if (buttonlists.get(i).isSelected()) {
                            buttonlists.get(i).changeAuthorityState(selectedPathArray[t], buttonVisible.isSelected());
                            authorityToolBarPane.repaint();
                        }
                    }
                    HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().fireTargetModified();
                    RolesAlreadyEditedPane.getInstance().refreshDockingView();
                    UICheckBox checkbox = (UICheckBox) e.getSource();
                    List<ToolBarButton> _buttonlists = AuthorityEditPane.this.buttonlists;
                    for (int j = 0; j < _buttonlists.size(); j++) {
                        if (_buttonlists.get(j).isSelected()) {
                            //由引擎实现保存进模板报表
                            authorityToolBarPane.setAuthorityWebAttr(_buttonlists.get(j).getWidget(), checkbox.isSelected(), selectedPathArray[t]);
                        }
                    }
                }
            }
        };
        private void initSelectedselectedPathArray () {
            TreePath[] selectionPaths = ReportAndFSManagePane.getInstance().getRoleTree().getCheckBoxTreeSelectionModel().getSelectionPaths();
            if (selectionPaths.length == 1){
                if(((ExpandMutableTreeNode)(selectionPaths[0].getLastPathComponent())).getChildCount() > 0){
                    ExpandMutableTreeNode node = (ExpandMutableTreeNode) ((ExpandMutableTreeNode)(selectionPaths[0].getLastPathComponent())).getLastChild();
                    selectedPathArray = new String[node.getChildCount()];
                    for (int i = 0 ; i < node.getChildCount(); i++) {
                        ExpandMutableTreeNode n = (ExpandMutableTreeNode) node.getChildAt(i);
                        String nodeName = n.getUserObject().toString();
                        selectedPathArray[i] = nodeName;
                    }
                } else {
                    selectedPathArray = pathToString(selectionPaths);
                }
            } else {
                selectedPathArray = pathToString(selectionPaths);
            }

        }
        protected String[] pathToString(TreePath[] path) {
            String roles = StringUtils.EMPTY;
            if(path == null || path.length == 0){
                return null;
            }
            for(TreePath tempPath:path){
                String temp = tempPath.toString();
                boolean isTrue = temp.length() > 0 && temp.charAt(0) == '[' && temp.endsWith("]");
                if (isTrue) {
                    temp = temp.substring(1, temp.length() - 1);
                    String[] selectedRoles = temp.split(",");
                    String role = selectedRoles[2].trim();
                    if(roles.isEmpty()){
                        roles = role;
                    }else{
                        roles = roles + "," + role;
                    }
                }

            }
            String[] selectedRole = roles.split(",");
            return selectedRole;
        }

        public AuthorityEditPane(List<ToolBarButton> buttonlists) {
            setLayout(new BorderLayout());
            type = new UILabel();
            name = new UILabel();
            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.buttonlists = buttonlists;
            buttonVisible.addItemListener(itemListener);
        }

        private JPanel layoutText() {
            double p = TableLayout.PREFERRED;
            Component[][] components = new Component[][]{
                    new Component[]{new UILabel(Inter.getLocText("Type") + ":", SwingConstants.RIGHT)},
                    new Component[]{new UILabel(Inter.getLocText("WF-Name") + ":", SwingConstants.RIGHT)},
                    new Component[]{new UILabel(Inter.getLocText("DashBoard-Potence") + ":", 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() {
            double f = TableLayout.FILL;
            double p = TableLayout.PREFERRED;
            Component[][] components = new Component[][]{
                    new Component[]{type},
                    new Component[]{name},
                    new Component[]{checkPane},
            };
            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);
        }

        /**
         * 更新权限编辑面板的具体内容：类型、名称、权限面板
         */
        public void populateDetials() {
            populateName();
            populateType();
            populateCheckPane();
            checkVisibleCheckBoxes();
        }

        private void checkVisibleCheckBoxes() {
            buttonVisible.removeItemListener(itemListener);
            String selected = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
            if (selected == null) {
                buttonVisible.setSelected(true);
            }
            for (int i = 0; i < buttonlists.size(); i++) {
                if (buttonlists.get(i).isSelected()) {
                    buttonVisible.setSelected(!buttonlists.get(i).isDoneAuthorityEdited(selected));
                    break;
                }
            }
            buttonVisible.addItemListener(itemListener);
        }


        public void populateType() {
            if (name.getText() == "") {
                type.setText("");
            } else {
                type.setText(Inter.getLocText(new String[]{"ReportServerP-Toolbar", "Form-Button"}));
            }
        }

        public void populateName() {
            String names = "";
            for (int i = 0; i < buttonlists.size(); i++) {
                if (buttonlists.get(i).isSelected()) {
                    names += "," + buttonlists.get(i).getNameOption().optionName();
                }
            }
            if (names != "") {
                names = names.substring(1);
            }
            name.setText(names);
        }

        public void populateCheckPane() {
            checkPane.removeAll();
            if (name.getText() == "") {
                return;
            }
            double f = TableLayout.FILL;
            double p = TableLayout.PREFERRED;
            Component[][] components = new Component[][]{
                    new Component[]{new UILabel(Inter.getLocText("Form-Button"), SwingConstants.LEFT), 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);
            checkPane.add(check, BorderLayout.CENTER);
            checkPane.setBorder(BorderFactory.createEmptyBorder(ALIGNMENT_GAP, 0, 0, 0));
        }
    }
}
\ No newline at end of file
diff --git a/designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java b/designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java
index 0cc1bfc6b..27c2c1ec0 100644
--- a/designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java
+++ b/designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java
@@ -1 +1 @@
-package com.fr.design.mainframe;

import com.fr.base.ConfigManager;
import com.fr.base.FRContext;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.mainframe.toolbar.AuthorityEditToolBarComponent;
import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
import com.fr.design.webattr.ReportWebWidgetConstants;
import com.fr.design.webattr.ToolBarButton;
import com.fr.design.webattr.ToolBarPane;
import com.fr.form.ui.Button;
import com.fr.form.ui.ToolBar;
import com.fr.form.ui.Widget;
import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogger;
import com.fr.general.Inter;
import com.fr.main.TemplateWorkBook;
import com.fr.report.web.Location;
import com.fr.report.web.ToolBarManager;
import com.fr.report.web.WebContent;
import com.fr.base.ConfigManagerProvider;
import com.fr.stable.ArrayUtils;
import com.fr.web.attr.ReportWebAttr;

import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.util.List;

/**
 * Author : daisy
 * Date: 13-9-9
 * Time: 下午4:58
 */
public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<ReportWebAttr> implements AuthorityEditToolBarComponent {
    private static final int SMALL_GAP = 13;
    private static final int GAP = 25;
    private static final int PRE_GAP = 9;
    private static final int COMBOX_WIDTH = 144;

    private static final String[] CHOOSEITEM = new String[]{Inter.getLocText("M-Page_Preview"), Inter.getLocText(new String[]{"Face_Write", "PageSetup-Page"}), Inter.getLocText("M-Data_Analysis")};
    private UIComboBox choseComboBox;
    private ToolBarPane toolBarPane;
    private UICheckBox allSelectedCheckBox;
    private AuthorityEditToolBarPane authorityEditToolBarPane = null;
    private int selectedIndex = -1;
    private UILabel title = null;
    private MouseListener mouseListener = new MouseAdapter() {
        public void mouseClicked(MouseEvent e) {
            if (!toolBarPane.isEnabled()) {
                return;
            }
            java.util.List<ToolBarButton> buttonlists = toolBarPane.getToolBarButtons();
            int oldIndex = selectedIndex;
            selectedIndex = pressButtonIndex(e, buttonlists);
            //实现shift多选
            if (e.isShiftDown()) {
                if (oldIndex == -1) {
                    removeSelection();
                    ((ToolBarButton) e.getSource()).setSelected(true);
                } else {
                    int max = oldIndex >= selectedIndex ? oldIndex : selectedIndex;
                    int min = oldIndex <= selectedIndex ? oldIndex : selectedIndex;
                    for (int i = min; i <= max; i++) {
                        buttonlists.get(i).setSelected(true);
                    }
                }
            } else if (!e.isControlDown()) {
                //实现单选
                removeSelection();
                if (selectedIndex != -1) {
                    ((ToolBarButton) e.getSource()).setSelected(true);
                }
            }
            authorityEditToolBarPane.populate();
            EastRegionContainerPane.getInstance().replaceUpPane(authorityEditToolBarPane);
        }

    };


    private int pressButtonIndex(MouseEvent e, java.util.List<ToolBarButton> buttonlists) {
        if (!(e.getSource() instanceof ToolBarButton)) {
            return -1;
        }
        ToolBarButton button = (ToolBarButton) e.getSource();
        for (int i = 0; i < buttonlists.size(); i++) {
            if (ComparatorUtils.equals(button, buttonlists.get(i))) {
                return i;
            }
        }
        return -1;
    }

    /**
     * 去掉选择
     */
    public void removeSelection() {
        for (ToolBarButton button : toolBarPane.getToolBarButtons()) {
            button.setSelected(false);
        }
    }


    private ItemListener itemListener = new ItemListener() {

        @Override
        public void itemStateChanged(ItemEvent e) {
            if (e.getStateChange() == ItemEvent.DESELECTED) {
                selectedIndex = -1;
                populateToolBarPane();
                authorityEditToolBarPane = new AuthorityEditToolBarPane(toolBarPane.getToolBarButtons());
                authorityEditToolBarPane.setAuthorityToolBarPane(AuthorityToolBarPane.this);
                EastRegionContainerPane.getInstance().replaceUpPane(authorityEditToolBarPane);
                EastRegionContainerPane.getInstance().replaceDownPane(RolesAlreadyEditedPane.getInstance());
            }
        }
    };

    public AuthorityToolBarPane() {
        this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 3));
        this.setBorder(BorderFactory.createEmptyBorder(0, PRE_GAP, 0, 0));
        title = new UILabel(Inter.getLocText(new String[]{"ReportServerP-Toolbar", "Choose_Role"}));
        title.setHorizontalAlignment(SwingConstants.CENTER);
        this.add(title, 0);
        choseComboBox = new UIComboBox(CHOOSEITEM) {
            public Dimension getPreferredSize() {
                Dimension dim = super.getPreferredSize();
                dim.width = COMBOX_WIDTH;
                return dim;
            }
        };
        choseComboBox.addItemListener(itemListener);
        //默认选择第一个
        choseComboBox.setSelectedIndex(0);
        this.add(createGapPanel(SMALL_GAP));
        this.add(choseComboBox);
        toolBarPane = new ToolBarPane();
        toolBarPane.setBorder(null);
        toolBarPane.removeDefaultMouseListener();
        this.add(createGapPanel(GAP));
        this.add(toolBarPane);
        allSelectedCheckBox = new UICheckBox(Inter.getLocText("FR-Engine_Choose_All"));
        allSelectedCheckBox.setHorizontalAlignment(SwingConstants.CENTER);
        this.add(allSelectedCheckBox);

        allSelectedCheckBox.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                removeSelection();
                List<ToolBarButton> toolBarButtons = toolBarPane.getToolBarButtons();
                for (ToolBarButton button : toolBarButtons) {
                    button.setSelected(allSelectedCheckBox.isSelected());
                }
                authorityEditToolBarPane.populate();
                EastRegionContainerPane.getInstance().replaceUpPane(authorityEditToolBarPane);

            }
        });
        populateDefaultToolBarWidgets();
        populateBean(getReportWebAttr());
        toolBarPane.addAuthorityListener(mouseListener);
        authorityEditToolBarPane = new AuthorityEditToolBarPane(toolBarPane.getToolBarButtons());
        authorityEditToolBarPane.setAuthorityToolBarPane(this);
        checkToolBarPaneEnable();
    }

    private JPanel createGapPanel(final int gap) {
        return new JPanel() {
            public Dimension getPreferredSize() {
                Dimension dim = super.getPreferredSize();
                dim.width = gap;
                return dim;
            }
        };
    }


    private void populateToolBarPane() {
        toolBarPane.removeAll();
        populateDefaultToolBarWidgets();
        populateBean(getReportWebAttr());
        toolBarPane.addAuthorityListener(mouseListener);
        toolBarPane.repaint();
        authorityEditToolBarPane = new AuthorityEditToolBarPane(toolBarPane.getToolBarButtons());
        checkToolBarPaneEnable();
    }

    /**
     * 使用普通用户远程设计时，如果工具栏使用的是“采用服务器设置”，则工具栏按钮为灰不可用
     */
    private void checkToolBarPaneEnable() {
        List<ToolBarButton> toolBarButtons = toolBarPane.getToolBarButtons();
        boolean isnotEnable = ComparatorUtils.equals(title.getText(), Inter.getLocText(new String[]{"Server", "ReportServerP-Toolbar", "Choose_Role"}))
                && !FRContext.getCurrentEnv().isRoot();
        for (ToolBarButton button : toolBarButtons) {
            button.setEnabled(!isnotEnable);
        }
        toolBarPane.setEnabled(!isnotEnable);
        allSelectedCheckBox.setEnabled(!isnotEnable);
    }

    /**
     * 更新权限工具栏面板
     */
    public void populateAuthority() {
        toolBarPane.repaint();
    }


    private ReportWebAttr getReportWebAttr() {
        JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
        if (!editingTemplate.isJWorkBook()) {
            return null;
        }
        JWorkBook editingWorkBook = (JWorkBook) editingTemplate;
        TemplateWorkBook wbTpl = editingWorkBook.getTarget();
        return wbTpl.getReportWebAttr();
    }


    //将该报表的设置过权限的属性记录一下
    public void setAuthorityWebAttr(Widget widget, boolean isSelected, String selectedRole) {
        JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
        if (!editingTemplate.isJWorkBook()) {
            return;
        }
        JWorkBook editingWorkBook = (JWorkBook) editingTemplate;
        TemplateWorkBook wbTpl = editingWorkBook.getTarget();

        ReportWebAttr rw = wbTpl.getReportWebAttr();
        ConfigManagerProvider cm = ConfigManager.getProviderInstance();
        ReportWebAttr webAttr = ((ReportWebAttr) cm.getGlobalAttribute(ReportWebAttr.class));

        //wbTpl.clear先清空
        //再将所有的保存进去
        //看是存在服务器还存在模板里面
        if (choseComboBox.getSelectedIndex() == 0) {
            //分页
            if (rw == null || rw.getWebPage() == null) {
                dealWithWebContent(webAttr.getWebPage(), widget, isSelected, selectedRole);
            }
        } else if (choseComboBox.getSelectedIndex() == 1) {
            //填报
            if (rw == null || rw.getWebPage() == null) {
                dealWithWebContent(webAttr.getWebWrite(), widget, isSelected, selectedRole);
            }
        } else {
            //view
            if (rw == null || rw.getWebPage() == null) {
                dealWithWebContent(webAttr.getWebView(), widget, isSelected, selectedRole);
            }
        }

        try {
            FRContext.getCurrentEnv().writeResource(cm);
        } catch (Exception e) {
            FRLogger.getLogger().error(e.getMessage());
        }
    }

    private void dealWithWebContent(WebContent wc, Widget widget, boolean isSelected, String selectedRole) {
        ToolBarManager[] managers = wc.getToolBarManagers();
        if (managers == null) {
            return;
        }
        for (int i = 0; i < managers.length; i++) {
            ToolBar tb = managers[i].getToolBar();
            for (int j = 0; j < tb.getWidgetSize(); j++) {
                if (widget instanceof Button && tb.getWidget(j) instanceof Button) {
                    if (ComparatorUtils.equals(((Button) widget).getIconName(),
                            ((Button) tb.getWidget(j)).getIconName())) {
                        if (!isSelected) {
                            tb.getWidget(j).getWidgetPrivilegeControl().addInvisibleRole(selectedRole);
                        } else {
                            tb.getWidget(j).getWidgetPrivilegeControl().removeInvisibleRole(selectedRole);
                        }
                    }
                }
            }
        }
        wc.setToolBarManagers(managers);
    }


    public void populateBean(ReportWebAttr reportWebAttr) {
        this.remove(title);
        // 如果是空值就说明采用服务器配置了
        if (reportWebAttr == null || this.getWebContent(reportWebAttr) == null) {
            title = new UILabel(Inter.getLocText(new String[]{"Server", "ReportServerP-Toolbar", "Choose_Role"}));
            populateServerSettings();
            this.add(title, 0);
            return;
        }
        // 模板设置
        T webContent = this.getWebContent(reportWebAttr);
        title = new UILabel(Inter.getLocText(new String[]{"the_template", "ReportServerP-Toolbar", "Choose_Role"}));
        this.add(title, 0);
        populate(webContent.getToolBarManagers());
    }

    public ReportWebAttr updateBean() {
        return null;
    }

    public void populate(ToolBarManager[] toolBarManager) {
        if (ArrayUtils.isEmpty(toolBarManager)) {
            return;
        }
        if (toolBarManager.length == 0) {
            return;
        }
        for (int i = 0; i < toolBarManager.length; i++) {
            toolBarPane.populateBean(toolBarManager[i].getToolBar());
        }
    }


    public Dimension getPreferredSize() {
        Dimension dim = super.getPreferredSize();
        dim.height = ToolBarMenuDock.PANLE_HEIGNT;
        return dim;
    }


    public void populateBean(ToolBarManager[] toolBarManager) {
        if (ArrayUtils.isEmpty(toolBarManager)) {
            return;
        }
        for (int i = 0; i < toolBarManager.length; i++) {
            Location location = toolBarManager[i].getToolBarLocation();
            if (location instanceof Location.Embed) {
                toolBarPane.populateBean(toolBarManager[i].getToolBar());
            }
        }
    }


    private void populateServerSettings() {
        ConfigManagerProvider cm = ConfigManager.getProviderInstance();
        ReportWebAttr webAttr = ((ReportWebAttr) cm.getGlobalAttribute(ReportWebAttr.class));
        if (this.getWebContent(webAttr) != null) {
            populate(this.getWebContent(webAttr).getToolBarManagers());
        }
    }

    protected String title4PopupWindow() {
        return null;
    }


    private T getWebContent(ReportWebAttr reportWebAttr) {
        if (choseComboBox.getSelectedIndex() == 0) {
            return reportWebAttr == null ? null : (T) reportWebAttr.getWebPage();
        } else if (choseComboBox.getSelectedIndex() == 1) {
            return reportWebAttr == null ? null : (T) reportWebAttr.getWebWrite();
        } else {
            return reportWebAttr == null ? null : (T) reportWebAttr.getWebView();
        }

    }

    private void populateDefaultToolBarWidgets() {
        if (choseComboBox.getSelectedIndex() == 0) {
            ReportWebWidgetConstants.getPageToolBarInstance();
        } else if (choseComboBox.getSelectedIndex() == 1) {
            ReportWebWidgetConstants.getWriteToolBarInstance();
        } else {
            ReportWebWidgetConstants.getViewToolBarInstance();
        }
    }

    private ToolBarManager getDefaultToolBarManager() {
        if (choseComboBox.getSelectedIndex() == 0) {
            return ToolBarManager.createDefaultToolBar();
        } else if (choseComboBox.getSelectedIndex() == 1) {
            return ToolBarManager.createDefaultWriteToolBar();
        } else {
            return ToolBarManager.createDefaultViewToolBar();
        }

    }


}
\ No newline at end of file
+package com.fr.design.mainframe;

import com.fr.base.ConfigManager;
import com.fr.base.FRContext;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.mainframe.toolbar.AuthorityEditToolBarComponent;
import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
import com.fr.design.webattr.ReportWebWidgetConstants;
import com.fr.design.webattr.ToolBarButton;
import com.fr.design.webattr.ToolBarPane;
import com.fr.form.ui.Button;
import com.fr.form.ui.ToolBar;
import com.fr.form.ui.Widget;
import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogger;
import com.fr.general.Inter;
import com.fr.main.TemplateWorkBook;
import com.fr.report.web.Location;
import com.fr.report.web.ToolBarManager;
import com.fr.report.web.WebContent;
import com.fr.base.ConfigManagerProvider;
import com.fr.stable.ArrayUtils;
import com.fr.web.attr.ReportWebAttr;

import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.util.List;

/**
 * Author : daisy
 * Date: 13-9-9
 * Time: 下午4:58
 */
public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<ReportWebAttr> implements AuthorityEditToolBarComponent {
    private static final int SMALL_GAP = 13;
    private static final int GAP = 25;
    private static final int PRE_GAP = 9;
    private static final int COMBOX_WIDTH = 144;

    private static final String[] CHOOSEITEM = new String[]{Inter.getLocText("M-Page_Preview"), Inter.getLocText(new String[]{"Face_Write", "PageSetup-Page"}), Inter.getLocText("M-Data_Analysis")};
    private UIComboBox choseComboBox;
    private ToolBarPane toolBarPane;
    private AuthorityEditToolBarPane authorityEditToolBarPane = null;
    private int selectedIndex = -1;
    private UILabel title = null;
    private MouseListener mouseListener = new MouseAdapter() {
        public void mouseClicked(MouseEvent e) {
            if (!toolBarPane.isEnabled()) {
                return;
            }
            java.util.List<ToolBarButton> buttonlists = toolBarPane.getToolBarButtons();
            int oldIndex = selectedIndex;
            selectedIndex = pressButtonIndex(e, buttonlists);
            //实现shift多选
            if (e.isShiftDown()) {
                if (oldIndex == -1) {
                    removeSelection();
                    ((ToolBarButton) e.getSource()).setSelected(true);
                } else {
                    int max = oldIndex >= selectedIndex ? oldIndex : selectedIndex;
                    int min = oldIndex <= selectedIndex ? oldIndex : selectedIndex;
                    for (int i = min; i <= max; i++) {
                        buttonlists.get(i).setSelected(true);
                    }
                }
            } else if (!e.isControlDown()) {
                //实现单选
                removeSelection();
                if (selectedIndex != -1) {
                    ((ToolBarButton) e.getSource()).setSelected(true);
                }
            }
            authorityEditToolBarPane.populate();
            EastRegionContainerPane.getInstance().replaceUpPane(authorityEditToolBarPane);
        }

    };


    private int pressButtonIndex(MouseEvent e, java.util.List<ToolBarButton> buttonlists) {
        if (!(e.getSource() instanceof ToolBarButton)) {
            return -1;
        }
        ToolBarButton button = (ToolBarButton) e.getSource();
        for (int i = 0; i < buttonlists.size(); i++) {
            if (ComparatorUtils.equals(button, buttonlists.get(i))) {
                return i;
            }
        }
        return -1;
    }

    /**
     * 去掉选择
     */
    public void removeSelection() {
        for (ToolBarButton button : toolBarPane.getToolBarButtons()) {
            button.setSelected(false);
        }
    }


    private ItemListener itemListener = new ItemListener() {

        @Override
        public void itemStateChanged(ItemEvent e) {
            if (e.getStateChange() == ItemEvent.DESELECTED) {
                selectedIndex = -1;
                populateToolBarPane();
                authorityEditToolBarPane = new AuthorityEditToolBarPane(toolBarPane.getToolBarButtons());
                authorityEditToolBarPane.setAuthorityToolBarPane(AuthorityToolBarPane.this);
                EastRegionContainerPane.getInstance().replaceUpPane(authorityEditToolBarPane);
                EastRegionContainerPane.getInstance().replaceDownPane(RolesAlreadyEditedPane.getInstance());
            }
        }
    };

    public AuthorityToolBarPane() {
        this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 3));
        this.setBorder(BorderFactory.createEmptyBorder(0, PRE_GAP, 0, 0));
        title = new UILabel(Inter.getLocText(new String[]{"ReportServerP-Toolbar", "Choose_Role"}));
        title.setHorizontalAlignment(SwingConstants.CENTER);
        this.add(title, 0);
        choseComboBox = new UIComboBox(CHOOSEITEM) {
            public Dimension getPreferredSize() {
                Dimension dim = super.getPreferredSize();
                dim.width = COMBOX_WIDTH;
                return dim;
            }
        };
        choseComboBox.addItemListener(itemListener);
        //默认选择第一个
        choseComboBox.setSelectedIndex(0);
        this.add(createGapPanel(SMALL_GAP));
        this.add(choseComboBox);
        toolBarPane = new ToolBarPane();
        toolBarPane.setBorder(null);
        toolBarPane.removeDefaultMouseListener();
        this.add(createGapPanel(GAP));
        this.add(toolBarPane);
        populateDefaultToolBarWidgets();
        populateBean(getReportWebAttr());
        toolBarPane.addAuthorityListener(mouseListener);
        authorityEditToolBarPane = new AuthorityEditToolBarPane(toolBarPane.getToolBarButtons());
        authorityEditToolBarPane.setAuthorityToolBarPane(this);
        checkToolBarPaneEnable();
    }

    private JPanel createGapPanel(final int gap) {
        return new JPanel() {
            public Dimension getPreferredSize() {
                Dimension dim = super.getPreferredSize();
                dim.width = gap;
                return dim;
            }
        };
    }


    private void populateToolBarPane() {
        toolBarPane.removeAll();
        populateDefaultToolBarWidgets();
        populateBean(getReportWebAttr());
        toolBarPane.addAuthorityListener(mouseListener);
        toolBarPane.repaint();
        authorityEditToolBarPane = new AuthorityEditToolBarPane(toolBarPane.getToolBarButtons());
        checkToolBarPaneEnable();
    }

    /**
     * 使用普通用户远程设计时，如果工具栏使用的是“采用服务器设置”，则工具栏按钮为灰不可用
     */
    private void checkToolBarPaneEnable() {
        List<ToolBarButton> toolBarButtons = toolBarPane.getToolBarButtons();
        boolean isnotEnable = ComparatorUtils.equals(title.getText(), Inter.getLocText(new String[]{"Server", "ReportServerP-Toolbar", "Choose_Role"}))
                && !FRContext.getCurrentEnv().isRoot();
        for (ToolBarButton button : toolBarButtons) {
            button.setEnabled(!isnotEnable);
        }
        toolBarPane.setEnabled(!isnotEnable);
    }

    /**
     * 更新权限工具栏面板
     */
    public void populateAuthority() {
        toolBarPane.repaint();
    }


    private ReportWebAttr getReportWebAttr() {
        JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
        if (!editingTemplate.isJWorkBook()) {
            return null;
        }
        JWorkBook editingWorkBook = (JWorkBook) editingTemplate;
        TemplateWorkBook wbTpl = editingWorkBook.getTarget();
        return wbTpl.getReportWebAttr();
    }


    //将该报表的设置过权限的属性记录一下
    public void setAuthorityWebAttr(Widget widget, boolean isSelected, String selectedRole) {
        JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
        if (!editingTemplate.isJWorkBook()) {
            return;
        }
        JWorkBook editingWorkBook = (JWorkBook) editingTemplate;
        TemplateWorkBook wbTpl = editingWorkBook.getTarget();

        ReportWebAttr rw = wbTpl.getReportWebAttr();
        ConfigManagerProvider cm = ConfigManager.getProviderInstance();
        ReportWebAttr webAttr = ((ReportWebAttr) cm.getGlobalAttribute(ReportWebAttr.class));

        //wbTpl.clear先清空
        //再将所有的保存进去
        //看是存在服务器还存在模板里面
        if (choseComboBox.getSelectedIndex() == 0) {
            //分页
            if (rw == null || rw.getWebPage() == null) {
                dealWithWebContent(webAttr.getWebPage(), widget, isSelected, selectedRole);
            }
        } else if (choseComboBox.getSelectedIndex() == 1) {
            //填报
            if (rw == null || rw.getWebPage() == null) {
                dealWithWebContent(webAttr.getWebWrite(), widget, isSelected, selectedRole);
            }
        } else {
            //view
            if (rw == null || rw.getWebPage() == null) {
                dealWithWebContent(webAttr.getWebView(), widget, isSelected, selectedRole);
            }
        }

        try {
            FRContext.getCurrentEnv().writeResource(cm);
        } catch (Exception e) {
            FRLogger.getLogger().error(e.getMessage());
        }
    }

    private void dealWithWebContent(WebContent wc, Widget widget, boolean isSelected, String selectedRole) {
        ToolBarManager[] managers = wc.getToolBarManagers();
        if (managers == null) {
            return;
        }
        for (int i = 0; i < managers.length; i++) {
            ToolBar tb = managers[i].getToolBar();
            for (int j = 0; j < tb.getWidgetSize(); j++) {
                if (widget instanceof Button && tb.getWidget(j) instanceof Button) {
                    if (ComparatorUtils.equals(((Button) widget).getIconName(),
                            ((Button) tb.getWidget(j)).getIconName())) {
                        if (!isSelected) {
                            tb.getWidget(j).getWidgetPrivilegeControl().addInvisibleRole(selectedRole);
                        } else {
                            tb.getWidget(j).getWidgetPrivilegeControl().removeInvisibleRole(selectedRole);
                        }
                    }
                }
            }
        }
        wc.setToolBarManagers(managers);
    }


    public void populateBean(ReportWebAttr reportWebAttr) {
        this.remove(title);
        // 如果是空值就说明采用服务器配置了
        if (reportWebAttr == null || this.getWebContent(reportWebAttr) == null) {
            title = new UILabel(Inter.getLocText(new String[]{"Server", "ReportServerP-Toolbar", "Choose_Role"}));
            populateServerSettings();
            this.add(title, 0);
            return;
        }
        // 模板设置
        T webContent = this.getWebContent(reportWebAttr);
        title = new UILabel(Inter.getLocText(new String[]{"the_template", "ReportServerP-Toolbar", "Choose_Role"}));
        this.add(title, 0);
        populate(webContent.getToolBarManagers());
    }

    public ReportWebAttr updateBean() {
        return null;
    }

    public void populate(ToolBarManager[] toolBarManager) {
        if (ArrayUtils.isEmpty(toolBarManager)) {
            return;
        }
        if (toolBarManager.length == 0) {
            return;
        }
        for (int i = 0; i < toolBarManager.length; i++) {
            toolBarPane.populateBean(toolBarManager[i].getToolBar());
        }
    }


    public Dimension getPreferredSize() {
        Dimension dim = super.getPreferredSize();
        dim.height = ToolBarMenuDock.PANLE_HEIGNT;
        return dim;
    }


    public void populateBean(ToolBarManager[] toolBarManager) {
        if (ArrayUtils.isEmpty(toolBarManager)) {
            return;
        }
        for (int i = 0; i < toolBarManager.length; i++) {
            Location location = toolBarManager[i].getToolBarLocation();
            if (location instanceof Location.Embed) {
                toolBarPane.populateBean(toolBarManager[i].getToolBar());
            }
        }
    }


    private void populateServerSettings() {
        ConfigManagerProvider cm = ConfigManager.getProviderInstance();
        ReportWebAttr webAttr = ((ReportWebAttr) cm.getGlobalAttribute(ReportWebAttr.class));
        if (this.getWebContent(webAttr) != null) {
            populate(this.getWebContent(webAttr).getToolBarManagers());
        }
    }

    protected String title4PopupWindow() {
        return null;
    }


    private T getWebContent(ReportWebAttr reportWebAttr) {
        if (choseComboBox.getSelectedIndex() == 0) {
            return reportWebAttr == null ? null : (T) reportWebAttr.getWebPage();
        } else if (choseComboBox.getSelectedIndex() == 1) {
            return reportWebAttr == null ? null : (T) reportWebAttr.getWebWrite();
        } else {
            return reportWebAttr == null ? null : (T) reportWebAttr.getWebView();
        }

    }

    private void populateDefaultToolBarWidgets() {
        if (choseComboBox.getSelectedIndex() == 0) {
            ReportWebWidgetConstants.getPageToolBarInstance();
        } else if (choseComboBox.getSelectedIndex() == 1) {
            ReportWebWidgetConstants.getWriteToolBarInstance();
        } else {
            ReportWebWidgetConstants.getViewToolBarInstance();
        }
    }

    private ToolBarManager getDefaultToolBarManager() {
        if (choseComboBox.getSelectedIndex() == 0) {
            return ToolBarManager.createDefaultToolBar();
        } else if (choseComboBox.getSelectedIndex() == 1) {
            return ToolBarManager.createDefaultWriteToolBar();
        } else {
            return ToolBarManager.createDefaultViewToolBar();
        }

    }


}
\ No newline at end of file
diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java b/designer/src/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
index 9eb6303d5..3f9a717dd 100644
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
@@ -1 +1 @@
-package com.fr.design.mainframe;

import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Rectangle;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;

import javax.swing.BorderFactory;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.SwingConstants;

import com.fr.design.constants.LayoutConstants;
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.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.toolbar.AuthorityEditToolBarComponent;
import com.fr.design.roleAuthority.ReportAndFSManagePane;
import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
import com.fr.form.ui.Widget;
import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;
import com.fr.grid.selection.CellSelection;
import com.fr.grid.selection.FloatSelection;
import com.fr.grid.selection.Selection;
import com.fr.js.NameJavaScriptGroup;
import com.fr.report.cell.AbstractCellElement;
import com.fr.report.cell.DefaultTemplateCellElement;
import com.fr.report.cell.FloatElement;
import com.fr.report.cell.TemplateCellElement;
import com.fr.report.elementcase.TemplateElementCase;
import com.fr.report.worksheet.WorkSheet;
import com.fr.stable.ColumnRow;

/**
 * Author : daisy
 * Date: 13-9-4
 * Time: 下午4:01
 */
public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
    private static final int WIDGET_VISIBLE = 0;
    private static final int WIDGET_USABLE = 1;
    private static final int CELL = 2;
    private static final int HYPER_LINK = 3;
    private static final int FLOAT_SELECTION = 3;
    private static final int NEW_VALUE = 4;
    //新值下面的编辑器的宽度
    private static final int NEW_PANE_WIDTH = 120;


    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 gridColumnRowVisible = new UICheckBox(Inter.getLocText("FR-Designer_Hide"));
    private UICheckBox newValue = new UICheckBox(Inter.getLocText("FR-Designer_New_Value"));
    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 boolean isAllHasWidget;
    private boolean isAllHasHyperlink;
    private UIObserverListener observerListener = new UIObserverListener() {
        @Override
        public void doChange() {
            if (elementCasePane == null || cellSelection == null) {
                return;
            }
            if (setAuthorityStyle(NEW_VALUE)) {
                elementCasePane.fireTargetModified();
            }

        }
    };
    private ItemListener newValuelistener = new ItemListener() {
        @Override
        public void itemStateChanged(ItemEvent e) {
            if (elementCasePane == null || cellSelection == null) {
                return;
            }
            if (setAuthorityStyle(NEW_VALUE)) {
                valueEditor.setEnabled(newValue.isSelected());
                doAfterAuthority();
            }
        }
    };
    private ItemListener columnRowAuthorityListener = new ItemListener() {
        public void itemStateChanged(ItemEvent e) {
            if (elementCasePane == null) {
                return;
            }
            boolean isDone = false;
            if (selectionType == CellSelection.CHOOSE_COLUMN) {
                isDone = setAuthorityColumn();
            } else {
                isDone = setAuthorityRow();
            }
            if (isDone) {
                doAfterAuthority();
            }
        }
    };
    private ItemListener floatElementAuthorityListener = new ItemListener() {
        public void itemStateChanged(ItemEvent e) {
            if (elementCasePane == null || floatSelection == null) {
                return;
            }
            if (setLFloatAuthorityStyle()) {
                doAfterAuthority();
            }
        }
    };
    private ItemListener cellRolesAuthorityListener = new ItemListener() {
        public void itemStateChanged(ItemEvent e) {
            if (elementCasePane == null || cellSelection == null) {
                return;
            }
            if (setAuthorityStyle(CELL)) {
                doAfterAuthority();
            }
        }
    };
    private ItemListener widgetVisibleRoleAuthorityListener = new ItemListener() {
        public void itemStateChanged(ItemEvent e) {
            if (elementCasePane == null || cellSelection == null) {
                return;
            }
            if (setAuthorityStyle(WIDGET_VISIBLE)) {
                doAfterAuthority();
            }
        }
    };
    private ItemListener widgetUsableAuthorityListener = new ItemListener() {
        public void itemStateChanged(ItemEvent e) {
            if (elementCasePane == null || cellSelection == null) {
                return;
            }

            if (setAuthorityStyle(WIDGET_USABLE)) {
                doAfterAuthority();
            }
        }
    };

    public ElementCasePaneAuthorityEditPane(ElementCasePane elementCasePane) {
        super(elementCasePane);
        this.elementCasePane = elementCasePane;
        initCheckBoxesState();
        initListener();
    }

    private void doAfterAuthority() {
        elementCasePane.repaint();
        elementCasePane.fireTargetModified();
        RolesAlreadyEditedPane.getInstance().refreshDockingView();
        RolesAlreadyEditedPane.getInstance().setReportAndFSSelectedRoles();
        RolesAlreadyEditedPane.getInstance().repaint();
        checkCheckBoxes();
    }

    private boolean setAuthorityColumn() {
        String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
        if (ComparatorUtils.equals(selectedRoles, Inter.getLocText("FR-Designer_Role"))) {
            return false;
        }
        if (selectedRoles == null) {
            return false;
        }
        final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
        boolean isVisible = !gridColumnRowVisible.isSelected();

        if (!isVisible) {
            for (int col = cellSelection.getColumn(); col < cellSelection.getColumn() + cellSelection.getColumnSpan(); col++) {
                elementCase.addColumnPrivilegeControl(col, selectedRoles);
            }
        } else {
            for (int col = cellSelection.getColumn(); col < cellSelection.getColumn() + cellSelection.getColumnSpan(); col++) {
                elementCase.removeColumnPrivilegeControl(col, selectedRoles);
            }
        }

        return true;
    }

    private boolean setAuthorityRow() {
        String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
        if (ComparatorUtils.equals(selectedRoles, Inter.getLocText("FR-Designer_Role"))) {
            return false;
        }
        if (selectedRoles == null) {
            return false;
        }
        final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
        boolean isVisible = !gridColumnRowVisible.isSelected();

        if (!isVisible) {
            for (int row = cellSelection.getRow(); row < cellSelection.getRow() + cellSelection.getRowSpan(); row++) {
                elementCase.addRowPrivilegeControl(row, selectedRoles);
            }
        } else {
            for (int row = cellSelection.getRow(); row < cellSelection.getRow() + cellSelection.getRowSpan(); row++) {
                elementCase.removeRowPrivilegeControl(row, selectedRoles);
            }
        }

        return true;
    }

    private boolean setLFloatAuthorityStyle() {
        String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
        if (ComparatorUtils.equals(selectedRoles, Inter.getLocText("FR-Designer_Role"))) {
            return false;
        }
        if (selectedRoles == null) {
            return false;
        }
        String name = floatSelection.getSelectedFloatName();
        TemplateElementCase ec = elementCasePane.getEditingElementCase();
        FloatElement fe = ec.getFloatElement(name);
        fe.changeAuthorityState(selectedRoles, floatElementVisibleCheckBoxes.isSelected());
        return true;
    }

    private boolean setAuthorityStyle(int type) {
        String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
        if (ComparatorUtils.equals(selectedRoles, Inter.getLocText("FR-Designer_Role"))) {
            return false;
        }
        if (selectedRoles == null) {
            return false;
        }
        final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
        int cellRectangleCount = cellSelection.getCellRectangleCount();
        for (int rec = 0; rec < cellRectangleCount; rec++) {
            Rectangle cellRectangle = cellSelection.getCellRectangle(rec);
            // 从最后循环起以保证最后一个修改标准单元格（originalStyle）。
            for (int j = cellRectangle.height - 1; j >= 0; j--) {
                for (int i = cellRectangle.width - 1; i >= 0; i--) {
                    int column = i + cellRectangle.x;
                    int row = j + cellRectangle.y;
                    TemplateCellElement editCellElement = elementCase.getTemplateCellElement(column, row);
                    if (editCellElement == null) {
                        editCellElement = new DefaultTemplateCellElement(column, row);
                        elementCase.addCellElement(editCellElement);
                    } else {
                        // 对于合并的格子,我们不多次计算的权限.
                        if (editCellElement.getColumn() != column
                                || editCellElement.getRow() != row) {
                            continue;
                        }
                    }
                    if (type == CELL) {
                        editCellElement.changeAuthorityState(selectedRoles, cellElementVisibleCheckBoxes.isSelected());
                    } else if (type == NEW_VALUE) {
                        editCellElement.changeNewValueAuthorityState(selectedRoles, newValue.isSelected(), valueEditor.update());
                    } else if (type == WIDGET_VISIBLE) {
                        Widget widget = editCellElement.getWidget();
                        widget.changeVisibleAuthorityState(selectedRoles, widgetVisible.isSelected());
                    } else {
                        Widget widget = editCellElement.getWidget();
                        widget.changeUsableAuthorityState(selectedRoles, widgetAvailable.isSelected());
                    }

                }
            }
        }
        return true;
    }

    /**
     * 选中的单元格的乐见状态以第一个单元格为齐
     */
    public void initCheckBoxesState() {
        final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
        if (cellSelection == null) {
            cellElementVisibleCheckBoxes.setSelected(true);
        } else {
            Rectangle cellRectangle = cellSelection.getCellRectangle(0);
            DefaultTemplateCellElement cellElement = (DefaultTemplateCellElement) elementCase.getCellElement(cellRectangle.x, cellRectangle.y);
            if (cellElement == null) {
                cellElement = new DefaultTemplateCellElement(cellRectangle.x, cellRectangle.y);
            }
            boolean firstCellDoneaAuthority = cellElement.isDoneAuthority(
                    ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName());
            cellElementVisibleCheckBoxes.setSelected(!firstCellDoneaAuthority);
        }
        widgetAvailable.setEnabled(cellElementVisibleCheckBoxes.isSelected());
        widgetVisible.setEnabled(cellElementVisibleCheckBoxes.isSelected());
    }

    private void initListener() {
        cellElementVisibleCheckBoxes.addItemListener(cellRolesAuthorityListener);
        widgetVisible.addItemListener(widgetVisibleRoleAuthorityListener);
        widgetAvailable.addItemListener(widgetUsableAuthorityListener);
        floatElementVisibleCheckBoxes.addItemListener(floatElementAuthorityListener);
        gridColumnRowVisible.addItemListener(columnRowAuthorityListener);
        newValue.addItemListener(newValuelistener);
        valueEditor.registerChangeListener(observerListener);
    }

    private void removeListener() {
        cellElementVisibleCheckBoxes.removeItemListener(cellRolesAuthorityListener);
        widgetVisible.removeItemListener(widgetVisibleRoleAuthorityListener);
        widgetAvailable.removeItemListener(widgetUsableAuthorityListener);
        floatElementVisibleCheckBoxes.removeItemListener(floatElementAuthorityListener);
        gridColumnRowVisible.removeItemListener(columnRowAuthorityListener);
        newValue.removeItemListener(newValuelistener);
        valueEditor.registerChangeListener(null);
    }

    private void addHyperlinkListener() {
        cellElementVisibleCheckBoxes.addItemListener(new ItemListener() {
            public void itemStateChanged(ItemEvent e) {
                if (hyperlinkCheckBoxes != null) {
                    for (int i = 0; i < hyperlinkCheckBoxes.length; i++) {
                        hyperlinkCheckBoxes[i].setEnabled(cellElementVisibleCheckBoxes.isSelected());
                        if (!cellElementVisibleCheckBoxes.isSelected()) {
                            hyperlinkCheckBoxes[i].setSelected(false);
                        }
                    }
                }
            }
        });
        for (int i = 0; i < hyperlinkCheckBoxes.length; i++) {
            hyperlinkCheckBoxes[i].addItemListener(cellRolesAuthorityListener);
        }
    }

    /**
     * 更新适合的类型
     */
    public void populateType() {
        if (selectionType == CellSelection.NORMAL) {
            type.setText(Inter.getLocText("FR-Designer_Cell"));
        } else if (selectionType == CellSelection.CHOOSE_ROW) {
            type.setText(Inter.getLocText("FR-Designer_Row"));
        } else if (selectionType == CellSelection.CHOOSE_COLUMN) {
            type.setText(Inter.getLocText("FR-Designer_Column"));
        } else {
            type.setText(Inter.getLocText("M_Insert-Float"));
        }
    }

    /**
     * 名字
     */
    public void populateName() {
        if (selectionType == CellSelection.NORMAL) {
            name.setText(getCellSelectionName());
        } else if (selectionType == CellSelection.CHOOSE_ROW || selectionType == CellSelection.CHOOSE_COLUMN) {
            name.setText(getCellColumnRowName());
        } else {
            name.setText(getFloatSelectionName());
        }
    }

    private String getCellSelectionName() {
        String nameText = "";
        int count = cellSelection.getCellRectangleCount();
        for (int rect = 0; rect < count; rect++) {
            nameText += ",";
            Rectangle cellRectangle = cellSelection.getCellRectangle(rect);
            ColumnRow beginCR = ColumnRow.valueOf(cellRectangle.x, cellRectangle.y);
            nameText += beginCR.toString();
            if (cellRectangle.width * cellRectangle.height != 1) {
                ColumnRow endCR = ColumnRow.valueOf(cellRectangle.width + cellRectangle.x - 1, cellRectangle.height + cellRectangle.y - 1);
                nameText += ":" + endCR.toString();
            }
        }
        return nameText.substring(1);
    }

    private String getCellColumnRowName() {
        int count = cellSelection.getCellRectangleCount();
        String nameText = "";
        ColumnRow cr = ColumnRow.valueOf(cellSelection.getColumn(), cellSelection.getRow());
        if (cellSelection.getSelectedType() == CellSelection.CHOOSE_COLUMN && count == 1) {
            if (cellSelection.getColumnSpan() == 1) {
                nameText = cr.toString().substring(0, 1);
            } else {
                ColumnRow endCr = ColumnRow.valueOf(cellSelection.getColumn() + cellSelection.getColumnSpan() - 1,
                        cellSelection.getRow() + cellSelection.getRowSpan() - 1);
                nameText = cr.toString().substring(0, 1) + "-" + endCr.toString().substring(0, 1);
            }
        } else if (cellSelection.getSelectedType() == CellSelection.CHOOSE_ROW && count == 1) {
            if (cellSelection.getRowSpan() == 1) {
                nameText = cr.toString().substring(1);
            } else {
                ColumnRow endCr = ColumnRow.valueOf(cellSelection.getColumn() + cellSelection.getColumnSpan() - 1,
                        cellSelection.getRow() + cellSelection.getRowSpan() - 1);
                nameText = cr.toString().substring(1) + "-" + endCr.toString().substring(1);
            }
        }
        return nameText;
    }

    private String getFloatSelectionName() {
        return floatSelection.getSelectedFloatName();
    }

    private void mutilRect(CellSelection cellSelection) {
        isAllHasWidget = true;
        isAllHasHyperlink = true;
        int count = cellSelection.getCellRectangleCount();
        final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
        for (int rect = 0; rect < count; rect++) {
            Rectangle cellRectangle = cellSelection.getCellRectangle(rect);
            for (int j = 0; j < cellRectangle.height; j++) {
                for (int i = 0; i < cellRectangle.width; i++) {
                    int column = i + cellRectangle.x;
                    int row = j + cellRectangle.y;
                    DefaultTemplateCellElement cellElement = (DefaultTemplateCellElement) elementCase.getCellElement(column, row);
                    if (cellElement == null) {
                        cellElement = new DefaultTemplateCellElement(cellSelection.getColumn(), cellSelection.getRow());
                    }
                    if (cellElement.getCellWidgetAttr() == null) {
                        isAllHasWidget = false;
                    }
                    if (cellElement.getNameHyperlinkGroup() == null) {
                        isAllHasHyperlink = false;
                    }
                }
            }
        }
    }

    /**
     * 更新适合的pane
     *
     * @return 返回Pane
     */
    public JPanel populateCheckPane() {
        checkPane.removeAll();
        if (selectionType == CellSelection.NORMAL) {
            populateCellSelectionCheckPane(checkPane);
        } else if (selectionType == CellSelection.CHOOSE_COLUMN || selectionType == CellSelection.CHOOSE_ROW) {
            populateColumnRowCheckPane(checkPane);
        } else if (selectionType == FLOAT_SELECTION) {
            populateFloatSelectionCheckPane(checkPane);
        }
        checkPane.setBorder(BorderFactory.createEmptyBorder(ALIGNMENT_GAP, 0, 0, 0));
        return checkPane;
    }

    private void populateColumnRowCheckPane(JPanel checkPane) {
        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
        Component[][] components = new Component[][]{
                new Component[]{gridColumnRowVisible}
        };
        double[] rowSize = {p};
        double[] columnSize = {f};
        int[][] rowCount = {{1}};
        checkPane.add(
                TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM)
                , BorderLayout.WEST);
    }

    private void populateFloatSelectionCheckPane(JPanel checkPane) {
        checkPane.add(populateFloatElementCheckPane(), BorderLayout.WEST);
    }

    private void populateCellSelectionCheckPane(JPanel checkPane) {
        if (elementCasePane.isSelectedOneCell()) {
            //只选中了一个单元格
            final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
            DefaultTemplateCellElement cellElement = (DefaultTemplateCellElement) elementCase.getCellElement(cellSelection.getColumn(), cellSelection.getRow());
            if (cellElement == null) {
                cellElement = new DefaultTemplateCellElement(cellSelection.getColumn(), cellSelection.getRow());
            }
            //单元格带控件
            if (cellElement.getCellWidgetAttr() != null) {
                checkPane.add(populateWidgetCheckPane(), BorderLayout.WEST);
            } else {
                checkPane.add(populatCellCheckPane(), BorderLayout.WEST);
            }
        } else {
            //批量选中单元格
            mutilRect(cellSelection);
            if (!isAllHasWidget && !isAllHasHyperlink) {
                checkPane.add(populateMutilCellCheckPane(), BorderLayout.WEST);
            } else if (isAllHasWidget) {
                checkPane.add(populateMutilWidgetCheckPane(), BorderLayout.WEST);
            }

        }
    }

    /**
     * 对单元格区域进行操作时的权限编辑页面 ,对应的角色的populate
     */
    public void populateDetials() {
        //做模式标记，此时鼠标焦点是在报表主体，为下一次退出权限编辑时做准备
        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setAuthorityMode(false);
        TemplateElementCase templateElementCase = elementCasePane.getEditingElementCase();
        if (templateElementCase instanceof WorkSheet) {
            ((WorkSheet) templateElementCase).setPaintSelection(true);
        }

        signelSelection();

        Selection selection = elementCasePane.getSelection();
        if (selection instanceof CellSelection) {
            selectionType = CellSelection.NORMAL;
            this.cellSelection = ((CellSelection) selection).clone();
            this.floatSelection = null;
            judgeChooseCR();
        } else if (selection instanceof FloatSelection) {
            selectionType = FLOAT_SELECTION;
            cellSelection = null;
            floatSelection = new FloatSelection(((FloatSelection) selection).getSelectedFloatName());
        }
        populateType();
        populateName();
        populateCheckPane();
        checkCheckBoxes();
    }

    //判断是否选择的行列
    private void judgeChooseCR() {
        if (cellSelection.getSelectedType() == CellSelection.CHOOSE_COLUMN && cellSelection.getCellRectangleCount() == 1) {
            selectionType = CellSelection.CHOOSE_COLUMN;
        }
        if (cellSelection.getSelectedType() == CellSelection.CHOOSE_ROW && cellSelection.getCellRectangleCount() == 1) {
            selectionType = CellSelection.CHOOSE_ROW;
        }
    }


    //实现单选

    private void signelSelection() {
        JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
        if (jTemplate.isJWorkBook()) {
            //清工具栏
            JComponent component = DesignerContext.getDesignerFrame().getToolbarComponent();
            if (component instanceof AuthorityEditToolBarComponent) {
                ((AuthorityEditToolBarComponent) component).removeSelection();
            }

            //清参数面板
            jTemplate.removeParameterPaneSelection();
        }
    }

    private JPanel populateFloatElementCheckPane() {
        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
        Component[][] components = new Component[][]{
                new Component[]{new UILabel(Inter.getLocText("M_Insert-Float"), SwingConstants.LEFT), 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);
    }

    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 populateMutilWidgetCheckPane() {
        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[]{new UILabel(Inter.getLocText("FR-Designer_Widget"), SwingConstants.LEFT), widgetVisible},
                new Component[]{null, widgetAvailable}
        };
        double[] rowSize = {p, p, p};
        double[] columnSize = {p, f};
        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
    }

    private JPanel populateMutilCellCheckPane() {
        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
        Component[][] components = new Component[][]{
                new Component[]{cellElementVisibleCheckBoxes},
        };
        double[] rowSize = {p};
        double[] columnSize = {f};
        int[][] rowCount = {{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;
        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);
    }

    public TemplateCellElement getFirstCell() {
        final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
        Rectangle cellRectangle = cellSelection.getCellRectangle(0);
        // 从最后循环起以保证最后一个修改标准单元格（originalStyle）。
        TemplateCellElement firstCell = null;
        for (int j = cellRectangle.height - 1; j >= 0; j--) {
            for (int i = cellRectangle.width - 1; i >= 0; i--) {
                int column = i + cellRectangle.x;
                int row = j + cellRectangle.y;
                TemplateCellElement editCellElement = elementCase.getTemplateCellElement(column, row);
                if (editCellElement != null) {
                    // 对于合并的格子,我们不多次计算的权限.
                    if (editCellElement.getColumn() != column
                            || editCellElement.getRow() != row) {
                        continue;
                    }

                    firstCell = editCellElement;
                }
            }
        }
        return firstCell;
    }

    private void checkCheckBoxes() {
        String selected = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
        removeListener();
        if (selectionType == CellSelection.NORMAL) {
            checkCellSelectionCkeckboxes(selected);
        } else if (selectionType == CellSelection.CHOOSE_COLUMN || selectionType == CellSelection.CHOOSE_ROW) {
            checkColumnRowCheckBoxes(selected);
        } else if (selectionType == FLOAT_SELECTION) {
            checkFloatSelectionCkeckboxes(selected);
        }
        initListener();
    }

    private void checkCellSelectionCkeckboxes(String selected) {
        TemplateCellElement firstCell = getFirstCell();
        if (firstCell == null) {
            resetCellElementCheckBoxes();
            return;
        }
        cellElementVisibleCheckBoxes.setSelected(!firstCell.isDoneAuthority(selected));
        newValue.setEnabled(!firstCell.isDoneAuthority(selected));
        if (!firstCell.isDoneAuthority(selected)) {
            newValue.setSelected(firstCell.isDoneNewValueAuthority(selected));
            if (newValue.isSelected()) {
                valueEditor.setEnabled(true);
                valueEditor.populate(firstCell.getCellPrivilegeControl().getNewValueMap().get(selected));
            } else {
                valueEditor.setEnabled(false);
            }
        } else {
            newValue.setSelected(false);
            valueEditor.setEnabled(false);
        }
        
    	populateWidgetButton(firstCell.getWidget(), selected, firstCell);
    }
    
    private void populateWidgetButton(Widget widget, String selected, TemplateCellElement firstCell){
    	if(widget == null){
    		return;
    	}

    	if(widget.isVisible()){
    		widgetVisible.setSelected(!widget.isDoneVisibleAuthority(selected));
    		widgetVisible.setEnabled(!firstCell.isDoneAuthority(selected));
    	}else{
    		widgetVisible.setSelected(widget.isVisibleAuthority(selected));
    	}
    	
    	if(widget.isEnabled()){
	        widgetAvailable.setSelected(!widget.isDoneUsableAuthority(selected));
	        widgetAvailable.setEnabled(!widget.isDoneVisibleAuthority(selected));
    	}else{
    		widgetAvailable.setSelected(widget.isUsableAuthority(selected));
    	}
    
    }

    private void resetCellElementCheckBoxes() {
        cellElementVisibleCheckBoxes.setSelected(true);
        widgetVisible.setSelected(true);
        widgetVisible.setEnabled(true);
        widgetAvailable.setSelected(true);
        widgetAvailable.setEnabled(true);
        newValue.setSelected(false);
        valueEditor.setEnabled(false);
    }

    private void checkColumnRowCheckBoxes(String selected) {
        if (cellSelection == null) {
            gridColumnRowVisible.setSelected(false);
            return;
        }
        TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
        boolean isInside = selectionType == CellSelection.CHOOSE_COLUMN ?
                elementCase.getColumnPrivilegeControl(cellSelection.getColumn()).checkInvisible(selected) :
                elementCase.getRowPrivilegeControl(cellSelection.getRow()).checkInvisible(selected);

        gridColumnRowVisible.setSelected(isInside);
    }

    private void checkFloatSelectionCkeckboxes(String selected) {
        String name = floatSelection.getSelectedFloatName();
        TemplateElementCase ec = elementCasePane.getEditingElementCase();
        FloatElement fe = ec.getFloatElement(name);
        floatElementVisibleCheckBoxes.setSelected(!fe.isDoneAuthority(selected));
    }

    private JPanel populateHyperlinkCheckPane(AbstractCellElement cellElement) {
        NameJavaScriptGroup linkGroup = cellElement.getNameHyperlinkGroup();
        //超链接的个数+单元格可见的操作
        hyperlinkCheckBoxes = new UICheckBox[linkGroup.size()];

        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
        Component[][] components = new Component[hyperlinkCheckBoxes.length + 1][];
        if (linkGroup.size() == 1) {
            components[0] = new Component[]{new UILabel(Inter.getLocText("FR-Designer_Cell"), SwingConstants.LEFT), cellElementVisibleCheckBoxes};
            components[1] = new Component[]{new UILabel(Inter.getLocText("FR-Designer_Hyperlink"), SwingConstants.LEFT), hyperlinkCheckBoxes[0] = new UICheckBox(Inter.getLocText("FR-Designer_Visible"))};

        } else {
            components[0] = new Component[]{new UILabel(Inter.getLocText("FR-Designer_Cell"), SwingConstants.LEFT), cellElementVisibleCheckBoxes = new UICheckBox(Inter.getLocText("FR-Designer_Visible"))};
            components[1] = new Component[]{new UILabel(Inter.getLocText("FR-Designer_Hyperlink"), SwingConstants.LEFT), hyperlinkCheckBoxes[0] = new UICheckBox(linkGroup.getNameHyperlink(0).getName() + Inter.getLocText("FR-Designer_Visible"))};
            for (int i = 1; i < hyperlinkCheckBoxes.length; i++) {
                components[i + 1] = new Component[]{null, hyperlinkCheckBoxes[i] = new UICheckBox(linkGroup.getNameHyperlink(i).getName() + Inter.getLocText("FR-Designer_Visible"))};
            }
        }

        for (int i = 0; i < hyperlinkCheckBoxes.length; i++) {
            hyperlinkCheckBoxes[i].setEnabled(cellElementVisibleCheckBoxes.isSelected());
        }

        addHyperlinkListener();

        double[] rowSize = new double[hyperlinkCheckBoxes.length + 1];
        int[][] rowCount = new int[hyperlinkCheckBoxes.length + 1][];
        for (int i = 0; i < hyperlinkCheckBoxes.length + 1; i++) {
            rowSize[i] = p;
            rowCount[i] = new int[]{1, 1};
        }
        double[] columnSize = {p, f};

        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);

    }

    private JPanel populateMutilHyperlinkCheckPane() {
        //超链接的个数+单元格可见的操作
        hyperlinkCheckBoxes = new UICheckBox[1];

        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
        Component[][] components = new Component[2][];
        components[0] = new Component[]{new UILabel(Inter.getLocText("FR-Designer_Cell"), SwingConstants.LEFT), cellElementVisibleCheckBoxes};
        components[1] = new Component[]{new UILabel(Inter.getLocText("FR-Designer_Hyperlink"), SwingConstants.LEFT), hyperlinkCheckBoxes[0] = new UICheckBox(Inter.getLocText("FR-Designer_Visible"))};


        hyperlinkCheckBoxes[0].setEnabled(cellElementVisibleCheckBoxes.isSelected());

        addHyperlinkListener();

        double[] rowSize = {p, p};
        double[] columnSize = {p, f};
        int[][] rowCount = {{1, 1}, {1, 1}};

        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);

    }
}
\ No newline at end of file
+package com.fr.design.mainframe;

import com.fr.design.constants.LayoutConstants;
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.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.toolbar.AuthorityEditToolBarComponent;
import com.fr.design.roleAuthority.ReportAndFSManagePane;
import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
import com.fr.form.ui.Widget;
import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;
import com.fr.grid.selection.CellSelection;
import com.fr.grid.selection.FloatSelection;
import com.fr.grid.selection.Selection;
import com.fr.js.NameJavaScriptGroup;
import com.fr.report.cell.AbstractCellElement;
import com.fr.report.cell.DefaultTemplateCellElement;
import com.fr.report.cell.FloatElement;
import com.fr.report.cell.TemplateCellElement;
import com.fr.report.elementcase.TemplateElementCase;
import com.fr.report.worksheet.WorkSheet;
import com.fr.stable.ColumnRow;
import com.fr.stable.StringUtils;

import javax.swing.*;
import javax.swing.tree.TreePath;
import java.awt.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;

/**
 * Author : daisy
 * Date: 13-9-4
 * Time: 下午4:01
 */
public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
    private static final int WIDGET_VISIBLE = 0;
    private static final int WIDGET_USABLE = 1;
    private static final int CELL = 2;
    private static final int HYPER_LINK = 3;
    private static final int FLOAT_SELECTION = 3;
    private static final int NEW_VALUE = 4;
    //新值下面的编辑器的宽度
    private static final int NEW_PANE_WIDTH = 120;


    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 gridColumnRowVisible = new UICheckBox(Inter.getLocText("FR-Designer_Hide"));
    private UICheckBox newValue = new UICheckBox(Inter.getLocText("FR-Designer_New_Value"));
    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 boolean isAllHasWidget;
    private boolean isAllHasHyperlink;
    private String[] selectedPathArray;
    private UIObserverListener observerListener = new UIObserverListener() {
        @Override
        public void doChange() {
            if (elementCasePane == null || cellSelection == null) {
                return;
            }
            if (setAuthorityStyle(NEW_VALUE)) {
                elementCasePane.fireTargetModified();
            }

        }
    };
    private ItemListener newValuelistener = new ItemListener() {
        @Override
        public void itemStateChanged(ItemEvent e) {
            if (elementCasePane == null || cellSelection == null) {
                return;
            }
            if (setAuthorityStyle(NEW_VALUE)) {
                valueEditor.setEnabled(newValue.isSelected());
                doAfterAuthority();
            }
        }
    };
    private ItemListener columnRowAuthorityListener = new ItemListener() {
        public void itemStateChanged(ItemEvent e) {
            if (elementCasePane == null) {
                return;
            }
            boolean isDone = false;
            if (selectionType == CellSelection.CHOOSE_COLUMN) {
                isDone = setAuthorityColumn();
            } else {
                isDone = setAuthorityRow();
            }
            if (isDone) {
                doAfterAuthority();
            }
        }
    };
    private ItemListener floatElementAuthorityListener = new ItemListener() {
        public void itemStateChanged(ItemEvent e) {
            if (elementCasePane == null || floatSelection == null) {
                return;
            }
            if (setLFloatAuthorityStyle()) {
                doAfterAuthority();
            }
        }
    };
    private ItemListener cellRolesAuthorityListener = new ItemListener() {
        public void itemStateChanged(ItemEvent e) {
            if (elementCasePane == null || cellSelection == null) {
                return;
            }
            if (setAuthorityStyle(CELL)) {
                doAfterAuthority();
            }
        }
    };
    private ItemListener widgetVisibleRoleAuthorityListener = new ItemListener() {
        public void itemStateChanged(ItemEvent e) {
            if (elementCasePane == null || cellSelection == null) {
                return;
            }
            if (setAuthorityStyle(WIDGET_VISIBLE)) {
                doAfterAuthority();
            }
        }
    };
    private ItemListener widgetUsableAuthorityListener = new ItemListener() {
        public void itemStateChanged(ItemEvent e) {
            if (elementCasePane == null || cellSelection == null) {
                return;
            }

            if (setAuthorityStyle(WIDGET_USABLE)) {
                doAfterAuthority();
            }
        }
    };

    public ElementCasePaneAuthorityEditPane(ElementCasePane elementCasePane) {
        super(elementCasePane);
        this.elementCasePane = elementCasePane;
        initCheckBoxesState();
        initListener();
    }

    private void doAfterAuthority() {
        elementCasePane.repaint();
        elementCasePane.fireTargetModified();
        RolesAlreadyEditedPane.getInstance().refreshDockingView();
        RolesAlreadyEditedPane.getInstance().setReportAndFSSelectedRoles();
        RolesAlreadyEditedPane.getInstance().repaint();
        checkCheckBoxes();
    }

    private boolean setAuthorityColumn() {
        initSelectedselectedPathArray();
        String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
        if (ComparatorUtils.equals(selectedRoles, Inter.getLocText("FR-Designer_Role"))) {
            return false;
        }
        if (selectedRoles == null) {
            return false;
        }
        if (selectedPathArray == null) {
            return false;
        }
        final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
        boolean isVisible = !gridColumnRowVisible.isSelected();
        for (int t = 0; t<selectedPathArray.length; t++){
            if (!isVisible) {
                for (int col = cellSelection.getColumn(); col < cellSelection.getColumn() + cellSelection.getColumnSpan(); col++) {
                    elementCase.addColumnPrivilegeControl(col, selectedPathArray[t]);
                }
            } else {
                for (int col = cellSelection.getColumn(); col < cellSelection.getColumn() + cellSelection.getColumnSpan(); col++) {
                    elementCase.removeColumnPrivilegeControl(col, selectedPathArray[t]);
                }
            }
        }

        return true;
    }

    private boolean setAuthorityRow() {
        initSelectedselectedPathArray();
        String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
        if (ComparatorUtils.equals(selectedRoles, Inter.getLocText("FR-Designer_Role"))) {
            return false;
        }
        if (selectedRoles == null) {
            return false;
        }
        if (selectedPathArray == null) {
            return false;
        }
        final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
        boolean isVisible = !gridColumnRowVisible.isSelected();
        for (int t = 0; t<selectedPathArray.length; t++){
            if (!isVisible) {
                for (int row = cellSelection.getRow(); row < cellSelection.getRow() + cellSelection.getRowSpan(); row++) {
                    elementCase.addRowPrivilegeControl(row, selectedPathArray[t]);
                }
            } else {
                for (int row = cellSelection.getRow(); row < cellSelection.getRow() + cellSelection.getRowSpan(); row++) {
                    elementCase.removeRowPrivilegeControl(row, selectedPathArray[t]);
                }
            }
        }


        return true;
    }

    private boolean setLFloatAuthorityStyle() {
        initSelectedselectedPathArray();
        String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
        if (ComparatorUtils.equals(selectedRoles, Inter.getLocText("FR-Designer_Role"))) {
            return false;
        }
        if (selectedRoles == null) {
            return false;
        }
        if (selectedPathArray == null) {
            return false;
        }
        String name = floatSelection.getSelectedFloatName();
        TemplateElementCase ec = elementCasePane.getEditingElementCase();
        FloatElement fe = ec.getFloatElement(name);
        for (int t = 0; t<selectedPathArray.length; t++){
            fe.changeAuthorityState(selectedPathArray[t], floatElementVisibleCheckBoxes.isSelected());
        }

        return true;
    }

    private boolean setAuthorityStyle(int type) {
        initSelectedselectedPathArray();
        String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
        if (ComparatorUtils.equals(selectedRoles, Inter.getLocText("FR-Designer_Role"))) {
            return false;
        }
        if (selectedRoles == null) {
            return false;
        }
        if (selectedPathArray == null){
            return false;
        }
        final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
        int cellRectangleCount = cellSelection.getCellRectangleCount();
        for (int t = 0; t<selectedPathArray.length; t++){

            for (int rec = 0; rec < cellRectangleCount; rec++) {
                Rectangle cellRectangle = cellSelection.getCellRectangle(rec);
                // 从最后循环起以保证最后一个修改标准单元格（originalStyle）。
                for (int j = cellRectangle.height - 1; j >= 0; j--) {
                    for (int i = cellRectangle.width - 1; i >= 0; i--) {
                        int column = i + cellRectangle.x;
                        int row = j + cellRectangle.y;
                        TemplateCellElement editCellElement = elementCase.getTemplateCellElement(column, row);
                        if (editCellElement == null) {
                            editCellElement = new DefaultTemplateCellElement(column, row);
                            elementCase.addCellElement(editCellElement);
                        } else {
                            // 对于合并的格子,我们不多次计算的权限.
                            if (editCellElement.getColumn() != column
                                    || editCellElement.getRow() != row) {
                                continue;
                            }
                        }
                        if (type == CELL) {
                            editCellElement.changeAuthorityState(selectedPathArray[t], cellElementVisibleCheckBoxes.isSelected());
                        } else if (type == NEW_VALUE) {
                            editCellElement.changeNewValueAuthorityState(selectedPathArray[t], newValue.isSelected(), valueEditor.update());
                        } else if (type == WIDGET_VISIBLE) {
                            Widget widget = editCellElement.getWidget();
                            widget.changeVisibleAuthorityState(selectedPathArray[t], widgetVisible.isSelected());
                        } else {
                            Widget widget = editCellElement.getWidget();
                            widget.changeUsableAuthorityState(selectedPathArray[t], widgetAvailable.isSelected());
                        }

                    }
                }
            }
        }
        return true;
    }
    private void initSelectedselectedPathArray () {
        TreePath[] selectionPaths = ReportAndFSManagePane.getInstance().getRoleTree().getCheckBoxTreeSelectionModel().getSelectionPaths();
        if (selectionPaths.length == 1){
            if(((ExpandMutableTreeNode)(selectionPaths[0].getLastPathComponent())).getChildCount() > 0){
                ExpandMutableTreeNode node = (ExpandMutableTreeNode) ((ExpandMutableTreeNode)(selectionPaths[0].getLastPathComponent())).getLastChild();
                System.out.printf(node.getUserObject().toString());
                selectedPathArray = new String[node.getChildCount()];
                for (int i = 0; i < node.getChildCount(); i++) {
                    ExpandMutableTreeNode n = (ExpandMutableTreeNode) node.getChildAt(i);
                    String nodeName = n.getUserObject().toString();
                    selectedPathArray[i] = nodeName;
                }
            } else {
                selectedPathArray = pathToString(selectionPaths);
            }
        } else {
            selectedPathArray = pathToString(selectionPaths);
        }

    }
    protected String[] pathToString(TreePath[] path) {
        String roles = StringUtils.EMPTY;
        if(path == null || path.length == 0){
            return null;
        }
        for(TreePath tempPath:path){
            String temp = tempPath.toString();
            boolean isTrue = temp.length() > 0 && temp.charAt(0) == '[' && temp.endsWith("]");
            if (isTrue) {
                temp = temp.substring(1, temp.length() - 1);
                String[] selectedRoles = temp.split(",");
                String role = selectedRoles[2].trim();
                if(roles.isEmpty()){
                    roles = role;
                }else{
                    roles = roles + "," + role;
                }
            }

        }
        String[] selectedRole = roles.split(",");
        return selectedRole;
    }

    /**
     * 选中的单元格的乐见状态以第一个单元格为齐
     */
    public void initCheckBoxesState() {
        final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
        if (cellSelection == null) {
            cellElementVisibleCheckBoxes.setSelected(true);
        } else {
            Rectangle cellRectangle = cellSelection.getCellRectangle(0);
            DefaultTemplateCellElement cellElement = (DefaultTemplateCellElement) elementCase.getCellElement(cellRectangle.x, cellRectangle.y);
            if (cellElement == null) {
                cellElement = new DefaultTemplateCellElement(cellRectangle.x, cellRectangle.y);
            }
            boolean firstCellDoneaAuthority = cellElement.isDoneAuthority(
                    ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName());
            cellElementVisibleCheckBoxes.setSelected(!firstCellDoneaAuthority);
        }
        widgetAvailable.setEnabled(cellElementVisibleCheckBoxes.isSelected());
        widgetVisible.setEnabled(cellElementVisibleCheckBoxes.isSelected());
    }

    private void initListener() {
        cellElementVisibleCheckBoxes.addItemListener(cellRolesAuthorityListener);
        widgetVisible.addItemListener(widgetVisibleRoleAuthorityListener);
        widgetAvailable.addItemListener(widgetUsableAuthorityListener);
        floatElementVisibleCheckBoxes.addItemListener(floatElementAuthorityListener);
        gridColumnRowVisible.addItemListener(columnRowAuthorityListener);
        newValue.addItemListener(newValuelistener);
        valueEditor.registerChangeListener(observerListener);
    }

    private void removeListener() {
        cellElementVisibleCheckBoxes.removeItemListener(cellRolesAuthorityListener);
        widgetVisible.removeItemListener(widgetVisibleRoleAuthorityListener);
        widgetAvailable.removeItemListener(widgetUsableAuthorityListener);
        floatElementVisibleCheckBoxes.removeItemListener(floatElementAuthorityListener);
        gridColumnRowVisible.removeItemListener(columnRowAuthorityListener);
        newValue.removeItemListener(newValuelistener);
        valueEditor.registerChangeListener(null);
    }

    private void addHyperlinkListener() {
        cellElementVisibleCheckBoxes.addItemListener(new ItemListener() {
            public void itemStateChanged(ItemEvent e) {
                if (hyperlinkCheckBoxes != null) {
                    for (int i = 0; i < hyperlinkCheckBoxes.length; i++) {
                        hyperlinkCheckBoxes[i].setEnabled(cellElementVisibleCheckBoxes.isSelected());
                        if (!cellElementVisibleCheckBoxes.isSelected()) {
                            hyperlinkCheckBoxes[i].setSelected(false);
                        }
                    }
                }
            }
        });
        for (int i = 0; i < hyperlinkCheckBoxes.length; i++) {
            hyperlinkCheckBoxes[i].addItemListener(cellRolesAuthorityListener);
        }
    }

    /**
     * 更新适合的类型
     */
    public void populateType() {
        if (selectionType == CellSelection.NORMAL) {
            type.setText(Inter.getLocText("FR-Designer_Cell"));
        } else if (selectionType == CellSelection.CHOOSE_ROW) {
            type.setText(Inter.getLocText("FR-Designer_Row"));
        } else if (selectionType == CellSelection.CHOOSE_COLUMN) {
            type.setText(Inter.getLocText("FR-Designer_Column"));
        } else {
            type.setText(Inter.getLocText("M_Insert-Float"));
        }
    }

    /**
     * 名字
     */
    public void populateName() {
        if (selectionType == CellSelection.NORMAL) {
            name.setText(getCellSelectionName());
        } else if (selectionType == CellSelection.CHOOSE_ROW || selectionType == CellSelection.CHOOSE_COLUMN) {
            name.setText(getCellColumnRowName());
        } else {
            name.setText(getFloatSelectionName());
        }
    }

    private String getCellSelectionName() {
        String nameText = "";
        int count = cellSelection.getCellRectangleCount();
        for (int rect = 0; rect < count; rect++) {
            nameText += ",";
            Rectangle cellRectangle = cellSelection.getCellRectangle(rect);
            ColumnRow beginCR = ColumnRow.valueOf(cellRectangle.x, cellRectangle.y);
            nameText += beginCR.toString();
            if (cellRectangle.width * cellRectangle.height != 1) {
                ColumnRow endCR = ColumnRow.valueOf(cellRectangle.width + cellRectangle.x - 1, cellRectangle.height + cellRectangle.y - 1);
                nameText += ":" + endCR.toString();
            }
        }
        return nameText.substring(1);
    }

    private String getCellColumnRowName() {
        int count = cellSelection.getCellRectangleCount();
        String nameText = "";
        ColumnRow cr = ColumnRow.valueOf(cellSelection.getColumn(), cellSelection.getRow());
        if (cellSelection.getSelectedType() == CellSelection.CHOOSE_COLUMN && count == 1) {
            if (cellSelection.getColumnSpan() == 1) {
                nameText = cr.toString().substring(0, 1);
            } else {
                ColumnRow endCr = ColumnRow.valueOf(cellSelection.getColumn() + cellSelection.getColumnSpan() - 1,
                        cellSelection.getRow() + cellSelection.getRowSpan() - 1);
                nameText = cr.toString().substring(0, 1) + "-" + endCr.toString().substring(0, 1);
            }
        } else if (cellSelection.getSelectedType() == CellSelection.CHOOSE_ROW && count == 1) {
            if (cellSelection.getRowSpan() == 1) {
                nameText = cr.toString().substring(1);
            } else {
                ColumnRow endCr = ColumnRow.valueOf(cellSelection.getColumn() + cellSelection.getColumnSpan() - 1,
                        cellSelection.getRow() + cellSelection.getRowSpan() - 1);
                nameText = cr.toString().substring(1) + "-" + endCr.toString().substring(1);
            }
        }
        return nameText;
    }

    private String getFloatSelectionName() {
        return floatSelection.getSelectedFloatName();
    }

    private void mutilRect(CellSelection cellSelection) {
        isAllHasWidget = true;
        isAllHasHyperlink = true;
        int count = cellSelection.getCellRectangleCount();
        final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
        for (int rect = 0; rect < count; rect++) {
            Rectangle cellRectangle = cellSelection.getCellRectangle(rect);
            for (int j = 0; j < cellRectangle.height; j++) {
                for (int i = 0; i < cellRectangle.width; i++) {
                    int column = i + cellRectangle.x;
                    int row = j + cellRectangle.y;
                    DefaultTemplateCellElement cellElement = (DefaultTemplateCellElement) elementCase.getCellElement(column, row);
                    if (cellElement == null) {
                        cellElement = new DefaultTemplateCellElement(cellSelection.getColumn(), cellSelection.getRow());
                    }
                    if (cellElement.getCellWidgetAttr() == null) {
                        isAllHasWidget = false;
                    }
                    if (cellElement.getNameHyperlinkGroup() == null) {
                        isAllHasHyperlink = false;
                    }
                }
            }
        }
    }

    /**
     * 更新适合的pane
     *
     * @return 返回Pane
     */
    public JPanel populateCheckPane() {
        checkPane.removeAll();
        if (selectionType == CellSelection.NORMAL) {
            populateCellSelectionCheckPane(checkPane);
        } else if (selectionType == CellSelection.CHOOSE_COLUMN || selectionType == CellSelection.CHOOSE_ROW) {
            populateColumnRowCheckPane(checkPane);
        } else if (selectionType == FLOAT_SELECTION) {
            populateFloatSelectionCheckPane(checkPane);
        }
        checkPane.setBorder(BorderFactory.createEmptyBorder(ALIGNMENT_GAP, 0, 0, 0));
        return checkPane;
    }

    private void populateColumnRowCheckPane(JPanel checkPane) {
        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
        Component[][] components = new Component[][]{
                new Component[]{gridColumnRowVisible}
        };
        double[] rowSize = {p};
        double[] columnSize = {f};
        int[][] rowCount = {{1}};
        checkPane.add(
                TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM)
                , BorderLayout.WEST);
    }

    private void populateFloatSelectionCheckPane(JPanel checkPane) {
        checkPane.add(populateFloatElementCheckPane(), BorderLayout.WEST);
    }

    private void populateCellSelectionCheckPane(JPanel checkPane) {
        if (elementCasePane.isSelectedOneCell()) {
            //只选中了一个单元格
            final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
            DefaultTemplateCellElement cellElement = (DefaultTemplateCellElement) elementCase.getCellElement(cellSelection.getColumn(), cellSelection.getRow());
            if (cellElement == null) {
                cellElement = new DefaultTemplateCellElement(cellSelection.getColumn(), cellSelection.getRow());
            }
            //单元格带控件
            if (cellElement.getCellWidgetAttr() != null) {
                checkPane.add(populateWidgetCheckPane(), BorderLayout.WEST);
            } else {
                checkPane.add(populatCellCheckPane(), BorderLayout.WEST);
            }
        } else {
            //批量选中单元格
            mutilRect(cellSelection);
            if (!isAllHasWidget && !isAllHasHyperlink) {
                checkPane.add(populateMutilCellCheckPane(), BorderLayout.WEST);
            } else if (isAllHasWidget) {
                checkPane.add(populateMutilWidgetCheckPane(), BorderLayout.WEST);
            }

        }
    }

    /**
     * 对单元格区域进行操作时的权限编辑页面 ,对应的角色的populate
     */
    public void populateDetials() {
        //做模式标记，此时鼠标焦点是在报表主体，为下一次退出权限编辑时做准备
        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setAuthorityMode(false);
        TemplateElementCase templateElementCase = elementCasePane.getEditingElementCase();
        if (templateElementCase instanceof WorkSheet) {
            ((WorkSheet) templateElementCase).setPaintSelection(true);
        }

        signelSelection();

        Selection selection = elementCasePane.getSelection();
        if (selection instanceof CellSelection) {
            selectionType = CellSelection.NORMAL;
            this.cellSelection = ((CellSelection) selection).clone();
            this.floatSelection = null;
            judgeChooseCR();
        } else if (selection instanceof FloatSelection) {
            selectionType = FLOAT_SELECTION;
            cellSelection = null;
            floatSelection = new FloatSelection(((FloatSelection) selection).getSelectedFloatName());
        }
        populateType();
        populateName();
        populateCheckPane();
        checkCheckBoxes();
    }

    //判断是否选择的行列
    private void judgeChooseCR() {
        if (cellSelection.getSelectedType() == CellSelection.CHOOSE_COLUMN && cellSelection.getCellRectangleCount() == 1) {
            selectionType = CellSelection.CHOOSE_COLUMN;
        }
        if (cellSelection.getSelectedType() == CellSelection.CHOOSE_ROW && cellSelection.getCellRectangleCount() == 1) {
            selectionType = CellSelection.CHOOSE_ROW;
        }
    }


    //实现单选

    private void signelSelection() {
        JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
        if (jTemplate.isJWorkBook()) {
            //清工具栏
            JComponent component = DesignerContext.getDesignerFrame().getToolbarComponent();
            if (component instanceof AuthorityEditToolBarComponent) {
                ((AuthorityEditToolBarComponent) component).removeSelection();
            }

            //清参数面板
            jTemplate.removeParameterPaneSelection();
        }
    }

    private JPanel populateFloatElementCheckPane() {
        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
        Component[][] components = new Component[][]{
                new Component[]{new UILabel(Inter.getLocText("M_Insert-Float"), SwingConstants.LEFT), 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);
    }

    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 populateMutilWidgetCheckPane() {
        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[]{new UILabel(Inter.getLocText("FR-Designer_Widget"), SwingConstants.LEFT), widgetVisible},
                new Component[]{null, widgetAvailable}
        };
        double[] rowSize = {p, p, p};
        double[] columnSize = {p, f};
        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
    }

    private JPanel populateMutilCellCheckPane() {
        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
        Component[][] components = new Component[][]{
                new Component[]{cellElementVisibleCheckBoxes},
        };
        double[] rowSize = {p};
        double[] columnSize = {f};
        int[][] rowCount = {{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;
        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);
    }

    public TemplateCellElement getFirstCell() {
        final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
        Rectangle cellRectangle = cellSelection.getCellRectangle(0);
        // 从最后循环起以保证最后一个修改标准单元格（originalStyle）。
        TemplateCellElement firstCell = null;
        for (int j = cellRectangle.height - 1; j >= 0; j--) {
            for (int i = cellRectangle.width - 1; i >= 0; i--) {
                int column = i + cellRectangle.x;
                int row = j + cellRectangle.y;
                TemplateCellElement editCellElement = elementCase.getTemplateCellElement(column, row);
                if (editCellElement != null) {
                    // 对于合并的格子,我们不多次计算的权限.
                    if (editCellElement.getColumn() != column
                            || editCellElement.getRow() != row) {
                        continue;
                    }

                    firstCell = editCellElement;
                }
            }
        }
        return firstCell;
    }

    private void checkCheckBoxes() {
        String selected = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
        removeListener();
        if (selectionType == CellSelection.NORMAL) {
            checkCellSelectionCkeckboxes(selected);
        } else if (selectionType == CellSelection.CHOOSE_COLUMN || selectionType == CellSelection.CHOOSE_ROW) {
            checkColumnRowCheckBoxes(selected);
        } else if (selectionType == FLOAT_SELECTION) {
            checkFloatSelectionCkeckboxes(selected);
        }
        initListener();
    }

    private void checkCellSelectionCkeckboxes(String selected) {
        TemplateCellElement firstCell = getFirstCell();
        if (firstCell == null) {
            resetCellElementCheckBoxes();
            return;
        }
        cellElementVisibleCheckBoxes.setSelected(!firstCell.isDoneAuthority(selected));
        newValue.setEnabled(!firstCell.isDoneAuthority(selected));
        if (!firstCell.isDoneAuthority(selected)) {
            newValue.setSelected(firstCell.isDoneNewValueAuthority(selected));
            if (newValue.isSelected()) {
                valueEditor.setEnabled(true);
                valueEditor.populate(firstCell.getCellPrivilegeControl().getNewValueMap().get(selected));
            } else {
                valueEditor.setEnabled(false);
            }
        } else {
            newValue.setSelected(false);
            valueEditor.setEnabled(false);
        }
        
    	populateWidgetButton(firstCell.getWidget(), selected, firstCell);
    }
    
    private void populateWidgetButton(Widget widget, String selected, TemplateCellElement firstCell){
    	if(widget == null){
    		return;
    	}

    	if(widget.isVisible()){
    		widgetVisible.setSelected(!widget.isDoneVisibleAuthority(selected));
    		widgetVisible.setEnabled(!firstCell.isDoneAuthority(selected));
    	}else{
    		widgetVisible.setSelected(widget.isVisibleAuthority(selected));
    	}
    	
    	if(widget.isEnabled()){
	        widgetAvailable.setSelected(!widget.isDoneUsableAuthority(selected));
	        widgetAvailable.setEnabled(!widget.isDoneVisibleAuthority(selected));
    	}else{
    		widgetAvailable.setSelected(widget.isUsableAuthority(selected));
    	}
    
    }

    private void resetCellElementCheckBoxes() {
        cellElementVisibleCheckBoxes.setSelected(true);
        widgetVisible.setSelected(true);
        widgetVisible.setEnabled(true);
        widgetAvailable.setSelected(true);
        widgetAvailable.setEnabled(true);
        newValue.setSelected(false);
        valueEditor.setEnabled(false);
    }

    private void checkColumnRowCheckBoxes(String selected) {
        if (cellSelection == null) {
            gridColumnRowVisible.setSelected(false);
            return;
        }
        TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
        boolean isInside = selectionType == CellSelection.CHOOSE_COLUMN ?
                elementCase.getColumnPrivilegeControl(cellSelection.getColumn()).checkInvisible(selected) :
                elementCase.getRowPrivilegeControl(cellSelection.getRow()).checkInvisible(selected);

        gridColumnRowVisible.setSelected(isInside);
    }

    private void checkFloatSelectionCkeckboxes(String selected) {
        String name = floatSelection.getSelectedFloatName();
        TemplateElementCase ec = elementCasePane.getEditingElementCase();
        FloatElement fe = ec.getFloatElement(name);
        floatElementVisibleCheckBoxes.setSelected(!fe.isDoneAuthority(selected));
    }

    private JPanel populateHyperlinkCheckPane(AbstractCellElement cellElement) {
        NameJavaScriptGroup linkGroup = cellElement.getNameHyperlinkGroup();
        //超链接的个数+单元格可见的操作
        hyperlinkCheckBoxes = new UICheckBox[linkGroup.size()];

        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
        Component[][] components = new Component[hyperlinkCheckBoxes.length + 1][];
        if (linkGroup.size() == 1) {
            components[0] = new Component[]{new UILabel(Inter.getLocText("FR-Designer_Cell"), SwingConstants.LEFT), cellElementVisibleCheckBoxes};
            components[1] = new Component[]{new UILabel(Inter.getLocText("FR-Designer_Hyperlink"), SwingConstants.LEFT), hyperlinkCheckBoxes[0] = new UICheckBox(Inter.getLocText("FR-Designer_Visible"))};

        } else {
            components[0] = new Component[]{new UILabel(Inter.getLocText("FR-Designer_Cell"), SwingConstants.LEFT), cellElementVisibleCheckBoxes = new UICheckBox(Inter.getLocText("FR-Designer_Visible"))};
            components[1] = new Component[]{new UILabel(Inter.getLocText("FR-Designer_Hyperlink"), SwingConstants.LEFT), hyperlinkCheckBoxes[0] = new UICheckBox(linkGroup.getNameHyperlink(0).getName() + Inter.getLocText("FR-Designer_Visible"))};
            for (int i = 1; i < hyperlinkCheckBoxes.length; i++) {
                components[i + 1] = new Component[]{null, hyperlinkCheckBoxes[i] = new UICheckBox(linkGroup.getNameHyperlink(i).getName() + Inter.getLocText("FR-Designer_Visible"))};
            }
        }

        for (int i = 0; i < hyperlinkCheckBoxes.length; i++) {
            hyperlinkCheckBoxes[i].setEnabled(cellElementVisibleCheckBoxes.isSelected());
        }

        addHyperlinkListener();

        double[] rowSize = new double[hyperlinkCheckBoxes.length + 1];
        int[][] rowCount = new int[hyperlinkCheckBoxes.length + 1][];
        for (int i = 0; i < hyperlinkCheckBoxes.length + 1; i++) {
            rowSize[i] = p;
            rowCount[i] = new int[]{1, 1};
        }
        double[] columnSize = {p, f};

        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);

    }

    private JPanel populateMutilHyperlinkCheckPane() {
        //超链接的个数+单元格可见的操作
        hyperlinkCheckBoxes = new UICheckBox[1];

        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
        Component[][] components = new Component[2][];
        components[0] = new Component[]{new UILabel(Inter.getLocText("FR-Designer_Cell"), SwingConstants.LEFT), cellElementVisibleCheckBoxes};
        components[1] = new Component[]{new UILabel(Inter.getLocText("FR-Designer_Hyperlink"), SwingConstants.LEFT), hyperlinkCheckBoxes[0] = new UICheckBox(Inter.getLocText("FR-Designer_Visible"))};


        hyperlinkCheckBoxes[0].setEnabled(cellElementVisibleCheckBoxes.isSelected());

        addHyperlinkListener();

        double[] rowSize = {p, p};
        double[] columnSize = {p, f};
        int[][] rowCount = {{1, 1}, {1, 1}};

        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);

    }
}
\ No newline at end of file
diff --git a/designer/src/com/fr/design/mainframe/bbs/BBSDialog.java b/designer/src/com/fr/design/mainframe/bbs/BBSDialog.java
index c714bb055..b0667d4c6 100644
--- a/designer/src/com/fr/design/mainframe/bbs/BBSDialog.java
+++ b/designer/src/com/fr/design/mainframe/bbs/BBSDialog.java
@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.bbs;
 
 import com.fr.design.dialog.UIDialog;
+import com.fr.design.extra.PluginWebBridge;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
@@ -20,8 +21,6 @@ import netscape.javascript.JSObject;
 import javax.swing.*;
 
 import java.awt.*;
-import java.io.IOException;
-import java.net.URI;
 
 /**
  * @author richie
@@ -54,7 +53,7 @@ public class BBSDialog extends UIDialog {
     }
 
     private void disableLink(final WebEngine eng) {
-        try{
+        try {
             // webView端不跳转 虽然webView可以指定本地浏览器打开某个链接，但是当本地浏览器跳转到指定链接的同时，webView也做了跳转，
             // 为了避免出现在一个600*400的资讯框里加载整个网页的情况，webView不跳转到新网页
             Platform.runLater(new Runnable() {
@@ -63,16 +62,17 @@ public class BBSDialog extends UIDialog {
                     eng.executeScript("history.go(0)");
                 }
             });
-        }catch(Exception e){
+        } catch (Exception e) {
             FRLogger.getLogger().error(e.getMessage());
         }
     }
 
     /**
      * 打开资讯框
+     *
      * @param url 资讯链接
      */
-    public void showWindow(final String url){
+    public void showWindow(final String url) {
         GUICoreUtils.centerWindow(this);
         this.setResizable(false);
         Platform.runLater(new Runnable() {
@@ -93,20 +93,19 @@ public class BBSDialog extends UIDialog {
                 root.getChildren().add(view);
                 eng.locationProperty().addListener(new ChangeListener<String>() {
                     @Override
-                    public void changed(ObservableValue<? extends String> observable, final String oldValue, String newValue)
-                    {
-                    	disableLink(eng);
-                    	// webView好像默认以手机版显示网页，浏览器里过滤掉这个跳转
-                		if(ComparatorUtils.equals(newValue, url) || ComparatorUtils.equals(newValue, SiteCenter.getInstance().acquireUrlByKind("bbs.mobile"))){
-                			return;
-                		}
-                		openUrlAtLocalWebBrowser(eng,newValue);
-					}
-				});
+                    public void changed(ObservableValue<? extends String> observable, final String oldValue, String newValue) {
+                        disableLink(eng);
+                        // webView好像默认以手机版显示网页，浏览器里过滤掉这个跳转
+                        if (ComparatorUtils.equals(newValue, url) || ComparatorUtils.equals(newValue, SiteCenter.getInstance().acquireUrlByKind("bbs.mobile"))) {
+                            return;
+                        }
+                        PluginWebBridge.getHelper().openUrlAtLocalWebBrowser(eng, newValue);
+                    }
+                });
                 eng.getLoadWorker().stateProperty().addListener(new ChangeListener<Worker.State>() {
                     @Override
                     public void changed(ObservableValue<? extends Worker.State> observable, Worker.State oldValue, Worker.State newValue) {
-                        if (newValue == Worker.State.SUCCEEDED){
+                        if (newValue == Worker.State.SUCCEEDED) {
                             JSObject obj = (JSObject) eng.executeScript("window");
                             obj.setMember("BBSWebBridge", BBSDialog.this);
                             setVisible(true);
@@ -117,29 +116,6 @@ public class BBSDialog extends UIDialog {
         });
     }
 
-    // 在本地浏览器里打开url
-    private void openUrlAtLocalWebBrowser(WebEngine eng,String url){
-        if(Desktop.isDesktopSupported()){
-            try{
-                //创建一个URI实例,注意不是URL
-                URI uri = URI.create(url);
-                //获取当前系统桌面扩展
-                Desktop desktop = Desktop.getDesktop();
-                //判断系统桌面是否支持要执行的功能
-                if(desktop.isSupported(Desktop.Action.BROWSE)){
-                    //获取系统默认浏览器打开链接
-                	desktop.browse(uri);
-                }
-            }catch(NullPointerException e){
-                //此为uri为空时抛出异常
-            	FRLogger.getLogger().error(e.getMessage());
-            }catch(IOException e){
-                //此为无法获取系统默认浏览器
-            	FRLogger.getLogger().error(e.getMessage());
-            }
-        }
-    }
-
     /**
      * 提供给web页面调用的关闭窗口
      */
@@ -147,6 +123,7 @@ public class BBSDialog extends UIDialog {
         this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
         this.setVisible(false);
     }
+
     /**
      * 略
      */
diff --git a/designer_base/designer_base.iml b/designer_base/designer_base.iml
index d20642b28..9f8c89a0b 100644
--- a/designer_base/designer_base.iml
+++ b/designer_base/designer_base.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../env/WebReport/WEB-INF/classes" />
+    <output url="file://$MODULE_DIR$/../../../env/8.0/WebReport/WEB-INF/classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
diff --git a/designer_base/src/com/fr/design/DesignModelAdapter.java b/designer_base/src/com/fr/design/DesignModelAdapter.java
index 7c2c71806..8e35dbf38 100644
--- a/designer_base/src/com/fr/design/DesignModelAdapter.java
+++ b/designer_base/src/com/fr/design/DesignModelAdapter.java
@@ -1,9 +1,5 @@
 package com.fr.design;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import com.fr.base.Parameter;
 import com.fr.base.io.IOFile;
 import com.fr.data.TableDataSource;
@@ -13,6 +9,10 @@ import com.fr.form.ui.Widget;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.js.WidgetName;
 
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 当前的设计器模式
  *
@@ -29,6 +29,14 @@ public abstract class DesignModelAdapter<T extends IOFile, S extends JTemplatePr
         setCurrentModelAdapter(this);
     }
 
+    public S getjTemplate() {
+        return jTemplate;
+    }
+
+    public void setjTemplate(S jTemplate) {
+        this.jTemplate = jTemplate;
+    }
+
     public T getBook() {
         return (T) ((JTemplate) jTemplate).getTarget();
     }
diff --git a/designer_base/src/com/fr/design/ExtraDesignClassManager.java b/designer_base/src/com/fr/design/ExtraDesignClassManager.java
index 72d5269b0..c761430e9 100644
--- a/designer_base/src/com/fr/design/ExtraDesignClassManager.java
+++ b/designer_base/src/com/fr/design/ExtraDesignClassManager.java
@@ -126,6 +126,16 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
 
     private DesignerEnvProcessor envProcessor;
 
+    private TableDataTreePaneProcessor tableDataTreePaneProcessor;
+
+    public TableDataTreePaneProcessor getTableDataTreePaneProcessor() {
+        return tableDataTreePaneProcessor;
+    }
+
+    public void setTableDataSourceOPProcessor(Level level, PluginSimplify simplify) {
+        validAPILevel(level, TableDataTreePaneProcessor.CURRENT_LEVEL, simplify.getPluginName());
+        tableDataTreePaneProcessor = (TableDataTreePaneProcessor) level;
+    }
 
     public DesignerEnvProcessor getEnvProcessor() {
         return envProcessor;
@@ -797,6 +807,8 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
                 addSupportDesignApps(impl, simplify);
             } else if (tagName.equals(DesignerEnvProcessor.XML_TAG)) {
                 setEnvProcessor(impl, simplify);
+            } else if (tagName.equals(TableDataTreePaneProcessor.XML_TAG)) {
+                setTableDataSourceOPProcessor(impl, simplify);
             }
         } catch (PluginInvalidLevelException e) {
             PluginMessage.remindUpdate(e.getMessage());
diff --git a/designer_base/src/com/fr/design/actions/server/PluginManagerAction.java b/designer_base/src/com/fr/design/actions/server/PluginManagerAction.java
index 91b4eb810..d88fdf992 100644
--- a/designer_base/src/com/fr/design/actions/server/PluginManagerAction.java
+++ b/designer_base/src/com/fr/design/actions/server/PluginManagerAction.java
@@ -2,8 +2,10 @@ package com.fr.design.actions.server;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.UpdateAction;
-import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.UIDialog;
 import com.fr.design.extra.PluginManagerPane;
+import com.fr.design.extra.PluginWebBridge;
+import com.fr.design.extra.PluginShopDialog;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.general.Inter;
@@ -28,8 +30,8 @@ public class PluginManagerAction extends UpdateAction {
     @Override
     public void actionPerformed(ActionEvent e) {
         final PluginManagerPane managerPane = new PluginManagerPane();
-        BasicDialog dlg = managerPane.showLargeWindow(DesignerContext.getDesignerFrame(),null);
-
+        UIDialog dlg = new PluginShopDialog(DesignerContext.getDesignerFrame(),managerPane);
+        PluginWebBridge.getHelper().setDialogHandle(dlg);
         dlg.setVisible(true);
     }
 
diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java b/designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java
index 03ed0dfbb..da85a4241 100644
--- a/designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java
+++ b/designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java
@@ -1,26 +1,22 @@
 package com.fr.design.data.datapane;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import com.fr.general.NameObject;
 import com.fr.base.StoreProcedureParameter;
 import com.fr.base.TableData;
-import com.fr.design.data.DesignTableDataManager;
 import com.fr.data.TableDataSource;
 import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.data.impl.storeproc.StoreProcedureConstants;
+import com.fr.design.DesignModelAdapter;
+import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.tabledata.wrapper.StoreProcedureDataWrapper;
 import com.fr.design.data.tabledata.wrapper.StoreProcedureNameWrapper;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
-import com.fr.design.DesignModelAdapter;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.gui.itree.refreshabletree.UserObjectOP;
 import com.fr.general.Inter;
+import com.fr.general.NameObject;
+
+import java.util.*;
+import java.util.Map.Entry;
 
 /**
  * 数据集树的操作
@@ -41,6 +37,14 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
         this.tc = tc;
     }
 
+    public DesignModelAdapter<?, ?> getDesignModelAdapter() {
+        return tc;
+    }
+
+    public void setDesignModelAdapter(DesignModelAdapter<?, ?> tc) {
+        this.tc = tc;
+    }
+
     /**
      * 初始化数据集的list
      *
diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataTree.java b/designer_base/src/com/fr/design/data/datapane/TableDataTree.java
index 2b2238a9d..bb8553d30 100644
--- a/designer_base/src/com/fr/design/data/datapane/TableDataTree.java
+++ b/designer_base/src/com/fr/design/data/datapane/TableDataTree.java
@@ -31,7 +31,6 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
         this.setCellRenderer(tableDataTreeCellRenderer);
         this.setEditable(false);
     }
-
     // CellRenderer
     private DefaultTreeCellRenderer tableDataTreeCellRenderer = new DefaultTreeCellRenderer() {
         private static final long serialVersionUID = 1L;
@@ -82,6 +81,13 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
         }
     };
 
+    public DefaultTreeCellRenderer getTableDataTreeCellRenderer() {
+        return tableDataTreeCellRenderer;
+    }
+
+    public void setTableDataTreeCellRenderer(DefaultTreeCellRenderer tableDataTreeCellRenderer) {
+        this.tableDataTreeCellRenderer = tableDataTreeCellRenderer;
+    }
 
     protected void refreshTreeNode(ExpandMutableTreeNode eTreeNode, String childName) {
         if (interceptRefresh(eTreeNode)) {
diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
index a0b4fb3bf..84c56e794 100644
--- a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
+++ b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
@@ -52,9 +52,9 @@ import java.util.Map;
 
 public class TableDataTreePane extends DockingView implements ResponseDataSourceChange {
 
-    private static final int PROCEDURE_NAME_INDEX = 4;
-    private static final int TEMPLATE_TABLE_DATA = 0;
-    private static final int SERVER_TABLE_DATA = 1;
+    protected static final int PROCEDURE_NAME_INDEX = 4;
+    protected static final int TEMPLATE_TABLE_DATA = 0;
+    protected static final int SERVER_TABLE_DATA = 1;
     private static final long serialVersionUID = -12168467370000617L;
     private static TableDataTreePane singleton = new TableDataTreePane();
     private String type = "";
@@ -77,7 +77,7 @@ public class TableDataTreePane extends DockingView implements ResponseDataSource
         return singleton;
     }
 
-    private static TableDataTree dataTree;
+    private TableDataTree dataTree;
     private TableDataSourceOP op;
 
     private MenuDef addMenuDef;
@@ -147,6 +147,74 @@ public class TableDataTreePane extends DockingView implements ResponseDataSource
         checkButtonEnabled();
     }
 
+    public void setDataTree(TableDataTree dataTree) {
+        this.dataTree = dataTree;
+    }
+
+    public TableDataSourceOP getOp() {
+        return op;
+    }
+
+    public void setOp(TableDataSourceOP op) {
+        this.op = op;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public MenuDef getAddMenuDef() {
+        return addMenuDef;
+    }
+
+    public void setAddMenuDef(MenuDef addMenuDef) {
+        this.addMenuDef = addMenuDef;
+    }
+
+    public EditAction getEditAction() {
+        return editAction;
+    }
+
+    public void setEditAction(EditAction editAction) {
+        this.editAction = editAction;
+    }
+
+    public RemoveAction getRemoveAction() {
+        return removeAction;
+    }
+
+    public void setRemoveAction(RemoveAction removeAction) {
+        this.removeAction = removeAction;
+    }
+
+    public DesignModelAdapter<?, ?> getTc() {
+        return tc;
+    }
+
+    public void setTc(DesignModelAdapter<?, ?> tc) {
+        this.tc = tc;
+    }
+
+    public PreviewTableDataAction getPreviewTableDataAction() {
+        return previewTableDataAction;
+    }
+
+    public void setPreviewTableDataAction(PreviewTableDataAction previewTableDataAction) {
+        this.previewTableDataAction = previewTableDataAction;
+    }
+
+    public ConnectionTableAction getConnectionTableAction() {
+        return connectionTableAction;
+    }
+
+    public void setConnectionTableAction(ConnectionTableAction connectionTableAction) {
+        this.connectionTableAction = connectionTableAction;
+    }
+
     private KeyAdapter getTableTreeNodeListener() {
         return new KeyAdapter() {
 
@@ -227,11 +295,11 @@ public class TableDataTreePane extends DockingView implements ResponseDataSource
     /**
      * 刷新
      */
-    public static void refresh() {
+    public void refresh() {
         dataTree.refresh();
     }
 
-    private void checkButtonEnabled() {
+    protected void checkButtonEnabled() {
         // august:BUG 9344
         addMenuDef.setEnabled(true);
         connectionTableAction.setEnabled(FRContext.getCurrentEnv() != null && FRContext.getCurrentEnv().isRoot());
diff --git a/designer_base/src/com/fr/design/dialog/BasicPane.java b/designer_base/src/com/fr/design/dialog/BasicPane.java
index c94c246bf..9bc96f643 100644
--- a/designer_base/src/com/fr/design/dialog/BasicPane.java
+++ b/designer_base/src/com/fr/design/dialog/BasicPane.java
@@ -16,380 +16,390 @@ import java.awt.*;
  */
 public abstract class BasicPane extends JPanel {
 
-	/**
-	 *显示窗口
-	 * @param window 窗口
-	 * @return 对话框
-	 */
-	public BasicDialog showWindow(Window window) {
-		return this.showWindow(window, null);
-	}
-
-
-	/**
-	 * 显示窗口
-	 * @param window 窗口
-	 * @param l 对话框监听器
-	 * @return 对话框
-	 */
-	public BasicDialog showWindow(Window window, DialogActionListener l) {
-		BasicDialog dg;
-		if (window instanceof Frame) {
-			dg = new DIALOG((Frame) window);
-		} else {
-			dg = new DIALOG((Dialog) window);
-		}
-
-		if (l != null) {
-			dg.addDialogActionListener(l);
-		}
-
-		dg.setBasicDialogSize(BasicDialog.DEFAULT);
-		GUICoreUtils.centerWindow(dg);
-		dg.setResizable(false);
-		return dg;
-	}
-
-	/**
-	 * 显示窗口
-	 * @param window 窗口
-	 * @param isNeedButtonsPane 是否需要确定删除按钮
-	 * @return 对话框
-	 */
-	public BasicDialog showWindow(Window window, boolean isNeedButtonsPane) {
-		BasicDialog dg;
-		if (window instanceof Frame) {
-			dg = new DIALOG((Frame) window, isNeedButtonsPane);
-		} else {
-			dg = new DIALOG((Dialog) window, isNeedButtonsPane);
-		}
-		dg.setBasicDialogSize(BasicDialog.DEFAULT);
-		GUICoreUtils.centerWindow(dg);
-		dg.setResizable(false);
-		return dg;
-	}
-
-
-
-	/**
-	 * 图表类型选择时 弹出的按钮大小, 不适合用最大最小, 因为图表大小 默认是规定好的, 那么界面大小也是必须配合.
-	 * 并且包括 条件显示中 多个条件的大小
-	 * @param window 窗口
-	 * @param l 监听器
-	 * @return 对话框
-	 */
-	public BasicDialog showWindow4ChartType(Window window, DialogActionListener l) {
-		BasicDialog dg;
-		if (window instanceof Frame) {
-			dg = new DIALOG((Frame) window);
-		} else {
-			dg = new DIALOG((Dialog) window);
-		}
-
-		if (l != null) {
-			dg.addDialogActionListener(l);
-		}
-
-		dg.setBasicDialogSize(BasicDialog.CHART);
-		GUICoreUtils.centerWindow(dg);
-		dg.setResizable(false);
-		return dg;
-	}
-
-	/**
-	 * 显示窗口
-	 * @param window 窗口
-	 * @param l 对话框监听器
-	 * @return 对话框
-	 */
-	public BasicDialog showSmallWindow(Window window, DialogActionListener l) {
-		BasicDialog dg;
-		if (window instanceof Frame) {
-			dg = new DIALOG((Frame) window);
-		} else {
-			dg = new DIALOG((Dialog) window);
-		}
-
-		if (l != null) {
-			dg.addDialogActionListener(l);
-		}
-		dg.setBasicDialogSize(BasicDialog.SMALL);
-		GUICoreUtils.centerWindow(dg);
-		dg.setResizable(false);
-		return dg;
-	}
-
-	/**
-	 * 显示窗口
-	 * @param window 窗口
-	 * @param l 对话框监听器
-	 * @return 对话框
-	 */
-	public BasicDialog showMediumWindow(Window window, DialogActionListener l) {
-		BasicDialog dg;
-		if (window instanceof Frame) {
-			dg = new DIALOG((Frame) window);
-		} else {
-			dg = new DIALOG((Dialog) window);
-		}
-
-		if (l != null) {
-			dg.addDialogActionListener(l);
-		}
-		dg.setBasicDialogSize(BasicDialog.MEDIUM);
-		GUICoreUtils.centerWindow(dg);
-		dg.setResizable(false);
-		return dg;
-	}
-
-	/**
-	 * 显示窗口
-	 * @param window 窗口
-	 * @param l 对话框监听器
-	 * @return 对话框
-	 */
-	public BasicDialog showLargeWindow(Window window, DialogActionListener l) {
-		BasicDialog dg;
-		if (window instanceof Frame) {
-			dg = new DIALOG((Frame) window);
-		} else {
-			dg = new DIALOG((Dialog) window);
-		}
-
-		if (l != null) {
-			dg.addDialogActionListener(l);
-		}
-		dg.setBasicDialogSize(BasicDialog.LARGE);
-		GUICoreUtils.centerWindow(dg);
-		dg.setResizable(false);
-		return dg;
-	}
-
-	/**
-	 * 显示窗口
-	 * @param window 窗口
-	 * @param l 对话框监听器
-	 * @return 对话框
-	 */
-	public UIDialog showUnsizedWindow(Window window, DialogActionListener l) {
-		UIDialog dg;
-		if (window instanceof Frame) {
-			dg = new UnsizedDialog((Frame) window);
-		} else {
-			dg = new UnsizedDialog((Dialog) window);
-		}
-
-		if (l != null) {
-			dg.addDialogActionListener(l);
-		}
-		GUICoreUtils.centerWindow(dg);
-		dg.setResizable(false);
-		return dg;
-	}
-
-	/**
-	 * 显示窗口
-	 * @param window 窗口
-	 * @param l 对话框监听器
-	 * @return 对话框
-	 */
-	public BasicDialog showWindow4ChartMapArray(Window window,DialogActionListener l){
-		BasicDialog dg;
-		if (window instanceof Frame) {
-			dg = new DIALOG((Frame) window);
-		} else {
-			dg = new DIALOG((Dialog) window);
-		}
-
-		if (l != null) {
-			dg.addDialogActionListener(l);
-		}
-		dg.setBasicDialogSize(BasicDialog.MAP_SIZE);
-		GUICoreUtils.centerWindow(dg);
-		dg.setResizable(false);
-		return dg;
-	}
-
-
-	/**
-	 * 显示窗口
-	 * @param window 窗口
-	 * @return 对话框
-	 */
-	public BasicDialog showWindow4UpdateOnline(Window window){
-		BasicDialog dg;
-		if (window instanceof Frame) {
-			dg = new DIALOG((Frame) window,false);
-		} else {
-			dg = new DIALOG((Dialog) window,false);
-		}
-		dg.setBasicDialogSize(BasicDialog.UPDATE_ONLINE_SIZE);
-		GUICoreUtils.centerWindow(dg);
-		dg.setResizable(false);
-		return dg;
-	}
-
-	protected abstract String title4PopupWindow();
-
-	public String getTitle(){
-		return title4PopupWindow();
-	}
-
-	/**
-	 * 作为名字面板
-	 * @return 面板
-	 */
-	public NamePane asNamePane() {
-		return new NamePane(this);
-	}
-
-	/**
-     * 检查是否符合规范
+    /**
+     * 显示窗口
      *
-     * @throws Exception 异常
-    */
-	public void checkValid() throws Exception {
-	}
-
-	public static final class NamePane extends BasicPane {
-		private UITextField nameTextField;
-		private BasicPane centerPane;
-		private UILabel showfield;
-		private PropertyChangeAdapter changeListener;
-
-		private NamePane(BasicPane bPane) {
-			this.setLayout(new BorderLayout(4, 4));
-
-			nameTextField = new UITextField(30);
-			JPanel northPane = new JPanel(new BorderLayout(4, 4));
-			northPane.add(new UILabel(Inter.getLocText("FR-Designer-Hyperlink_Name") + ":"), BorderLayout.WEST);
-			northPane.add(nameTextField, BorderLayout.CENTER);
-			northPane.add(showfield = new UILabel(" "), BorderLayout.EAST);
-			showfield.setForeground(new Color(204, 0, 1));
-			showfield.setPreferredSize(new Dimension(220, showfield.getPreferredSize().height));
-			this.add(northPane, BorderLayout.NORTH);
-			this.centerPane = bPane;
-			this.add(bPane, BorderLayout.CENTER);
-			this.nameTextField.getDocument().addDocumentListener(new javax.swing.event.DocumentListener() {
-
-				@Override
-				public void insertUpdate(DocumentEvent e) {
-					doTextChanged();
-				}
-
-				@Override
-				public void removeUpdate(DocumentEvent e) {
-					doTextChanged();
-				}
-
-				@Override
-				public void changedUpdate(DocumentEvent e) {
-					doTextChanged();
-				}
-
-			});
-		}
-
-		private void doTextChanged() {
-			if (changeListener != null) {
-				changeListener.propertyChange();
-			}
-		}
-
-		public String getObjectName() {
-			return this.nameTextField.getText().trim();
-		}
-
-		public void setObjectName(String name) {
-			this.nameTextField.setText(name);
-		}
-
-		public void setShowText(String name) {
-			this.showfield.setText(name);
-		}
-
-		@Override
-		protected String title4PopupWindow() {
-			return centerPane.title4PopupWindow();
-		}
-
-		/**
-	     * 检查是否符合规范
-	     *
-	     * @throws Exception 异常
-	    */
-		public void checkValid() throws Exception {
-			super.checkValid();
-
-			this.centerPane.checkValid();
-		}
-
-		/**
-		 * 添加属性改变的监听器
-		 * @param listener 监听器
-		 */
-		public void addPropertyChangeListener(PropertyChangeAdapter listener) {
-			this.changeListener = listener;
-		}
-	}
-
-	private class DIALOG extends BasicDialog {
-		public DIALOG(Frame parent) {
-			super(parent, BasicPane.this);
-			this.setTitle(BasicPane.this.title4PopupWindow());
-		}
-
-		public DIALOG(Dialog parent) {
-			super(parent, BasicPane.this);
-			this.setTitle(BasicPane.this.title4PopupWindow());
-		}
-
-
-		public DIALOG(Frame parent, boolean isNeedButtonPane) {
-			super(parent, BasicPane.this, isNeedButtonPane);
-			this.setTitle(BasicPane.this.title4PopupWindow());
-		}
-
-
-		public DIALOG(Dialog parent, boolean isNeedButtonPane) {
-			super(parent, BasicPane.this, isNeedButtonPane);
-			this.setTitle(BasicPane.this.title4PopupWindow());
-		}
-
-
-
-		/**
-		 * init Components
-		 */
-
-
-		/**
-		 * Check valid.
-		 */
-		public void checkValid() throws Exception {
-			BasicPane.this.checkValid();
-		}
+     * @param window 窗口
+     * @return 对话框
+     */
+    public BasicDialog showWindow(Window window) {
+        return this.showWindow(window, null);
+    }
 
-	}
 
-	private class UnsizedDialog extends UIDialog {
+    /**
+     * 显示窗口
+     *
+     * @param window 窗口
+     * @param l      对话框监听器
+     * @return 对话框
+     */
+    public BasicDialog showWindow(Window window, DialogActionListener l) {
+        BasicDialog dg;
+        if (window instanceof Frame) {
+            dg = new DIALOG((Frame) window);
+        } else {
+            dg = new DIALOG((Dialog) window);
+        }
+
+        if (l != null) {
+            dg.addDialogActionListener(l);
+        }
+
+        dg.setBasicDialogSize(BasicDialog.DEFAULT);
+        GUICoreUtils.centerWindow(dg);
+        dg.setResizable(false);
+        return dg;
+    }
+
+    /**
+     * 显示窗口
+     *
+     * @param window            窗口
+     * @param isNeedButtonsPane 是否需要确定删除按钮
+     * @return 对话框
+     */
+    public BasicDialog showWindow(Window window, boolean isNeedButtonsPane) {
+        BasicDialog dg;
+        if (window instanceof Frame) {
+            dg = new DIALOG((Frame) window, isNeedButtonsPane);
+        } else {
+            dg = new DIALOG((Dialog) window, isNeedButtonsPane);
+        }
+        dg.setBasicDialogSize(BasicDialog.DEFAULT);
+        GUICoreUtils.centerWindow(dg);
+        dg.setResizable(false);
+        return dg;
+    }
+
+
+    /**
+     * 图表类型选择时 弹出的按钮大小, 不适合用最大最小, 因为图表大小 默认是规定好的, 那么界面大小也是必须配合.
+     * 并且包括 条件显示中 多个条件的大小
+     *
+     * @param window 窗口
+     * @param l      监听器
+     * @return 对话框
+     */
+    public BasicDialog showWindow4ChartType(Window window, DialogActionListener l) {
+        BasicDialog dg;
+        if (window instanceof Frame) {
+            dg = new DIALOG((Frame) window);
+        } else {
+            dg = new DIALOG((Dialog) window);
+        }
+
+        if (l != null) {
+            dg.addDialogActionListener(l);
+        }
+
+        dg.setBasicDialogSize(BasicDialog.CHART);
+        GUICoreUtils.centerWindow(dg);
+        dg.setResizable(false);
+        return dg;
+    }
+
+    /**
+     * 显示窗口
+     *
+     * @param window 窗口
+     * @param l      对话框监听器
+     * @return 对话框
+     */
+    public BasicDialog showSmallWindow(Window window, DialogActionListener l) {
+        BasicDialog dg;
+        if (window instanceof Frame) {
+            dg = new DIALOG((Frame) window);
+        } else {
+            dg = new DIALOG((Dialog) window);
+        }
+
+        if (l != null) {
+            dg.addDialogActionListener(l);
+        }
+        dg.setBasicDialogSize(BasicDialog.SMALL);
+        GUICoreUtils.centerWindow(dg);
+        dg.setResizable(false);
+        return dg;
+    }
+
+    /**
+     * 显示窗口
+     *
+     * @param window 窗口
+     * @param l      对话框监听器
+     * @return 对话框
+     */
+    public BasicDialog showMediumWindow(Window window, DialogActionListener l) {
+        BasicDialog dg;
+        if (window instanceof Frame) {
+            dg = new DIALOG((Frame) window);
+        } else {
+            dg = new DIALOG((Dialog) window);
+        }
+
+        if (l != null) {
+            dg.addDialogActionListener(l);
+        }
+        dg.setBasicDialogSize(BasicDialog.MEDIUM);
+        GUICoreUtils.centerWindow(dg);
+        dg.setResizable(false);
+        return dg;
+    }
+
+    /**
+     * 显示窗口
+     *
+     * @param window 窗口
+     * @param l      对话框监听器
+     * @return 对话框
+     */
+    public BasicDialog showLargeWindow(Window window, DialogActionListener l) {
+        BasicDialog dg;
+        if (window instanceof Frame) {
+            dg = new DIALOG((Frame) window);
+        } else {
+            dg = new DIALOG((Dialog) window);
+        }
+
+        if (l != null) {
+            dg.addDialogActionListener(l);
+        }
+        dg.setBasicDialogSize(BasicDialog.LARGE);
+        GUICoreUtils.centerWindow(dg);
+        dg.setResizable(false);
+        return dg;
+    }
+
+    /**
+     * 显示窗口
+     *
+     * @param window 窗口
+     * @param l      对话框监听器
+     * @return 对话框
+     */
+    public UIDialog showUnsizedWindow(Window window, DialogActionListener l) {
+        UIDialog dg;
+        if (window instanceof Frame) {
+            dg = new UnsizedDialog((Frame) window);
+        } else {
+            dg = new UnsizedDialog((Dialog) window);
+        }
+
+        if (l != null) {
+            dg.addDialogActionListener(l);
+        }
+        GUICoreUtils.centerWindow(dg);
+        dg.setResizable(false);
+        return dg;
+    }
+
+    /**
+     * 显示窗口
+     *
+     * @param window 窗口
+     * @param l      对话框监听器
+     * @return 对话框
+     */
+    public BasicDialog showWindow4ChartMapArray(Window window, DialogActionListener l) {
+        BasicDialog dg;
+        if (window instanceof Frame) {
+            dg = new DIALOG((Frame) window);
+        } else {
+            dg = new DIALOG((Dialog) window);
+        }
+
+        if (l != null) {
+            dg.addDialogActionListener(l);
+        }
+        dg.setBasicDialogSize(BasicDialog.MAP_SIZE);
+        GUICoreUtils.centerWindow(dg);
+        dg.setResizable(false);
+        return dg;
+    }
+
+
+    /**
+     * 显示窗口
+     *
+     * @param window 窗口
+     * @return 对话框
+     */
+    public BasicDialog showWindow4UpdateOnline(Window window) {
+        BasicDialog dg;
+        if (window instanceof Frame) {
+            dg = new DIALOG((Frame) window, false);
+        } else {
+            dg = new DIALOG((Dialog) window, false);
+        }
+        dg.setBasicDialogSize(BasicDialog.UPDATE_ONLINE_SIZE);
+        GUICoreUtils.centerWindow(dg);
+        dg.setResizable(false);
+        return dg;
+    }
+
+    protected abstract String title4PopupWindow();
+
+    public String getTitle() {
+        return title4PopupWindow();
+    }
+
+    /**
+     * 作为名字面板
+     *
+     * @return 面板
+     */
+    public NamePane asNamePane() {
+        return new NamePane(this);
+    }
 
-		public UnsizedDialog(Frame parent) {
-			super(parent, BasicPane.this);
-			this.setTitle(BasicPane.this.title4PopupWindow());
-		}
+    /**
+     * 检查是否符合规范
+     *
+     * @throws Exception 异常
+     */
+    public void checkValid() throws Exception {
+    }
+
+    public static final class NamePane extends BasicPane {
+        private UITextField nameTextField;
+        private BasicPane centerPane;
+        private UILabel showfield;
+        private PropertyChangeAdapter changeListener;
+
+        private NamePane(BasicPane bPane) {
+            this.setLayout(new BorderLayout(4, 4));
+
+            nameTextField = new UITextField(30);
+            JPanel northPane = new JPanel(new BorderLayout(4, 4));
+            northPane.add(new UILabel(Inter.getLocText("FR-Designer-Hyperlink_Name") + ":"), BorderLayout.WEST);
+            northPane.add(nameTextField, BorderLayout.CENTER);
+            northPane.add(showfield = new UILabel(" "), BorderLayout.EAST);
+            showfield.setForeground(new Color(204, 0, 1));
+            showfield.setPreferredSize(new Dimension(220, showfield.getPreferredSize().height));
+            this.add(northPane, BorderLayout.NORTH);
+            this.centerPane = bPane;
+            this.add(bPane, BorderLayout.CENTER);
+            this.nameTextField.getDocument().addDocumentListener(new javax.swing.event.DocumentListener() {
+
+                @Override
+                public void insertUpdate(DocumentEvent e) {
+                    doTextChanged();
+                }
+
+                @Override
+                public void removeUpdate(DocumentEvent e) {
+                    doTextChanged();
+                }
+
+                @Override
+                public void changedUpdate(DocumentEvent e) {
+                    doTextChanged();
+                }
+
+            });
+        }
+
+        private void doTextChanged() {
+            if (changeListener != null) {
+                changeListener.propertyChange();
+            }
+        }
+
+        public String getObjectName() {
+            return this.nameTextField.getText().trim();
+        }
+
+        public void setObjectName(String name) {
+            this.nameTextField.setText(name);
+        }
+
+        public void setShowText(String name) {
+            this.showfield.setText(name);
+        }
+
+        @Override
+        protected String title4PopupWindow() {
+            return centerPane.title4PopupWindow();
+        }
+
+        /**
+         * 检查是否符合规范
+         *
+         * @throws Exception 异常
+         */
+        public void checkValid() throws Exception {
+            super.checkValid();
+
+            this.centerPane.checkValid();
+        }
+
+        /**
+         * 添加属性改变的监听器
+         *
+         * @param listener 监听器
+         */
+        public void addPropertyChangeListener(PropertyChangeAdapter listener) {
+            this.changeListener = listener;
+        }
+    }
+
+    private class DIALOG extends BasicDialog {
+        public DIALOG(Frame parent) {
+            super(parent, BasicPane.this);
+            this.setTitle(BasicPane.this.title4PopupWindow());
+        }
+
+        public DIALOG(Dialog parent) {
+            super(parent, BasicPane.this);
+            this.setTitle(BasicPane.this.title4PopupWindow());
+        }
+
+
+        public DIALOG(Frame parent, boolean isNeedButtonPane) {
+            super(parent, BasicPane.this, isNeedButtonPane);
+            this.setTitle(BasicPane.this.title4PopupWindow());
+        }
+
+
+        public DIALOG(Dialog parent, boolean isNeedButtonPane) {
+            super(parent, BasicPane.this, isNeedButtonPane);
+            this.setTitle(BasicPane.this.title4PopupWindow());
+        }
+
+
+        /**
+         * init Components
+         */
+
+
+        /**
+         * Check valid.
+         */
+        public void checkValid() throws Exception {
+            BasicPane.this.checkValid();
+        }
+
+    }
 
-		public UnsizedDialog(Dialog parent) {
-			super(parent, BasicPane.this);
-			this.setTitle(BasicPane.this.title4PopupWindow());
-		}
+    private class UnsizedDialog extends UIDialog {
+
+        public UnsizedDialog(Frame parent) {
+            super(parent, BasicPane.this);
+            this.setTitle(BasicPane.this.title4PopupWindow());
+        }
+
+        public UnsizedDialog(Dialog parent) {
+            super(parent, BasicPane.this);
+            this.setTitle(BasicPane.this.title4PopupWindow());
+        }
 
 
-		public void checkValid() throws Exception {
-			BasicPane.this.checkValid();
-		}
+        public void checkValid() throws Exception {
+            BasicPane.this.checkValid();
+        }
 
-	}
+    }
 
 
 }
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/extra/PluginManagerPane.java b/designer_base/src/com/fr/design/extra/PluginManagerPane.java
index d579266ef..3a63c685b 100644
--- a/designer_base/src/com/fr/design/extra/PluginManagerPane.java
+++ b/designer_base/src/com/fr/design/extra/PluginManagerPane.java
@@ -2,23 +2,9 @@ package com.fr.design.extra;
 
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.UITabbedPane;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
-import com.fr.stable.StableUtils;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.concurrent.Worker;
-import javafx.scene.web.WebEngine;
 
-import javax.script.Bindings;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.swing.*;
 import java.awt.*;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.URL;
 
 /**
@@ -37,15 +23,14 @@ public class PluginManagerPane extends BasicPane {
 
     public PluginManagerPane() {
         setLayout(new BorderLayout());
-//        if (StableUtils.isDebug()) {
-//            URL url = ClassLoader.getSystemResource("");
-//            String installHome = url.getPath();
-//            PluginWebPane webPane = new PluginWebPane(installHome);
-//            add(webPane, BorderLayout.CENTER);
-//        } else {
-//
-//        }
-        initTraditionalStore();
+        if (System.getProperty("java.version").startsWith("1.8")) {
+            URL url = ClassLoader.getSystemResource("");
+            String installHome = url.getPath();
+            PluginWebPane webPane = new PluginWebPane(installHome);
+            add(webPane, BorderLayout.CENTER);
+        } else {
+            initTraditionalStore();
+        }
     }
 
     private void initTraditionalStore() {
diff --git a/designer_base/src/com/fr/design/extra/PluginShopDialog.java b/designer_base/src/com/fr/design/extra/PluginShopDialog.java
new file mode 100644
index 000000000..5d04401b2
--- /dev/null
+++ b/designer_base/src/com/fr/design/extra/PluginShopDialog.java
@@ -0,0 +1,25 @@
+package com.fr.design.extra;
+
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.UIDialog;
+import com.fr.design.utils.gui.GUICoreUtils;
+
+import java.awt.*;
+
+/**
+ * Created by vito on 16/4/18.
+ */
+public class PluginShopDialog extends UIDialog {
+    private static final Dimension DEFAULT_SHOP = new Dimension(900, 710);
+
+    public PluginShopDialog(Frame frame, BasicPane pane) {
+        super(frame, pane, false);
+        setSize(DEFAULT_SHOP);
+        GUICoreUtils.centerWindow(this);
+        setResizable(false);
+    }
+
+    @Override
+    public void checkValid() throws Exception {
+    }
+}
diff --git a/designer_base/src/com/fr/design/extra/PluginStatusCheckCompletePane.java b/designer_base/src/com/fr/design/extra/PluginStatusCheckCompletePane.java
index cf772d5d6..46f55d40b 100644
--- a/designer_base/src/com/fr/design/extra/PluginStatusCheckCompletePane.java
+++ b/designer_base/src/com/fr/design/extra/PluginStatusCheckCompletePane.java
@@ -67,8 +67,8 @@ public abstract class PluginStatusCheckCompletePane extends PluginAbstractViewPa
 
     public void setProgress(double percent) {
         progressBar.setVisible(true);
-        progressBar.setValue((int)percent);
-        progressBar.setString((int)percent + "%");
+        progressBar.setValue((int) percent);
+        progressBar.setString((int) percent + "%");
         progressBar.repaint();
     }
 
diff --git a/designer_base/src/com/fr/design/extra/PluginTask.java b/designer_base/src/com/fr/design/extra/PluginTask.java
index e67f4e426..5efcdd1d4 100644
--- a/designer_base/src/com/fr/design/extra/PluginTask.java
+++ b/designer_base/src/com/fr/design/extra/PluginTask.java
@@ -2,6 +2,7 @@ package com.fr.design.extra;
 
 import com.fr.design.extra.exe.Executor;
 import com.fr.design.extra.exe.Command;
+import com.fr.stable.StringUtils;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Task;
@@ -10,6 +11,7 @@ import netscape.javascript.JSObject;
 
 /**
  * 插件安装,卸载,更新等任务
+ *
  * @param <T>
  */
 public class PluginTask<T> extends Task<T> {
@@ -25,7 +27,7 @@ public class PluginTask<T> extends Task<T> {
         messageProperty().addListener(new ChangeListener<String>() {
             @Override
             public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
-                String fun = "(" + callback + ")('" + newValue + "')";
+                String fun = "(" + callback + ")(\"" + newValue + "\")";
                 try {
                     webEngine.executeScript(fun);
                 } catch (Exception e) {
@@ -40,14 +42,35 @@ public class PluginTask<T> extends Task<T> {
         Command[] commands = executor.getCommands();
         for (Command command : commands) {
             String message = command.getExecuteMessage();
-            updateMessage(message);
-            command.run();
+            if (StringUtils.isNotBlank(message)) {
+                updateMessage(message);
+            }
+            command.run(new Process<String>() {
+                @Override
+                public void process(String s) {
+                    if (StringUtils.isNotBlank(s)) {
+                        updateMessage(changText(s));
+                    }
+                }
+            });
         }
         return null;
     }
 
     @Override
     protected void done() {
-        updateMessage(executor.getTaskFinishMessage());
+        updateMessage(changText(executor.getTaskFinishMessage()));
+    }
+
+    /**
+     * 转换掉一些会造成错误的特殊字符
+     * 1 ""中的""必须转义
+     * 2 js字符串中的\n会导致js字符串变成多行,而js字符创不支持多行拼接
+     *
+     * @param old 原始字符串
+     * @return 处理之后的字符串
+     */
+    private String changText(String old) {
+        return old.replaceAll("\"", "\\\\\"").replaceAll("\n", "");
     }
 }
diff --git a/designer_base/src/com/fr/design/extra/PluginUpdatePane.java b/designer_base/src/com/fr/design/extra/PluginUpdatePane.java
index 33d976372..e0b3ada35 100644
--- a/designer_base/src/com/fr/design/extra/PluginUpdatePane.java
+++ b/designer_base/src/com/fr/design/extra/PluginUpdatePane.java
@@ -25,7 +25,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<Plugin[], Vo
     private PluginControlPane controlPane;
     private JLabel errorMsgLabel;
     private UITabbedPane tabbedPane;
-    
+
     private static final int PERSENT = 100;
 
     public PluginUpdatePane(UITabbedPane tabbedPane) {
@@ -35,6 +35,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<Plugin[], Vo
 
     /**
      * 更新pane
+     *
      * @return 同上
      */
     public JPanel createSuccessPane() {
@@ -56,7 +57,6 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<Plugin[], Vo
             }
 
 
-
             @Override
             public String textForInstallFromDiskButton() {
                 return Inter.getLocText("FR-Designer_Plugin_Normal_Update_From_Local");
@@ -79,6 +79,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<Plugin[], Vo
 
     /**
      * 出错pane
+     *
      * @return 同上
      */
     @Override
@@ -104,7 +105,6 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<Plugin[], Vo
             }
 
 
-
             @Override
             public String textForInstallFromDiskButton() {
                 return Inter.getLocText("FR-Designer_Plugin_Normal_Update_From_Local");
@@ -119,6 +119,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<Plugin[], Vo
 
     /**
      * 加载插件
+     *
      * @return 所有插件
      */
     public Plugin[] loadData() throws Exception {
@@ -127,7 +128,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<Plugin[], Vo
 
     /**
      * 加载成功处理
-     * 
+     *
      * @param plugins 插件
      */
     public void loadOnSuccess(Plugin[] plugins) {
@@ -137,7 +138,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<Plugin[], Vo
 
     /**
      * 加载失败处理
-     * 
+     *
      * @param e 异常
      */
     public void loadOnFailed(Exception e) {
@@ -146,6 +147,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<Plugin[], Vo
 
     /**
      * 略
+     *
      * @return 略
      */
     @Override
@@ -165,11 +167,11 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<Plugin[], Vo
     }
 
     private void doUpdateOnline(final PluginStatusCheckCompletePane pane) {
-        if (StringUtils.isEmpty(DesignerEnvManager.getEnvManager().getBBSName())){
+        if (StringUtils.isEmpty(DesignerEnvManager.getEnvManager().getBBSName())) {
             LoginCheckContext.fireLoginCheckListener();
         }
-        if (StringUtils.isNotEmpty(DesignerEnvManager.getEnvManager().getBBSName())){
-            new SwingWorker<Void, Double>(){
+        if (StringUtils.isNotEmpty(DesignerEnvManager.getEnvManager().getBBSName())) {
+            new SwingWorker<Void, Double>() {
 
                 @Override
                 protected Void doInBackground() throws Exception {
@@ -181,7 +183,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<Plugin[], Vo
                     String username = DesignerEnvManager.getEnvManager().getBBSName();
                     String password = DesignerEnvManager.getEnvManager().getBBSPassword();
                     try {
-                        PluginHelper.downloadPluginFile(id,username,password, new Process<Double>() {
+                        PluginHelper.downloadPluginFile(id, username, password, new Process<Double>() {
                             @Override
                             public void process(Double integer) {
                                 publish(integer);
@@ -264,12 +266,14 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<Plugin[], Vo
 
     /**
      * 从磁盘安装按钮的提示
+     *
      * @return 按钮标题字符串
      */
     @Override
     public String textForInstallFromDiskFileButton() {
         return Inter.getLocText("FR-Designer_Plugin_Normal_Update_From_Local");
     }
+
     @Override
     protected String title4PopupWindow() {
         return "Update";
diff --git a/designer_base/src/com/fr/design/extra/PluginWebBridge.java b/designer_base/src/com/fr/design/extra/PluginWebBridge.java
index b4eb6e9e1..90fcd2af0 100644
--- a/designer_base/src/com/fr/design/extra/PluginWebBridge.java
+++ b/designer_base/src/com/fr/design/extra/PluginWebBridge.java
@@ -1,8 +1,11 @@
 package com.fr.design.extra;
 
+import com.fr.base.FRContext;
+import com.fr.design.RestartHelper;
+import com.fr.design.dialog.UIDialog;
 import com.fr.design.extra.exe.*;
-import com.fr.json.JSONArray;
-import com.fr.json.JSONObject;
+import com.fr.general.FRLogger;
+import com.fr.general.Inter;
 import com.fr.plugin.Plugin;
 import com.fr.plugin.PluginLoader;
 import com.fr.stable.ArrayUtils;
@@ -13,7 +16,11 @@ import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import netscape.javascript.JSObject;
 
+import javax.swing.*;
+import java.awt.*;
 import java.io.File;
+import java.io.IOException;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,24 +31,41 @@ public class PluginWebBridge {
 
     private static PluginWebBridge helper;
 
-    public static PluginWebBridge getHelper(WebEngine webEngine) {
+    private UIDialog uiDialog;
+
+    public static final String PLUGIN_SHOP = "http://192.168.101.20/ShopServer?pg=plist";
+
+    public static PluginWebBridge getHelper() {
         if (helper != null) {
             return helper;
         }
         synchronized (PluginWebBridge.class) {
             if (helper == null) {
-                helper = new PluginWebBridge(webEngine);
+                helper = new PluginWebBridge();
             }
             return helper;
         }
     }
 
+    public static PluginWebBridge getHelper(WebEngine webEngine) {
+        getHelper();
+        helper.setEngine(webEngine);
+        return helper;
+    }
+
     private WebEngine webEngine;
 
-    private PluginWebBridge(WebEngine webEngine) {
+    private PluginWebBridge() {
+    }
+
+    public void setEngine(WebEngine webEngine) {
         this.webEngine = webEngine;
     }
 
+    public void setDialogHandle(UIDialog uiDialog) {
+        this.uiDialog = uiDialog;
+    }
+
     /**
      * 从插件服务器上安装插件
      *
@@ -76,10 +100,10 @@ public class PluginWebBridge {
     /**
      * 从插件服务器上更新选中的插件
      *
-     * @param pluginID 插件的ID
+     * @param pluginIDs 插件集合
      */
-    public void updatePluginOnline(String pluginID, final JSObject callback) {
-        Task<Void> task = new PluginTask<>(webEngine, callback, new UpdateOnlineExecutor(pluginID));
+    public void updatePluginOnline(JSObject pluginIDs, final JSObject callback) {
+        Task<Void> task = new PluginTask<>(webEngine, callback, new UpdateOnlineExecutor(jsObjectToStringArray(pluginIDs)));
         new Thread(task).start();
     }
 
@@ -97,10 +121,17 @@ public class PluginWebBridge {
      * 修改选中的插件的活跃状态
      *
      * @param pluginID 插件ID
-     * @param active   如果要把插件修改为激活状态,则为true,否则为false
      */
-    public void setPluginActive(String pluginID, boolean active, final JSObject callback) {
-        Task<Void> task = new PluginTask<>(webEngine, callback, new ModifyStatusExecutor(pluginID, active));
+    public void setPluginActive(String pluginID, final JSObject callback) {
+        Task<Void> task = new PluginTask<>(webEngine, callback, new ModifyStatusExecutor(pluginID));
+        new Thread(task).start();
+    }
+
+    /**
+     * 已安装插件检查更新
+     */
+    public void readUpdateOnline(final JSObject callback) {
+        Task<Void> task = new PluginTask<>(webEngine, callback, new ReadUpdateOnlineExecutor());
         new Thread(task).start();
     }
 
@@ -157,6 +188,7 @@ public class PluginWebBridge {
 
     /**
      * 获取已经安装的插件的数组
+     *
      * @return 已安装的插件组成的数组
      */
     public Plugin[] getInstalledPlugins() {
@@ -174,4 +206,144 @@ public class PluginWebBridge {
         }
         return list.toArray(new String[len]);
     }
+
+    /**
+     * 搜索在线插件
+     *
+     * @param keyword 关键字
+     */
+    public void searchPlugin(String keyword, final JSObject callback) {
+        Task<Void> task = new PluginTask<>(webEngine, callback, new SearchOnlineExecutor(keyword));
+        new Thread(task).start();
+    }
+
+    /**
+     * 根据条件获取在线插件的
+     *
+     * @param category 分类
+     * @param seller   卖家性质
+     * @param fee      收费类型
+     * @param callback 回调函数
+     */
+    public void getPluginFromStore(String category, String seller, String fee, final JSObject callback) {
+        Task<Void> task = new PluginTask<>(webEngine, callback, new GetPluginFromStoreExecutor(category, seller, fee));
+        new Thread(task).start();
+    }
+
+    /**
+     * 展示一个重启的对话框(少用,莫名其妙会有bug)
+     *
+     * @param message 展示的消息
+     */
+    public void showRestartMessage(String message) {
+        int rv = JOptionPane.showOptionDialog(
+                null,
+                message,
+                Inter.getLocText("FR-Designer-Plugin_Warning"),
+                JOptionPane.YES_NO_OPTION,
+                JOptionPane.INFORMATION_MESSAGE,
+                null,
+                new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")},
+                null
+        );
+        if (rv == JOptionPane.OK_OPTION) {
+            RestartHelper.restart();
+        }
+    }
+
+    /**
+     * 关闭窗口
+     */
+    public void closeWindow() {
+        if (uiDialog != null) {
+            uiDialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+            uiDialog.setVisible(false);
+        }
+    }
+
+    /**
+     * 在本地浏览器里打开url
+     *
+     * @param eng web引擎
+     * @param url 要打开的地址
+     */
+    public void openUrlAtLocalWebBrowser(WebEngine eng, String url) {
+        if (Desktop.isDesktopSupported()) {
+            try {
+                //创建一个URI实例,注意不是URL
+                URI uri = URI.create(url);
+                //获取当前系统桌面扩展
+                Desktop desktop = Desktop.getDesktop();
+                //判断系统桌面是否支持要执行的功能
+                if (desktop.isSupported(Desktop.Action.BROWSE)) {
+                    //获取系统默认浏览器打开链接
+                    desktop.browse(uri);
+                }
+            } catch (NullPointerException e) {
+                //此为uri为空时抛出异常
+                FRLogger.getLogger().error(e.getMessage());
+            } catch (IOException e) {
+                //此为无法获取系统默认浏览器
+                FRLogger.getLogger().error(e.getMessage());
+            }
+        }
+    }
+
+    public void openUrlAtLocalWebBrowser(String url) {
+        openUrlAtLocalWebBrowser(webEngine, url);
+    }
+
+    /**
+     * 从硬盘升级
+     *
+     * @param fileOnDisk 硬盘上的文件
+     */
+    public void updateFileFromDisk(File fileOnDisk) {
+        try {
+            Plugin plugin = PluginHelper.readPlugin(fileOnDisk);
+            if (plugin == null) {
+                JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Illegal_Plugin_Zip"), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                return;
+            }
+            Plugin oldPlugin = PluginLoader.getLoader().getPluginById(plugin.getId());
+            if (oldPlugin != null) {
+                // 说明安装了同ID的插件，再比较两个插件的版本
+                if (PluginHelper.isNewThan(plugin, oldPlugin)) {
+                    // 说明是新的插件，删除老的然后安装新的
+                    final String[] files = PluginHelper.uninstallPlugin(FRContext.getCurrentEnv(), oldPlugin);
+                    PluginHelper.installPluginFromUnzippedTempDir(FRContext.getCurrentEnv(), plugin, new After() {
+                        @Override
+                        public void done() {
+                            int rv = JOptionPane.showOptionDialog(
+                                    null,
+                                    Inter.getLocText("FR-Designer-Plugin_Update_Successful"),
+                                    Inter.getLocText("FR-Designer-Plugin_Warning"),
+                                    JOptionPane.YES_NO_OPTION,
+                                    JOptionPane.INFORMATION_MESSAGE,
+                                    null,
+                                    new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"),
+                                            Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")
+                                    },
+                                    null
+                            );
+
+                            if (rv == JOptionPane.OK_OPTION) {
+                                RestartHelper.restart();
+                            }
+                            // 如果不是立即重启，就把要删除的文件存放起来
+                            if (rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
+                                RestartHelper.saveFilesWhichToDelete(files);
+                            }
+                        }
+                    });
+                } else {
+                    JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Version_Is_Lower_Than_Current"), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                }
+            } else {
+                JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Cannot_Update_Not_Install"), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            }
+        } catch (Exception e1) {
+            JOptionPane.showMessageDialog(null, e1.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+        }
+    }
 }
diff --git a/designer_base/src/com/fr/design/extra/PluginWebPane.java b/designer_base/src/com/fr/design/extra/PluginWebPane.java
index 8b899220f..4278dd77c 100644
--- a/designer_base/src/com/fr/design/extra/PluginWebPane.java
+++ b/designer_base/src/com/fr/design/extra/PluginWebPane.java
@@ -1,10 +1,13 @@
 package com.fr.design.extra;
 
+import com.fr.general.FRLogger;
 import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.embed.swing.JFXPanel;
 import javafx.event.EventHandler;
-import javafx.scene.Group;
 import javafx.scene.Scene;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebEvent;
 import javafx.scene.web.WebView;
@@ -24,7 +27,7 @@ public class PluginWebPane extends JFXPanel {
         Platform.runLater(new Runnable() {
             @Override
             public void run() {
-                Group root = new Group();
+                BorderPane root = new BorderPane();
                 Scene scene = new Scene(root);
                 PluginWebPane.this.setScene(scene);
                 WebView webView = new WebView();
@@ -36,13 +39,33 @@ public class PluginWebPane extends JFXPanel {
                         showAlert(event.getData());
                     }
                 });
+                webEngine.locationProperty().addListener(new ChangeListener<String>() {
+                    @Override
+                    public void changed(ObservableValue<? extends String> observable, final String oldValue, String newValue) {
+                        disableLink(webEngine);
+                        PluginWebBridge.getHelper().openUrlAtLocalWebBrowser(webEngine, newValue);
+                    }
+                });
                 JSObject obj = (JSObject) webEngine.executeScript("window");
                 obj.setMember("PluginHelper", PluginWebBridge.getHelper(webEngine));
-                root.getChildren().add(webView);
+                root.setCenter(webView);
             }
         });
     }
 
+    private void disableLink(final WebEngine webEngine) {
+        try {
+            Platform.runLater(new Runnable() {
+                @Override
+                public void run() {
+                    webEngine.executeScript("history.go(0)");
+                }
+            });
+        } catch (Exception e) {
+            FRLogger.getLogger().error(e.getMessage());
+        }
+    }
+
     private void showAlert(final String message) {
         SwingUtilities.invokeLater(new Runnable() {
             @Override
@@ -50,9 +73,5 @@ public class PluginWebPane extends JFXPanel {
                 JOptionPane.showMessageDialog(PluginWebPane.this, message);
             }
         });
-//        Dialog<Void> alert = new Dialog<>();
-//        alert.getDialogPane().setContentText(message);
-//        alert.getDialogPane().getButtonTypes().add(ButtonType.OK);
-//        alert.showAndWait();
     }
 }
diff --git a/designer_base/src/com/fr/design/extra/exe/Command.java b/designer_base/src/com/fr/design/extra/exe/Command.java
index 5b117586e..c16b0c288 100644
--- a/designer_base/src/com/fr/design/extra/exe/Command.java
+++ b/designer_base/src/com/fr/design/extra/exe/Command.java
@@ -1,5 +1,7 @@
 package com.fr.design.extra.exe;
 
+import com.fr.design.extra.Process;
+
 /**
  * Created by richie on 16/3/19.
  */
@@ -7,5 +9,5 @@ public interface Command {
 
     String getExecuteMessage();
 
-    void run();
+    void run(Process<String> process);
 }
diff --git a/designer_base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java b/designer_base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java
new file mode 100644
index 000000000..030b22f21
--- /dev/null
+++ b/designer_base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java
@@ -0,0 +1,61 @@
+package com.fr.design.extra.exe;
+
+import com.fr.design.extra.PluginWebBridge;
+import com.fr.design.extra.Process;
+import com.fr.general.FRLogger;
+import com.fr.general.http.HttpClient;
+import com.fr.stable.StringUtils;
+
+/**
+ * Created by vito on 16/4/18.
+ * 获取插件分类信息
+ */
+public class GetPluginFromStoreExecutor implements Executor {
+    private String result = "[]";
+    private String category;
+    private String seller;
+    private String fee;
+
+    public GetPluginFromStoreExecutor(String category, String seller, String fee) {
+        this.category = category;
+        this.seller = seller;
+        this.fee = fee;
+    }
+
+    @Override
+    public String getTaskFinishMessage() {
+        return result;
+    }
+
+    @Override
+    public Command[] getCommands() {
+        return new Command[]{
+                new Command() {
+                    @Override
+                    public String getExecuteMessage() {
+                        return StringUtils.EMPTY;
+                    }
+
+                    @Override
+                    public void run(Process<String> process) {
+                        StringBuilder url = new StringBuilder(PluginWebBridge.PLUGIN_SHOP);
+                        if (StringUtils.isNotBlank(category)) {
+                            url.append("&cid=").append(category.split("-")[1]);
+                        }
+                        if (StringUtils.isNotBlank(seller)) {
+                            url.append("&seller=").append(seller.split("-")[1]);
+                        }
+                        if (StringUtils.isNotBlank(fee)) {
+                            url.append("&fee=").append(fee.split("-")[1]);
+                        }
+                        try {
+                            HttpClient httpClient = new HttpClient(url.toString());
+                            result = httpClient.getResponseText();
+                        } catch (Exception e) {
+                            FRLogger.getLogger().error(e.getMessage());
+                        }
+                    }
+                }
+        };
+    }
+}
diff --git a/designer_base/src/com/fr/design/extra/exe/InstallFromDiskExecutor.java b/designer_base/src/com/fr/design/extra/exe/InstallFromDiskExecutor.java
index 098a91c02..da5222f96 100644
--- a/designer_base/src/com/fr/design/extra/exe/InstallFromDiskExecutor.java
+++ b/designer_base/src/com/fr/design/extra/exe/InstallFromDiskExecutor.java
@@ -1,5 +1,16 @@
 package com.fr.design.extra.exe;
 
+import com.fr.design.extra.After;
+import com.fr.design.extra.PluginHelper;
+import com.fr.design.extra.PluginWebBridge;
+import com.fr.design.extra.Process;
+import com.fr.general.FRLogger;
+import com.fr.general.Inter;
+import com.fr.plugin.PluginVerifyException;
+
+import javax.swing.*;
+import java.io.File;
+
 /**
  * Created by richie on 16/3/19.
  */
@@ -26,12 +37,8 @@ public class InstallFromDiskExecutor implements Executor {
                     }
 
                     @Override
-                    public void run() {
-                        try {
-                            Thread.sleep(2000);
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
-                        }
+                    public void run(Process<java.lang.String> process) {
+
                     }
                 },
                 new Command() {
@@ -41,11 +48,19 @@ public class InstallFromDiskExecutor implements Executor {
                     }
 
                     @Override
-                    public void run() {
+                    public void run(Process<String> process) {
                         try {
-                            Thread.sleep(2000);
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
+                            PluginHelper.installPluginFromDisk(new File(filePath), new After() {
+                                @Override
+                                public void done() {
+                                    FRLogger.getLogger().info("插件安装成功");
+                                    PluginWebBridge.getHelper().showRestartMessage(Inter.getLocText("FR-Designer-Plugin_Install_Successful"));
+                                }
+                            });
+                        } catch (PluginVerifyException e) {
+                            JOptionPane.showMessageDialog(null, e.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                        } catch (Exception e) {
+                            FRLogger.getLogger().error(e.getMessage());
                         }
                     }
                 }
diff --git a/designer_base/src/com/fr/design/extra/exe/InstallOnlineExecutor.java b/designer_base/src/com/fr/design/extra/exe/InstallOnlineExecutor.java
index 7baf378fd..d343ec590 100644
--- a/designer_base/src/com/fr/design/extra/exe/InstallOnlineExecutor.java
+++ b/designer_base/src/com/fr/design/extra/exe/InstallOnlineExecutor.java
@@ -1,5 +1,16 @@
 package com.fr.design.extra.exe;
 
+import com.fr.base.FRContext;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.RestartHelper;
+import com.fr.design.extra.After;
+import com.fr.design.extra.PluginHelper;
+import com.fr.design.extra.Process;
+import com.fr.general.Inter;
+import com.fr.plugin.PluginVerifyException;
+
+import javax.swing.*;
+
 /**
  * Created by richie on 16/3/19.
  */
@@ -13,7 +24,7 @@ public class InstallOnlineExecutor implements Executor {
 
     @Override
     public String getTaskFinishMessage() {
-        return "已成功安裝";
+        return "task succeed";
     }
 
     @Override
@@ -26,11 +37,18 @@ public class InstallOnlineExecutor implements Executor {
                     }
 
                     @Override
-                    public void run() {
+                    public void run(final Process<String> process) {
+                        String username = DesignerEnvManager.getEnvManager().getBBSName();
+                        String password = DesignerEnvManager.getEnvManager().getBBSPassword();
                         try {
-                            Thread.sleep(3000);
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
+                            PluginHelper.downloadPluginFile(pluginID, username, password, new Process<Double>() {
+                                @Override
+                                public void process(Double integer) {
+                                    process.process(Math.round(integer * 100) + "%");
+                                }
+                            });
+                        } catch (Exception e) {
+                            FRContext.getLogger().error(e.getMessage(), e);
                         }
                     }
                 },
@@ -41,11 +59,32 @@ public class InstallOnlineExecutor implements Executor {
                     }
 
                     @Override
-                    public void run() {
+                    public void run(Process<String> process) {
                         try {
-                            Thread.sleep(3000);
+                            PluginHelper.installPluginFromDisk(PluginHelper.getDownloadTempFile(), new After() {
+                                @Override
+                                public void done() {
+                                    int rv = JOptionPane.showOptionDialog(
+                                            null,
+                                            Inter.getLocText("FR-Designer-Plugin_Install_Successful"),
+                                            Inter.getLocText("FR-Designer-Plugin_Warning"),
+                                            JOptionPane.YES_NO_OPTION,
+                                            JOptionPane.INFORMATION_MESSAGE,
+                                            null,
+                                            new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")},
+                                            null
+                                    );
+                                    if (rv == JOptionPane.OK_OPTION) {
+                                        RestartHelper.restart();
+                                    }
+                                }
+                            });
+                        } catch (PluginVerifyException e) {
+                            JOptionPane.showMessageDialog(null, e.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                         } catch (InterruptedException e) {
                             e.printStackTrace();
+                        } catch (Exception e) {
+                            e.printStackTrace();
                         }
                     }
                 }
diff --git a/designer_base/src/com/fr/design/extra/exe/ModifyStatusExecutor.java b/designer_base/src/com/fr/design/extra/exe/ModifyStatusExecutor.java
index ff5d82bd5..c544858dd 100644
--- a/designer_base/src/com/fr/design/extra/exe/ModifyStatusExecutor.java
+++ b/designer_base/src/com/fr/design/extra/exe/ModifyStatusExecutor.java
@@ -1,5 +1,13 @@
 package com.fr.design.extra.exe;
 
+import com.fr.base.FRContext;
+import com.fr.design.extra.PluginWebBridge;
+import com.fr.design.extra.Process;
+import com.fr.general.Inter;
+import com.fr.plugin.Plugin;
+import com.fr.plugin.PluginLoader;
+import com.fr.stable.StringUtils;
+
 /**
  * Created by richie on 16/3/19.
  */
@@ -7,19 +15,39 @@ public class ModifyStatusExecutor implements Executor {
 
     private String pluginID;
     private boolean active;
+    private Plugin plugin;
 
-    public ModifyStatusExecutor(String pluginID, boolean active) {
+    public ModifyStatusExecutor(String pluginID) {
         this.pluginID = pluginID;
-        this.active = active;
     }
 
     @Override
     public String getTaskFinishMessage() {
-        return "插件" + pluginID + "已更改为可用状态:" + active;
+        return plugin.isActive() ? Inter.getLocText("FR-Designer-Plugin_Has_Been_Actived") : Inter.getLocText("FR-Designer-Plugin_Has_Been_Disabled");
     }
 
     @Override
     public Command[] getCommands() {
-        return new Command[0];
+        return new Command[]{
+                new Command() {
+                    @Override
+                    public String getExecuteMessage() {
+                        return StringUtils.EMPTY;
+                    }
+
+                    @Override
+                    public void run(Process<String> process) {
+                        plugin = PluginLoader.getLoader().getPluginById(pluginID);
+                        active = !plugin.isActive();
+                        plugin.setActive(active);
+                        try {
+                            FRContext.getCurrentEnv().writePlugin(plugin);
+                            PluginWebBridge.getHelper().showRestartMessage(plugin.isActive() ? Inter.getLocText("FR-Designer-Plugin_Has_Been_Actived") : Inter.getLocText("FR-Designer-Plugin_Has_Been_Disabled"));
+                        } catch (Exception e) {
+                            FRContext.getLogger().error(e.getMessage());
+                        }
+                    }
+                }
+        };
     }
 }
diff --git a/designer_base/src/com/fr/design/extra/exe/ReadUpdateOnlineExecutor.java b/designer_base/src/com/fr/design/extra/exe/ReadUpdateOnlineExecutor.java
new file mode 100644
index 000000000..8120049e1
--- /dev/null
+++ b/designer_base/src/com/fr/design/extra/exe/ReadUpdateOnlineExecutor.java
@@ -0,0 +1,50 @@
+package com.fr.design.extra.exe;
+
+import com.fr.design.extra.PluginsReaderFromStore;
+import com.fr.design.extra.Process;
+import com.fr.general.FRLogger;
+import com.fr.plugin.Plugin;
+import com.fr.stable.StringUtils;
+
+/**
+ * Created by vito on 16/4/19.
+ */
+public class ReadUpdateOnlineExecutor implements Executor {
+    private Plugin[] plugins;
+    private String result;
+
+    @Override
+    public String getTaskFinishMessage() {
+        return result;
+    }
+
+    @Override
+    public Command[] getCommands() {
+        return new Command[]{
+                new Command() {
+                    @Override
+                    public String getExecuteMessage() {
+                        return StringUtils.EMPTY;
+                    }
+
+                    @Override
+                    public void run(Process<String> process) {
+                        try {
+                            plugins = PluginsReaderFromStore.readPluginsForUpdate();
+                            StringBuilder sb = new StringBuilder();
+                            if (plugins != null) {
+                                sb.append("[");
+                                for (Plugin plugin : plugins) {
+                                    sb.append("{pluginid:'").append(plugin.getId()).append("'}");
+                                }
+                                sb.append("]");
+                            }
+                            result = sb.toString();
+                        } catch (Exception e) {
+                            FRLogger.getLogger().error(e.getMessage());
+                        }
+                    }
+                }
+        };
+    }
+}
diff --git a/designer_base/src/com/fr/design/extra/exe/SearchOnlineExecutor.java b/designer_base/src/com/fr/design/extra/exe/SearchOnlineExecutor.java
new file mode 100644
index 000000000..a94fcc5f2
--- /dev/null
+++ b/designer_base/src/com/fr/design/extra/exe/SearchOnlineExecutor.java
@@ -0,0 +1,47 @@
+package com.fr.design.extra.exe;
+
+import com.fr.design.extra.PluginWebBridge;
+import com.fr.design.extra.Process;
+import com.fr.general.FRLogger;
+import com.fr.general.http.HttpClient;
+import com.fr.stable.StringUtils;
+
+/**
+ * Created by vito on 16/4/18.
+ */
+public class SearchOnlineExecutor implements Executor {
+    private String result;
+    private String keyword;
+
+    public SearchOnlineExecutor(String keyword) {
+        this.keyword = keyword;
+    }
+
+    @Override
+    public String getTaskFinishMessage() {
+        return result;
+    }
+
+    @Override
+    public Command[] getCommands() {
+        return new Command[]{
+                new Command() {
+                    @Override
+                    public String getExecuteMessage() {
+                        return StringUtils.EMPTY;
+                    }
+
+                    @Override
+                    public void run(Process<String> process) {
+                        try {
+                            HttpClient httpClient = new HttpClient(PluginWebBridge.PLUGIN_SHOP + "&keyword=" + keyword);
+                            result = httpClient.getResponseText();
+
+                        } catch (Exception e) {
+                            FRLogger.getLogger().error(e.getMessage());
+                        }
+                    }
+                }
+        };
+    }
+}
diff --git a/designer_base/src/com/fr/design/extra/exe/UninstallExecutor.java b/designer_base/src/com/fr/design/extra/exe/UninstallExecutor.java
index 5138c1a58..3f0845a7a 100644
--- a/designer_base/src/com/fr/design/extra/exe/UninstallExecutor.java
+++ b/designer_base/src/com/fr/design/extra/exe/UninstallExecutor.java
@@ -1,5 +1,15 @@
 package com.fr.design.extra.exe;
 
+import com.fr.base.FRContext;
+import com.fr.design.RestartHelper;
+import com.fr.design.extra.PluginHelper;
+import com.fr.design.extra.Process;
+import com.fr.general.Inter;
+import com.fr.plugin.Plugin;
+import com.fr.plugin.PluginLoader;
+
+import javax.swing.*;
+
 /**
  * Created by richie on 16/3/19.
  */
@@ -18,6 +28,45 @@ public class UninstallExecutor implements Executor {
 
     @Override
     public Command[] getCommands() {
-        return new Command[0];
+        return new Command[]{
+                new Command() {
+                    @Override
+                    public String getExecuteMessage() {
+                        return "删除成功";
+                    }
+
+                    @Override
+                    public void run(Process<String> process) {
+                        int rv = JOptionPane.showOptionDialog(
+                                null,
+                                Inter.getLocText("FR-Designer-Plugin_Will_Be_Delete"),
+                                Inter.getLocText("FR-Designer-Plugin_Warning"),
+                                JOptionPane.YES_NO_CANCEL_OPTION,
+                                JOptionPane.INFORMATION_MESSAGE,
+                                null,
+                                new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"),
+                                        Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later"),
+                                        Inter.getLocText("FR-Designer-Basic_Cancel")
+                                },
+                                null
+                        );
+                        if (rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
+                            return;
+                        }
+                        for (String pluginID : pluginIDs) {
+                            try {
+                                Plugin plugin = PluginLoader.getLoader().getPluginById(pluginID);
+                                String[] filesToBeDelete = PluginHelper.uninstallPlugin(FRContext.getCurrentEnv(), plugin);
+                                RestartHelper.saveFilesWhichToDelete(filesToBeDelete);
+                            } catch (Exception e) {
+                                JOptionPane.showMessageDialog(null, e.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                            }
+                        }
+                        if (rv == JOptionPane.OK_OPTION) {
+                            RestartHelper.restart();
+                        }
+                    }
+                }
+        };
     }
 }
diff --git a/designer_base/src/com/fr/design/extra/exe/UpdateFromDiskExecutor.java b/designer_base/src/com/fr/design/extra/exe/UpdateFromDiskExecutor.java
index cfc0ab222..5c8c6e361 100644
--- a/designer_base/src/com/fr/design/extra/exe/UpdateFromDiskExecutor.java
+++ b/designer_base/src/com/fr/design/extra/exe/UpdateFromDiskExecutor.java
@@ -1,5 +1,10 @@
 package com.fr.design.extra.exe;
 
+import com.fr.design.extra.PluginWebBridge;
+import com.fr.design.extra.Process;
+
+import java.io.File;
+
 /**
  * Created by richie on 16/3/19.
  */
@@ -13,11 +18,23 @@ public class UpdateFromDiskExecutor implements Executor {
 
     @Override
     public String getTaskFinishMessage() {
-        return "插件已更新完毕";
+        return "插件更新操作结束";
     }
 
     @Override
     public Command[] getCommands() {
-        return new Command[0];
+        return new Command[]{
+                new Command() {
+                    @Override
+                    public String getExecuteMessage() {
+                        return null;
+                    }
+
+                    @Override
+                    public void run(Process<String> process) {
+                        PluginWebBridge.getHelper().updateFileFromDisk(new File(filePath));
+                    }
+                }
+        };
     }
 }
diff --git a/designer_base/src/com/fr/design/extra/exe/UpdateOnlineExecutor.java b/designer_base/src/com/fr/design/extra/exe/UpdateOnlineExecutor.java
index a5f49ea6e..f1c3b0f04 100644
--- a/designer_base/src/com/fr/design/extra/exe/UpdateOnlineExecutor.java
+++ b/designer_base/src/com/fr/design/extra/exe/UpdateOnlineExecutor.java
@@ -1,23 +1,106 @@
 package com.fr.design.extra.exe;
 
+import com.fr.base.FRContext;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.RestartHelper;
+import com.fr.design.extra.After;
+import com.fr.design.extra.PluginHelper;
+import com.fr.design.extra.Process;
+import com.fr.general.Inter;
+import com.fr.plugin.Plugin;
+import com.fr.plugin.PluginLoader;
+
+import javax.swing.*;
+import java.io.File;
+
 /**
  * Created by richie on 16/3/19.
  */
 public class UpdateOnlineExecutor implements Executor {
 
-    private String pluginID;
-
-    public UpdateOnlineExecutor(String pluginID) {
-        this.pluginID = pluginID;
+    private String[] pluginIDs;
+    private static final int PERCENT_100 = 100;
 
+    public UpdateOnlineExecutor(String[] pluginIDs) {
+        this.pluginIDs = pluginIDs;
     }
+
     @Override
     public String getTaskFinishMessage() {
-        return "插件已更新完毕:" + pluginID;
+        return "task succeed";
     }
 
     @Override
     public Command[] getCommands() {
-        return new Command[0];
+        return new Command[]{
+                new Command() {
+                    @Override
+                    public String getExecuteMessage() {
+                        return null;
+                    }
+
+                    @Override
+                    public void run(Process<String> process) {
+                        for (int i = 0; i < pluginIDs.length; i++) {
+                            Plugin plugin = PluginLoader.getLoader().getPluginById(pluginIDs[i]);
+                            String id = null;
+                            if (plugin != null) {
+                                id = plugin.getId();
+                            }
+                            String username = DesignerEnvManager.getEnvManager().getBBSName();
+                            String password = DesignerEnvManager.getEnvManager().getBBSPassword();
+                            try {
+                                PluginHelper.downloadPluginFile(id, username, password, new Process<Double>() {
+                                    @Override
+                                    public void process(Double integer) {
+                                    }
+                                });
+                                updateFileFromDisk(PluginHelper.getDownloadTempFile());
+                                process.process(PERCENT_100 / pluginIDs.length * (i + 1) + "%");
+                            } catch (Exception e) {
+                                FRContext.getLogger().error(e.getMessage(), e);
+                            }
+                        }
+                        int rv = JOptionPane.showOptionDialog(
+                                null,
+                                Inter.getLocText("FR-Designer-Plugin_Update_Successful"),
+                                Inter.getLocText("FR-Designer-Plugin_Warning"),
+                                JOptionPane.YES_NO_OPTION,
+                                JOptionPane.INFORMATION_MESSAGE,
+                                null,
+                                new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"),
+                                        Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")
+                                },
+                                null
+                        );
+                        if (rv == JOptionPane.OK_OPTION) {
+                            RestartHelper.restart();
+                        }
+                    }
+                }
+        };
+    }
+
+    private void updateFileFromDisk(File fileOnDisk) {
+        try {
+            Plugin plugin = PluginHelper.readPlugin(fileOnDisk);
+            if (plugin == null) {
+                JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Illegal_Plugin_Zip"), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                return;
+            }
+            Plugin oldPlugin = PluginLoader.getLoader().getPluginById(plugin.getId());
+            if (oldPlugin != null) {
+                String[] files = PluginHelper.uninstallPlugin(FRContext.getCurrentEnv(), oldPlugin);
+                PluginHelper.installPluginFromUnzippedTempDir(FRContext.getCurrentEnv(), plugin, new After() {
+                    @Override
+                    public void done() {
+                    }
+                });
+            } else {
+                JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Cannot_Update_Not_Install"), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            }
+        } catch (Exception e1) {
+            JOptionPane.showMessageDialog(null, e1.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+        }
     }
 }
diff --git a/designer_base/src/com/fr/design/fun/TableDataTreePaneProcessor.java b/designer_base/src/com/fr/design/fun/TableDataTreePaneProcessor.java
new file mode 100644
index 000000000..066038568
--- /dev/null
+++ b/designer_base/src/com/fr/design/fun/TableDataTreePaneProcessor.java
@@ -0,0 +1,22 @@
+package com.fr.design.fun;
+
+import com.fr.design.data.datapane.TableDataTreePane;
+import com.fr.stable.fun.Level;
+
+/**
+ * 自定义的模板（服务器）数据集的树样式接口  el:分组样式
+ * Coder: zack
+ * Date: 2016/4/18
+ * Time: 9:04
+ */
+public interface TableDataTreePaneProcessor extends Level {
+    String XML_TAG = "TableDataTreePaneProcessor";
+
+    int CURRENT_LEVEL = 1;
+    /**
+     * 创建数据集面板
+     * @return 数据集面板
+     */
+    TableDataTreePane createTableDataTreePane();
+
+}
diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractTDTreePaneProcessor.java b/designer_base/src/com/fr/design/fun/impl/AbstractTDTreePaneProcessor.java
new file mode 100644
index 000000000..635739a07
--- /dev/null
+++ b/designer_base/src/com/fr/design/fun/impl/AbstractTDTreePaneProcessor.java
@@ -0,0 +1,15 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.TableDataTreePaneProcessor;
+
+/**
+ * Coder: zack
+ * Date: 2016/4/18
+ * Time: 10:30
+ */
+public abstract class AbstractTDTreePaneProcessor implements TableDataTreePaneProcessor {
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+}
diff --git a/designer_base/src/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java b/designer_base/src/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java
index fdf6b56ad..963c5506b 100644
--- a/designer_base/src/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java
+++ b/designer_base/src/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java
@@ -9,6 +9,7 @@ import javax.swing.tree.*;
 import com.fr.general.NameObject;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.itooltip.UIToolTip;
+import com.fr.design.gui.itree.checkboxtree.CheckBoxTree;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.stable.StringUtils;
@@ -16,7 +17,7 @@ import com.fr.stable.StringUtils;
 import java.awt.*;
 import java.awt.event.MouseEvent;
 
-public abstract class RefreshableJTree extends JTree {
+public abstract class RefreshableJTree extends CheckBoxTree {
     private static final int WIDTH_BETWEEN_NODES = 20; //tree父子节点之间最左侧横向像素的差
     private Icon icon;
 
@@ -31,7 +32,9 @@ public abstract class RefreshableJTree extends JTree {
     public RefreshableJTree() {
         this(null);
     }
-
+    public boolean isCheckBoxVisible(TreePath path) {
+        return false;
+    }
     public RefreshableJTree(Object rootObj) {
         super(new DefaultTreeModel(new ExpandMutableTreeNode(rootObj)));
         DefaultTreeModel model = (DefaultTreeModel) getModel();
diff --git a/designer_base/src/com/fr/design/gui/itree/refreshabletree/UserObjectRefreshJTree.java b/designer_base/src/com/fr/design/gui/itree/refreshabletree/UserObjectRefreshJTree.java
index 9bef9e6fa..b463ca7eb 100644
--- a/designer_base/src/com/fr/design/gui/itree/refreshabletree/UserObjectRefreshJTree.java
+++ b/designer_base/src/com/fr/design/gui/itree/refreshabletree/UserObjectRefreshJTree.java
@@ -133,7 +133,7 @@ public abstract class UserObjectRefreshJTree<T extends UserObjectOP<?>> extends
 		super.setSelectionPath(treePath);
 	}
 
-	private MouseListener treeMouseListener = new MouseAdapter() {
+	protected MouseListener treeMouseListener = new MouseAdapter() {
 		public void mousePressed(MouseEvent e) {
 			if (SwingUtilities.isLeftMouseButton(e)) {
 				TreePath path = getPathForLocation(e.getX(), e.getY());
diff --git a/designer_base/src/com/fr/design/mainframe/WestRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/WestRegionContainerPane.java
index 36c2584d0..0ed5556c2 100644
--- a/designer_base/src/com/fr/design/mainframe/WestRegionContainerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/WestRegionContainerPane.java
@@ -1,11 +1,15 @@
 package com.fr.design.mainframe;
 
-import com.fr.design.data.datapane.TableDataTreePane;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.data.datapane.TableDataTreePane;
+import com.fr.design.fun.TableDataTreePaneProcessor;
 import com.fr.design.gui.icontainer.UIResizableContainer;
 import com.fr.stable.Constants;
 
+import javax.swing.*;
+
 public class WestRegionContainerPane extends UIResizableContainer {
 
     private static WestRegionContainerPane THIS;
@@ -16,15 +20,23 @@ public class WestRegionContainerPane extends UIResizableContainer {
      */
     public static final WestRegionContainerPane getInstance() {
         if (THIS == null) {
-            THIS = new WestRegionContainerPane();
+            TableDataTreePane tableDataTreePane = null;
+            TableDataTreePaneProcessor treePaneProcessor = ExtraDesignClassManager.getInstance().getTableDataTreePaneProcessor();
+            if (treePaneProcessor != null) {
+                tableDataTreePane = treePaneProcessor.createTableDataTreePane();
+            } else {
+                tableDataTreePane = TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
+            }
+            THIS = new WestRegionContainerPane(tableDataTreePane);
             THIS.setLastToolPaneY(DesignerEnvManager.getEnvManager().getLastWestRegionToolPaneY());
             THIS.setLastContainerWidth(DesignerEnvManager.getEnvManager().getLastWestRegionContainerWidth());
         }
         return THIS;
     }
 
-    public WestRegionContainerPane() {
-        super(DesignerFrameFileDealerPane.getInstance(), TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()), Constants.RIGHT);
+    public WestRegionContainerPane(JComponent pane) {
+        super(DesignerFrameFileDealerPane.getInstance(), pane, Constants.RIGHT);
         setContainerWidth(165);
     }
+
 }
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/roleAuthority/RoleTree.java b/designer_base/src/com/fr/design/roleAuthority/RoleTree.java
index de621a043..3ee627987 100644
--- a/designer_base/src/com/fr/design/roleAuthority/RoleTree.java
+++ b/designer_base/src/com/fr/design/roleAuthority/RoleTree.java
@@ -1 +1 @@
-package com.fr.design.roleAuthority;

import com.fr.general.NameObject;
import com.fr.design.constants.UIConstants;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
import com.fr.design.gui.itree.refreshabletree.UserObjectRefreshJTree;
import com.fr.design.mainframe.AuthorityPropertyPane;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.EastRegionContainerPane;
import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;

import javax.swing.*;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.*;
import java.awt.*;
import java.util.Enumeration;

/**
 * Author : daisy
 * Date: 13-8-30
 * Time: 下午3:32
 */
public class RoleTree extends UserObjectRefreshJTree<RoleSourceOP> {
    private static final long serialVersionUID = 2L;

    private String roleName = null;


    public RoleTree() {
        super();
        this.setCellRenderer(roleTreeRenderer);
        this.setEnabled(true);
        this.setEditable(true);
        this.setRowHeight(20);
        this.addTreeSelectionListener(new TreeSelectionListener() {
            public void valueChanged(TreeSelectionEvent e) {
                doWithValueChanged(e);
            }
        });
    }

    /**
     * 更新UI
     */
    public void updateUI() {
        super.updateUI();
        setUI(new UIRoleTreeUI());
    }

    protected void doWithValueChanged(TreeSelectionEvent e) {
        if (e.getNewLeadSelectionPath() != null) {
            if (e.getNewLeadSelectionPath().getLastPathComponent().toString() != Inter.getLocText("Role")) {
                roleName = e.getNewLeadSelectionPath().getLastPathComponent().toString();
                setTabRoleName(roleName);
                refreshRoleTree(roleName);
                refreshElementAndAuthorityPane();
                HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().judgeSheetAuthority(roleName);
            }
        }
    }

    protected void setTabRoleName(String roleName) {

    }


    /**
     * 刷新角色树
     *
     * @param selectedRole 角色
     */
    public void refreshRoleTree(String selectedRole) {
        if (EastRegionContainerPane.getInstance().getUpPane() instanceof AuthorityPropertyPane) {
            AuthorityPropertyPane authorityPropertyPane = (AuthorityPropertyPane) EastRegionContainerPane.getInstance().getUpPane();
            authorityPropertyPane.populate();
            EastRegionContainerPane.getInstance().replaceUpPane(authorityPropertyPane);
        }
    }

    public void setSelectedRole(String selectedRole, TreePath parent) {
        ExpandMutableTreeNode node = (ExpandMutableTreeNode) parent.getLastPathComponent();
        if (node.children() != null && node.getChildCount() >= 0) {
            for (Enumeration e = node.children(); e.hasMoreElements(); ) {
                ExpandMutableTreeNode n = (ExpandMutableTreeNode) e.nextElement();
                Object userObj = n.getUserObject();
                String chilld = null;
                if (userObj instanceof String) {
                    chilld = (String) userObj;
                } else if (userObj instanceof NameObject) {
                    NameObject nameObject = (NameObject) userObj;
                    chilld = nameObject.getName();
                }
                if (ComparatorUtils.equals(chilld, selectedRole)) {
                    this.setSelectionPath(parent.pathByAddingChild(n));
                    return;
                } else {
                    setSelectedRole(selectedRole, parent.pathByAddingChild(n));
                }
            }
        }
    }


    private void refreshElementAndAuthorityPane() {
        JComponent authorityToolBar = DesignerContext.getDesignerFrame().getToolbarComponent();
        if (authorityToolBar instanceof BasicBeanPane) {
            //说明是工具栏的
            ((BasicBeanPane) authorityToolBar).populateAuthority();
        }
        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().repaint();
    }

    public String getSelectedRoleName() {
        return roleName;
    }

    public void setSelectedRoleName(String name) {
        roleName = name;
    }


    private DefaultTreeCellRenderer roleTreeRenderer = new DefaultTreeCellRenderer() {
        private static final long serialVersionUID = 2L;


        public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
            super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
            ExpandMutableTreeNode treeNode = (ExpandMutableTreeNode) value;
            Object userObj = treeNode.getUserObject();
            if (userObj instanceof String) {
                // p:这个是column field.
                this.setIcon(null);
                this.setText((String) userObj);
            } else if (userObj instanceof NameObject) {
                NameObject nameObject = (NameObject) userObj;
                this.setText(nameObject.getName());
                this.setIcon(null);
            }


            // 这里新建一个Label作为render是因为JTree在动态刷新的时候，节点上render画布的的宽度不会变，会使得一部分比较长的数据显示为"..."
            this.setBackgroundNonSelectionColor(UIConstants.NORMAL_BACKGROUND);
            this.setForeground(UIConstants.FONT_COLOR);
            this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);
            return this;
        }
    };


    /*
 * p:获得选中的NameObject = name + role.
 */
    public NameObject getSelectedNameObject() {
        TreePath selectedTreePath = this.getSelectionPath();
        if (selectedTreePath == null) {
            return null;
        }
        ExpandMutableTreeNode selectedTreeNode = (ExpandMutableTreeNode) selectedTreePath.getLastPathComponent();
        Object selectedUserObject = selectedTreeNode.getUserObject();
        return new NameObject(selectedUserObject.toString(), "");
    }


    /**
     * p:添加一个NameObject节点
     * @param no  需要添加的节点
     */
    public void addNameObject(NameObject no) {
        if (no == null) {
            return;
        }
        DefaultTreeModel treeModel = (DefaultTreeModel) this.getModel();

        // 新建一个放着NameObject的newChildTreeNode,加到Root下面
        ExpandMutableTreeNode root = (ExpandMutableTreeNode) treeModel.getRoot();

        ExpandMutableTreeNode newChildTreeNode = new ExpandMutableTreeNode(no);
        root.add(newChildTreeNode);
        newChildTreeNode.add(new ExpandMutableTreeNode());
        treeModel.reload(root);
    }


    /**
     * 刷新树节点
     */
    public void refreshTreeNode() {
        DefaultTreeModel treeModel = (DefaultTreeModel) this.getModel();
        ExpandMutableTreeNode root = (ExpandMutableTreeNode) treeModel.getRoot();
        if (interceptRefresh(root)) {
            return;
        }

        ExpandMutableTreeNode[] new_nodes = loadChildTreeNodes(root);

        java.util.List<DefaultMutableTreeNode> childTreeNodeList = new java.util.ArrayList<DefaultMutableTreeNode>();
        for (int i = 0, len = root.getChildCount(); i < len; i++) {
            if (root.getChildAt(i) instanceof ExpandMutableTreeNode) {
                childTreeNodeList.add((ExpandMutableTreeNode) root.getChildAt(i));
            } else {
                childTreeNodeList.add((DefaultMutableTreeNode) root.getChildAt(i));
            }
        }

        root.removeAllChildren();

        for (int ci = 0; ci < new_nodes.length; ci++) {
            Object cUserObject = new_nodes[ci].getUserObject();

            for (int ni = 0, nlen = childTreeNodeList.size(); ni < nlen; ni++) {
                ExpandMutableTreeNode cTreeNode = (ExpandMutableTreeNode) childTreeNodeList.get(ni);
                if (ComparatorUtils.equals(cTreeNode.getUserObject(), cUserObject)) {
                    new_nodes[ci].setExpanded(cTreeNode.isExpanded());
                    if (cTreeNode.getFirstChild() instanceof ExpandMutableTreeNode && cTreeNode.isExpanded()) {
                        checkChildNodes(cTreeNode, new_nodes[ci]);
                    }
                    break;
                }
            }

            root.add(new_nodes[ci]);
        }
    }


    protected void checkChildNodes(ExpandMutableTreeNode oldNode, ExpandMutableTreeNode newNode) {
        for (int i = 0; i < oldNode.getChildCount(); i++) {
            ExpandMutableTreeNode oldChild = (ExpandMutableTreeNode) oldNode.getChildAt(i);
            for (int j = 0; j < newNode.getChildCount(); j++) {
                ExpandMutableTreeNode newChild = (ExpandMutableTreeNode) newNode.getChildAt(j);
                ExpandMutableTreeNode[] nodes = RoleTree.this.loadChildTreeNodes(newChild);
                for (int k = 0; k < nodes.length; k++) {
                    newChild.add(nodes[k]);
                }
                if (newChild.getChildCount() > 1 && ((ExpandMutableTreeNode) newChild.getFirstChild()).getUserObject() == PENDING) {
                    newChild.remove(0);
                }
                if (ComparatorUtils.equals(oldChild.getUserObject(), newChild.getUserObject())) {
                    newChild.setExpanded(oldChild.isExpanded());
                }
            }
        }
    }

    public NameObject getRealSelectedNameObject() {
        TreePath selectedTreePath = this.getSelectionPath();
        if (selectedTreePath == null) {
            return null;
        }

        ExpandMutableTreeNode selectedTreeNode = (ExpandMutableTreeNode) selectedTreePath.getLastPathComponent();
        Object selectedUserObject = selectedTreeNode.getUserObject();
        if (selectedUserObject instanceof NameObject) {
            return (NameObject) selectedUserObject;
        }

        selectedTreeNode = (ExpandMutableTreeNode) selectedTreeNode.getParent();
        selectedUserObject = selectedTreeNode.getUserObject();
        if (selectedUserObject instanceof NameObject) {
            return (NameObject) selectedUserObject;
        }
        return null;
    }


}
\ No newline at end of file
+package com.fr.design.roleAuthority;

import com.fr.general.NameObject;
import com.fr.design.constants.UIConstants;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
import com.fr.design.gui.itree.refreshabletree.UserObjectRefreshJTree;
import com.fr.design.mainframe.AuthorityPropertyPane;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.EastRegionContainerPane;
import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;

import javax.swing.*;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.*;
import java.awt.*;
import java.util.Enumeration;

/**
 * Author : daisy
 * Date: 13-8-30
 * Time: 下午3:32
 */
public class RoleTree extends UserObjectRefreshJTree<RoleSourceOP> {
    private static final long serialVersionUID = 2L;

    private String roleName = null;


    public RoleTree() {
        super();
        this.setCellRenderer(roleTreeRenderer);
        this.setEnabled(true);
        this.setEditable(true);
        this.setRowHeight(20);
        this.setDigIn(true);
        this.removeMouseListener(treeMouseListener);
        this.addTreeSelectionListener(new TreeSelectionListener() {
            public void valueChanged(TreeSelectionEvent e) {
                doWithValueChanged(e);
            }
        });
    }

    public boolean isCheckBoxVisible(TreePath path) {
        return true;
    }

    /**
     * 更新UI
     */
    public void updateUI() {
        super.updateUI();
        setUI(new UIRoleTreeUI());
    }

    protected void doWithValueChanged(TreeSelectionEvent e) {
        if (e.getNewLeadSelectionPath() != null) {
            if (e.getNewLeadSelectionPath().getLastPathComponent().toString() != Inter.getLocText("Role")) {
                roleName = e.getNewLeadSelectionPath().getLastPathComponent().toString();
                setTabRoleName(roleName);
                refreshRoleTree(roleName);
                refreshElementAndAuthorityPane();
                HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().judgeSheetAuthority(roleName);
            }
        }
    }

    protected void setTabRoleName(String roleName) {

    }


    /**
     * 刷新角色树
     *
     * @param selectedRole 角色
     */
    public void refreshRoleTree(String selectedRole) {
        if (EastRegionContainerPane.getInstance().getUpPane() instanceof AuthorityPropertyPane) {
            AuthorityPropertyPane authorityPropertyPane = (AuthorityPropertyPane) EastRegionContainerPane.getInstance().getUpPane();
            authorityPropertyPane.populate();
            EastRegionContainerPane.getInstance().replaceUpPane(authorityPropertyPane);
        }
    }

    public void setSelectedRole(String selectedRole, TreePath parent) {
        ExpandMutableTreeNode node = (ExpandMutableTreeNode) parent.getLastPathComponent();
        if (node.children() != null && node.getChildCount() >= 0) {
            for (Enumeration e = node.children(); e.hasMoreElements(); ) {
                ExpandMutableTreeNode n = (ExpandMutableTreeNode) e.nextElement();
                Object userObj = n.getUserObject();
                String chilld = null;
                if (userObj instanceof String) {
                    chilld = (String) userObj;
                } else if (userObj instanceof NameObject) {
                    NameObject nameObject = (NameObject) userObj;
                    chilld = nameObject.getName();
                }
                if (ComparatorUtils.equals(chilld, selectedRole)) {
                    this.setSelectionPath(parent.pathByAddingChild(n));
                    return;
                } else {
                    setSelectedRole(selectedRole, parent.pathByAddingChild(n));
                }
            }
        }
    }


    private void refreshElementAndAuthorityPane() {
        JComponent authorityToolBar = DesignerContext.getDesignerFrame().getToolbarComponent();
        if (authorityToolBar instanceof BasicBeanPane) {
            //说明是工具栏的
            ((BasicBeanPane) authorityToolBar).populateAuthority();
        }
        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().repaint();
    }

    public String getSelectedRoleName() {
        return roleName;
    }

    public void setSelectedRoleName(String name) {
        roleName = name;
    }


    private DefaultTreeCellRenderer roleTreeRenderer = new DefaultTreeCellRenderer() {
        private static final long serialVersionUID = 2L;


        public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
            super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
            ExpandMutableTreeNode treeNode = (ExpandMutableTreeNode) value;
            Object userObj = treeNode.getUserObject();
            if (userObj instanceof String) {
                // p:这个是column field.
                this.setIcon(null);
                this.setText((String) userObj);
            } else if (userObj instanceof NameObject) {
                NameObject nameObject = (NameObject) userObj;
                this.setText(nameObject.getName());
                this.setIcon(null);
            }


            // 这里新建一个Label作为render是因为JTree在动态刷新的时候，节点上render画布的的宽度不会变，会使得一部分比较长的数据显示为"..."
            this.setBackgroundNonSelectionColor(UIConstants.NORMAL_BACKGROUND);
            this.setForeground(UIConstants.FONT_COLOR);
            this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);
            return this;
        }
    };


    /*
 * p:获得选中的NameObject = name + role.
 */
    public NameObject getSelectedNameObject() {
        TreePath selectedTreePath = this.getSelectionPath();
        if (selectedTreePath == null) {
            return null;
        }
        ExpandMutableTreeNode selectedTreeNode = (ExpandMutableTreeNode) selectedTreePath.getLastPathComponent();
        Object selectedUserObject = selectedTreeNode.getUserObject();
        return new NameObject(selectedUserObject.toString(), "");
    }


    /**
     * p:添加一个NameObject节点
     * @param no  需要添加的节点
     */
    public void addNameObject(NameObject no) {
        if (no == null) {
            return;
        }
        DefaultTreeModel treeModel = (DefaultTreeModel) this.getModel();

        // 新建一个放着NameObject的newChildTreeNode,加到Root下面
        ExpandMutableTreeNode root = (ExpandMutableTreeNode) treeModel.getRoot();

        ExpandMutableTreeNode newChildTreeNode = new ExpandMutableTreeNode(no);
        root.add(newChildTreeNode);
        newChildTreeNode.add(new ExpandMutableTreeNode());
        treeModel.reload(root);
    }


    /**
     * 刷新树节点
     */
    public void refreshTreeNode() {
        DefaultTreeModel treeModel = (DefaultTreeModel) this.getModel();
        ExpandMutableTreeNode root = (ExpandMutableTreeNode) treeModel.getRoot();
        if (interceptRefresh(root)) {
            return;
        }

        ExpandMutableTreeNode[] new_nodes = loadChildTreeNodes(root);

        java.util.List<DefaultMutableTreeNode> childTreeNodeList = new java.util.ArrayList<DefaultMutableTreeNode>();
        for (int i = 0, len = root.getChildCount(); i < len; i++) {
            if (root.getChildAt(i) instanceof ExpandMutableTreeNode) {
                childTreeNodeList.add((ExpandMutableTreeNode) root.getChildAt(i));
            } else {
                childTreeNodeList.add((DefaultMutableTreeNode) root.getChildAt(i));
            }
        }

        root.removeAllChildren();

        for (int ci = 0; ci < new_nodes.length; ci++) {
            Object cUserObject = new_nodes[ci].getUserObject();

            for (int ni = 0, nlen = childTreeNodeList.size(); ni < nlen; ni++) {
                ExpandMutableTreeNode cTreeNode = (ExpandMutableTreeNode) childTreeNodeList.get(ni);
                if (ComparatorUtils.equals(cTreeNode.getUserObject(), cUserObject)) {
                    new_nodes[ci].setExpanded(cTreeNode.isExpanded());
                    if (cTreeNode.getFirstChild() instanceof ExpandMutableTreeNode && cTreeNode.isExpanded()) {
                        checkChildNodes(cTreeNode, new_nodes[ci]);
                    }
                    break;
                }
            }

            root.add(new_nodes[ci]);
        }
    }


    protected void checkChildNodes(ExpandMutableTreeNode oldNode, ExpandMutableTreeNode newNode) {
        for (int i = 0; i < oldNode.getChildCount(); i++) {
            ExpandMutableTreeNode oldChild = (ExpandMutableTreeNode) oldNode.getChildAt(i);
            for (int j = 0; j < newNode.getChildCount(); j++) {
                ExpandMutableTreeNode newChild = (ExpandMutableTreeNode) newNode.getChildAt(j);
                ExpandMutableTreeNode[] nodes = RoleTree.this.loadChildTreeNodes(newChild);
                for (int k = 0; k < nodes.length; k++) {
                    newChild.add(nodes[k]);
                }
                if (newChild.getChildCount() > 1 && ((ExpandMutableTreeNode) newChild.getFirstChild()).getUserObject() == PENDING) {
                    newChild.remove(0);
                }
                if (ComparatorUtils.equals(oldChild.getUserObject(), newChild.getUserObject())) {
                    newChild.setExpanded(oldChild.isExpanded());
                }
            }
        }
    }

    public NameObject getRealSelectedNameObject() {
        TreePath selectedTreePath = this.getSelectionPath();
        if (selectedTreePath == null) {
            return null;
        }

        ExpandMutableTreeNode selectedTreeNode = (ExpandMutableTreeNode) selectedTreePath.getLastPathComponent();
        Object selectedUserObject = selectedTreeNode.getUserObject();
        if (selectedUserObject instanceof NameObject) {
            return (NameObject) selectedUserObject;
        }

        selectedTreeNode = (ExpandMutableTreeNode) selectedTreeNode.getParent();
        selectedUserObject = selectedTreeNode.getUserObject();
        if (selectedUserObject instanceof NameObject) {
            return (NameObject) selectedUserObject;
        }
        return null;
    }


}
\ No newline at end of file
diff --git a/designer_form/src/com/fr/design/designer/beans/painters/FRFitLayoutPainter.java b/designer_form/src/com/fr/design/designer/beans/painters/FRFitLayoutPainter.java
index 79f735684..8634ae172 100644
--- a/designer_form/src/com/fr/design/designer/beans/painters/FRFitLayoutPainter.java
+++ b/designer_form/src/com/fr/design/designer/beans/painters/FRFitLayoutPainter.java
@@ -93,6 +93,8 @@ public class FRFitLayoutPainter extends AbstractPainter{
 		int containerHeight = container.getHeight();
 		// 当前坐标点
 		Rectangle currentXY = new Rectangle(x, y, 1, 1);
+		hot_rec = new int[]{0, 0, 0, 0};
+
 		// 上边缘
 		Rectangle upEdge = new Rectangle(containerX, containerY, containerWidth, BORDER_PROPORTION);
 		if(upEdge.intersects(currentXY)){