Browse Source
* commit 'ffd5edf902666627112a9195d2020b6fd02aeca5': (267 commits) REPORT-41479 设计器参数界面宽度无法拖动 REPORT-41492 jdk11设计器默认字体有不一致的情况 REPORT-41543 触发一下pr REPORT-41491【冒烟】af搜索结果错乱 REPORT-41414 && REPORT-41495 【问题原因】REPORT-41414中之前改动没有考虑到菜单栏-模板-模板数据集界面中也会包括MaxMemRowCountPanel，然而模板数据集界面中给MaxMemRowCountPanel的空间比较小，会造成MaxMemRowCountPanel显示异常；REPORT-41495产生原因是Windows下的JDK11绘制时会有缩放效果，这里是字被放大了一点，把后面的框挤下去了，而之前回归改动只修改了"文件重命名"的情况，没有考虑"文件夹重命名" 【改动思路】REPORT-41414 在DBTableDataPane中把中间一部分的宽度缩短一点，相当于拉长了右侧的MaxMemRowCountPanel；REPORT-41495中将文本框缩小一点 CHART-16040 箱型图富文本编辑器参数修改 增加空判断 CHART-16224 增加富文本条件属性界面事件 CHART-16040 箱型图富文本参数面板修改 CHART-15957 & CHART-15957 调整富文本打开时的鼠标位置和字符样式 CHART-15955 & CHART-16115 调整富文本界面宽高 删除多余的语句 CHART-16226 富文本提示默认居左 CHART-16148 解决组合图中标签颜色颜色触发更新导致的属性储存错误 CHART-16154 & CHART-16194 删除搜索框、切换自动时，不修改对齐方式 REPORT-41414 数据集-繁体设计器，共享数据集缓存到磁盘记录数输入框消失 【问题原因】之前的一个改动将MaxMexRowCountPanel中的UISpinner给拉长得过多，超过了设定的最大宽度，因此输入框没能显示 【改动思路】调整拉长幅度，另外根据国际化特点调整了最大宽度 REPORT-41333 【冒烟】全局参数添加两个参数p1p2，将p2重命名为p1，不会有参数名重复的提醒 REPORT-41333 【冒烟】全局参数添加两个参数p1p2，将p2重命名为p1，不会有参数名重复的提醒 REPORT-38872 修改下变量名 REPORT-38872 设计器https证书密码明文存储 ...persist/10.0 10.0.10.2020.10.20
superman
4 years ago
272 changed files with 7776 additions and 2823 deletions
@ -0,0 +1,106 @@
|
||||
package com.fr.design.gui.ipasswordfield; |
||||
|
||||
import com.fr.stable.StringUtils; |
||||
import org.jetbrains.annotations.NotNull; |
||||
|
||||
import javax.swing.text.Document; |
||||
import java.awt.event.KeyAdapter; |
||||
import java.awt.event.KeyEvent; |
||||
import java.awt.event.MouseAdapter; |
||||
import java.awt.event.MouseEvent; |
||||
|
||||
/** |
||||
* @author Yvan |
||||
* @version 10.0 |
||||
* Created by Yvan on 2020-08-11 |
||||
* 有固定长度的"*"回显的密码框，避免泄露密码长度 |
||||
*/ |
||||
public class UIPasswordFieldWithFixedLength extends UIPassWordField { |
||||
/** |
||||
* 展示密码，为固定8位长度的特殊字符"*"组成 |
||||
*/ |
||||
private static final String DISPLAY_PASSWORD = "********"; |
||||
|
||||
/** |
||||
* 实际密码 |
||||
*/ |
||||
private String realPassword; |
||||
|
||||
/** |
||||
* 用于判断是否清空密码 |
||||
*/ |
||||
private boolean clearPassword; |
||||
|
||||
public UIPasswordFieldWithFixedLength() { |
||||
this(null, null, 0); |
||||
} |
||||
|
||||
public UIPasswordFieldWithFixedLength(String text) { |
||||
this(null, text, 0); |
||||
} |
||||
|
||||
public UIPasswordFieldWithFixedLength(int columns) { |
||||
this(null, null, columns); |
||||
} |
||||
|
||||
public UIPasswordFieldWithFixedLength(String text, int columns) { |
||||
this(null, text, columns); |
||||
} |
||||
|
||||
public UIPasswordFieldWithFixedLength(Document doc, String txt, int columns) { |
||||
super(doc, txt, columns); |
||||
initRealPassword(txt); |
||||
} |
||||
|
||||
/** |
||||
* 为realPassword赋初值并添加一个鼠标单击事件 |
||||
*/ |
||||
public void initRealPassword(String text) { |
||||
this.realPassword = text == null ? StringUtils.EMPTY : text; |
||||
this.clearPassword = true; |
||||
addShowFixedLengthPasswordListener(); |
||||
} |
||||
|
||||
/** |
||||
* 当鼠标点击密码框，第一次做出键入动作时，清空显示密码与实际密码，用户需要重新输入密码 |
||||
*/ |
||||
private void addShowFixedLengthPasswordListener() { |
||||
this.addMouseListener(new MouseAdapter() { |
||||
@Override |
||||
public void mouseClicked(MouseEvent e) { |
||||
UIPasswordFieldWithFixedLength.this.clearPassword = true; |
||||
} |
||||
}); |
||||
this.addKeyListener(new KeyAdapter() { |
||||
@Override |
||||
public void keyPressed(KeyEvent e) { |
||||
if (clearPassword) { |
||||
UIPasswordFieldWithFixedLength.this.setText(StringUtils.EMPTY); |
||||
UIPasswordFieldWithFixedLength.this.clearPassword = false; |
||||
UIPasswordFieldWithFixedLength.this.updateUI(); |
||||
} |
||||
} |
||||
}); |
||||
} |
||||
|
||||
@Override |
||||
public void setText(@NotNull String t) { |
||||
this.realPassword = t; |
||||
// 看到代码中有些场景是将密码置为空字符串的，所以在这里加个判断
|
||||
if (StringUtils.isEmpty(t)) { |
||||
super.setText(t); |
||||
} else { |
||||
super.setText(DISPLAY_PASSWORD); |
||||
} |
||||
} |
||||
|
||||
@Override |
||||
public char[] getPassword() { |
||||
//如果用户刚清空密码框，并输入了新密码，则返回输入内容，否则返回realPassword
|
||||
String text = new String(super.getPassword()); |
||||
if (!StringUtils.isEmpty(text) && StringUtils.isEmpty(realPassword)) { |
||||
return text.toCharArray(); |
||||
} |
||||
return realPassword.toCharArray(); |
||||
} |
||||
} |
||||
@ -0,0 +1,38 @@
|
||||
package com.fr.design.jdk; |
||||
|
||||
import com.fr.stable.StableUtils; |
||||
|
||||
/** |
||||
* 设计器运行jdk版本 |
||||
* |
||||
* @author hades |
||||
* @version 10.0 |
||||
* Created by hades on 2020/9/27 |
||||
*/ |
||||
public enum JdkVersion { |
||||
|
||||
/** |
||||
* 小于或等于jdk 8 |
||||
*/ |
||||
LE_8 { |
||||
|
||||
@Override |
||||
public boolean support() { |
||||
return StableUtils.getMajorJavaVersion() <= 8; |
||||
} |
||||
}, |
||||
|
||||
/** |
||||
* 大于或等于jdk 9 |
||||
*/ |
||||
GE_9 { |
||||
|
||||
@Override |
||||
public boolean support() { |
||||
return StableUtils.getMajorJavaVersion() >= 9; |
||||
} |
||||
}; |
||||
|
||||
|
||||
abstract public boolean support(); |
||||
} |
||||
@ -0,0 +1,20 @@
|
||||
package com.fr.design.mainframe; |
||||
|
||||
import javax.swing.JWindow; |
||||
|
||||
/** |
||||
* @Author: Yuan.Wang |
||||
* @Date: 2020/10/9 |
||||
* 只关心Window的显示和隐藏操作时可以实现该接口 |
||||
*/ |
||||
public interface PromptWindow { |
||||
/** |
||||
* 显示弹窗 |
||||
*/ |
||||
void showWindow(); |
||||
|
||||
/** |
||||
* 隐藏弹窗 |
||||
*/ |
||||
void hideWindow(); |
||||
} |
||||
@ -0,0 +1,22 @@
|
||||
package com.fr.design.notification; |
||||
|
||||
/** |
||||
* @Author: Yuan.Wang |
||||
* @Date: 2020/9/27 |
||||
*/ |
||||
public abstract class AbstractSnapChat implements SnapChat { |
||||
@Override |
||||
public boolean hasRead() { |
||||
|
||||
String calcKey = calcKey(); |
||||
Boolean val = SnapChatConfig.getInstance().hasRead(calcKey); |
||||
return val == null ? defaultStatus() : val; |
||||
} |
||||
|
||||
@Override |
||||
public void markRead() { |
||||
|
||||
String calcKey = calcKey(); |
||||
SnapChatConfig.getInstance().markRead(calcKey); |
||||
} |
||||
} |
||||
@ -0,0 +1,32 @@
|
||||
package com.fr.design.notification; |
||||
|
||||
import com.fr.plugin.context.PluginContext; |
||||
|
||||
/** |
||||
* @Author: Yuan.Wang |
||||
* @Date: 2020/10/10 |
||||
*/ |
||||
public class SnapChatFactory { |
||||
public static SnapChat createSnapChat(boolean defaultStatus, SnapChatKey snapChatKey) { |
||||
return createSnapChat(defaultStatus, snapChatKey, null); |
||||
} |
||||
|
||||
public static SnapChat createSnapChat(boolean defaultStatus, SnapChatKey snapChatKey, PluginContext context) { |
||||
return new AbstractSnapChat() { |
||||
@Override |
||||
public boolean defaultStatus() { |
||||
return defaultStatus; |
||||
} |
||||
|
||||
@Override |
||||
public SnapChatKey key() { |
||||
return snapChatKey; |
||||
} |
||||
|
||||
@Override |
||||
public String calcKey() { |
||||
return context == null ? key().calc() : key().calc(context); |
||||
} |
||||
}; |
||||
} |
||||
} |
||||
@ -1,9 +1,18 @@
|
||||
package com.fr.design.notification; |
||||
|
||||
import com.fr.plugin.context.PluginContext; |
||||
|
||||
/** |
||||
* created by Harrison on 2020/03/16 |
||||
**/ |
||||
public interface SnapChatKey { |
||||
|
||||
|
||||
String calc(); |
||||
|
||||
/** |
||||
* 插件刚被安装时不能通过PluginContexts.getContext()方法获取插件上下文，因此加一个接口 |
||||
*/ |
||||
default String calc(PluginContext context) { |
||||
throw new UnsupportedOperationException(); |
||||
} |
||||
} |
||||
|
||||
@ -1,129 +0,0 @@
|
||||
package com.fr.design.update.factory; |
||||
|
||||
import com.fr.log.FineLoggerFactory; |
||||
import com.fr.stable.ArrayUtils; |
||||
import com.fr.stable.StableUtils; |
||||
|
||||
import java.io.BufferedInputStream; |
||||
import java.io.BufferedOutputStream; |
||||
import java.io.DataInputStream; |
||||
import java.io.DataOutputStream; |
||||
import java.io.File; |
||||
import java.io.FileFilter; |
||||
import java.io.FileInputStream; |
||||
import java.io.FileOutputStream; |
||||
import java.io.IOException; |
||||
import java.util.Arrays; |
||||
|
||||
/** |
||||
* Created by XINZAI on 2018/8/21. |
||||
*/ |
||||
public class DirectoryOperationFactory { |
||||
/** |
||||
* 新建一个目录 |
||||
* |
||||
* @param dirPath 目录路径 |
||||
*/ |
||||
public static void createNewDirectory(String dirPath) { |
||||
try { |
||||
File newDirPath = new File(dirPath); |
||||
if (!newDirPath.exists()) { |
||||
StableUtils.mkdirs(newDirPath); |
||||
} |
||||
} catch (Exception e) { |
||||
FineLoggerFactory.getLogger().error(e.getMessage()); |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* 删除目录 |
||||
* |
||||
* @param dirPath 目录路径 |
||||
*/ |
||||
public static void deleteDirectory(String dirPath) { |
||||
try { |
||||
File dir = new File(dirPath); |
||||
if (dir.isDirectory()) { |
||||
File[] file = dir.listFiles(); |
||||
for (File fileTemp : file) { |
||||
deleteDirectory(fileTemp.toString()); |
||||
fileTemp.delete(); |
||||
} |
||||
} else { |
||||
dir.delete(); |
||||
} |
||||
dir.delete(); |
||||
} catch (Exception e) { |
||||
FineLoggerFactory.getLogger().error(e.getMessage()); |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* 复制目录 |
||||
* |
||||
* @param oldDirPath 被复制目录 |
||||
* @param newDirPath 新目录 |
||||
*/ |
||||
public static void copyDirectory(String oldDirPath, String newDirPath) { |
||||
File oldDir = new File(oldDirPath); |
||||
if (oldDir.isDirectory()) { |
||||
StableUtils.mkdirs(new File(newDirPath)); |
||||
File[] files = oldDir.listFiles(); |
||||
for (File fileTemp : files) { |
||||
copyDirectory(fileTemp.toString(), newDirPath + "/" + fileTemp.getName()); |
||||
} |
||||
} else { |
||||
try { |
||||
copy(oldDirPath, newDirPath); |
||||
} catch (IOException e) { |
||||
FineLoggerFactory.getLogger().error(e.getMessage()); |
||||
} |
||||
} |
||||
} |
||||
|
||||
private static void copy(String path1, String path2) throws IOException { |
||||
try (DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(path1))); |
||||
DataOutputStream out = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(path2)))) { |
||||
byte[] date = new byte[in.available()]; |
||||
in.read(date); |
||||
out.write(date); |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* 移动目录 |
||||
* |
||||
* @param oldDirPath 被移动目录 |
||||
* @param newDirPath 新目录 |
||||
*/ |
||||
public static void moveDirectory(String oldDirPath, String newDirPath) { |
||||
copyDirectory(oldDirPath, newDirPath); |
||||
deleteDirectory(oldDirPath); |
||||
} |
||||
|
||||
/** |
||||
* 列出过滤后的文件 |
||||
* |
||||
* @param installHome 安装目录 |
||||
* @param backupdir 备份目录 |
||||
* @return String数组 |
||||
*/ |
||||
public static String[] listFilteredFiles(String installHome, String backupdir) { |
||||
File backupDir = new File(StableUtils.pathJoin(installHome, backupdir)); |
||||
StableUtils.mkdirs(backupDir); |
||||
File[] fileNames = backupDir.listFiles(new FileFilter() { |
||||
@Override |
||||
public boolean accept(File pathname) { |
||||
return pathname.isDirectory(); |
||||
} |
||||
}); |
||||
String[] jarFileName = new String[fileNames.length]; |
||||
int j = 0; |
||||
for (File fileName : fileNames) { |
||||
if ((fileName.isDirectory()) && (ArrayUtils.getLength(fileName.listFiles()) > 0)) {//判断备份文件夹中是否为空，为空不显示
|
||||
jarFileName[j++] = fileName.getName(); |
||||
} |
||||
} |
||||
return Arrays.copyOf(jarFileName, j); |
||||
} |
||||
} |
||||
@ -0,0 +1,50 @@
|
||||
package com.fr.design.update.factory; |
||||
|
||||
import com.fr.decision.update.data.UpdateConstants; |
||||
import com.fr.log.FineLoggerFactory; |
||||
import com.fr.stable.StableUtils; |
||||
|
||||
import java.io.File;; |
||||
|
||||
/** |
||||
* @author Bryant |
||||
* @version 10.0 |
||||
* Created by Bryant on 2020-09-29 |
||||
*/ |
||||
public class UpdateFileFactory { |
||||
|
||||
private UpdateFileFactory() { |
||||
} |
||||
|
||||
public static File[] getBackupVersions() { |
||||
File[] versions = null; |
||||
try { |
||||
File backupDir = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR)); |
||||
StableUtils.mkdirs(backupDir); |
||||
versions = backupDir.listFiles(); |
||||
} catch (Exception e) { |
||||
FineLoggerFactory.getLogger().error(e.getMessage(), e); |
||||
} |
||||
return versions; |
||||
} |
||||
|
||||
public static boolean isBackupVersionsValid(String version) { |
||||
boolean designerValid = false; |
||||
boolean envValid = false; |
||||
try { |
||||
File designerLib = new File(StableUtils.pathJoin(version, UpdateConstants.DESIGNERBACKUPPATH)); |
||||
File[] jars = designerLib.listFiles(); |
||||
if (jars != null && jars.length > 0) { |
||||
designerValid = true; |
||||
} |
||||
File envLib = new File(StableUtils.pathJoin(version, UpdateConstants.BACKUPPATH)); |
||||
jars = envLib.listFiles(); |
||||
if (jars != null && jars.length > 0) { |
||||
envValid = true; |
||||
} |
||||
} catch (Exception e) { |
||||
FineLoggerFactory.getLogger().error(e.getMessage(), e); |
||||
} |
||||
return designerValid && envValid; |
||||
} |
||||
} |
||||
@ -0,0 +1,36 @@
|
||||
package com.fr.design.update.utils; |
||||
|
||||
import com.fr.design.update.factory.UpdateFileFactory; |
||||
import com.fr.stable.StableUtils; |
||||
|
||||
import java.io.File; |
||||
import java.util.ArrayList; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* @author Bryant |
||||
* @version 10.0 |
||||
* Created by Bryant on 2020-09-25 |
||||
*/ |
||||
public class UpdateFileUtils { |
||||
/** |
||||
* 列出过滤后的文件 |
||||
* |
||||
* @return String数组 |
||||
*/ |
||||
public static String[] listBackupVersions() { |
||||
File[] versionBackup = UpdateFileFactory.getBackupVersions(); |
||||
List<String> versions = new ArrayList<>(); |
||||
if (versionBackup != null) { |
||||
for (File file : versionBackup) { |
||||
if (UpdateFileFactory.isBackupVersionsValid(file.getAbsolutePath())) { |
||||
versions.add(file.getName()); |
||||
} else { |
||||
StableUtils.deleteFile(file); |
||||
} |
||||
} |
||||
} |
||||
String[] result = new String[versions.size()]; |
||||
return versions.toArray(result); |
||||
} |
||||
} |
||||
|
After Width: | Height: | Size: 2.4 KiB |
|
After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 2.5 KiB |
|
After Width: | Height: | Size: 2.7 KiB |
|
After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
|
After Width: | Height: | Size: 2.7 KiB |
@ -0,0 +1,26 @@
|
||||
package com.fr.design.data.datapane; |
||||
|
||||
import org.junit.Test; |
||||
|
||||
import java.util.Map; |
||||
|
||||
import static org.junit.Assert.*; |
||||
|
||||
/** |
||||
* @author Yyming |
||||
* @version 10.0 |
||||
* Created by Yyming on 2020/9/29 |
||||
*/ |
||||
public class TableDataPaneListPaneTest { |
||||
|
||||
@Test |
||||
public void rename() { |
||||
TableDataPaneListPane listPane = new TableDataPaneListPane(); |
||||
listPane.rename("111", "222"); |
||||
listPane.rename("222", "333"); |
||||
Map<String, String> dsNameChangedMap = listPane.getDsNameChangedMap(); |
||||
assertEquals(1, dsNameChangedMap.size()); |
||||
listPane.rename("333","111"); |
||||
assertEquals(0, dsNameChangedMap.size()); |
||||
} |
||||
} |
||||
@ -0,0 +1,28 @@
|
||||
package com.fr.design.update.factory; |
||||
|
||||
import com.fr.decision.update.data.UpdateConstants; |
||||
import com.fr.stable.StableUtils; |
||||
import org.junit.Assert; |
||||
import org.junit.Test; |
||||
|
||||
import java.io.File; |
||||
|
||||
public class UpdateFileFactoryTest { |
||||
|
||||
@Test |
||||
public void testGetBackupVersions() { |
||||
Assert.assertEquals(0, UpdateFileFactory.getBackupVersions().length); |
||||
File backupDir = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR)); |
||||
StableUtils.deleteFile(backupDir); |
||||
} |
||||
|
||||
@Test |
||||
public void testIsBackupVersionsValid() { |
||||
File des = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR, "test", UpdateConstants.BACKUPPATH, "test")); |
||||
File env = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR, "test", UpdateConstants.DESIGNERBACKUPPATH, "test")); |
||||
StableUtils.mkdirs(des); |
||||
StableUtils.mkdirs(env); |
||||
Assert.assertTrue(UpdateFileFactory.isBackupVersionsValid(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR, "test"))); |
||||
StableUtils.deleteFile(new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR))); |
||||
} |
||||
} |
||||
@ -0,0 +1,27 @@
|
||||
package com.fr.design.update.utils; |
||||
|
||||
import com.fr.decision.update.data.UpdateConstants; |
||||
import com.fr.stable.StableUtils; |
||||
import org.junit.Assert; |
||||
import org.junit.Test; |
||||
|
||||
import java.io.File; |
||||
|
||||
/** |
||||
* @author Bryant |
||||
* @version 10.0 |
||||
* Created by Bryant on 2020-09-25 |
||||
*/ |
||||
public class UpdateFileUtilsTest { |
||||
|
||||
@Test |
||||
public void testListFilteredFiles() { |
||||
File des = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR, "test", UpdateConstants.BACKUPPATH, "test")); |
||||
File env = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR, "test", UpdateConstants.DESIGNERBACKUPPATH, "test")); |
||||
StableUtils.mkdirs(des); |
||||
StableUtils.mkdirs(env); |
||||
String[] result = UpdateFileUtils.listBackupVersions(); |
||||
Assert.assertEquals(1, result.length); |
||||
StableUtils.deleteFile(new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR))); |
||||
} |
||||
} |
||||
@ -0,0 +1,17 @@
|
||||
package com.fr.van.chart.column; |
||||
|
||||
import com.fr.chart.chartattr.Plot; |
||||
import com.fr.design.condition.ConditionAttributesPane; |
||||
import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane; |
||||
import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane; |
||||
|
||||
public class VanChartColumnLabelConditionPane extends VanChartLabelConditionPane { |
||||
|
||||
public VanChartColumnLabelConditionPane(ConditionAttributesPane conditionAttributesPane, Plot plot) { |
||||
super(conditionAttributesPane, plot); |
||||
} |
||||
|
||||
protected VanChartPlotLabelPane createLabelPane() { |
||||
return new VanChartColumnPlotLabelNoCheckPane(getPlot(),null); |
||||
} |
||||
} |
||||
@ -0,0 +1,77 @@
|
||||
package com.fr.van.chart.column; |
||||
|
||||
import com.fr.chart.chartattr.Plot; |
||||
import com.fr.design.gui.ibutton.UIButtonGroup; |
||||
import com.fr.plugin.chart.base.AttrLabelDetail; |
||||
import com.fr.plugin.chart.base.AttrTooltipContent; |
||||
import com.fr.plugin.chart.column.VanChartColumnPlot; |
||||
import com.fr.van.chart.designer.component.VanChartLabelContentPane; |
||||
import com.fr.van.chart.designer.component.VanChartTooltipContentPane; |
||||
import com.fr.van.chart.designer.style.VanChartStylePane; |
||||
import com.fr.van.chart.designer.style.label.VanChartPlotLabelDetailPane; |
||||
|
||||
public class VanChartColumnPlotLabelDetailPane extends VanChartPlotLabelDetailPane { |
||||
|
||||
public VanChartColumnPlotLabelDetailPane(Plot plot, VanChartStylePane parent) { |
||||
super(plot, parent); |
||||
} |
||||
|
||||
protected void initToolTipContentPane(Plot plot) { |
||||
VanChartLabelContentPane dataLabelContentPane = new VanChartLabelContentPane(getParentPane(), VanChartColumnPlotLabelDetailPane.this) { |
||||
protected void checkCardPane() { |
||||
super.checkCardPane(); |
||||
checkOrientationPane(); |
||||
} |
||||
}; |
||||
|
||||
setDataLabelContentPane(dataLabelContentPane); |
||||
} |
||||
|
||||
private void checkOrientationPane() { |
||||
VanChartLabelContentPane dataLabelContentPane = (VanChartLabelContentPane) getDataLabelContentPane(); |
||||
UIButtonGroup<Integer> content = dataLabelContentPane.getContent(); |
||||
UIButtonGroup<Integer> orientation = getOrientation(); |
||||
|
||||
if (content == null || orientation == null) { |
||||
return; |
||||
} |
||||
|
||||
if (content.getSelectedIndex() == VanChartTooltipContentPane.RICH_EDITOR_INDEX) { |
||||
orientation.setSelectedIndex(HORIZONTAL_INDEX); |
||||
orientation.setEnabled(false); |
||||
} else { |
||||
orientation.setEnabled(true); |
||||
} |
||||
} |
||||
|
||||
protected boolean hasLabelOrientationPane() { |
||||
return !((VanChartColumnPlot) this.getPlot()).isBar(); |
||||
} |
||||
|
||||
private void checkOrientationEnable(AttrLabelDetail detail) { |
||||
AttrTooltipContent content = detail.getContent(); |
||||
UIButtonGroup<Integer> orientation = getOrientation(); |
||||
|
||||
if (orientation != null && content != null) { |
||||
if (content.isRichText()) { |
||||
|
||||
orientation.setSelectedIndex(HORIZONTAL_INDEX); |
||||
detail.setHorizontal(true); |
||||
|
||||
orientation.setEnabled(false); |
||||
} else { |
||||
orientation.setEnabled(true); |
||||
} |
||||
} |
||||
} |
||||
|
||||
public void populate(AttrLabelDetail detail) { |
||||
super.populate(detail); |
||||
checkOrientationEnable(detail); |
||||
} |
||||
|
||||
public void update(AttrLabelDetail detail) { |
||||
super.update(detail); |
||||
checkOrientationEnable(detail); |
||||
} |
||||
} |
||||
@ -0,0 +1,25 @@
|
||||
package com.fr.van.chart.column; |
||||
|
||||
import com.fr.chart.chartattr.Plot; |
||||
import com.fr.plugin.chart.base.AttrLabel; |
||||
import com.fr.van.chart.designer.style.VanChartStylePane; |
||||
|
||||
import java.awt.BorderLayout; |
||||
|
||||
public class VanChartColumnPlotLabelNoCheckPane extends VanChartColumnPlotLabelPane { |
||||
|
||||
public VanChartColumnPlotLabelNoCheckPane(Plot plot, VanChartStylePane parent) { |
||||
super(plot, parent); |
||||
} |
||||
|
||||
protected void addComponents() { |
||||
this.setLayout(new BorderLayout()); |
||||
this.add(getLabelPane(), BorderLayout.CENTER); |
||||
} |
||||
|
||||
public void populate(AttrLabel attr) { |
||||
super.populate(attr); |
||||
getLabelShowCheckBox().setSelected(true); |
||||
getLabelPane().setVisible(true); |
||||
} |
||||
} |
||||
@ -0,0 +1,20 @@
|
||||
package com.fr.van.chart.column; |
||||
|
||||
import com.fr.chart.chartattr.Plot; |
||||
import com.fr.van.chart.designer.style.VanChartStylePane; |
||||
import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane; |
||||
|
||||
import java.awt.BorderLayout; |
||||
|
||||
public class VanChartColumnPlotLabelPane extends VanChartPlotLabelPane { |
||||
|
||||
public VanChartColumnPlotLabelPane(Plot plot, VanChartStylePane parent) { |
||||
super(plot, parent); |
||||
} |
||||
|
||||
protected void createLabelPane() { |
||||
VanChartColumnPlotLabelDetailPane labelDetailPane = new VanChartColumnPlotLabelDetailPane(getPlot(), getParentPane()); |
||||
setLabelDetailPane(labelDetailPane); |
||||
getLabelPane().add(labelDetailPane, BorderLayout.CENTER); |
||||
} |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue