From 39bdb7e62851a594c522a1b2d3231d97324d5e17 Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Tue, 19 Sep 2017 10:33:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?REPORT-4605=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=88=A0=E9=99=A4=E5=85=88=E5=B0=9D=E8=AF=95?= =?UTF-8?q?=E6=94=BE=E5=9B=9E=E6=94=B6=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/file/TemplateTreePane.java | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/file/TemplateTreePane.java b/designer_base/src/com/fr/design/file/TemplateTreePane.java index e9009ff9fa..3c690a5c6b 100644 --- a/designer_base/src/com/fr/design/file/TemplateTreePane.java +++ b/designer_base/src/com/fr/design/file/TemplateTreePane.java @@ -5,8 +5,8 @@ package com.fr.design.file; import com.fr.base.FRContext; import com.fr.dav.LocalEnv; -import com.fr.design.gui.itree.filetree.TemplateFileTree; import com.fr.design.gui.icontainer.UIScrollPane; +import com.fr.design.gui.itree.filetree.TemplateFileTree; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; @@ -17,16 +17,18 @@ import com.fr.file.filetree.IOFileNodeFilter; import com.fr.general.ComparatorUtils; import com.fr.general.FRLogger; import com.fr.general.Inter; -import com.fr.stable.ProductConstants; import com.fr.stable.CoreConstants; +import com.fr.stable.ProductConstants; import com.fr.stable.StableUtils; import com.fr.stable.project.ProjectConstants; +import com.sun.jna.platform.FileUtils; import javax.swing.*; import javax.swing.tree.DefaultMutableTreeNode; import java.awt.*; import java.awt.event.*; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.logging.Level; @@ -177,7 +179,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { } if (nodeFile.exists()) { String path = StableUtils.pathJoin(new String[]{nodeFile.getEnvPath(), nodeFile.getPath()}); - FRContext.getCurrentEnv().deleteFile(nodeFile.getPath()); + moveToTrash(nodeFile); deleteHistory(path.replaceAll("/", "\\\\")); } else { JOptionPane.showMessageDialog(this, Inter.getLocText("Warning-Template_Do_Not_Exsit"), ProductConstants.PRODUCT_NAME, @@ -187,7 +189,6 @@ public class TemplateTreePane extends JPanel implements FileOperations { reportletsTree.refresh(); } - private void deleteHistory(String fileName) { int index = HistoryTemplateListPane.getInstance().contains(fileName); int size = HistoryTemplateListPane.getInstance().getHistoryCount(); @@ -304,4 +305,24 @@ public class TemplateTreePane extends JPanel implements FileOperations { } } + /** + * 文件回收 + * + * @param nodeFile 节点文件 + */ + private void moveToTrash(FileNodeFILE nodeFile) { + FileUtils fileUtils = FileUtils.getInstance(); + if (fileUtils.hasTrash()) { + try { + fileUtils.moveToTrash(new File[]{new File(StableUtils.pathJoin(nodeFile.getEnvPath(), nodeFile.getPath()))}); + } catch (IOException e) { + FRLogger.getLogger().info(e.getMessage()); + FRContext.getCurrentEnv().deleteFile(nodeFile.getPath()); + } + } else { + FRLogger.getLogger().info("No Trash Available"); + FRContext.getCurrentEnv().deleteFile(nodeFile.getPath()); + } + } + } \ No newline at end of file From 5769e260e6011f24d72901b23b3bedd4868d3b8c Mon Sep 17 00:00:00 2001 From: MoMeak Date: Tue, 19 Sep 2017 14:43:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?REPORT-4604=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E8=A7=86=E8=A7=89=E4=BF=AE=E6=94=B9=201.=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E4=B8=80=E4=B8=AAUIToggleButton(Icon[]=20icons)=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=9B=E4=BE=9B=E9=9C=80=E8=A6=81=E5=8F=8D?= =?UTF-8?q?=E7=99=BD=E7=9A=84=E6=8C=89=E9=92=AE=E8=B0=83=E7=94=A8=202.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E5=85=83=E6=A0=BC=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E7=9A=84=E5=8F=8D=E7=99=BD=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8810=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/expand/SortExpandAttrPane.java | 12 +++--- .../cell/settingpane/CellExpandAttrPane.java | 8 ++-- .../fr/design/gui/ibutton/UIButtonGroup.java | 36 ++++++++++++++++++ .../fr/design/gui/ibutton/UIToggleButton.java | 24 +++++++++++- .../fr/design/images/expand/asc_selected.png | Bin 0 -> 306 bytes .../fr/design/images/expand/des_selected.png | Bin 0 -> 305 bytes .../images/expand/landspace_selected@1x.png | Bin 0 -> 139 bytes .../images/expand/none16x16_selected@1x.png | Bin 0 -> 383 bytes .../images/expand/vertical_selected@1x.png | Bin 0 -> 128 bytes 9 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 designer_base/src/com/fr/design/images/expand/asc_selected.png create mode 100644 designer_base/src/com/fr/design/images/expand/des_selected.png create mode 100644 designer_base/src/com/fr/design/images/expand/landspace_selected@1x.png create mode 100644 designer_base/src/com/fr/design/images/expand/none16x16_selected@1x.png create mode 100644 designer_base/src/com/fr/design/images/expand/vertical_selected@1x.png diff --git a/designer/src/com/fr/design/expand/SortExpandAttrPane.java b/designer/src/com/fr/design/expand/SortExpandAttrPane.java index d346dd890c..284135bddd 100644 --- a/designer/src/com/fr/design/expand/SortExpandAttrPane.java +++ b/designer/src/com/fr/design/expand/SortExpandAttrPane.java @@ -24,13 +24,13 @@ public class SortExpandAttrPane extends JPanel { public SortExpandAttrPane() { this.setLayout(new BorderLayout(0, 4)); - Icon[] iconArray = { - BaseUtils.readIcon("/com/fr/design/images/expand/none16x16.png"), - BaseUtils.readIcon("/com/fr/design/images/expand/asc.png"), - BaseUtils.readIcon("/com/fr/design/images/expand/des.png") - }; + Icon[][] iconArray = { + {BaseUtils.readIcon("/com/fr/design/images/expand/none16x16.png"), BaseUtils.readIcon("/com/fr/design/images/expand/none16x16_selected@1x.png")}, + {BaseUtils.readIcon("/com/fr/design/images/expand/asc.png"), BaseUtils.readIcon("/com/fr/design/images/expand/asc_selected.png")}, + {BaseUtils.readIcon("/com/fr/design/images/expand/des.png"), BaseUtils.readIcon("/com/fr/design/images/expand/des_selected.png")} + }; String[] nameArray = { Inter.getLocText("Sort-Original"), Inter.getLocText("Sort-Ascending"), Inter.getLocText("Sort-Descending") }; - sort_type_pane = new UIButtonGroup(iconArray); + sort_type_pane = new UIButtonGroup(iconArray, null); sort_type_pane.setAllToolTips(nameArray); sort_type_pane.setGlobalName(Inter.getLocText("ExpandD-Sort_After_Expand")); this.add(sort_type_pane, BorderLayout.NORTH); diff --git a/designer/src/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java b/designer/src/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java index 4eedd4f7c5..b903e68048 100644 --- a/designer/src/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java +++ b/designer/src/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java @@ -45,10 +45,10 @@ public class CellExpandAttrPane extends AbstractCellAttrPane { */ public JPanel createContentPane() { String[] nameArray = {Inter.getLocText("ExpandD-Not_Expand"), Inter.getLocText("Utils-Top_to_Bottom"), Inter.getLocText("Utils-Left_to_Right")}; - Icon[] iconArray = { - BaseUtils.readIcon("/com/fr/design/images/expand/none16x16.png"), - BaseUtils.readIcon("/com/fr/design/images/expand/vertical.png"), - BaseUtils.readIcon("/com/fr/design/images/expand/landspace.png") + Icon[][] iconArray = { + {BaseUtils.readIcon("/com/fr/design/images/expand/none16x16.png"), BaseUtils.readIcon("/com/fr/design/images/expand/none16x16_selected@1x.png")}, + {BaseUtils.readIcon("/com/fr/design/images/expand/vertical.png"), BaseUtils.readIcon("/com/fr/design/images/expand/vertical_selected@1x.png")}, + {BaseUtils.readIcon("/com/fr/design/images/expand/landspace.png"), BaseUtils.readIcon("/com/fr/design/images/expand/landspace_selected@1x.png")} }; Byte[] valueArray = {Constants.NONE, Constants.TOP_TO_BOTTOM, Constants.LEFT_TO_RIGHT}; expandDirectionButton = new UIButtonGroup(iconArray, valueArray); diff --git a/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java b/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java index 0683fc7c2b..4133e109cd 100644 --- a/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java +++ b/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java @@ -80,6 +80,42 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver { } } + public UIButtonGroup(Icon[][] iconArray, T[] objects) { + if (!ArrayUtils.isEmpty(objects) && iconArray.length == objects.length) { + this.objectList = Arrays.asList(objects); + } + labelButtonList = new ArrayList(iconArray.length); + this.setLayout(getGridLayout(iconArray.length)); + this.setBorder(getGroupBorder()); + for (int i = 0; i < iconArray.length; i++) { + final int index = i; + Icon[] icon = iconArray[i]; + final UIToggleButton labelButton = new UIToggleButton(icon) { + @Override + protected MouseListener getMouseListener() { + return new MouseAdapter() { + @Override + public void mousePressed(MouseEvent e) { + isClick = true; + if (!isEnabled()) { + return; + } + if (globalNameListener != null) { + globalNameListener.setGlobalName(buttonGroupName); + } + setSelectedWithFireChanged(index); + } + }; + } + + public boolean shouldResponseNameListener() { + return false; + } + }; + initButton(labelButton); + } + } + public boolean hasClick() { return isClick; } diff --git a/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java b/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java index 0a766e2e91..21c8bb419a 100644 --- a/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java +++ b/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java @@ -3,12 +3,13 @@ package com.fr.design.gui.ibutton; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Shape; +import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.geom.RoundRectangle2D; -import javax.swing.Icon; +import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -46,6 +47,26 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{ addMouseListener(getMouseListener()); } + /** + * 需要反白的按钮接口 + * support icons[normalIcon, selectedIcon] + * @param icons + */ + public UIToggleButton(Icon[] icons) { + super(icons[0], null, icons[1]); + setSelectedIcon(icons[1]); + setExtraPainted(true); + addActionListener(new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + if (!UIToggleButton.super.isSelected()) { + UIToggleButton.super.setSelected(!UIToggleButton.super.isSelected()); + } + } + }); + addMouseListener(getMouseListener()); + } + public void setGlobalName(String name){ toggleButtonName = name ; } @@ -66,6 +87,7 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{ @Override public void setSelected(boolean isSelected) { + super.setSelected(isSelected); if (this.isSelected != isSelected) { this.isSelected = isSelected; repaint(); diff --git a/designer_base/src/com/fr/design/images/expand/asc_selected.png b/designer_base/src/com/fr/design/images/expand/asc_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..021bd2a495f4e992888853a60b5d991bd3b199a7 GIT binary patch literal 306 zcmV-20nPr2P)Px#>`6pHR5%f>k}(c~KoCXISQ{Iot%-U7J1aPaXE5;uUc+n9TiX*$VuCk-(#lHT zY?yUf)`-SQ9y|MI=CfppqJPBWO}O5)9AU1j)&`pN2+d^`Pj^o~fuXaSvNZ?{n1)Xe zYtZ2YL9c#L{X$fOYhWg%wc3mU$6xxDkmmQuUQZCJb<&IhH&Dnec#(H;u%95eAi+=q z73@I%hlQ+uppRkH_ymNQ#uPSqo$8?!eP8Fg%t$g=s~~TRp@hVWBPx#>q$gGR5%f>k-ZMVU=)U1F^i>Pm0+>iOk9O)khlW3VQ>@Ot?Z3aBy|ZLO{RLz zm!8jQsfIYou@XN6nJA+@3y#d7zA~;~Ck&2)x+9KflPMU;ud;c5M37Y2a1@h*1 zLiu0c&F##;K*Tmwg!f2mo0&(@^#(MhFyffS#`IDSAc2`Qfn2)6eCUkahYQ?c3MaV1 z%FAhL4MfCRO}5k-JdX>()w>l1qSCA|NnVbthu`)Ol^C-vwr2s500000NkvXXu0mjf D29tVJLo5W7 z|M0W$Okv1jo1k>erSqx6UgmrTWwZa29_flrNLn8JKj6z7<7B0%oCk*+lEedKI(Tj* jHHsK^?KSwo2IMiQwpzUAyk9p7Xdr{9tDnm{r-UW|8sjTh literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/expand/none16x16_selected@1x.png b/designer_base/src/com/fr/design/images/expand/none16x16_selected@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..24daf102b07ce54a8a26d00e07bfe041b4627493 GIT binary patch literal 383 zcmV-_0f7FAP)Px$IY~r8R5%fplQC|?FbqZG4gtDn$r*ewujxGkI72!$C&-#PLk^LX1TDH0?t8Kr z%W8|Z1U^KGpA<<^i$x{FFtnftS8&Tv_pGhx(-z|r?7;_k11GQr&)@=Hfi^kI$rH^3 za0bc|tY(Cfv*!FD0g*ceVPjOKs~yWdcFPFaCmTC!Hnn3(u669;?D~>@TGQVFYyOgU z1i^N9_Kdyd*puFk9XIX literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/expand/vertical_selected@1x.png b/designer_base/src/com/fr/design/images/expand/vertical_selected@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..0c78083bc6aebbcf5fec9333c9306b80ca50f05b GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|tUO&DLo5W7 z|M0W$h%ksvh;vhLFk?<&(L_L!%~64g Z!8_7W_zT0@-#}9sJYD@<);T3K0RWjAA}{~| literal 0 HcmV?d00001 From 8fcd901660310a2f9c12c1c66281f81fb8affc93 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Tue, 19 Sep 2017 15:12:55 +0800 Subject: [PATCH 3/6] PMD --- designer/src/com/fr/design/expand/SortExpandAttrPane.java | 2 +- .../src/com/fr/design/gui/ibutton/UIButtonGroup.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/expand/SortExpandAttrPane.java b/designer/src/com/fr/design/expand/SortExpandAttrPane.java index 284135bddd..11260c74b4 100644 --- a/designer/src/com/fr/design/expand/SortExpandAttrPane.java +++ b/designer/src/com/fr/design/expand/SortExpandAttrPane.java @@ -30,7 +30,7 @@ public class SortExpandAttrPane extends JPanel { {BaseUtils.readIcon("/com/fr/design/images/expand/des.png"), BaseUtils.readIcon("/com/fr/design/images/expand/des_selected.png")} }; String[] nameArray = { Inter.getLocText("Sort-Original"), Inter.getLocText("Sort-Ascending"), Inter.getLocText("Sort-Descending") }; - sort_type_pane = new UIButtonGroup(iconArray, null); + sort_type_pane = new UIButtonGroup(iconArray); sort_type_pane.setAllToolTips(nameArray); sort_type_pane.setGlobalName(Inter.getLocText("ExpandD-Sort_After_Expand")); this.add(sort_type_pane, BorderLayout.NORTH); diff --git a/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java b/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java index 4133e109cd..a8ad8f0956 100644 --- a/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java +++ b/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java @@ -44,6 +44,10 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver { this(iconArray, null); } + public UIButtonGroup(Icon[][] iconArray) { + this(iconArray, null); + } + public UIButtonGroup(Icon[] iconArray, T[] objects) { if (!ArrayUtils.isEmpty(objects) && iconArray.length == objects.length) { this.objectList = Arrays.asList(objects); From 1e2fdb3455db8c0287b7a118c09c58a93ecdc067 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 19 Sep 2017 16:12:56 +0800 Subject: [PATCH 4/6] =?UTF-8?q?REPORT-4672=20=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A7=E4=BB=B6=E5=90=8E=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E6=89=80=E5=9C=A8=E8=A1=8C=EF=BC=8C?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=B1=9E=E6=80=A7=E9=9D=A2=E6=9D=BF=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/ElementCasePaneDelegate.java | 8 ++--- .../form/FormElementCasePaneDelegate.java | 32 +++++++++---------- .../com/fr/poly/creator/ECBlockEditor.java | 1 + 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java index 556b5d59e1..3529ebcd03 100644 --- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java +++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java @@ -50,18 +50,18 @@ public class ElementCasePaneDelegate extends ElementCasePane { if (!isEditable() && !BaseUtils.isAuthorityEditing()) { return; } - doOnSelectionChanged(e); + refreshPropertyPanes(); } }); this.addTargetModifiedListener(new TargetModifiedListener() { @Override public void targetModified(TargetModifiedEvent e) { - CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this); + refreshPropertyPanes(); } }); } - private void doOnSelectionChanged(SelectionEvent e) { + private void refreshPropertyPanes() { //在编辑权限，所以要更新权限编辑面板 if (BaseUtils.isAuthorityEditing()) { AuthorityPropertyPane authorityPropertyPane = new AuthorityPropertyPane(ElementCasePaneDelegate.this); @@ -76,7 +76,7 @@ public class ElementCasePaneDelegate extends ElementCasePane { QuickEditorRegion.getInstance().populate(getCurrentEditor()); JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); if (editingTemplate != null && !editingTemplate.isUpMode()) { - Selection editingSelection = ((ElementCasePaneDelegate)e.getSource()).getSelection(); + Selection editingSelection = getSelection(); // 模板初始化完成后，才能初始化超级链接面板 HyperlinkGroupPane hyperlinkGroupPane = editingTemplate.getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance()); hyperlinkGroupPane.populate(ElementCasePaneDelegate.this); diff --git a/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java index 68ee0d79bd..5ddd8efb51 100644 --- a/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java +++ b/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java @@ -36,32 +36,30 @@ public class FormElementCasePaneDelegate extends ElementCasePane { @Override public void targetModified(TargetModifiedEvent e) { designer.fireTargetModified(); + resetSelectionAndChooseState(); } }); } From feada98bff1df92bee8a44d3b67214c7140625b0 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Tue, 19 Sep 2017 17:00:43 +0800 Subject: [PATCH 5/6] =?UTF-8?q?REPORT-4665=20[9.0=E4=BA=8C=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=20=E5=8D=95=E5=85=83=E6=A0=BC=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E6=97=A5=E6=9C=9F=E5=9E=8B=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/gui/style/FormatPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/gui/style/FormatPane.java b/designer_base/src/com/fr/design/gui/style/FormatPane.java index 43fcd247fa..5ab39647f4 100644 --- a/designer_base/src/com/fr/design/gui/style/FormatPane.java +++ b/designer_base/src/com/fr/design/gui/style/FormatPane.java @@ -323,7 +323,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs public void itemStateChanged(ItemEvent e) { if (e.getStateChange() == ItemEvent.SELECTED) { int contents = getFormatContents(); - String[] items = FormatField.getInstance().getFormatArray(contents); + String[] items = FormatField.getInstance().getFormatArray(contents, false); CardLayout cardLayout = (CardLayout) centerPane.getLayout(); if (isTextOrNull()) { From 4ce94fac8b88ff73dde035e59f6dbc670facdf55 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 19 Sep 2017 17:30:07 +0800 Subject: [PATCH 6/6] =?UTF-8?q?REPORT-4695=20=E6=89=93=E5=BC=80=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=92=8C=E6=8A=A5=E8=A1=A8=EF=BC=8C=E5=88=87=E6=8D=A2?= =?UTF-8?q?tab=E6=97=B6=E6=A8=A1=E6=9D=BF=E5=86=85=E5=AE=B9=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/roleAuthority/ReportAndFSManagePane.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/roleAuthority/ReportAndFSManagePane.java b/designer_base/src/com/fr/design/roleAuthority/ReportAndFSManagePane.java index 75dfa99bdf..8b406de1d2 100644 --- a/designer_base/src/com/fr/design/roleAuthority/ReportAndFSManagePane.java +++ b/designer_base/src/com/fr/design/roleAuthority/ReportAndFSManagePane.java @@ -265,9 +265,11 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo DesignTableDataManager.addDsChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { - roleTree.refreshTreeNode(); - expandTree(roleTree, true); - roleTree.updateUI(); + if (BaseUtils.isAuthorityEditing()) { + roleTree.refreshTreeNode(); + expandTree(roleTree, true); + roleTree.updateUI(); + } } });