From 72e819a9e6449861157979bfae6c17886dc0450a Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 3 Dec 2020 15:04:57 +0800 Subject: [PATCH 1/9] =?UTF-8?q?REPORT-44583=20=E9=83=A8=E7=BD=B2=E9=9B=86?= =?UTF-8?q?=E6=88=90-=E8=BF=9C=E7=A8=8B-=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=92=8C=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9C=A8=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E7=94=B5=E8=84=91=E4=B8=8A=EF=BC=8C=E8=BF=9C=E7=A8=8B=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../env/RemoteDesignerWorkspaceInfo.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java b/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java index f9de1cfa4..96069b435 100644 --- a/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java +++ b/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java @@ -25,13 +25,19 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo { private static final String HOST_NAME = "127.0.0.1"; private static final String LOCAL_HOTS_NAME = "localhost"; private static final String QUOTATION = ":"; - private static final String PORT = Integer.toString(DesignerEnvManager.getEnvManager().getEmbedServerPort()); + private static String port = Integer.toString(DesignerEnvManager.getEnvManager().getEmbedServerPort()); static { - FILTER_SET.add(HTTP + HOST_NAME + QUOTATION + PORT + PATH); - FILTER_SET.add(HTTPS + HOST_NAME + QUOTATION + PORT + PATH); - FILTER_SET.add(HTTP + LOCAL_HOTS_NAME + QUOTATION + PORT + PATH); - FILTER_SET.add(HTTPS + LOCAL_HOTS_NAME + QUOTATION + PORT + PATH); + initFilerSet(port); + } + + private static void initFilerSet(String newPort) { + FILTER_SET.clear(); + FILTER_SET.add(HTTP + HOST_NAME + QUOTATION + newPort + PATH); + FILTER_SET.add(HTTPS + HOST_NAME + QUOTATION + newPort + PATH); + FILTER_SET.add(HTTP + LOCAL_HOTS_NAME + QUOTATION + newPort + PATH); + FILTER_SET.add(HTTPS + LOCAL_HOTS_NAME + QUOTATION + newPort + PATH); + port = newPort; } private String name; @@ -164,6 +170,11 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo { @Override public boolean checkValid() { boolean result = false; + String newPort = Integer.toString(DesignerEnvManager.getEnvManager().getEmbedServerPort()); + if (!ComparatorUtils.equals(port, newPort)) { + // 使用过程中 更改了内置服务器端口 重新初始化下 + initFilerSet(newPort); + } if (FILTER_SET.contains(connection.getUrl())) { FineLoggerFactory.getLogger().error("url is same with local designer"); return result; From 71646c4285253314688aefac0ff88a7a6cada6d4 Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 3 Dec 2020 15:12:31 +0800 Subject: [PATCH 2/9] =?UTF-8?q?REPORT-43864=20=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E5=B1=9E=E6=80=A7-=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=B8=A2=E5=A4=B1=EF=BC=8C=E5=87=BA=E7=8E=B0=E5=A4=A7?= =?UTF-8?q?=E9=87=8F=E9=87=8D=E5=A4=8D=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/App.java | 11 +++++++++++ .../com/fr/design/mainframe/JTemplateFactory.java | 2 +- .../main/java/com/fr/design/mainframe/app/CptApp.java | 8 +++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/App.java b/designer-base/src/main/java/com/fr/design/mainframe/App.java index 3cae10f6b..c941df8af 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/App.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/App.java @@ -41,4 +41,15 @@ public interface App extends Mutable, Aftermath { * @return 报表 */ T asIOFile(FILE tplFile); + + + /** + * 输出workbook等对象 + * @param tplFile 文件 + * @param needCheck 是否需要check + * @return + */ + default T asIOFile(FILE tplFile, boolean needCheck) { + return asIOFile(tplFile); + } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java index 8019cc178..678b9bf84 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java @@ -56,7 +56,7 @@ public final class JTemplateFactory { String[] defaultAppExtensions = app.defaultExtensions(); for (String defaultAppExtension : defaultAppExtensions) { if (defaultAppExtension.equalsIgnoreCase(fileExtension)) { - BaseBook bb = app.asIOFile(file); + BaseBook bb = app.asIOFile(file, false); if (bb != null) { return (T) bb; } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java b/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java index cb6fb8d3e..adadab36d 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java @@ -42,7 +42,11 @@ class CptApp extends AbstractWorkBookApp { @Override public WorkBook asIOFile(FILE file) { + return asIOFile(file, true); + } + @Override + public WorkBook asIOFile(FILE file, boolean needCheck) { if (XMLEncryptUtils.isCptEncoded() && !XMLEncryptUtils.checkVaild(DesignerEnvManager.getEnvManager().getEncryptionKey())) { if (!new DecodeDialog(file).isPwdRight()) { @@ -67,7 +71,9 @@ class CptApp extends AbstractWorkBookApp { } catch (Exception exp) { FineLoggerFactory.getLogger().error(Toolkit.i18nText("Fine-Design_Report_NS_Exception_ReadError") + file, exp); } - checkNameStyle(namestyle); + if (needCheck) { + checkNameStyle(namestyle); + } return tpl; } From 1189e110dd5f3c2efed4a9df7e89948d6b5013b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Thu, 3 Dec 2020 17:24:24 +0800 Subject: [PATCH 3/9] =?UTF-8?q?CHART-17120=20=E5=A2=9E=E5=8A=A0=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=BB=91=E5=8A=A8=E6=9D=A1=E7=81=B5=E6=95=8F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/condition/ConditionAttributesPane.java | 9 +++++++-- .../SeriesCondition/DataSeriesConditionPane.java | 10 +++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java b/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java index 6ca4ed680..5d6ee4e5a 100644 --- a/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java @@ -14,10 +14,10 @@ import javax.swing.BoxLayout; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JScrollPane; -import java.awt.Dimension; import java.util.Iterator; -import java.util.Map; import java.util.LinkedHashMap; +import java.util.Map; +import java.awt.Dimension; @Open public abstract class ConditionAttributesPane extends BasicBeanPane { @@ -69,7 +69,12 @@ public abstract class ConditionAttributesPane extends BasicBeanPane { selectedItemScrollPane.setViewportView(selectedItemPane); selectedItemScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); selectedItemScrollPane.setMinimumSize(new Dimension((int) selectedItemScrollPane.getPreferredSize().getWidth(), MIN_HEIGHT)); + dealScrollPane(selectedItemScrollPane); propertyChangePane.add(selectedItemScrollPane); + } + + protected void dealScrollPane(JScrollPane scrollPane){ + } public void updateBean(T ob) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java index 90982ded5..aa8c9e46c 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java @@ -15,9 +15,10 @@ import com.fr.log.FineLoggerFactory; import javax.swing.BorderFactory; import javax.swing.JPanel; +import javax.swing.JScrollPane; +import java.util.Iterator; import java.awt.BorderLayout; import java.awt.Dimension; -import java.util.Iterator; /** * Created by IntelliJ IDEA. @@ -27,6 +28,9 @@ import java.util.Iterator; * Time : 上午9:16 */ public class DataSeriesConditionPane extends ConditionAttributesPane { + + private static final int SCROLL_BAR_UNIT_INCREMENT = 16; + protected Plot plot; public DataSeriesConditionPane(Plot plot) { @@ -43,6 +47,10 @@ public class DataSeriesConditionPane extends ConditionAttributesPane Date: Mon, 7 Dec 2020 10:00:04 +0800 Subject: [PATCH 4/9] =?UTF-8?q?REPORT-44390=20alpha-fine=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3=EF=BC=8C=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA=E8=AF=A6=E7=BB=86=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=96=87=E6=A1=A3=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E3=80=91=E6=9C=AC=E5=9C=B0=E5=B8=B8=E7=94=A8=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=9C=89=E7=82=B9=E9=97=AE=E9=A2=98=EF=BC=8C=E6=AF=94?= =?UTF-8?q?=E5=A6=82=E7=94=A8=E6=88=B7=E6=90=9C=E7=B4=A2"=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E5=A1=AB=E6=8A=A5"=EF=BC=8C=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E8=AF=8D=E8=A2=AB=E8=A7=A3=E6=9E=90=E6=88=90=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E8=AF=8D=E7=BB=84=EF=BC=8C=E9=81=8D=E5=8E=86=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E8=AF=8D=E7=BB=84=E5=8E=BB=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=E9=87=8C=E4=BC=9A=E5=B0=86=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E9=9B=86=E5=85=88=E6=B8=85=E7=A9=BA=E7=84=B6=E5=90=8E?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84=EF=BC=8C=E7=84=B6=E5=90=8E?= =?UTF-8?q?=E6=8A=8A=E8=BF=99=E4=B8=AA=E8=BF=94=E5=9B=9E=E7=9A=84=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=8F=88=E8=B5=8B=E5=80=BC=E7=BB=99=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E9=9B=86=E5=90=88=EF=BC=8C=E8=BF=99=E4=BC=9A=E4=B8=8D=E6=96=AD?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=BB=93=E6=9E=9C=E9=9B=86=E5=90=88=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E5=8F=AA?= =?UTF-8?q?=E6=98=AF=E5=85=B3=E9=94=AE=E8=AF=8D=E7=BB=84=E4=B8=AD=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=B8=80=E4=B8=AA=E5=85=83=E7=B4=A0=E7=9A=84=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E7=BB=93=E6=9E=9C=20=E3=80=90=E6=94=B9=E5=8A=A8?= =?UTF-8?q?=E6=80=9D=E8=B7=AF=E3=80=91=E5=9C=A8=E6=90=9C=E7=B4=A2=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E7=9A=84=E9=80=BB=E8=BE=91=E9=87=8C=EF=BC=8C=E5=B0=86?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E7=BB=93=E6=9E=9C=E9=9B=86=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=8E=BB=E6=8E=89=EF=BC=8C=E6=94=BE=E5=88=B0=E6=9B=B4?= =?UTF-8?q?=E4=B8=8A=E5=B1=82=E7=9A=84=E9=81=8D=E5=8E=86=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=EF=BC=8C=E8=BF=99=E6=A0=B7=E5=B0=B1=E4=B8=8D=E6=98=AF=E6=AF=8F?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E9=81=8D=E5=8E=86=E5=B0=B1=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=9B=86=EF=BC=8C=E8=80=8C=E6=98=AF=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=AF=8F=E4=B8=80=E6=AC=A1=E6=90=9C=E7=B4=A2=E6=89=8D?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E7=BB=93=E6=9E=9C=E9=9B=86=EF=BC=8C=E7=84=B6?= =?UTF-8?q?=E5=90=8E=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E7=9A=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E4=B9=9F=E6=97=A0=E9=A1=BB=E8=B5=8B=E5=80=BC?= =?UTF-8?q?=E7=BB=99=E7=BB=93=E6=9E=9C=E9=9B=86=EF=BC=8C=E5=9B=A0=E4=B8=BA?= =?UTF-8?q?=E5=9C=A8=E6=90=9C=E7=B4=A2=E7=9A=84=E6=97=B6=E5=80=99=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E6=B7=BB=E5=8A=A0=E5=88=B0=E7=BB=93=E6=9E=9C=E9=9B=86?= =?UTF-8?q?=E4=B8=AD=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/manager/impl/RecentSearchManager.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java index 72a485977..3c7de497a 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java @@ -45,9 +45,9 @@ import java.util.List; */ public class RecentSearchManager implements AlphaFineSearchProvider { private static final int MAX_SIZE = 100; - + private static final RecentSearchManager INSTANCE = new RecentSearchManager(); - + private IndexReader indexReader = null; //索引存储路径 private String path = ProductConstants.getEnvHome() + File.separator + "searchIndex"; @@ -58,18 +58,18 @@ public class RecentSearchManager implements AlphaFineSearchProvider { private IndexWriterConfig config = new IndexWriterConfig(Version.LUCENE_40, analyzer); private IndexWriter indexWriter = null; private SearchResult recentModelList = new SearchResult(); - + public static RecentSearchManager getInstance() { - + return INSTANCE; } @Override public SearchResult getLessSearchResult(String[] searchText) { - + this.recentModelList = new SearchResult(); SearchResult modelList = new SearchResult(); for (String aSearchText : searchText) { - recentModelList = getRecentModelList(aSearchText); + getRecentModelList(aSearchText); } if (recentModelList != null && recentModelList.size() > 0) { modelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Latest"))); @@ -86,7 +86,7 @@ public class RecentSearchManager implements AlphaFineSearchProvider { public SearchResult getMoreSearchResult(String searchText) { return new SearchResult(); } - + private synchronized SearchResult getRecentModelList(String searchText) { return searchBySort(searchText); } @@ -161,7 +161,6 @@ public class RecentSearchManager implements AlphaFineSearchProvider { * 按序搜索 */ private synchronized SearchResult searchBySort(String key) { - recentModelList = new SearchResult(); try { initReader(); @@ -175,7 +174,6 @@ public class RecentSearchManager implements AlphaFineSearchProvider { Query query = new TermQuery(term); TopFieldDocs docs = searcher.search(query, MAX_SIZE, sortKey); ScoreDoc[] scores = docs.scoreDocs; - this.recentModelList = new SearchResult(); //遍历结果 for (ScoreDoc scoreDoc : scores) { Document document = searcher.doc(scoreDoc.doc); From 58f85e4b10626e0ab1516d9bd37686df6b0b9327 Mon Sep 17 00:00:00 2001 From: shine Date: Mon, 7 Dec 2020 11:14:19 +0800 Subject: [PATCH 5/9] =?UTF-8?q?CHART-17231=20=E9=BB=98=E8=AE=A4=E4=B8=8D?= =?UTF-8?q?=E9=80=89=E4=B8=AD=20=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/extended/chart/UIComboBoxWithNone.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java b/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java index f20675066..e44214833 100644 --- a/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java +++ b/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java @@ -2,6 +2,8 @@ package com.fr.extended.chart; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.i18n.Toolkit; +import com.fr.general.GeneralUtils; +import com.fr.stable.StringUtils; import java.util.List; @@ -17,6 +19,11 @@ public class UIComboBoxWithNone extends UIComboBox { public UIComboBoxWithNone() { super(); addDefaultItem(); + setDefaultSelectedItem(); + } + + protected void setDefaultSelectedItem() { + setSelectedItem(null); } @Override @@ -43,7 +50,9 @@ public class UIComboBoxWithNone extends UIComboBox { //找不到的都选中无。中文的无 英文下是none。 //改正：找不到的且anObject不是null的 全部选中无。 - if (getSelectedIndex() == -1 && anObject != null) { + //改正：找不到的且anObject不是null的且anObject不是空字符串的 全部选中无。 + if (getSelectedIndex() == -1 && StringUtils.isNotEmpty(GeneralUtils.objectToString(anObject))) { + //进到if的anObject一定是某个国际化环境下的无 super.setSelectedItem(getDefaultLocaleString()); } } From ee32c3b9fef5eb8ba1021b4a83d84e3f75e915bb Mon Sep 17 00:00:00 2001 From: shine Date: Mon, 7 Dec 2020 11:15:23 +0800 Subject: [PATCH 6/9] update --- .../src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java b/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java index e44214833..0459cd710 100644 --- a/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java +++ b/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java @@ -52,7 +52,6 @@ public class UIComboBoxWithNone extends UIComboBox { //改正：找不到的且anObject不是null的 全部选中无。 //改正：找不到的且anObject不是null的且anObject不是空字符串的 全部选中无。 if (getSelectedIndex() == -1 && StringUtils.isNotEmpty(GeneralUtils.objectToString(anObject))) { - //进到if的anObject一定是某个国际化环境下的无 super.setSelectedItem(getDefaultLocaleString()); } } From 63779ffdcf6c8470218c2718f7345341eb672c09 Mon Sep 17 00:00:00 2001 From: Yvan Date: Mon, 7 Dec 2020 11:15:43 +0800 Subject: [PATCH 7/9] =?UTF-8?q?REPORT-44390=20alpha-fine=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3=EF=BC=8C=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA=E8=AF=A6=E7=BB=86=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=96=87=E6=A1=A3=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=20=E6=94=B9=E5=8A=A8=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E6=96=B9=E6=B3=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/manager/impl/RecentSearchManager.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java index 3c7de497a..d9b93fb55 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java @@ -69,7 +69,7 @@ public class RecentSearchManager implements AlphaFineSearchProvider { this.recentModelList = new SearchResult(); SearchResult modelList = new SearchResult(); for (String aSearchText : searchText) { - getRecentModelList(aSearchText); + addToRecentModelList(aSearchText); } if (recentModelList != null && recentModelList.size() > 0) { modelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Latest"))); @@ -87,8 +87,12 @@ public class RecentSearchManager implements AlphaFineSearchProvider { return new SearchResult(); } - private synchronized SearchResult getRecentModelList(String searchText) { - return searchBySort(searchText); + /** + * 将单次遍历的关键词的搜索结果添加到结果集中 + * @param searchText + */ + private synchronized void addToRecentModelList(String searchText) { + searchBySort(searchText); } public List getRecentModelList() { From a9a98b2d0ca30a28a821b67b7c818f1e9c391ff7 Mon Sep 17 00:00:00 2001 From: hades Date: Mon, 7 Dec 2020 19:51:53 +0800 Subject: [PATCH 8/9] =?UTF-8?q?REPORT-44784=20=E5=A4=8D=E5=88=B6tab?= =?UTF-8?q?=E5=9D=97=E4=B8=AD=E7=9A=84=E5=9B=BE=E8=A1=A8=E5=9D=97=E5=88=B0?= =?UTF-8?q?=E5=86=B3=E5=AE=9A=E7=94=BB=E5=B8=83=E5=9D=97=E4=B8=AD=20?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AFh5=E6=9F=A5=E7=9C=8B=E4=B8=8D?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=9C=89=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/ui/designer/mobile/ChartEditorDefinePane.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java index 371fcde7a..35f3ccbb1 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java @@ -176,8 +176,10 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane { this.functionalWhenUnactivatedCheckBox.setSelected(!isFunctionalWhenUnactivated); this.bindListeners2Widgets(); this.addAttributeChangeListener(changeListener); - + // 直接return时 也要处理下相应数据 + MobileCollapsedStyle style = ((ChartEditor) xCreator.toData()).getMobileCollapsedStyle(); if (!FormDesignerUtils.isAppRelayout(designer) || isInAbsoluteLayout()) { + fix(style); return; } @@ -199,8 +201,6 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane { } } }); - - MobileCollapsedStyle style = ((ChartEditor) xCreator.toData()).getMobileCollapsedStyle(); this.mobileCollapsedStyleEditor.setStyle(style); fix(style); this.mobileCollapsedStyleEditor.setSelected(style.isCollapsedWork()); From 0ff4a5e35910d7665975276eb249b4fa94506fd9 Mon Sep 17 00:00:00 2001 From: shine Date: Tue, 8 Dec 2020 11:41:09 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java b/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java index 0459cd710..65e7bbb43 100644 --- a/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java +++ b/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java @@ -23,7 +23,7 @@ public class UIComboBoxWithNone extends UIComboBox { } protected void setDefaultSelectedItem() { - setSelectedItem(null); + setSelectedItem(StringUtils.EMPTY); } @Override