Pull request #8832: 无jira 解决冲突

Merge in DESIGN/design from ~HADES/design:feature/x to feature/x

* commit '47fe63a2fb56177a8b5abf2c9fc194462710ee95':
  REPORT-70426 条件属性支持汇总数组-交互界面问题
  REPORT-70446 添加工具方法
  REPORT-70446 交互视觉修改 svg图片绘制问题
  REPORT-70387 次管远程连接，会看到特定的没有权限的数据连接
  REPORT-70446 交互视觉修改

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java

@@ -142,7 +142,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
             if (StringUtils.isNotBlank(s)) {
                 // 之前的写法有多线程问题，nameList异步尚未初始化完成的时候，这里可能无法匹配设置数据连接名称，导致DBTableDataPane打开后连接面板空白
                 // 这里的需求无非是设置上一次使用的数据连接，做个简单检查这个连接是否存在即可，存在就设置
-                if (ConnectionConfig.getInstance().getConnection(s) != null) {
+                if (nameList.contains(s)) {
                     this.setSelectedItem(s);
                 }
             }

designer-base/src/main/java/com/fr/design/utils/SvgPaintUtils.java

@@ -0,0 +1,28 @@
+package com.fr.design.utils;
+
+import com.fr.base.svg.SVGLoader;
+import com.fr.base.svg.SystemScaleUtils;
+import java.awt.Graphics2D;
+
+/**
+ * 用于绘制svg图片缩放(高分屏下)
+ *
+ * @author hades
+ * @version 11.0
+ * Created by hades on 2022/5/6
+ */
+public class SvgPaintUtils {
+
+    public static void beforePaint(Graphics2D g2) {
+        if (SystemScaleUtils.isJreHiDPIEnabled()) {
+            g2.scale(1 / SVGLoader.SYSTEM_SCALE, 1 / SVGLoader.SYSTEM_SCALE);
+        }
+    }
+
+    public static void afterPaint(Graphics2D g2) {
+        if (SystemScaleUtils.isJreHiDPIEnabled()) {
+            g2.scale(SVGLoader.SYSTEM_SCALE, SVGLoader.SYSTEM_SCALE);
+        }
+    }
+
+}

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java

@@ -2,6 +2,7 @@ package com.fr.design.chart.series.SeriesCondition;
 
 import com.fr.chart.chartattr.Chart;
 import com.fr.data.DSColumnWithSummaryMethod;
+import com.fr.data.util.function.AbstractDataFunction;
 import com.fr.design.chart.ChartDataHelper;
 import com.fr.design.data.datapane.SummaryMethodComboBox;
 import com.fr.design.editor.editor.Editor;
@@ -25,12 +26,15 @@ public class ColSelectedWithSummaryMethodEditor extends Editor<DSColumnWithSumma
             columnNameComboBox = new UIComboBox();
         }
         columnNameComboBox.setPreferredSize(new Dimension(82, 20));
-        this.add(columnNameComboBox);
         summaryMethodComboBox = new SummaryMethodComboBox();
         summaryMethodComboBox.setModel(summaryMethodComboBoxModel);
         summaryMethodComboBox.setPreferredSize(new Dimension(82, 20));
+        this.setLayout(FRGUIPaneFactory.createLeftZeroVgapNormalHgapLayout());
+        this.add(columnNameComboBox);
         this.add(summaryMethodComboBox);
         columnNameComboBox.setModel(columnNameComboBoxModel);
