From 28b56fd047455308dcf27780cb22a526035ab85b Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Tue, 18 Sep 2018 11:29:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-11394=20=E4=BA=8C=E6=AC=A1=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=9F=90=E4=BA=9B=E5=9C=BA=E6=99=AF=E4=B8=8B=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../remote/ui/AuthorityListControlPane.java | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java index 7404ed699..d8692c443 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java @@ -253,23 +253,17 @@ public class AuthorityListControlPane extends BasicPane { * @param authorities authority */ public void setAuthority(List authorities) { - - if (authorities == null || authorities.isEmpty()) { - return; - } - DefaultListModel model = (DefaultListModel) authorityList.getModel(); model.clear(); - - for (DesignAuthority authority : authorities) { - model.addElement(authority); + if (authorities != null && !authorities.isEmpty()) { + model.clear(); + for (DesignAuthority authority : authorities) { + model.addElement(authority); + } + int size = model.getSize() - 1; + authorityList.setSelectedIndex(size); + authorityList.ensureIndexIsVisible(size); } - - int size = model.getSize() - 1; - - authorityList.setSelectedIndex(size); - authorityList.ensureIndexIsVisible(size); - authorityList.revalidate(); authorityList.repaint(); } From f9191f54f340db523483c30d32f5261050476b49 Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Tue, 18 Sep 2018 11:40:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-11395=20=E7=94=A8=E6=88=B7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E4=BA=A4=E4=BA=92=E4=BF=AE=E8=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/remote/ui/UserManagerPane.java | 12 +++++++----- .../images/buttonicon/user_search_normal.png | Bin 0 -> 444 bytes .../images/buttonicon/user_search_normal@2x.png | Bin 0 -> 844 bytes .../java/com/fr/start/preload/ImagePreLoader.java | 7 +++++-- 4 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 designer-base/src/main/resources/com/fr/design/images/buttonicon/user_search_normal.png create mode 100644 designer-base/src/main/resources/com/fr/design/images/buttonicon/user_search_normal@2x.png diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java index a0fbb0bab..d23a5cbaf 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java @@ -1,5 +1,6 @@ package com.fr.design.remote.ui; +import com.fr.base.BaseUtils; import com.fr.design.border.UITitledBorder; import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; @@ -240,13 +241,14 @@ public class UserManagerPane extends BasicPane { ); // 搜索 - JPanel searchPanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); - searchPanel.setBorder(BorderFactory.createEmptyBorder()); - keyField.setPreferredSize(new Dimension(250, 20)); + JPanel searchPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 5)); + searchPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5)); + keyField.setPreferredSize(new Dimension(270, 20)); keyField.requestFocus(); keyField.addKeyListener(keyFieldKeyListener); keyField.getDocument().addDocumentListener(documentListener); - keyButton.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Search")); + keyButton.setIcon(BaseUtils.readIcon("com/fr/design/images/buttonicon/user_search_normal.png")); + keyButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Search")); keyButton.addActionListener(keyButtonActionListener); searchPanel.add(keyField); searchPanel.add(keyButton); @@ -395,7 +397,7 @@ public class UserManagerPane extends BasicPane { final SwingWorker loadMoreWorker = new SwingWorker, Void>() { @Override protected List doInBackground() { - + String username = WorkContext.getCurrent().getConnection().getUserName(); synchronized (addingMembers) { addingMembers.remove(RemoteDesignMember.DEFAULT_MEMBER); diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/user_search_normal.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/user_search_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..9a9a2e65a42643407fb8f09966d6b6442c504a3f GIT binary patch literal 444 zcmV;t0YmPx$c1c7*R5%f(QN2sUP!PXMf)d+qLP(xi) z*)@PnxzVV;#cP$VDZ}&DO8}h*MEPkL+HNkFwOO;z@i4EdM|#*n_%nlz?Rx#TI!cEY zgQW~E0kSLUPNELFM~HCo6PPJD&iQD(1iu<#L)Z1IL?-1#dD=}< zq{S|!3nBt+_If?q`gjR~V3Dr!oUTwK)cXDYRyrB?IZqe4j>p)J2r^|UVQ1W_!YjZY zB39A_ItP6J=|hP5J3f^Vj+M{n-wTC8+p?@>+qUcq+cL zlsFv(gR^$K^Gf=h3QbMJ1w^evLbKTWrdiROoU!89d=Y}puf4fWo0000Px&21!IgR9Fe+R?lk_K^WbMY15EE@X|xpOTdEkT0=>RHPAmG-uw%^coP)=0u`~r zgGW6J-psiO(FQ_D>#>(Y^^z2Nk!V7iCS-gso0)FX?9Of>r|xBE=6m1!-hA`T56img zpD-mLpU>a!_xr`sNEU?<>r%=zeb8>9eH4j^ax4}rSF6=OCa!sQPXUEOVWr#cK11M_ za7@i}c8#?mwm`((guzX@S|LH|cGnQU^b)9Kh4 z-65_~@%k8PTQ)1Me(5qzJ%fYbPdQ~TV{ z$z)R;iqj9T1^9u&+6IGxDsCgc1|VH62I2`9HsCBC#W&6-D(Y<3Hrv+%kgg*dA!K_N z6t=H8P>erKzFGipHG+Azo19E`#UZ8GGhwv=Ua0`Lk%=81CMHKOJAKK4Ec}Z`#b+;^ z8rK4NV)06)ffox;Mgc zS$vsH=8Y*h?Nb8ynBaX50^H~F0Yub;EC(^f(#HuZS5HoUzYZcm?bj*nbsr?0IYg{p zl8MscVdME_|7vTl0K#~m2Yr&U;1IaPv}5M4&~^p&7vU*DY316^d6Z)5#2NQFw;HS6 zU2q#4*>^J{c9Dq}iqri!3UGtNw1bMc6^1kn_Vl#1mrmPB_-sx5w%F&mn`dDH7$k^@ zg$nQzVcU0xtyU8c*qL*H1B>{a0u;N7TguT>)n0f8R3I(~XO7)*4?E}s`c-AS+5i8I WHhpe=F>4_J0000 Date: Tue, 18 Sep 2018 14:54:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=9C=AA=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E7=9A=84=E6=96=87=E4=BB=B6=E4=BA=A4=E4=BA=92=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/file/MutilTempalteTabPane.java | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java index b1a3b8e34..b6f18a188 100644 --- a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java +++ b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java @@ -17,6 +17,7 @@ import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.Constants; import com.fr.stable.ProductConstants; +import com.fr.third.javax.annotation.Nonnull; import com.fr.third.org.apache.commons.io.FilenameUtils; import com.fr.workspace.WorkContext; import com.fr.workspace.server.lock.TplOperator; @@ -677,34 +678,31 @@ public class MutilTempalteTabPane extends JComponent { //当前激活的模板 String filename = openedTemplate.get(selectedIndex).getPath(); - - filename = FilenameUtils.standard(filename); - if (!specifiedTemplate.isALLSaved() && !DesignerMode.isVcsMode()) { specifiedTemplate.stopEditing(); int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?", ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.YES_OPTION) { specifiedTemplate.saveTemplate(); - HistoryTemplateListCache.getInstance().closeSelectedReport(specifiedTemplate); - // release lock - WorkContext.getCurrent().get(TplOperator.class).closeAndFreeFile(specifiedTemplate.getPath()); - - activeTemplate(filename); FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); + closeTpl(specifiedTemplate, filename); + } else if (returnVal == JOptionPane.NO_OPTION) { + closeTpl(specifiedTemplate, filename); } } else { - HistoryTemplateListCache.getInstance().closeSelectedReport(specifiedTemplate); - // release lock - WorkContext.getCurrent().get(TplOperator.class).closeAndFreeFile(specifiedTemplate.getPath()); - - activeTemplate(filename); - FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); + closeTpl(specifiedTemplate, filename); } } + private void closeTpl(@Nonnull JTemplate specifiedTemplate, @Nonnull String fileName) { + HistoryTemplateListCache.getInstance().closeSelectedReport(specifiedTemplate); + // release lock + WorkContext.getCurrent().get(TplOperator.class).closeAndFreeFile(specifiedTemplate.getPath()); + activeTemplate(fileName); + } + /** * 关闭模板 * From 896e6a6ff0e79e42f254d9997e208d0b0e5e77cb Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Tue, 18 Sep 2018 15:03:03 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/remote/ui/AuthorityListControlPane.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java index d8692c443..1d027ac8a 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java @@ -256,7 +256,6 @@ public class AuthorityListControlPane extends BasicPane { DefaultListModel model = (DefaultListModel) authorityList.getModel(); model.clear(); if (authorities != null && !authorities.isEmpty()) { - model.clear(); for (DesignAuthority authority : authorities) { model.addElement(authority); } From abd64f7ba774b00ccd3919082fc27d60ba79853d Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Tue, 18 Sep 2018 15:46:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E5=A4=9A=E7=BA=BF=E7=A8=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/remote/ui/UserManagerPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java index d23a5cbaf..1e22dc808 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java @@ -369,9 +369,9 @@ public class UserManagerPane extends BasicPane { final SwingWorker getMemberWorker = new SwingWorker, Void>() { @Override protected List doInBackground() { - addingMembers.clear(); String username = WorkContext.getCurrent().getConnection().getUserName(); synchronized (addingMembers) { + addingMembers.clear(); Collection more = WorkContext.getCurrent().get(DecisionOperator.class).getMembers(username, keyword); pageNum = 1; if (!more.isEmpty()) {