Pull request #16623: REPORT-139082 feat:FR取数数据中心-交互优化

Merge in DESIGN/design from ~LEVY.XIE/design:fbp/feature to fbp/feature

* commit '48bd257200cd9d542d459dc6d96efdbade39e75f':
  REPORT-139082 feat:FR取数数据中心-交互优化

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

@@ -1,7 +1,9 @@
 package com.fr.design.data.datapane;
 
+import com.fine.component.toast.ToastMsgManager;
 import com.fine.theme.icon.LazyIcon;
 import com.fine.theme.light.ui.FineRoundBorder;
+import com.fine.theme.utils.FineUIStyle;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.base.TableData;
 import com.fr.data.MultiResultTableData;
@@ -264,7 +266,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
      * @return
      */
     private JPanel initTreePane() {
-        JPanel treePane = new JPanel(new BorderLayout(0, scale(6)));
+        JPanel treePane = new JPanel(new BorderLayout());
         // north
         JPanel northPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
         initServerDatasetAuthTipJPanel();
@@ -299,11 +301,11 @@ public class TableDataTreePane extends BasicTableDataTreePane {
             String lineTip = lineTips.get(i);
             List<JLabel> jLabels = new ArrayList<>();
             JLabel lineJLabel = new JLabel(lineTip);
-            lineJLabel.setForeground(Color.lightGray);
+            FineUIStyle.setStyle(lineJLabel, FineUIStyle.LABEL_TIP);
             jLabels.add(lineJLabel);
             if (i == (lineTips.size() - 1)) {
                 JLabel jLabel = new JLabel(Toolkit.i18nText("Fine-Design_Basic_Alphafine_No_Remind"));
-                jLabel.setForeground(Color.blue);
+                FineUIStyle.setStyle(jLabel, FineUIStyle.HYPER_LINK_LABEL);
                 jLabel.addMouseListener(new MouseAdapter() {
                     @Override
                     public void mouseClicked(MouseEvent e) {
@@ -1023,7 +1025,13 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            dgEdit(getTableDataInstance().creatTableDataPane(), createDsName(getNamePrefix()), false);
+            try {
+                dgEdit(getTableDataInstance().creatTableDataPane(), createDsName(getNamePrefix()), false);
+            } catch (Exception ex) {
+                String msg = StringUtils.isEmpty(ex.getMessage()) ? Toolkit.i18nText("Fine-Design_Remote_Data_Error")
+                        : ex.getMessage();
+                ToastMsgManager.getInstance().error(msg);
+            }
         }
     }
 

designer-base/src/main/java/com/fr/design/dialog/CollapsibleDetailDialog.java

@@ -5,6 +5,7 @@ import com.fine.theme.utils.FineUIScale;
 import com.fine.theme.utils.FineUIStyle;
 import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
+import com.fr.design.border.FineBorderFactory;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
@@ -107,6 +108,8 @@ public class CollapsibleDetailDialog extends JDialog implements ActionListener {
         scrollPane.getViewport().setOpaque(false);
         textArea.setOpaque(false);
         textArea.setEditable(false);
+        textArea.setBorder(null);
+        scrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder());
         hiddenPanel = row(fix(30), cell(scrollPane).weight(1)).getComponent();
         hiddenPanel.setVisible(false);
         hiddenPanel.setBorder(new ScaledEmptyBorder(0, 0, 0, 10));