+        columnNameComboBox.setSelectedItem(null);
+        summaryMethodComboBox.setSelectedItem(null);
     }
 
     public static void refreshCommonChartFieldNames(Chart chart) {
@@ -52,6 +56,8 @@ public class ColSelectedWithSummaryMethodEditor extends Editor<DSColumnWithSumma
             for (String method : SummaryMethodComboBox.CALCULATE_ARRAY) {
                 summaryMethodComboBoxModel.addElement(method);
             }
+            columnNameComboBoxModel.setSelectedItem(null);
+            summaryMethodComboBoxModel.setSelectedItem(null);
         } else {
             columnNameComboBoxModel.removeAllElements();
             summaryMethodComboBoxModel.removeAllElements();
@@ -77,7 +83,7 @@ public class ColSelectedWithSummaryMethodEditor extends Editor<DSColumnWithSumma
     public void setValue(DSColumnWithSummaryMethod value) {
         if (value != null) {
             columnNameComboBox.setSelectedItem(value.getFieldName());
-            summaryMethodComboBox.setSelectedItem(value.getDataFunction());
+            summaryMethodComboBox.populateBean((AbstractDataFunction)value.getDataFunction());
         }
     }
 

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/ProductNewsImagePanel.java

@@ -2,8 +2,10 @@ package com.fr.design.mainframe.alphafine.component;
 
 import com.fr.base.GraphHelper;
 import com.fr.base.svg.SVGLoader;
+import com.fr.base.svg.SystemScaleUtils;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.alphafine.model.ProductNews;
+import com.fr.design.utils.SvgPaintUtils;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -56,7 +58,9 @@ public class ProductNewsImagePanel extends JPanel {
         }
         Set<Long> readSet = DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().getReadSet();
         if (!readSet.contains(productNews.getId())) {
-            g2.drawImage(NEW_TIP_IMAGE, 0, 0, (int) (NEW_TIP_IMAGE.getWidth(this) / SVGLoader.SYSTEM_SCALE), (int) (NEW_TIP_IMAGE.getHeight(this) / SVGLoader.SYSTEM_SCALE), this);
+            SvgPaintUtils.beforePaint(g2);
+            g2.drawImage(NEW_TIP_IMAGE, 0, 0, this);
+            SvgPaintUtils.afterPaint(g2);
         }
 
         g2.setColor(BACKGROUND_COLOR);

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/question/QuestionPane.java

@@ -1,7 +1,9 @@
 package com.fr.design.mainframe.alphafine.question;
 
 import com.fr.base.svg.SVGLoader;
+import com.fr.base.svg.SystemScaleUtils;
 import com.fr.design.mainframe.alphafine.AlphaFineUtil;
+import com.fr.design.utils.SvgPaintUtils;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -23,6 +25,10 @@ public class QuestionPane extends JPanel {
 
     private static final Image QUESTION_BACKGROUND_IMAGE = SVGLoader.load("/com/fr/design/mainframe/alphafine/images/groupbackgroud.svg");
 
+    private static final int WIDTH = 40;
+
+    private static final int HEIGHT = 40;
+
 
     public QuestionPane() {
         this.setBackground(new Color(0, 0, 0, 0));
@@ -34,14 +40,21 @@ public class QuestionPane extends JPanel {
         Graphics2D g2 = (Graphics2D) g;
         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+        SvgPaintUtils.beforePaint(g2);
+        // 宽高保持
+        int width = SystemScaleUtils.isJreHiDPIEnabled() ? (int) (getWidth() * SVGLoader.SYSTEM_SCALE) : getWidth();
+        int height = SystemScaleUtils.isJreHiDPIEnabled() ? (int) (getHeight() * SVGLoader.SYSTEM_SCALE) : getHeight();
+
         if (AlphaFineUtil.unread()) {
-            g2.drawImage(NEW_MESSAGE_IMAGE, 0, 0, getWidth(), getHeight(), this);
+            g2.drawImage(NEW_MESSAGE_IMAGE, 0, 0, width, height, this);
         } else {
-            g2.drawImage(QUESTION_BACKGROUND_IMAGE, 0, 0, getWidth(), getHeight(), this);
+            g2.drawImage(QUESTION_BACKGROUND_IMAGE, 0, 0, width, height, this);
         }
-        int imageWidth = (int) (QUESTION_IMAGE.getWidth(this) / SVGLoader.SYSTEM_SCALE);
-        int imageHeight = (int) (QUESTION_IMAGE.getHeight(this) / SVGLoader.SYSTEM_SCALE);
-        g2.drawImage(QUESTION_IMAGE, (getWidth() - imageWidth) / 2, (getHeight() - imageHeight) / 2, imageWidth, imageHeight, this);
+
+        int imageWidth = QUESTION_IMAGE.getWidth(this);
+        int imageHeight =  QUESTION_IMAGE.getHeight(this);
+        g2.drawImage(QUESTION_IMAGE, (width - imageWidth) / 2, (height - imageHeight) / 2,  imageWidth, imageHeight,this);
+        SvgPaintUtils.afterPaint(g2);
     }
 
 

designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/group_new.svg

@@ -1,4 +1,4 @@
 <svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M32.9794 8.01574C32.1473 8.63412 31.1164 9 30 9C27.2386 9 25 6.76142 25 4C25 3.15756 25.2083 2.36378 25.5763 1.66737C23.2735 0.597339 20.7065 0 18 0C8.05887 0 0 8.05887 0 18C0 27.9411 8.05887 36 18 36C27.9411 36 36 27.9411 36 18C36 14.3065 34.8875 10.8728 32.9794 8.01574ZM18.1874 10C19.6551 10 20.8185 10.3972 21.7062 11.2167C22.5658 12.0066 23 13.095 23 14.46C23 15.483 22.7055 16.3837 22.1198 17.1565C21.8802 17.444 21.2511 18.0441 20.3133 18.8752C19.8557 19.2704 19.533 19.6504 19.3154 20.042C19.0497 20.4917 18.9221 20.9866 18.9221 21.5577V22.0647L18.7384 22.2483H16.975L16.7913 22.0647V21.5577C16.7913 20.8039 16.9292 20.1376 17.2053 19.5623C17.5279 18.8711 18.2717 18.0163 19.4682 16.9531C19.9441 16.4772 20.096 16.3188 20.2041 16.1747C20.6219 15.6525 20.8251 15.119 20.8251 14.5481C20.8251 13.7278 20.5868 13.0854 20.1267 12.6253C19.6672 12.1457 18.9969 11.9104 18.0992 11.9104C17.0461 11.9104 16.29 12.2425 15.7969 12.9202C15.3385 13.5036 15.1087 14.3027 15.1087 15.3417L14.9251 15.5253H13.1837L13 15.3417C13 13.7383 13.4434 12.465 14.3483 11.5149C15.2669 10.5045 16.5511 10 18.1874 10ZM18.9571 23.8527C18.6667 23.5624 18.2962 23.4242 17.8573 23.4242C17.4239 23.4242 17.0725 23.5598 16.7796 23.8527C16.4894 24.1185 16.3511 24.4706 16.3511 24.9084C16.3511 25.3419 16.4867 25.6932 16.7796 25.9861C17.0907 26.2715 17.4454 26.4146 17.8573 26.4146C18.2693 26.4146 18.6239 26.2715 18.9293 25.9916C19.2344 25.7119 19.3856 25.3529 19.3856 24.9084C19.3856 24.4919 19.2388 24.1345 18.9571 23.8527Z" fill="#419BF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.9794 8.01574C32.1473 8.63412 31.1164 9 30 9C27.2386 9 25 6.76142 25 4C25 3.15756 25.2083 2.36378 25.5763 1.66737C23.2735 0.597339 20.7065 0 18 0C8.05887 0 0 8.05887 0 18C0 27.9411 8.05887 36 18 36C27.9411 36 36 27.9411 36 18C36 14.3065 34.8875 10.8728 32.9794 8.01574Z" fill="#419BF9"/>
 <circle cx="30" cy="4" r="4" fill="#EB1D1F"/>
 </svg>