Browse Source

Pull request #6347: REPORT-58538 适配平台支持服务器数据集权限

Merge in DESIGN/design from ~HENRY.WANG/design:final/11.0 to final/11.0

* commit '2c5364119057db9aad70d9c2a39e1c4623742d09':
  REPORT-58538 适配平台支持服务器数据集权限
new-design
Henry.Wang 3 years ago
parent
commit
233643a4bd
  1. 16
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java

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

@ -53,6 +53,7 @@ import com.fr.plugin.injectable.PluginModule;
import com.fr.plugin.manage.PluginFilter; import com.fr.plugin.manage.PluginFilter;
import com.fr.plugin.observer.PluginEvent; import com.fr.plugin.observer.PluginEvent;
import com.fr.plugin.observer.PluginEventListener; import com.fr.plugin.observer.PluginEventListener;
import com.fr.stable.StringUtils;
import com.fr.stable.core.PropertyChangeAdapter; import com.fr.stable.core.PropertyChangeAdapter;
import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContext;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -74,6 +75,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
@ -180,16 +182,20 @@ public class TableDataTreePane extends BasicTableDataTreePane {
} }
private void initServerDatasetAuthTipJPanel() { private void initServerDatasetAuthTipJPanel() {
String[] lineTips = Toolkit.i18nText("Fine-Design_Server_Dataset_Auth_Tip").split("\n"); String datasetAuthTip = Toolkit.i18nText("Fine-Design_Server_Dataset_Auth_Tip");
List<String> lineTips = new ArrayList(Arrays.asList(datasetAuthTip.split("\n")));
if (datasetAuthTip.endsWith("\n")) {
lineTips.add(StringUtils.EMPTY);
}
serverDatasetAuthTipJPanel = new JPanel(); serverDatasetAuthTipJPanel = new JPanel();
serverDatasetAuthTipJPanel.setLayout(new GridLayout(lineTips.length, 1)); serverDatasetAuthTipJPanel.setLayout(new GridLayout(lineTips.size(), 1));
for (int i = 0; i < lineTips.length; i++) { for (int i = 0; i < lineTips.size(); i++) {
String lineTip = lineTips[i]; String lineTip = lineTips.get(i);
List<JLabel> jLabels = new ArrayList<>(); List<JLabel> jLabels = new ArrayList<>();
JLabel lineJLabel = new JLabel(lineTip); JLabel lineJLabel = new JLabel(lineTip);
lineJLabel.setForeground(Color.lightGray); lineJLabel.setForeground(Color.lightGray);
jLabels.add(lineJLabel); jLabels.add(lineJLabel);
if (i == (lineTips.length - 1)) { if (i == (lineTips.size() - 1)) {
JLabel jLabel = new JLabel(Toolkit.i18nText("Fine-Design_Basic_Alphafine_No_Remind")); JLabel jLabel = new JLabel(Toolkit.i18nText("Fine-Design_Basic_Alphafine_No_Remind"));
jLabel.setForeground(Color.blue); jLabel.setForeground(Color.blue);
jLabel.addMouseListener(new MouseAdapter() { jLabel.addMouseListener(new MouseAdapter() {

Loading…
Cancel
Save