Browse Source

Merge branch 'release/10.0' of https://code.fineres.com/scm/~lucian.chen/design into release/10.0

feature/big-screen
lucian 4 years ago
parent
commit
f77e6988d5
  1. 8
      designer-base/src/main/java/com/fr/design/actions/UpdateAction.java
  2. 4
      designer-base/src/main/java/com/fr/design/constants/UIConstants.java
  3. 195
      designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java
  4. 4
      designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
  5. 34
      designer-base/src/main/java/com/fr/design/file/filter/ClassFilter.java
  6. 2
      designer-base/src/main/java/com/fr/design/fun/MobileParamUIProvider.java
  7. 17
      designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
  8. 2
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
  9. 26
      designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java
  10. 4
      designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileParamSettingPane.java
  11. 4
      designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java
  12. 55
      designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java
  13. 8
      designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/new_folder_disabled.svg
  14. 8
      designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/new_folder_normal.svg
  15. 7
      designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/refresh_normal.svg
  16. 7
      designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/remove_disabled.svg
  17. 7
      designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/remove_normal.svg
  18. 7
      designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/rename_disabled.svg
  19. 7
      designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/rename_normal.svg
  20. 7
      designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/vcs_list_disabled.svg
  21. 7
      designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/vcs_list_normal.svg
  22. 7
      designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/view_folder_disabled.svg
  23. 7
      designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/view_folder_normal.svg
  24. 21
      designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPieValueLabelDetailPane.java
  25. 6
      designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java
  26. 24
      designer-form/src/main/java/com/fr/design/mainframe/widget/ui/WidgetBasicPropertyPaneFactory.java
  27. 3
      designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java
  28. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ParaMobileDefinePane.java
  29. 2
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
  30. 3
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellRichTextEditor.java
  31. 3
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellSubReportEditor.java

8
designer-base/src/main/java/com/fr/design/actions/UpdateAction.java

@ -180,9 +180,15 @@ public abstract class UpdateAction extends ShortCut implements Action {
* 如果a_disabled.svg或者a_pressed.svg缺失则不会被设置成灰化状态或者按压状态图标
* 如果a_normal.svg缺失则会读到a.png这也就不是一个SVGIcon了
* 如果连 a.png 也不存在那么这个action的图标就是空白的
* @param resource
*
* 如果想让这个Action没有图标可以传入""
* @param resource 图标资源路径
*/
public void setSmallIcon(String resource) {
if (StringUtils.equals(resource, StringUtils.EMPTY)) {
this.putValue(Action.SMALL_ICON, null);
return;
}
this.putValue(Action.SMALL_ICON, IconUtils.readIcon(resource));
this.putValue(UpdateAction.DISABLED_ICON, IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_DISABLED));
}

4
designer-base/src/main/java/com/fr/design/constants/UIConstants.java

@ -4,11 +4,14 @@
package com.fr.design.constants;
import com.fr.base.svg.IconUtils;
import com.fr.base.svg.SVGIcon;
import com.fr.general.IOUtils;
import com.fr.stable.Constants;
import com.fr.stable.StringUtils;
import javax.swing.BorderFactory;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.border.Border;
import java.awt.BasicStroke;
import java.awt.Color;
@ -26,6 +29,7 @@ public interface UIConstants {
public static final Icon CPT_ICON = IOUtils.readIcon("/com/fr/base/images/oem/cpt.png");
public static final Icon BLACK_ICON = IOUtils.readIcon("/com/fr/base/images/cell/blank.gif");
public static final String EMPTY_ICON = StringUtils.EMPTY;
public static final Image APPFIT_V0 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/V0.png");
public static final Image APPFIT_V1 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/V1.png");

195
designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java

File diff suppressed because one or more lines are too long

4
designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java

@ -5,11 +5,11 @@ import com.fr.base.io.BaseBook;
import com.fr.design.DesignerEnvManager;
import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.file.filter.ClassFilter;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.DesignerFrameFileDealerPane;
import com.fr.design.mainframe.JTemplate;
import com.fr.design.mainframe.JTemplateFactory;
import com.fr.design.mainframe.JVirtualTemplate;
import com.fr.design.module.DesignModuleFactory;
import com.fr.design.ui.util.UIUtil;
@ -474,7 +474,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
String name = template.getEditingFILE().getName();
String pluginId = context.getID();
long start = System.currentTimeMillis();
Set<ClassLoader> set = ClassHelper.getClassLoaders(baseBook);
Set<ClassLoader> set = ClassHelper.getClassLoadersByFilter(baseBook, ClassFilter.getInstance());
FineLoggerFactory.getLogger().info("{} find plugin classloader spend: {} ms", name, (System.currentTimeMillis() - start));
if (set != null) {
for (ClassLoader classLoader : set) {

34
designer-base/src/main/java/com/fr/design/file/filter/ClassFilter.java

@ -0,0 +1,34 @@
package com.fr.design.file.filter;
import com.fr.stable.Filter;
import java.util.HashSet;
import java.util.Set;
/**
* 过滤无需遍历的jdk class
*
* @author hades
* @version 10.0
* Created by hades on 2021/1/7
*/
public class ClassFilter implements Filter<String> {
private static final Set<String> FILTER_SET = new HashSet<>();
private static final Filter<String> INSTANCE = new ClassFilter();
public static Filter<String> getInstance() {
return INSTANCE;
}
static {
FILTER_SET.add("java.awt.image.BufferedImage");
FILTER_SET.add("sun.awt.AppContext");
}
@Override
public boolean accept(String s) {
return FILTER_SET.contains(s);
}
}

2
designer-base/src/main/java/com/fr/design/fun/MobileParamUIProvider.java

@ -26,7 +26,7 @@ public interface MobileParamUIProvider extends Mutable {
* 移动端参数面板中扩展项的面板
* @return
*/
Class<? extends BasicBeanPane<MobileParamStyle>> classForMobileParamAppearance();
Class<? extends BasicBeanPane<? extends MobileParamStyle>> classForMobileParamAppearance();
/**
* 扩展项的名称描述

17
designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@ -99,7 +99,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
public enum PropertyMode {
REPORT, // 报表
REPORT_PARA, // 报表参数面板
REPORT_PARA_WIDGET, //报表参数面板中的控件
REPORT_PARA(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings")), // 报表参数面板
REPORT_FLOAT, // 报表悬浮元素
FORM(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings")), // 表单
FORM_REPORT, // 表单报表块
@ -272,27 +273,27 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
propertyItemMap = new LinkedHashMap<>(); // 有序map
// 单元格元素
PropertyItem cellElement = new PropertyItem(KEY_CELL_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Element"),
"cellelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
"cellelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
// 单元格属性
PropertyItem cellAttr = new PropertyItem(KEY_CELL_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Attributes"),
"cellattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
"cellattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
// 悬浮元素
PropertyItem floatElement = new PropertyItem(KEY_FLOAT_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Float_Element"),
"floatelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
"floatelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.POLY_REPORT});
// 控件设置
PropertyItem widgetSettings = new PropertyItem(KEY_WIDGET_SETTINGS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings"),
"widgetsettings", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.FORM, PropertyMode.POLY},
new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.FORM, PropertyMode.POLY_REPORT, PropertyMode.POLY_CHART});
"widgetsettings", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.FORM, PropertyMode.POLY},
new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.FORM, PropertyMode.POLY_REPORT, PropertyMode.POLY_CHART});
// 条件属性
PropertyItem conditionAttr = new PropertyItem(KEY_CONDITION_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"),
"conditionattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
"conditionattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
// 超级链接
PropertyItem hyperlink = new PropertyItem(KEY_HYPERLINK, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink"),
"hyperlink", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
"hyperlink", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
// 组件库
PropertyItem widgetLib = new PropertyItem(KEY_WIDGET_LIB, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Library"),

2
designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@ -341,7 +341,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
public void refreshResource(FILE file) {
try {
this.template = JTemplateFactory.asIOFile(file);
this.template = JTemplateFactory.asIOFile(file, this.suffix());
setTarget(this.template);
// 先移除旧的。

26
designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java

@ -3,11 +3,12 @@ package com.fr.design.mainframe;
import com.fr.base.io.BaseBook;
import com.fr.file.FILE;
import com.fr.stable.CoreConstants;
import com.fr.third.javax.annotation.Nonnull;
import com.fr.third.javax.annotation.Nullable;
import com.fr.stable.StringUtils;
import java.util.ArrayList;
import java.util.List;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public final class JTemplateFactory {
private static final List<App<?>> ALL_APP = new ArrayList<App<?>>();
@ -21,8 +22,7 @@ public final class JTemplateFactory {
* @param file 包含了模板名称类型以及内容的文件
* @return 设计器编辑的模板对象
*/
@Nullable
public static JTemplate<?, ?> createJTemplate(@Nonnull FILE file) {
public static JTemplate<?, ?> createJTemplate(@NotNull FILE file) {
String fileName = file.getName();
int indexOfLastDot = fileName.lastIndexOf(CoreConstants.DOT);
@ -44,14 +44,18 @@ public final class JTemplateFactory {
return null;
}
public static <T extends BaseBook> T asIOFile(@Nonnull FILE file) {
@Nullable
public static <T extends BaseBook> T asIOFile(@NotNull FILE file, String fileNameOrSuffix) {
String fileName = file.getName();
int indexOfLastDot = fileName.lastIndexOf(CoreConstants.DOT);
if (StringUtils.isEmpty(fileNameOrSuffix)) {
return null;
}
int indexOfLastDot = fileNameOrSuffix.lastIndexOf(CoreConstants.DOT);
if (indexOfLastDot < 0) {
return null;
}
String fileExtension = fileName.substring(indexOfLastDot + 1);
String fileExtension = fileNameOrSuffix.substring(indexOfLastDot + 1);
for (App<?> app : ALL_APP) {
String[] defaultAppExtensions = app.defaultExtensions();
for (String defaultAppExtension : defaultAppExtensions) {
@ -66,6 +70,12 @@ public final class JTemplateFactory {
return null;
}
@Nullable
public static <T extends BaseBook> T asIOFile(@NotNull FILE file) {
return asIOFile(file, file.getName());
}
/**
* 注册app.

4
designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileParamSettingPane.java

@ -12,6 +12,7 @@ import com.fr.form.ui.mobile.MobileParamStyle;
import com.fr.general.ComparatorUtils;
import com.fr.report.ExtraReportClassManager;
import com.fr.report.fun.MobileParamStyleProvider;
import com.fr.report.mobile.EmptyMobileParamStyle;
import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.Component;
@ -103,7 +104,10 @@ public class MobileParamSettingPane extends BasicPane {
if (ComparatorUtils.equals(mobileParamStyle.disPlayName(), provider.displayName())) {
String displayName = provider.displayName();
paramStyleList.setSelectedIndex(i);
// 如果是兼容空类型 无须填充面板
if (!(mobileParamStyle instanceof EmptyMobileParamStyle)) {
map.get(displayName).populateBean(mobileParamStyle);
}
card.show(right, displayName);
return;
}

4
designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java

@ -27,10 +27,6 @@ public class DictionaryPane extends UIComboBoxPane<Dictionary> implements DataCr
public DictionaryPane() {
}
public DictionaryPane(boolean needTableDataChange) {
this.tableDataDictPane.setNeedTableDataChange(needTableDataChange);
}
@Override
protected void initLayout() {
this.setLayout(new BorderLayout(0, 4));

55
designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java

@ -64,7 +64,6 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
private ItemListener itemListener;
private UIObserverListener uiObserverListener;
private FormulaEditor localFormulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
private boolean needTableDataChange = true;
public TableDataDictPane() {
initBasicComponets();
@ -72,14 +71,6 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
iniListener();
}
/**
* 设置为true后一旦触发TableDataComboBox的itemChange就会通过数据连接更换当前数据字典的列名List
* @param needTableDataChange
*/
public void setNeedTableDataChange(boolean needTableDataChange) {
this.needTableDataChange = needTableDataChange;
}
public static void main(String[] args) {
JFrame jf = new JFrame("test");
jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@ -169,30 +160,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
if (tableDataWrappe == null) {
return;
}
if (itemListener != null) {
itemListener.itemStateChanged(e);
localFormulaEditor.addChangeListener(event -> itemListener.itemStateChanged(e));
}
if (isNeedTableDataChange()) {
changeColumnsName();
}
}
private void changeColumnsName() {
TableDataWrapper tableDataWrappe = this.tableDataNameComboBox.getSelectedItem();
SwingWorker<List<String>, Object> worker = new SwingWorker<List<String>, Object>() {
@Override
protected List<String> doInBackground() {
if (tableDataWrappe == null) {
return new ArrayList<>();
}
return tableDataWrappe.calculateColumnNameList();
}
@Override
protected void done() {
try {
List<String> namelist = get();
List<String> namelist = tableDataWrappe.calculateColumnNameList();
String[] columnNames = null;
if (!namelist.isEmpty()) {
columnNames = namelist.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
@ -207,21 +175,24 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
actualColumnIndexEditor.addItemListener(itemListener);
keyColumnPane.setEditors(new Editor[]{actualColumnNameEditor, actualColumnIndexEditor}, columnNames[0]);
localFormulaEditor.setEnabled(true);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
formulaEditor.setEnabled(true);
formulaEditor.addChangeListener(ee -> {
if (itemListener != null) {
itemListener.itemStateChanged(e);
}
});
// 显示值列名
ColumnNameEditor displayColumnNameEditor = new ColumnNameEditor(columnNames);
displayColumnNameEditor.addItemListener(itemListener);
// 显示值列序号
ColumnIndexEditor displayColumnIndexEditor = new ColumnIndexEditor(columnNames.length);
displayColumnIndexEditor.addItemListener(itemListener);
valueDictPane.setEditors(new Editor[]{displayColumnNameEditor, displayColumnIndexEditor, localFormulaEditor}, columnNames[0]);
} catch (InterruptedException | ExecutionException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
valueDictPane.setEditors(new Editor[]{displayColumnNameEditor, displayColumnIndexEditor, formulaEditor}, columnNames[0]);
if (itemListener != null) {
itemListener.itemStateChanged(e);
}
}
};
worker.execute();
}
@Override
/**
@ -404,8 +375,4 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
public void registerDSChangeListener() {
tableDataNameComboBox.registerGlobalDSChangeListener();
}
public boolean isNeedTableDataChange() {
return needTableDataChange;
}
}

8
designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/new_folder_disabled.svg

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_NewFolderIcon_disable</title>
<g id="icon_NewFolderIcon_disable" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
<path d="M7,2 L14,2 C14.55,2 15,2.45 15,3 L15,4.26865267 C14.7056021,4.09786765 14.363952,4 14,4 L9,4 C8.82858946,4 8.52433038,3.81190466 8.44778989,3.65851255 L8.33972031,3.4443888 C8.01577562,2.79516387 7.33247527,2.27587935 6.60444984,2.08202852 C6.7259209,2.02927911 6.85970721,2 7,2 Z M10,14 L2,14 C1.45,14 1,13.55 1,13 L1,4 C1,3.45 1.45,3 2,3 L6,3 C6.55,3 7.201,3.402 7.447,3.895 L7.553,4.105 C7.799,4.598 8.45,5 9,5 L14,5 C14.55,5 15,5.45 15,6 L15,9 L14,9 L14,6 L9,6 C8.07067731,6 7.07334254,5.38343985 6.66027969,4.5556112 L6.55221011,4.34148745 C6.47566962,4.18809534 6.17141054,4 6,4 L2,4 L2,13 L10,13 L10,14 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
<path d="M12.5,8 C12.7761424,8 13,8.22385763 13,8.5 L13,11 L15.5,11 C15.7761424,11 16,11.2238576 16,11.5 C16,11.7761424 15.7761424,12 15.5,12 L13,12 L13,14.5 C13,14.7761424 12.7761424,15 12.5,15 C12.2238576,15 12,14.7761424 12,14.5 L12,12 L9.5,12 C9.22385763,12 9,11.7761424 9,11.5 C9,11.2238576 9.22385763,11 9.5,11 L12,11 L12,8.5 C12,8.22385763 12.2238576,8 12.5,8 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

8
designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/new_folder_normal.svg

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_NewFolderIcon_normal</title>
<g id="icon_NewFolderIcon_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M7,2 L14,2 C14.55,2 15,2.45 15,3 L15,4.26865267 C14.7056021,4.09786765 14.363952,4 14,4 L9,4 C8.82858946,4 8.52433038,3.81190466 8.44778989,3.65851255 L8.33972031,3.4443888 C8.01577562,2.79516387 7.33247527,2.27587935 6.60444984,2.08202852 C6.7259209,2.02927911 6.85970721,2 7,2 Z M10,14 L2,14 C1.45,14 1,13.55 1,13 L1,4 C1,3.45 1.45,3 2,3 L6,3 C6.55,3 7.201,3.402 7.447,3.895 L7.553,4.105 C7.799,4.598 8.45,5 9,5 L14,5 C14.55,5 15,5.45 15,6 L15,9 L14,9 L14,6 L9,6 C8.07067731,6 7.07334254,5.38343985 6.66027969,4.5556112 L6.55221011,4.34148745 C6.47566962,4.18809534 6.17141054,4 6,4 L2,4 L2,13 L10,13 L10,14 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
<path d="M12.5,8 C12.7761424,8 13,8.22385763 13,8.5 L13,11 L15.5,11 C15.7761424,11 16,11.2238576 16,11.5 C16,11.7761424 15.7761424,12 15.5,12 L13,12 L13,14.5 C13,14.7761424 12.7761424,15 12.5,15 C12.2238576,15 12,14.7761424 12,14.5 L12,12 L9.5,12 C9.22385763,12 9,11.7761424 9,11.5 C9,11.2238576 9.22385763,11 9.5,11 L12,11 L12,8.5 C12,8.22385763 12.2238576,8 12.5,8 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

7
designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/refresh_normal.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_刷新_normal</title>
<g id="icon_刷新_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M13.0593807,1 C13.4802225,1 13.8213822,1.34115968 13.8213822,1.76200147 L13.8213822,1.76200147 L13.8213822,5.2534957 C13.8213822,5.67433749 13.4802225,6.01549717 13.0593807,6.01549717 L13.0593807,6.01549717 L9.56788646,6.01549717 C9.14704467,6.01549717 8.80588499,5.67433749 8.80588499,5.2534957 C8.80588499,4.83265391 9.14704467,4.49149423 9.56788646,4.49149423 L9.56788646,4.49149423 L11.169634,4.48959417 C10.8434607,4.27112237 10.4895308,4.09123525 10.1125367,3.95402064 C7.56533579,3.02691531 4.74885407,4.34026231 3.82174874,6.88746326 C2.89464341,9.43466421 4.20799041,12.2511459 6.75519136,13.1782513 C9.30239231,14.1053566 12.118874,12.7920096 13.0459794,10.2448086 C13.1899157,9.84934672 13.6271844,9.64544497 14.0226464,9.78938133 C14.4181083,9.9333177 14.62201,10.3705864 14.4780737,10.7660483 C13.2630956,14.1041731 9.57207646,15.8253236 6.23395166,14.6103456 C2.89582685,13.3953675 1.17467636,9.70434836 2.38965442,6.36622356 C3.60463249,3.02809876 7.29565164,1.30694826 10.6337764,2.52192632 C11.3047108,2.76612647 11.9217951,3.11486447 12.467588,3.55405023 L12.297,3.423 L12.2973792,1.76200147 C12.2973792,1.37622983 12.5840481,1.05741329 12.9559816,1.00695618 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

7
designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/remove_disabled.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_删除_disabled</title>
<g id="icon_删除_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
<path d="M11,1 L11,3 L15,3 L15,4 L13,4 L13,15 L3,15 L3,4 L1,4 L1,3 L5,3 L5,1 L11,1 Z M12,4 L4,4 L4,14 L12,14 L12,4 Z M7,6 L7,12 L6,12 L6,6 L7,6 Z M10,6 L10,12 L9,12 L9,6 L10,6 Z M10,2 L6,2 L6,3 L10,3 L10,2 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 610 B

7
designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/remove_normal.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_删除_normal copy</title>
<g id="icon_删除_normal-copy" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M11,1 L11,3 L15,3 L15,4 L13,4 L13,15 L3,15 L3,4 L1,4 L1,3 L5,3 L5,1 L11,1 Z M12,4 L4,4 L4,14 L12,14 L12,4 Z M7,6 L7,12 L6,12 L6,6 L7,6 Z M10,6 L10,12 L9,12 L9,6 L10,6 Z M10,2 L6,2 L6,3 L10,3 L10,2 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 602 B

7
designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/rename_disabled.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_重命名_disable</title>
<g id="icon_重命名_disable" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
<path d="M16,1.875 L16,14.875 L2,14.875 L2,10.875 L3,10.875 L3,13.875 L10.9999,13.8756 L10.9999,9.8746 L15,9.874 L15,2.875 L11,2.875 L11,1.875 L16,1.875 Z M15.0009,11.8756 L13.9999,11.8756 L13.9999,12.8756 L12.9999,12.8756 L12.9999,13.8756 L15.0009,13.8756 L15.0009,11.8756 Z M13.9379,10.8756 L11.9999,10.8756 L11.9999,12.8756 L12.9999,12.8756 L12.9999,11.8756 L13.9379,11.8756 L13.9379,10.8756 Z M7,1 L7.00095826,3.17100877 C7.10111582,3.20644169 7.1988298,3.24704235 7.29377984,3.2924904 L8.8281,1.757 L10.2421,3.171 L8.70798211,4.70720778 C8.75338867,4.80216052 8.79394842,4.89987512 8.82934116,5.00003141 L11,5 L11,7 L8.82899123,7.00095826 C8.79343547,7.10146305 8.75267608,7.19950728 8.70703675,7.29476726 L10.242,8.8291 L8.828,10.2431 L7.29279222,8.70798211 C7.19815226,8.7532391 7.1007686,8.79368115 7.00095826,8.82899123 L7,11 L5,11 L5.00003141,8.82934116 C4.89952784,8.79382569 4.80148292,8.75310733 4.70622016,8.7075096 L3.1719,10.243 L1.7579,8.829 L3.29201789,7.29279222 C3.2467609,7.19815226 3.20631885,7.1007686 3.17100877,7.00095826 L1,7 L1,5 L3.17065884,5.00003141 C3.20629703,4.89918056 3.24717413,4.80080537 3.29296325,4.70523274 L1.758,3.1709 L3.172,1.7569 L4.70720778,3.29201789 C4.80216052,3.24661133 4.89987512,3.20605158 5.00003141,3.17065884 L5,1 L7,1 Z M6,4 C4.897,4 4,4.897 4,6 C4,7.103 4.897,8 6,8 C7.103,8 8,7.103 8,6 C8,4.897 7.103,4 6,4 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

7
designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/rename_normal.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_重命名_normal</title>
<g id="icon_重命名_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M16,1.875 L16,14.875 L2,14.875 L2,10.875 L3,10.875 L3,13.875 L10.9999,13.8756 L10.9999,9.8746 L15,9.874 L15,2.875 L11,2.875 L11,1.875 L16,1.875 Z M15.0009,11.8756 L13.9999,11.8756 L13.9999,12.8756 L12.9999,12.8756 L12.9999,13.8756 L15.0009,13.8756 L15.0009,11.8756 Z M13.9379,10.8756 L11.9999,10.8756 L11.9999,12.8756 L12.9999,12.8756 L12.9999,11.8756 L13.9379,11.8756 L13.9379,10.8756 Z M7,1 L7.00095826,3.17100877 C7.10111582,3.20644169 7.1988298,3.24704235 7.29377984,3.2924904 L8.8281,1.757 L10.2421,3.171 L8.70798211,4.70720778 C8.75338867,4.80216052 8.79394842,4.89987512 8.82934116,5.00003141 L11,5 L11,7 L8.82899123,7.00095826 C8.79343547,7.10146305 8.75267608,7.19950728 8.70703675,7.29476726 L10.242,8.8291 L8.828,10.2431 L7.29279222,8.70798211 C7.19815226,8.7532391 7.1007686,8.79368115 7.00095826,8.82899123 L7,11 L5,11 L5.00003141,8.82934116 C4.89952784,8.79382569 4.80148292,8.75310733 4.70622016,8.7075096 L3.1719,10.243 L1.7579,8.829 L3.29201789,7.29279222 C3.2467609,7.19815226 3.20631885,7.1007686 3.17100877,7.00095826 L1,7 L1,5 L3.17065884,5.00003141 C3.20629703,4.89918056 3.24717413,4.80080537 3.29296325,4.70523274 L1.758,3.1709 L3.172,1.7569 L4.70720778,3.29201789 C4.80216052,3.24661133 4.89987512,3.20605158 5.00003141,3.17065884 L5,1 L7,1 Z M6,4 C4.897,4 4,4.897 4,6 C4,7.103 4.897,8 6,8 C7.103,8 8,7.103 8,6 C8,4.897 7.103,4 6,4 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

7
designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/vcs_list_disabled.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_版本管理_disabled</title>
<g id="icon_版本管理_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
<path d="M12,13 C12,14.1045695 11.1045695,15 10,15 L10,15 L3,15 C1.8954305,15 1,14.1045695 1,13 L1,13 L1,6 C1,4.8954305 1.8954305,4 3,4 L3,4 L4,4 L4,3 C4,1.8954305 4.8954305,1 6,1 L13,1 C14.1045695,1 15,1.8954305 15,3 L15,10 C15,11.1045695 14.1045695,12 13,12 L12,12 Z M13,2 L6,2 C5.44771525,2 5,2.44771525 5,3 L5,10 C5,10.5522847 5.44771525,11 6,11 L13,11 C13.5522847,11 14,10.5522847 14,10 L14,3 C14,2.44771525 13.5522847,2 13,2 Z M6,12 C4.8954305,12 4,11.1045695 4,10 L4,5 L3,5 C2.44771525,5 2,5.44771525 2,6 L2,6 L2,13 C2,13.5522847 2.44771525,14 3,14 L3,14 L10,14 C10.5522847,14 11,13.5522847 11,13 L11,13 L11,12 L6,12 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

7
designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/vcs_list_normal.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_版本管理_normal</title>
<g id="icon_版本管理_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M12,13 C12,14.1045695 11.1045695,15 10,15 L10,15 L3,15 C1.8954305,15 1,14.1045695 1,13 L1,13 L1,6 C1,4.8954305 1.8954305,4 3,4 L3,4 L4,4 L4,3 C4,1.8954305 4.8954305,1 6,1 L13,1 C14.1045695,1 15,1.8954305 15,3 L15,10 C15,11.1045695 14.1045695,12 13,12 L12,12 Z M13,2 L6,2 C5.44771525,2 5,2.44771525 5,3 L5,10 C5,10.5522847 5.44771525,11 6,11 L13,11 C13.5522847,11 14,10.5522847 14,10 L14,3 C14,2.44771525 13.5522847,2 13,2 Z M6,12 C4.8954305,12 4,11.1045695 4,10 L4,5 L3,5 C2.44771525,5 2,5.44771525 2,6 L2,6 L2,13 C2,13.5522847 2.44771525,14 3,14 L3,14 L10,14 C10.5522847,14 11,13.5522847 11,13 L11,13 L11,12 L6,12 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

7
designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/view_folder_disabled.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_打开文件_disable</title>
<g id="icon_打开文件_disable" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
<path d="M16,1 L16,14.937 L0,14.937 L0,1 L16,1 Z M3,4.937 L1,4.937 L1,13.937 L7,13.937 L7.001,12.937 L3,12.937 L3,4.937 Z M9,11.937 L9,13.937 L15,13.937 L15,4.937 L4,4.937 L4,5.937 L9,5.937 L9,7.937 L7,7.937 L7.001,6.937 L4,6.937 L4,8.937 L9,8.937 L9,10.937 L7,10.937 L7.001,9.937 L4,9.937 L4,11.937 L9,11.937 Z M15,1.937 L1,1.937 L1,3.937 L15,3.937 L15,1.937 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 774 B

7
designer-base/src/main/resources/com/fr/design/images/FileDealerPaneIcon/view_folder_normal.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_所在文件夹_normal</title>
<g id="icon_所在文件夹_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M15,1 C15.5522847,1 16,1.44771525 16,2 L16,14 C16,14.5522847 15.5522847,15 15,15 L1,15 C0.44771525,15 0,14.5522847 0,14 L0,2 C0,1.44771525 0.44771525,1 1,1 L15,1 Z M3,5 L1,5 L1,14 L7,14 L7,13 L3,13 L3,5 Z M9,12 L9,14 L15,14 L15,5 L4,5 L4,6 L9,6 L9,8 L7,8 L7,7 L4,7 L4,9 L9,9 L9,11 L7,11 L7,10 L4,10 L4,12 L9,12 Z M15,2 L1,2 L1,4 L15,4 L15,2 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 774 B

21
designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPieValueLabelDetailPane.java

@ -13,6 +13,7 @@ import com.fr.van.chart.designer.style.VanChartStylePane;
import com.fr.van.chart.pie.style.VanChartPieValueLabelContentPane;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Component;
/**
@ -34,6 +35,14 @@ public class VanChartPieValueLabelDetailPane extends VanChartPlotLabelDetailPane
return panel;
}
protected JPanel createBorderAndBackgroundPane() {
JPanel jPanel = new JPanel();
jPanel.setLayout(new BorderLayout(0, 10));
jPanel.add(createLabelBorderPane(), BorderLayout.NORTH);
jPanel.add(createLabelBackgroundPane(), BorderLayout.CENTER);
return jPanel;
}
protected JPanel createLabelBorderPane() {
VanChartBorderWithShapePane borderPane = new VanChartBorderWithShapePane() {
@Override
@ -58,6 +67,18 @@ public class VanChartPieValueLabelDetailPane extends VanChartPlotLabelDetailPane
protected JPanel createLabelBackgroundPane() {
VanChartBackgroundWithOutImagePane backgroundPane = new VanChartBackgroundWithOutImagePane() {
@Override
protected JPanel initContentPanel() {
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
double[] columnSize = {f, e};
double[] rowSize = {p, p, p};
return TableLayout4VanChartHelper.createGapTableLayoutPane(getPaneComponents(), rowSize, columnSize);
}
@Override
protected Component[][] getPaneComponents() {
return new Component[][]{
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Utils_Background")), typeComboBox},

6
designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java

@ -23,6 +23,7 @@ import com.fr.van.chart.designer.component.background.VanChartBackgroundWithOutI
import com.fr.van.chart.designer.component.border.VanChartBorderWithShapePane;
import com.fr.van.chart.designer.style.VanChartStylePane;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import javax.swing.event.ChangeEvent;
@ -242,6 +243,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
if (plot.isSupportLeadLine()) {
tractionLine = new UIToggleButton(Toolkit.i18nText("Fine-Design_Chart_Show_Guideline"));
tractionLinePane = TableLayout4VanChartHelper.createGapTableLayoutPane("", tractionLine);
tractionLinePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0));
panel.add(tractionLinePane, BorderLayout.SOUTH);
initPositionListener();
} else if (PlotFactory.plotAutoAdjustLabelPosition(plot)) {
@ -350,7 +352,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
}
private void checkPosition() {
tractionLine.setSelected(position.getSelectedItem() == Constants.OUTSIDE);
tractionLine.setSelected(position.getSelectedItem() != null && position.getSelectedItem() == Constants.OUTSIDE);
checkPositionEnabled();
}
@ -364,7 +366,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
}
private void checkPositionEnabled() {
tractionLinePane.setVisible(position.getSelectedItem() == Constants.OUTSIDE);
tractionLinePane.setVisible(position.getSelectedItem() != null && position.getSelectedItem() == Constants.OUTSIDE);
}
protected void checkPane() {

24
designer-form/src/main/java/com/fr/design/mainframe/widget/ui/WidgetBasicPropertyPaneFactory.java

@ -1,21 +1,37 @@
package com.fr.design.mainframe.widget.ui;
import com.fr.design.designer.creator.XCreator;
import com.fr.design.designer.creator.XWParameterLayout;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.mainframe.EastRegionContainerPane;
import com.fr.design.mainframe.JForm;
/**
* Created by kerry on 2017/9/30.
*/
public class WidgetBasicPropertyPaneFactory {
public static FormBasicPropertyPane createBasicPropertyPane(XCreator xCreator){
if(xCreator.supportSetVisible() && xCreator.supportSetEnable()){
public static FormBasicPropertyPane createBasicPropertyPane(XCreator xCreator) {
freshPropertyMode(xCreator);
if (xCreator.supportSetVisible() && xCreator.supportSetEnable()) {
return new FormBasicWidgetPropertyPane();
}
if(xCreator.supportSetVisible()){
if (xCreator.supportSetVisible()) {
return new BasicSetVisiblePropertyPane();
}else{
} else {
return new FormBasicPropertyPane();
}
}
private static void freshPropertyMode(XCreator xCreator) {
if (!(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate() instanceof JForm)) {
if (xCreator instanceof XWParameterLayout) {
EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA);
} else {
EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA_WIDGET);
}
}
}
}

3
designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java

@ -28,8 +28,7 @@ public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane<CheckBoxGroup
@Override
protected void initComponents() {
super.initComponents();
dictPane = new DictionaryPane(false);
dictPane = new DictionaryPane();
}
@Override

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ParaMobileDefinePane.java

@ -82,7 +82,7 @@ public class ParaMobileDefinePane extends MobileWidgetDefinePane {
double[] columnSize = {p, f};
int[][] rowCount = {{1, 1}, {1, 1}};
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Panel")), mobileParamEditor},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Param_Style")), mobileParamEditor},
new Component[]{tipLabel, null},
};
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1);

2
designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@ -260,7 +260,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
condition.setEditingComponent(tc);
}
//丢掉icon,修改按钮名称为编辑
condition.setSmallIcon(UIConstants.BLACK_ICON);
condition.setSmallIcon(UIConstants.EMPTY_ICON);
condition.setName(Toolkit.i18nText("Fine-Design_Basic_Edit"));
conditionUIButton = new UIButton(condition);
Component[][] components = new Component[][]{

3
designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellRichTextEditor.java

@ -9,6 +9,7 @@ import com.fr.design.layout.TableLayoutHelper;
import com.fr.quickeditor.CellQuickEditor;
import javax.swing.Icon;
import javax.swing.JComponent;
import javax.swing.JPanel;
import java.awt.BorderLayout;
@ -48,7 +49,7 @@ public class CellRichTextEditor extends CellQuickEditor {
protected void refreshDetails() {
RichTextCellAction subReportCellAction = new RichTextCellAction(tc);
subReportCellAction.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
subReportCellAction.setSmallIcon(UIConstants.BLACK_ICON);
subReportCellAction.setSmallIcon(UIConstants.EMPTY_ICON);
richTextButton.setAction(subReportCellAction);
}

3
designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellSubReportEditor.java

@ -9,6 +9,7 @@ import com.fr.design.layout.TableLayoutHelper;
import com.fr.quickeditor.CellQuickEditor;
import javax.swing.Icon;
import javax.swing.JComponent;
import javax.swing.JPanel;
import java.awt.BorderLayout;
@ -44,7 +45,7 @@ public class CellSubReportEditor extends CellQuickEditor {
protected void refreshDetails() {
SubReportCellAction subReportCellAction = new SubReportCellAction(tc);
subReportCellAction.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
subReportCellAction.setSmallIcon(UIConstants.BLACK_ICON);
subReportCellAction.setSmallIcon(UIConstants.EMPTY_ICON);
subReportButton.setAction(subReportCellAction);
}

Loading…
Cancel
Save