Browse Source

REPORT-42238 【10.0.13】JDK11设计器图标模糊问题优化

No.8: 替换了底部sheet栏与右侧面板的tab栏图标
persist/11.0
Yvan 4 years ago
parent
commit
1418ae05fa
  1. 2
      designer-base/src/main/java/com/fr/base/svg/SVGLoader.java
  2. 2
      designer-base/src/main/java/com/fr/design/constants/UIConstants.java
  3. 17
      designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
  4. 8
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.svg
  5. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.svg
  6. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.svg
  7. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.svg
  8. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.svg
  9. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.svg
  10. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.svg
  11. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.svg
  12. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.svg
  13. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.svg
  14. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.svg
  15. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.svg
  16. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.svg
  17. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.svg
  18. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.svg
  19. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.svg
  20. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.svg
  21. 8
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.svg
  22. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.svg
  23. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.svg
  24. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.svg
  25. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.svg
  26. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.svg
  27. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.svg
  28. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.svg
  29. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.svg
  30. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.svg
  31. 16
      designer-base/src/main/resources/com/fr/design/images/sheet/add_polysheet_normal.svg
  32. 7
      designer-base/src/main/resources/com/fr/design/images/sheet/next_page_disabled.svg
  33. 7
      designer-base/src/main/resources/com/fr/design/images/sheet/next_page_normal.svg
  34. 9
      designer-base/src/main/resources/com/fr/design/images/sheet/polysheet_normal.svg
  35. 7
      designer-base/src/main/resources/com/fr/design/images/sheet/pre_page_disabled.svg
  36. 7
      designer-base/src/main/resources/com/fr/design/images/sheet/pre_page_normal.svg
  37. 16
      designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java
  38. 33
      designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java

2
designer-base/src/main/java/com/fr/base/svg/SVGLoader.java

@ -75,7 +75,7 @@ public class SVGLoader {
@Nullable
public static Image load(@NotNull String url, float width, float height) {
try {
String svgUri = url.toString();
String svgUri = IOUtils.getResource(url, SVGLoader.class).toString();
TranscoderInput input = new TranscoderInput(svgUri);
return SVGTranscoder.createImage(SVGIcon.SYSTEM_SCALE, input, -1, -1, width, height).getImage();
} catch (TranscoderException ignore) {

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

@ -3,6 +3,7 @@
*/
package com.fr.design.constants;
import com.fr.base.svg.SVGIcon;
import com.fr.general.IOUtils;
import com.fr.stable.Constants;
@ -179,6 +180,7 @@ public interface UIConstants {
public static final Icon YES_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/yes.png");
public static final Icon CHOOSEN_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/select_item.png");
public static final Icon PRE_WIDGET_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/prewidget.png");
public static final Icon PRE_WIDGET_NORMAL_ICON = SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/prewidget_normal.svg", 30, 20);
public static final Icon EDIT_NORMAL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/editn.png");
public static final Icon EDIT_PRESSED_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/editp.png");
public static final Icon HIDE_NORMAL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/hiden.png");

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

@ -1,7 +1,7 @@
package com.fr.design.mainframe;
import com.fr.base.BaseUtils;
import com.fr.base.FRContext;
import com.fr.base.svg.SVGIcon;
import com.fr.base.vcs.DesignerMode;
import com.fr.design.DesignerEnvManager;
import com.fr.design.ExtraDesignClassManager;
@ -673,9 +673,11 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
// 完整icon路径为 ICON_BASE_DIR + btnIconName + iconSuffix
private static final String ICON_BASE_DIR = "/com/fr/design/images/buttonicon/propertiestab/";
private static final String ICON_SUFFIX_NORMAL = "_normal.png";
private static final String ICON_SUFFIX_DISABLED = "_disabled.png";
private static final String ICON_SUFFIX_SELECTED = "_selected.png";
private static final String ICON_SUFFIX_NORMAL = "_normal.svg";
private static final String ICON_SUFFIX_DISABLED = "_disabled.svg";
private static final String ICON_SUFFIX_SELECTED = "_selected.svg";
private static final int ICON_WIDTH = 18;
private static final int ICON_HEIGHT = 18;
private String btnIconName;
private String iconBaseDir;
private String iconSuffix = ICON_SUFFIX_NORMAL; // normal, diabled, selected, 三者之一
@ -845,7 +847,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
public void resetButtonIcon() {
if (iconSuffix.equals(ICON_SUFFIX_SELECTED)) {
iconSuffix = ICON_SUFFIX_NORMAL;
button.setIcon(BaseUtils.readIcon(getBtnIconUrl()));
button.setIcon(SVGIcon.readSVGIcon(getBtnIconUrl(), ICON_WIDTH, ICON_HEIGHT));
button.setBackground(originBtnBackground);
button.setOpaque(false);
}
@ -854,7 +856,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
public void setTabButtonSelected() {
resetPropertyIcons();
iconSuffix = ICON_SUFFIX_SELECTED;
button.setIcon(BaseUtils.readIcon(getBtnIconUrl()));
button.setIcon(SVGIcon.readSVGIcon(getBtnIconUrl(), ICON_WIDTH, ICON_HEIGHT));
button.setBackground(selectedBtnBackground);
button.setOpaque(true);
selectedItem = this;
@ -865,7 +867,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
}
private void initButton() {
button = new UIButton(BaseUtils.readIcon(getBtnIconUrl())) {
button = new UIButton(SVGIcon.readSVGIcon(getBtnIconUrl(), ICON_WIDTH, ICON_HEIGHT)) {
public Dimension getPreferredSize() {
return new Dimension(TAB_BUTTON_WIDTH, TAB_BUTTON_HEIGHT);
}
@ -874,6 +876,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
super.paintComponent(g);
}
};
button.setDisabledIcon(SVGIcon.readSVGIcon(getIconBaseDir() + btnIconName + ICON_SUFFIX_DISABLED, ICON_WIDTH, ICON_HEIGHT));
button.set4LargeToolbarButton();
button.setUI(new UIButtonUI() {
@Override

8
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.svg

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M9,5 C10.1045695,5 11,5.8954305 11,7 C11,7.7398375 10.5982846,8.38584934 10.0010775,8.73181186 L10,11 C10,11.5522847 9.55228475,12 9,12 C8.44771525,12 8,11.5522847 8,11 L7.99992752,8.73239368 C7.40216612,8.38657394 7,7.74025244 7,7 C7,5.8954305 7.8954305,5 9,5 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
<path d="M9,2.36417668 C7.4854345,3.18748636 5.7676434,3.63037957 4,3.6310317 L4,9.0821584 C4,9.45104665 4.17312121,10.0431453 4.5311549,10.7404681 C4.95854929,11.5729051 5.62212701,12.5045187 6.44436469,13.4137689 C7.1880488,14.236172 8.06071333,15.0361293 8.88429196,15.6520343 C8.91798794,15.6531625 8.93413837,15.641016 8.95037407,15.628759 C9.81328106,14.9772657 10.7176871,14.1566565 11.4814426,13.3314693 C12.3377436,12.4063102 13.0263882,11.4692542 13.4666268,10.6435552 C13.8275377,9.96665349 14,9.40512489 14,9.08215841 L14,3.63103171 C12.23235,3.63038272 10.514552,3.18748928 9,2.36417668 Z M14.0038909,1.63103242 C14.3296318,1.63103242 14.7913276,1.56301051 15.3889782,1.4269667 C15.6582471,1.36562643 15.9262313,1.53422973 15.9875275,1.80350869 C15.9958164,1.83992242 16,1.87715012 16,1.91449535 L16,9.08215842 C16,9.77619285 15.7342394,10.6415117 15.2314445,11.584522 C14.7050914,12.5717347 13.9159202,13.645573 12.9492231,14.6900054 C12.1057303,15.6013435 11.1135511,16.5015748 10.1554738,17.2249214 C9.74266787,17.5365673 9.39859373,17.7693418 9.12860813,17.9378543 C8.99842505,18.0191043 8.83359313,18.0208462 8.70184453,17.9421247 C8.43538605,17.7829022 8.09483905,17.5590619 7.68650327,17.2536904 C6.75785014,16.5592065 5.78988933,15.6718988 4.96093887,14.7552039 C4.02753262,13.7230208 3.26367368,12.6506248 2.75195723,11.6539535 C2.26002664,10.695847 2,9.80651646 2,9.0821584 L2,1.91446377 C2,1.63833384 2.22387007,1.4144863 2.5,1.4144863 C2.53734105,1.4144863 2.57456457,1.41866951 2.61097419,1.42695767 C3.20863679,1.56300751 3.67034214,1.63103242 3.99609024,1.63103242 C5.84903947,1.63103242 7.59636348,1.03323193 9,0 C10.4036177,1.03323193 12.1509417,1.63103242 14.0038909,1.63103242 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.4 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M9,0 C10.4036177,1.03323193 12.1509417,1.63103242 14.0038909,1.63103242 C14.3296318,1.63103242 14.7913276,1.56301051 15.3889782,1.4269667 C15.6582471,1.36562643 15.9262313,1.53422973 15.9875275,1.80350869 C15.9958164,1.83992242 16,1.87715012 16,1.91449535 L16,9.08215842 C16,9.77619285 15.7342394,10.6415117 15.2314445,11.584522 C14.7050914,12.5717347 13.9159202,13.645573 12.9492231,14.6900054 C12.1057303,15.6013435 11.1135511,16.5015748 10.1554738,17.2249214 C9.74266787,17.5365673 9.39859373,17.7693418 9.12860813,17.9378543 C8.99842505,18.0191043 8.83359313,18.0208462 8.70184453,17.9421247 C8.43538605,17.7829022 8.09483905,17.5590619 7.68650327,17.2536904 C6.75785014,16.5592065 5.78988933,15.6718988 4.96093887,14.7552039 C4.02753262,13.7230208 3.26367368,12.6506248 2.75195723,11.6539535 C2.26002664,10.695847 2,9.80651646 2,9.0821584 L2,1.91446377 C2,1.63833384 2.22387007,1.4144863 2.5,1.4144863 C2.53734105,1.4144863 2.57456457,1.41866951 2.61097419,1.42695767 C3.20863679,1.56300751 3.67034214,1.63103242 3.99609024,1.63103242 C5.84903947,1.63103242 7.59636348,1.03323193 9,0 Z M9,2.36417668 C7.4854345,3.18748636 5.7676434,3.63037957 4,3.6310317 L4,9.0821584 C4,9.45104665 4.17312121,10.0431453 4.5311549,10.7404681 C4.95854929,11.5729051 5.62212701,12.5045187 6.44436469,13.4137689 C7.1880488,14.236172 8.06071333,15.0361293 8.88429196,15.6520343 C8.91798794,15.6531625 8.93413837,15.641016 8.95037407,15.628759 C9.81328106,14.9772657 10.7176871,14.1566565 11.4814426,13.3314693 C12.3377436,12.4063102 13.0263882,11.4692542 13.4666268,10.6435552 C13.8275377,9.96665349 14,9.40512489 14,9.08215841 L14,3.63103171 C12.23235,3.63038272 10.514552,3.18748928 9,2.36417668 Z M9,5 C10.1045695,5 11,5.8954305 11,7 C11,7.7398375 10.5982846,8.38584934 10.0010775,8.73181186 L10,11 C10,11.5522847 9.55228475,12 9,12 C8.44771525,12 8,11.5522847 8,11 L7.99992752,8.73239368 C7.40216612,8.38657394 7,7.74025244 7,7 C7,5.8954305 7.8954305,5 9,5 Z" id="Combined-Shape" fill="#62646E" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_属性_权限编辑_selected</title>
<g id="icon_属性_权限编辑_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M9,0 C10.4036177,1.03323193 12.1509417,1.63103242 14.0038909,1.63103242 C14.3296318,1.63103242 14.7913276,1.56301051 15.3889782,1.4269667 C15.6582471,1.36562643 15.9262313,1.53422973 15.9875275,1.80350869 C15.9958164,1.83992242 16,1.87715012 16,1.91449535 L16,9.08215842 C16,9.77619285 15.7342394,10.6415117 15.2314445,11.584522 C14.7050914,12.5717347 13.9159202,13.645573 12.9492231,14.6900054 C12.1057303,15.6013435 11.1135511,16.5015748 10.1554738,17.2249214 C9.74266787,17.5365673 9.39859373,17.7693418 9.12860813,17.9378543 C8.99842505,18.0191043 8.83359313,18.0208462 8.70184453,17.9421247 C8.43538605,17.7829022 8.09483905,17.5590619 7.68650327,17.2536904 C6.75785014,16.5592065 5.78988933,15.6718988 4.96093887,14.7552039 C4.02753262,13.7230208 3.26367368,12.6506248 2.75195723,11.6539535 C2.26002664,10.695847 2,9.80651646 2,9.0821584 L2,1.91446377 C2.00002254,1.63833384 2.22387007,1.4144863 2.5,1.4144863 C2.53734105,1.4144863 2.57456457,1.41866951 2.61097419,1.42695767 C3.20863679,1.56300751 3.67034214,1.63103242 3.99609024,1.63103242 C5.84903947,1.63103242 7.59636348,1.03323193 9,0 Z M9,5 C7.8954305,5 7,5.8954305 7,7 C7,7.7398375 7.40171539,8.38584934 7.9989225,8.73181186 L8,11 C8,11.5522847 8.44771525,12 9,12 C9.55228475,12 10,11.5522847 10,11 L10,11 L10.0000725,8.73239368 C10.5978339,8.38657394 11,7.74025244 11,7 C11,5.8954305 10.1045695,5 9,5 Z" id="Combined-Shape" fill="#419BF9" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M16,1 C16.5522847,1 17,1.44771525 17,2 L17,5 C17,5.55228475 16.5522847,6 16,6 C15.4477153,6 15,5.55228475 15,5 L15,3 L12,3 L12,5.5 C12,5.77614237 11.7761424,6 11.5,6 C11.2238576,6 11,5.77614237 11,5.5 L11,3 L7,3 L7,6 L8.5,6 C8.77614237,6 9,6.22385763 9,6.5 C9,6.77614237 8.77614237,7 8.5,7 L7,7 L7,8.5 C7,8.77614237 6.77614237,9 6.5,9 C6.22385763,9 6,8.77614237 6,8.5 L6,7 L3,7 L3,11 L5.5,11 C5.77614237,11 6,11.2238576 6,11.5 C6,11.7761424 5.77614237,12 5.5,12 L3,12 L3,15 L5,15 C5.55228475,15 6,15.4477153 6,16 C6,16.5522847 5.55228475,17 5,17 L2,17 C1.44771525,17 1,16.5522847 1,16 L1,2 C1,1.44771525 1.44771525,1 2,1 L16,1 Z M11.8,6.8 C14.5614237,6.8 16.8,9.03857625 16.8,11.8 C16.8,14.5614237 14.5614237,16.8 11.8,16.8 C9.03857625,16.8 6.8,14.5614237 6.8,11.8 C6.8,9.03857625 9.03857625,6.8 11.8,6.8 Z M11.8,10.8 C11.2477153,10.8 10.8,11.2477153 10.8,11.8 L10.8,11.8 L10.8,14.8 C10.8,15.3522847 11.2477153,15.8 11.8,15.8 C12.3522847,15.8 12.8,15.3522847 12.8,14.8 L12.8,14.8 L12.8,11.8 C12.8,11.2477153 12.3522847,10.8 11.8,10.8 Z M11.8,7.8 C11.2477153,7.8 10.8,8.24771525 10.8,8.8 C10.8,9.35228475 11.2477153,9.8 11.8,9.8 C12.3522847,9.8 12.8,9.35228475 12.8,8.8 C12.8,8.24771525 12.3522847,7.8 11.8,7.8 Z M6,3 L3,3 L3,6 L6,6 L6,3 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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 C16.5522847,1 17,1.44771525 17,2 L17,5 C17,5.55228475 16.5522847,6 16,6 C15.4477153,6 15,5.55228475 15,5 L15,3 L12,3 L12,5.5 C12,5.77614237 11.7761424,6 11.5,6 C11.2238576,6 11,5.77614237 11,5.5 L11,3 L7,3 L7,6 L8.5,6 C8.77614237,6 9,6.22385763 9,6.5 C9,6.77614237 8.77614237,7 8.5,7 L7,7 L7,8.5 C7,8.77614237 6.77614237,9 6.5,9 C6.22385763,9 6,8.77614237 6,8.5 L6,7 L3,7 L3,11 L5.5,11 C5.77614237,11 6,11.2238576 6,11.5 C6,11.7761424 5.77614237,12 5.5,12 L3,12 L3,15 L5,15 C5.55228475,15 6,15.4477153 6,16 C6,16.5522847 5.55228475,17 5,17 L2,17 C1.44771525,17 1,16.5522847 1,16 L1,2 C1,1.44771525 1.44771525,1 2,1 L16,1 Z M11.8,6.8 C14.5614237,6.8 16.8,9.03857625 16.8,11.8 C16.8,14.5614237 14.5614237,16.8 11.8,16.8 C9.03857625,16.8 6.8,14.5614237 6.8,11.8 C6.8,9.03857625 9.03857625,6.8 11.8,6.8 Z M11.8,10.8 C11.2477153,10.8 10.8,11.2477153 10.8,11.8 L10.8,11.8 L10.8,14.8 C10.8,15.3522847 11.2477153,15.8 11.8,15.8 C12.3522847,15.8 12.8,15.3522847 12.8,14.8 L12.8,14.8 L12.8,11.8 C12.8,11.2477153 12.3522847,10.8 11.8,10.8 Z M11.8,7.8 C11.2477153,7.8 10.8,8.24771525 10.8,8.8 C10.8,9.35228475 11.2477153,9.8 11.8,9.8 C12.3522847,9.8 12.8,9.35228475 12.8,8.8 C12.8,8.24771525 12.3522847,7.8 11.8,7.8 Z M6,3 L3,3 L3,6 L6,6 L6,3 Z" id="Combined-Shape" fill="#62646E"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_属性_单元格属性_selected</title>
<g id="icon_属性_单元格属性_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M6,13 L6,17 L2,17 C1.44771525,17 1,16.5522847 1,16 L1,13 L6,13 Z M12,7 C14.7614237,7 17,9.23857625 17,12 C17,14.7614237 14.7614237,17 12,17 C9.23857625,17 7,14.7614237 7,12 C7,9.23857625 9.23857625,7 12,7 Z M12,11 C11.4477153,11 11,11.4477153 11,12 L11,12 L11,15 C11,15.5522847 11.4477153,16 12,16 C12.5522847,16 13,15.5522847 13,15 L13,15 L13,12 C13,11.4477153 12.5522847,11 12,11 Z M6,7 L6,12 L1,12 L1,7 L6,7 Z M12,8 C11.4477153,8 11,8.44771525 11,9 C11,9.55228475 11.4477153,10 12,10 C12.5522847,10 13,9.55228475 13,9 C13,8.44771525 12.5522847,8 12,8 Z M6,1 L6,6 L1,6 L1,2 C1,1.44771525 1.44771525,1 2,1 L6,1 Z M12,1 L12,6 L7,6 L7,1 L12,1 Z M16,1 C16.5522847,1 17,1.44771525 17,2 L17,6 L13,6 L13,1 L16,1 Z" id="Combined-Shape" fill="#419BF9"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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,11 L11,3 L3,3 L3,11 L11,11 Z M11,13 L8,13 L8,16 C8,16.5522847 7.55228475,17 7,17 C6.44771525,17 6,16.5522847 6,16 L6,13 L3,13 L3,16 C3,16.5522847 2.55228475,17 2,17 C1.44771525,17 1,16.5522847 1,16 L1,1.80000001 C1,1.35817221 1.35817221,1 1.80000001,1 L16,1 C16.5522847,1 17,1.44771525 17,2 C17,2.55228475 16.5522847,3 16,3 L13,3 L13,6 L16,6 C16.5522847,6 17,6.44771525 17,7 C17,7.55228475 16.5522847,8 16,8 L13,8 L13,11 L16,11 C16.5522847,11 17,11.4477153 17,12 C17,12.5522847 16.5522847,13 16,13 L13,13 L13,16 C13,16.5522847 12.5522847,17 12,17 C11.4477153,17 11,16.5522847 11,16 L11,13 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M11,11 L11,3 L3,3 L3,11 L11,11 Z M11,13 L8,13 L8,16 C8,16.5522847 7.55228475,17 7,17 C6.44771525,17 6,16.5522847 6,16 L6,13 L3,13 L3,16 C3,16.5522847 2.55228475,17 2,17 C1.44771525,17 1,16.5522847 1,16 L1,1.80000001 C1,1.35817221 1.35817221,1 1.80000001,1 L16,1 C16.5522847,1 17,1.44771525 17,2 C17,2.55228475 16.5522847,3 16,3 L13,3 L13,6 L16,6 C16.5522847,6 17,6.44771525 17,7 C17,7.55228475 16.5522847,8 16,8 L13,8 L13,11 L16,11 C16.5522847,11 17,11.4477153 17,12 C17,12.5522847 16.5522847,13 16,13 L13,13 L13,16 C13,16.5522847 12.5522847,17 12,17 C11.4477153,17 11,16.5522847 11,16 L11,13 Z" id="Combined-Shape" fill="#62646E"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1020 B

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_属性_单元格元素_selected</title>
<g id="icon_属性_单元格元素_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M6,12 L6,17 L2,17 C1.44771525,17 1,16.5522847 1,16 L1,12 L6,12 Z M11,12 L11,17 L7,17 L7,12 L11,12 Z M17,12 L17,16 C17,16.5522847 16.5522847,17 16,17 L12,17 L12,12 L17,12 Z M11,1 L11,11 L1,11 L1,2 C1,1.44771525 1.44771525,1 2,1 L11,1 Z M17,7 L17,11 L12,11 L12,7 L17,7 Z M16,1 C16.5522847,1 17,1.44771525 17,2 L17,6 L12,6 L12,1 L16,1 Z" id="Combined-Shape" fill="#419BF9"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 763 B

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M1,6 L2.5,6 C2.77614237,6 3,5.77614237 3,5.5 C3,5.22385763 2.77614237,5 2.5,5 L0.5,5 C0.361928813,5 0.236928813,5.05596441 0.146446609,5.14644661 C0.0559644063,5.23692881 0,5.36192881 0,5.5 L0,12.5 C0,12.6380712 0.0559644063,12.7630712 0.146446609,12.8535534 C0.236928813,12.9440356 0.361928813,13 0.5,13 L2.5,13 C2.77614237,13 3,12.7761424 3,12.5 C3,12.2238576 2.77614237,12 2.5,12 L1,12 L1,6 Z M5,3 L17,3 C17.5522847,3 18,3.44771525 18,4 L18,7 C18,7.55228475 17.5522847,8 17,8 L5,8 C4.44771525,8 4,7.55228475 4,7 L4,4 C4,3.44771525 4.44771525,3 5,3 Z M5,10 L14,10 C14.5522847,10 15,10.4477153 15,11 L15,14 C15,14.5522847 14.5522847,15 14,15 L5,15 C4.44771525,15 4,14.5522847 4,14 L4,11 C4,10.4477153 4.44771525,10 5,10 Z M6,6 L16,6 L16,5 L6,5 L6,6 Z M6,13 L13,13 L13,12 L6,12 L6,13 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M1,6 L2.5,6 C2.77614237,6 3,5.77614237 3,5.5 C3,5.22385763 2.77614237,5 2.5,5 L0.5,5 C0.361928813,5 0.236928813,5.05596441 0.146446609,5.14644661 C0.0559644063,5.23692881 0,5.36192881 0,5.5 L0,12.5 C0,12.6380712 0.0559644063,12.7630712 0.146446609,12.8535534 C0.236928813,12.9440356 0.361928813,13 0.5,13 L2.5,13 C2.77614237,13 3,12.7761424 3,12.5 C3,12.2238576 2.77614237,12 2.5,12 L1,12 L1,6 Z M5,3 L17,3 C17.5522847,3 18,3.44771525 18,4 L18,7 C18,7.55228475 17.5522847,8 17,8 L5,8 C4.44771525,8 4,7.55228475 4,7 L4,4 C4,3.44771525 4.44771525,3 5,3 Z M5,10 L14,10 C14.5522847,10 15,10.4477153 15,11 L15,14 C15,14.5522847 14.5522847,15 14,15 L5,15 C4.44771525,15 4,14.5522847 4,14 L4,11 C4,10.4477153 4.44771525,10 5,10 Z M6,6 L16,6 L16,5 L6,5 L6,6 Z M6,13 L13,13 L13,12 L6,12 L6,13 Z" id="Combined-Shape" fill="#62646E"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_属性_条件属性_selected</title>
<g id="icon_属性_条件属性_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M14.5,10 C14.7761424,10 15,10.2238576 15,10.5 L15,14.5 C15,14.7761424 14.7761424,15 14.5,15 L4.5,15 C4.22385763,15 4,14.7761424 4,14.5 L4,10.5 C4,10.2238576 4.22385763,10 4.5,10 L14.5,10 Z M2.5,5 C2.77614237,5 3,5.22385763 3,5.5 C3,5.77614237 2.77614237,6 2.5,6 L1,6 L1,12 L2.5,12 C2.77614237,12 3,12.2238576 3,12.5 C3,12.7761424 2.77614237,13 2.5,13 L0.5,13 C0.223857625,13 0,12.7761424 0,12.5 L0,5.5 C0,5.22385763 0.223857625,5 0.5,5 L2.5,5 Z M17.5,3 C17.7761424,3 18,3.22385763 18,3.5 L18,7.5 C18,7.77614237 17.7761424,8 17.5,8 L4.5,8 C4.22385763,8 4,7.77614237 4,7.5 L4,3.5 C4,3.22385763 4.22385763,3 4.5,3 L17.5,3 Z" id="Combined-Shape" fill="#419BF9"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M4.01632125,15.58159 C5.15138437,15.8653558 6.77993827,16 8.7625,16 C10.754965,16 12.3653254,15.8634211 13.4725502,15.5731777 C13.9124868,15.4578545 14.231192,15.3277744 14.4125,15.2119576 C14.4125,15.1652894 14.4125,15.1548971 14.4125,15.13125 L14.4125,14.85 C14.4125,14.9557804 14.4200946,14.975694 14.3765447,14.9152512 C14.2506619,14.7405383 14.0239801,14.5217976 13.7118083,14.2899231 C13.0424081,13.792707 12.0970381,13.3197127 11.0993043,12.9850097 C9.49607329,12.6883775 8.50959183,10.7841703 9.20263379,8.70504447 L9.35193628,8.25713697 L9.68578682,7.92328644 C10.4105557,7.19851756 10.925,5.80034921 10.925,4.3875 C10.925,2.77389367 10.1213412,2 8.7625,2 C7.40365881,2 6.6,2.77389367 6.6,4.3875 C6.6,5.80409932 7.11195135,7.20102415 7.83421364,7.92328644 L8.12449186,8.21356466 L8.27695346,8.59471865 C8.89523505,10.1404226 8.35007114,11.5173382 7.22038505,12.3604538 C7.04790989,12.4891767 6.87469271,12.5964931 6.6948119,12.6928413 C6.59686449,12.7453041 6.49795664,12.7935942 6.45442713,12.8138544 L6.32729717,12.8774194 L6.19245547,12.9223666 C5.20751555,13.2506799 4.28915526,13.7335539 3.65828876,14.2481897 C3.38090155,14.4744712 3.18081392,14.6895331 3.06721218,14.8679092 C3.00991736,14.9578729 3,14.9878135 3,14.9625 C3,15.1239178 3,15.1763444 3,15.2063588 C3.20221523,15.3301561 3.54752216,15.4643902 4.01632125,15.58159 Z M11.1000004,9.3375 C10.6500004,10.6875 11.4275,11.025 11.54,11.025 C14.015,11.8125 16.4125,13.3875 16.4125,14.85 L16.4125,15.4125 C16.4125,17.55 12.475,18 8.7625,18 C5.05,18 1.1125,17.55 1,15.525 L1,14.9625 C1,13.3875 3.19749994,11.8125 5.55999994,11.025 C5.78499994,10.9125 6.87000008,10.4625 6.42000008,9.3375 C5.29500008,8.2125 4.6,6.3 4.6,4.3875 C4.6,1.4625 6.5125,0 8.7625,0 C11.0125,0 12.925,1.4625 12.925,4.3875 C12.925,6.3 12.2250004,8.2125 11.1000004,9.3375 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M4.01632125,15.58159 C5.15138437,15.8653558 6.77993827,16 8.7625,16 C10.754965,16 12.3653254,15.8634211 13.4725502,15.5731777 C13.9124868,15.4578545 14.231192,15.3277744 14.4125,15.2119576 C14.4125,15.1652894 14.4125,15.1548971 14.4125,15.13125 L14.4125,14.85 C14.4125,14.9557804 14.4200946,14.975694 14.3765447,14.9152512 C14.2506619,14.7405383 14.0239801,14.5217976 13.7118083,14.2899231 C13.0424081,13.792707 12.0970381,13.3197127 11.0993043,12.9850097 C9.49607329,12.6883775 8.50959183,10.7841703 9.20263379,8.70504447 L9.35193628,8.25713697 L9.68578682,7.92328644 C10.4105557,7.19851756 10.925,5.80034921 10.925,4.3875 C10.925,2.77389367 10.1213412,2 8.7625,2 C7.40365881,2 6.6,2.77389367 6.6,4.3875 C6.6,5.80409932 7.11195135,7.20102415 7.83421364,7.92328644 L8.12449186,8.21356466 L8.27695346,8.59471865 C8.89523505,10.1404226 8.35007114,11.5173382 7.22038505,12.3604538 C7.04790989,12.4891767 6.87469271,12.5964931 6.6948119,12.6928413 C6.59686449,12.7453041 6.49795664,12.7935942 6.45442713,12.8138544 L6.32729717,12.8774194 L6.19245547,12.9223666 C5.20751555,13.2506799 4.28915526,13.7335539 3.65828876,14.2481897 C3.38090155,14.4744712 3.18081392,14.6895331 3.06721218,14.8679092 C3.00991736,14.9578729 3,14.9878135 3,14.9625 C3,15.1239178 3,15.1763444 3,15.2063588 C3.20221523,15.3301561 3.54752216,15.4643902 4.01632125,15.58159 Z M11.1000004,9.3375 C10.6500004,10.6875 11.4275,11.025 11.54,11.025 C14.015,11.8125 16.4125,13.3875 16.4125,14.85 L16.4125,15.4125 C16.4125,17.55 12.475,18 8.7625,18 C5.05,18 1.1125,17.55 1,15.525 L1,14.9625 C1,13.3875 3.19749994,11.8125 5.55999994,11.025 C5.78499994,10.9125 6.87000008,10.4625 6.42000008,9.3375 C5.29500008,8.2125 4.6,6.3 4.6,4.3875 C4.6,1.4625 6.5125,0 8.7625,0 C11.0125,0 12.925,1.4625 12.925,4.3875 C12.925,6.3 12.2250004,8.2125 11.1000004,9.3375 Z" id="Combined-Shape" fill="#62646E" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_属性_配置角色_selected</title>
<g id="icon_属性_配置角色_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M11.1000004,9.3375 C12.2250004,8.2125 12.925,6.3 12.925,4.3875 C12.925,1.4625 11.0125,0 8.7625,0 C6.5125,0 4.6,1.4625 4.6,4.3875 C4.6,6.3 5.29500008,8.2125 6.42000008,9.3375 C6.87000008,10.4625 5.78499994,10.9125 5.55999994,11.025 C3.19749994,11.8125 1,13.3875 1,14.9625 C1,15.4125 1,15.075 1,15.525 C1.1125,17.55 5.05,18 8.7625,18 C12.475,18 16.4125,17.55 16.4125,15.4125 C16.4125,14.9625 16.4125,15.3 16.4125,14.85 C16.4125,13.3875 14.015,11.8125 11.54,11.025 C11.4275,11.025 10.6500004,10.6875 11.1000004,9.3375 Z" id="Combined-Shape" fill="#419BF9" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 960 B

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M3.10000002,1 C3.59705629,1 4,1.40294371 4,1.89999998 L4,2 L14,2 L14,1.89999998 C14,1.40294371 14.4029437,1 14.9,1 L15.1,1 C15.5970563,1 16,1.40294371 16,1.89999998 L16,2 L16.1,2 C16.5970563,2 17,2.40294371 17,2.89999998 L17,3.10000002 C17,3.59705629 16.5970563,4 16.1,4 L16,4 L16,14 L16.1,14 C16.5970563,14 17,14.4029437 17,14.9 L17,15.1 C17,15.5970563 16.5970563,16 16.1,16 L16,16 L16,16.1 C16,16.5970563 15.5970563,17 15.1,17 L14.9,17 C14.4029437,17 14,16.5970563 14,16.1 L14,16 L4,16 L4,16.1 C4,16.5970563 3.59705629,17 3.10000002,17 L2.89999998,17 C2.40294371,17 2,16.5970563 2,16.1 L2,16 L1.89999998,16 C1.40294371,16 1,15.5970563 1,15.1 L1,14.9 C1,14.4029437 1.40294371,14 1.89999998,14 L2,14 L2,4 L1.89999998,4 C1.40294371,4 1,3.59705629 1,3.10000002 L1,2.89999998 C1,2.40294371 1.40294371,2 1.89999998,2 L2,2 L2,1.89999998 C2,1.40294371 2.40294371,1 2.89999998,1 L3.10000002,1 Z M14,4 L4,4 L4,14 L14,14 L14,4 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M3.10000002,1 C3.59705629,1 4,1.40294371 4,1.89999998 L4,2 L14,2 L14,1.89999998 C14,1.40294371 14.4029437,1 14.9,1 L15.1,1 C15.5970563,1 16,1.40294371 16,1.89999998 L16,2 L16.1,2 C16.5970563,2 17,2.40294371 17,2.89999998 L17,3.10000002 C17,3.59705629 16.5970563,4 16.1,4 L16,4 L16,14 L16.1,14 C16.5970563,14 17,14.4029437 17,14.9 L17,15.1 C17,15.5970563 16.5970563,16 16.1,16 L16,16 L16,16.1 C16,16.5970563 15.5970563,17 15.1,17 L14.9,17 C14.4029437,17 14,16.5970563 14,16.1 L14,16 L4,16 L4,16.1 C4,16.5970563 3.59705629,17 3.10000002,17 L2.89999998,17 C2.40294371,17 2,16.5970563 2,16.1 L2,16 L1.89999998,16 C1.40294371,16 1,15.5970563 1,15.1 L1,14.9 C1,14.4029437 1.40294371,14 1.89999998,14 L2,14 L2,4 L1.89999998,4 C1.40294371,4 1,3.59705629 1,3.10000002 L1,2.89999998 C1,2.40294371 1.40294371,2 1.89999998,2 L2,2 L2,1.89999998 C2,1.40294371 2.40294371,1 2.89999998,1 L3.10000002,1 Z M14,4 L4,4 L4,14 L14,14 L14,4 Z" id="Combined-Shape" fill="#62646E"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

8
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.svg

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_属性_悬浮元素_selected</title>
<g id="icon_属性_悬浮元素_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M3.10000002,1 C3.59705629,1 4,1.40294371 4,1.89999998 L4,2 L14,2 L14,1.89999998 C14,1.40294371 14.4029437,1 14.9,1 L15.1,1 C15.5970563,1 16,1.40294371 16,1.89999998 L16,2 L16.1,2 C16.5970563,2 17,2.40294371 17,2.89999998 L17,3.10000002 C17,3.59705629 16.5970563,4 16.1,4 L16,4 L16,14 L16.1,14 C16.5970563,14 17,14.4029437 17,14.9 L17,15.1 C17,15.5970563 16.5970563,16 16.1,16 L16,16 L16,16.1 C16,16.5970563 15.5970563,17 15.1,17 L14.9,17 C14.4029437,17 14,16.5970563 14,16.1 L14,16 L4,16 L4,16.1 C4,16.5970563 3.59705629,17 3.10000002,17 L2.89999998,17 C2.40294371,17 2,16.5970563 2,16.1 L2,16 L1.89999998,16 C1.40294371,16 1,15.5970563 1,15.1 L1,14.9 C1,14.4029437 1.40294371,14 1.89999998,14 L2,14 L2,4 L1.89999998,4 C1.40294371,4 1,3.59705629 1,3.10000002 L1,2.89999998 C1,2.40294371 1.40294371,2 1.89999998,2 L2,2 L2,1.89999998 C2,1.40294371 2.40294371,1 2.89999998,1 L3.10000002,1 Z M14,4 L4,4 L4,14 L14,14 L14,4 Z" id="Combined-Shape" fill="#419BF9"></path>
<rect id="Rectangle-2" fill="#419BF9" x="5" y="5" width="8" height="8"></rect>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M7.19238816,5.19238816 C7.74467291,5.19238816 8.19238816,5.64010341 8.19238816,6.19238816 C8.19238816,6.74467291 7.74467291,7.19238816 7.19238816,7.19238816 L7.19238816,7.19238816 L4.19238816,7.19238816 C3.08781866,7.19238816 2.19238816,8.08781866 2.19238816,9.19238816 C2.19238816,10.2969577 3.08781866,11.1923882 4.19238816,11.1923882 L4.19238816,11.1923882 L7.19238816,11.1923882 C7.74467291,11.1923882 8.19238816,11.6401034 8.19238816,12.1923882 C8.19238816,12.7446729 7.74467291,13.1923882 7.19238816,13.1923882 L7.19238816,13.1923882 L4.19238816,13.1923882 C1.98324916,13.1923882 0.192388155,11.4015272 0.192388155,9.19238816 C0.192388155,6.98324916 1.98324916,5.19238816 4.19238816,5.19238816 L4.19238816,5.19238816 Z M14.1923882,5.19238816 C16.4015272,5.19238816 18.1923882,6.98324916 18.1923882,9.19238816 C18.1923882,11.4015272 16.4015272,13.1923882 14.1923882,13.1923882 L11.1923882,13.1923882 C10.6401034,13.1923882 10.1923882,12.7446729 10.1923882,12.1923882 C10.1923882,11.6401034 10.6401034,11.1923882 11.1923882,11.1923882 L14.1923882,11.1923882 C15.2969577,11.1923882 16.1923882,10.2969577 16.1923882,9.19238816 C16.1923882,8.08781866 15.2969577,7.19238816 14.1923882,7.19238816 L11.1923882,7.19238816 C10.6401034,7.19238816 10.1923882,6.74467291 10.1923882,6.19238816 C10.1923882,5.64010341 10.6401034,5.19238816 11.1923882,5.19238816 L14.1923882,5.19238816 Z M12.1923882,8.19238816 C12.7446729,8.19238816 13.1923882,8.64010341 13.1923882,9.19238816 C13.1923882,9.74467291 12.7446729,10.1923882 12.1923882,10.1923882 L6.19238816,10.1923882 C5.64010341,10.1923882 5.19238816,9.74467291 5.19238816,9.19238816 C5.19238816,8.64010341 5.64010341,8.19238816 6.19238816,8.19238816 L12.1923882,8.19238816 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero" transform="translate(9.192388, 9.192388) rotate(45.000000) translate(-9.192388, -9.192388) "></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M7,5 C7.55228475,5 8,5.44771525 8,6 C8,6.55228475 7.55228475,7 7,7 L7,7 L4,7 C2.8954305,7 2,7.8954305 2,9 C2,10.1045695 2.8954305,11 4,11 L4,11 L7,11 C7.55228475,11 8,11.4477153 8,12 C8,12.5522847 7.55228475,13 7,13 L7,13 L4,13 C1.790861,13 0,11.209139 0,9 C0,6.790861 1.790861,5 4,5 L4,5 Z M14,5 C16.209139,5 18,6.790861 18,9 C18,11.209139 16.209139,13 14,13 L11,13 C10.4477153,13 10,12.5522847 10,12 C10,11.4477153 10.4477153,11 11,11 L14,11 C15.1045695,11 16,10.1045695 16,9 C16,7.8954305 15.1045695,7 14,7 L11,7 C10.4477153,7 10,6.55228475 10,6 C10,5.44771525 10.4477153,5 11,5 L14,5 Z M12,8 C12.5522847,8 13,8.44771525 13,9 C13,9.55228475 12.5522847,10 12,10 L6,10 C5.44771525,10 5,9.55228475 5,9 C5,8.44771525 5.44771525,8 6,8 L12,8 Z" id="Combined-Shape" fill="#62646E" fill-rule="nonzero" transform="translate(9.000000, 9.000000) rotate(45.000000) translate(-9.000000, -9.000000) "></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_属性_超级链接_selected</title>
<g id="icon_属性_超级链接_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M7.19238816,5.19238816 C7.74467291,5.19238816 8.19238816,5.64010341 8.19238816,6.19238816 C8.19238816,6.74467291 7.74467291,7.19238816 7.19238816,7.19238816 L7.19238816,7.19238816 L4.19238816,7.19238816 C3.08781866,7.19238816 2.19238816,8.08781866 2.19238816,9.19238816 C2.19238816,10.2969577 3.08781866,11.1923882 4.19238816,11.1923882 L4.19238816,11.1923882 L7.19238816,11.1923882 C7.74467291,11.1923882 8.19238816,11.6401034 8.19238816,12.1923882 C8.19238816,12.7446729 7.74467291,13.1923882 7.19238816,13.1923882 L7.19238816,13.1923882 L4.19238816,13.1923882 C1.98324916,13.1923882 0.192388155,11.4015272 0.192388155,9.19238816 C0.192388155,6.98324916 1.98324916,5.19238816 4.19238816,5.19238816 L4.19238816,5.19238816 Z M14.1923882,5.19238816 C16.4015272,5.19238816 18.1923882,6.98324916 18.1923882,9.19238816 C18.1923882,11.4015272 16.4015272,13.1923882 14.1923882,13.1923882 L11.1923882,13.1923882 C10.6401034,13.1923882 10.1923882,12.7446729 10.1923882,12.1923882 C10.1923882,11.6401034 10.6401034,11.1923882 11.1923882,11.1923882 L14.1923882,11.1923882 C15.2969577,11.1923882 16.1923882,10.2969577 16.1923882,9.19238816 C16.1923882,8.08781866 15.2969577,7.19238816 14.1923882,7.19238816 L11.1923882,7.19238816 C10.6401034,7.19238816 10.1923882,6.74467291 10.1923882,6.19238816 C10.1923882,5.64010341 10.6401034,5.19238816 11.1923882,5.19238816 L14.1923882,5.19238816 Z M12.1923882,8.19238816 C12.7446729,8.19238816 13.1923882,8.64010341 13.1923882,9.19238816 C13.1923882,9.74467291 12.7446729,10.1923882 12.1923882,10.1923882 L6.19238816,10.1923882 C5.64010341,10.1923882 5.19238816,9.74467291 5.19238816,9.19238816 C5.19238816,8.64010341 5.64010341,8.19238816 6.19238816,8.19238816 L12.1923882,8.19238816 Z" id="Combined-Shape" stroke="#419BF9" stroke-width="0.5" fill="#419BF9" fill-rule="nonzero" transform="translate(9.192388, 9.192388) rotate(45.000000) translate(-9.192388, -9.192388) "></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M9.5,9 C9.77614237,9 10,9.22385763 10,9.5 L10,15.5 C10,15.7761424 9.77614237,16 9.5,16 L1.5,16 C1.22385763,16 1,15.7761424 1,15.5 L1,9.5 C1,9.22385763 1.22385763,9 1.5,9 L9.5,9 Z M16.5,9 C16.7761424,9 17,9.22385763 17,9.5 L17,15.5 C17,15.7761424 16.7761424,16 16.5,16 L11.5,16 C11.2238576,16 11,15.7761424 11,15.5 L11,9.5 C11,9.22385763 11.2238576,9 11.5,9 L16.5,9 Z M8,11 L3,11 L3,14 L8,14 L8,11 Z M15,11 L13,11 L13,14 L15,14 L15,11 Z M16.5,2 C16.7761424,2 17,2.22385763 17,2.5 L17,7.5 C17,7.77614237 16.7761424,8 16.5,8 L1.5,8 C1.22385763,8 1,7.77614237 1,7.5 L1,2.5 C1,2.22385763 1.22385763,2 1.5,2 L16.5,2 Z M15,4 L3,4 L3,6 L15,6 L15,4 Z" id="形状" fill="#333334"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M9.5,9 C9.77614237,9 10,9.22385763 10,9.5 L10,15.5 C10,15.7761424 9.77614237,16 9.5,16 L1.5,16 C1.22385763,16 1,15.7761424 1,15.5 L1,9.5 C1,9.22385763 1.22385763,9 1.5,9 L9.5,9 Z M16.5,9 C16.7761424,9 17,9.22385763 17,9.5 L17,15.5 C17,15.7761424 16.7761424,16 16.5,16 L11.5,16 C11.2238576,16 11,15.7761424 11,15.5 L11,9.5 C11,9.22385763 11.2238576,9 11.5,9 L16.5,9 Z M8,11 L3,11 L3,14 L8,14 L8,11 Z M15,11 L13,11 L13,14 L15,14 L15,11 Z M16.5,2 C16.7761424,2 17,2.22385763 17,2.5 L17,7.5 C17,7.77614237 16.7761424,8 16.5,8 L1.5,8 C1.22385763,8 1,7.77614237 1,7.5 L1,2.5 C1,2.22385763 1.22385763,2 1.5,2 L16.5,2 Z M15,4 L3,4 L3,6 L15,6 L15,4 Z" id="形状" fill="#62646E" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_属性_组件库_selected</title>
<g id="icon_属性_组件库_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M9.5,9 C9.77614237,9 10,9.22385763 10,9.5 L10,15.5 C10,15.7761424 9.77614237,16 9.5,16 L1.5,16 C1.22385763,16 1,15.7761424 1,15.5 L1,9.5 C1,9.22385763 1.22385763,9 1.5,9 L9.5,9 Z M16.5,9 C16.7761424,9 17,9.22385763 17,9.5 L17,15.5 C17,15.7761424 16.7761424,16 16.5,16 L11.5,16 C11.2238576,16 11,15.7761424 11,15.5 L11,9.5 C11,9.22385763 11.2238576,9 11.5,9 L16.5,9 Z M16.5,2 C16.7761424,2 17,2.22385763 17,2.5 L17,7.5 C17,7.77614237 16.7761424,8 16.5,8 L1.5,8 C1.22385763,8 1,7.77614237 1,7.5 L1,2.5 C1,2.22385763 1.22385763,2 1.5,2 L16.5,2 Z" id="形状结合" fill="#419BF9" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 978 B

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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="M16.1,3 C16.5970563,3 17,3.40294371 17,3.89999998 L17,14.1 C17,14.5970563 16.5970563,15 16.1,15 L1.89999998,15 C1.40294371,15 1,14.5970563 1,14.1 L1,3.89999998 C1,3.40294371 1.40294371,3 1.89999998,3 L16.1,3 Z M15,5 L3,5 L3,13 L15,13 L15,5 Z M13.4587257,7 C13.6244111,7 13.7587257,7.13431458 13.7587257,7.3 C13.7587257,7.35622591 13.7429249,7.4113202 13.7131252,7.45899968 L11.6695997,10.7286405 C11.6110576,10.8223078 11.4876675,10.8507825 11.3940002,10.7922404 C11.3682464,10.7761443 11.3464965,10.7543944 11.3304003,10.7286405 L9.2868748,7.45899968 C9.1990617,7.31849872 9.24177365,7.13341361 9.38227461,7.04560051 C9.42995409,7.01580083 9.48504838,7 9.54127429,7 L13.4587257,7 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" 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,3 C16.5970563,3 17,3.40294371 17,3.89999998 L17,14.1 C17,14.5970563 16.5970563,15 16.1,15 L1.89999998,15 C1.40294371,15 1,14.5970563 1,14.1 L1,3.89999998 C1,3.40294371 1.40294371,3 1.89999998,3 L16.1,3 Z M15,5 L3,5 L3,13 L15,13 L15,5 Z M13.4587257,7 C13.6244111,7 13.7587257,7.13431458 13.7587257,7.3 C13.7587257,7.35622591 13.7429249,7.4113202 13.7131252,7.45899968 L11.6695997,10.7286405 C11.6110576,10.8223078 11.4876675,10.8507825 11.3940002,10.7922404 C11.3682464,10.7761443 11.3464965,10.7543944 11.3304003,10.7286405 L9.2868748,7.45899968 C9.1990617,7.31849872 9.24177365,7.13341361 9.38227461,7.04560051 C9.42995409,7.01580083 9.48504838,7 9.54127429,7 L13.4587257,7 Z" id="Combined-Shape" fill="#62646E" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.svg

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_属性_控件设置_selected</title>
<g id="icon_属性_控件设置_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M16.1,3 C16.5970563,3 17,3.40294371 17,3.89999998 L17,14.1 C17,14.5970563 16.5970563,15 16.1,15 L1.89999998,15 C1.40294371,15 1,14.5970563 1,14.1 L1,3.89999998 C1,3.40294371 1.40294371,3 1.89999998,3 L16.1,3 Z M13.4587257,7 L9.54127429,7 C9.48504838,7 9.42995409,7.01580083 9.38227461,7.04560051 C9.24177365,7.13341361 9.1990617,7.31849872 9.2868748,7.45899968 L9.2868748,7.45899968 L11.3304003,10.7286405 C11.3464965,10.7543944 11.3682464,10.7761443 11.3940002,10.7922404 C11.4876675,10.8507825 11.6110576,10.8223078 11.6695997,10.7286405 L11.6695997,10.7286405 L13.7131252,7.45899968 C13.7429249,7.4113202 13.7587257,7.35622591 13.7587257,7.3 C13.7587257,7.13431458 13.6244111,7 13.4587257,7 L13.4587257,7 Z" id="Combined-Shape" fill="#419BF9" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

16
designer-base/src/main/resources/com/fr/design/images/sheet/add_polysheet_normal.svg

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="12px" viewBox="0 0 22 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_sheet_添加数据集_normal</title>
<g id="icon_sheet_添加数据集_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M22,0.0004 L20.0367403,2.61866614 C19.7176826,2.45251885 19.3802905,2.31673535 19.0283951,2.2151467 L20,1 L1,1 L1,11 L12,11 L12.6797985,10.1508283 C12.9113978,10.571067 13.196355,10.9577711 13.5255391,11.3018093 L13,12.0004 L0,12.0004 L0,0.0004 L22,0.0004 Z" id="Combined-Shape" fill="#333334"></path>
<line x1="17" y1="6" x2="17" y2="11" id="Fill-8" fill="#16C153"></line>
<g id="Group" transform="translate(13.000000, 3.000000)">
<path d="M9,4.5 C9,6.985 6.985,9 4.5,9 C2.015,9 0,6.985 0,4.5 C0,2.015 2.015,0 4.5,0 C6.985,0 9,2.015 9,4.5" id="Fill-6" fill="#16C153"></path>
<path d="M4.5,1.5 C4.776,1.5 5,1.724 5,2 L5,4 L7,4 C7.276,4 7.5,4.224 7.5,4.5 C7.5,4.776 7.276,5 7,5 L5,5 L5,7 C5,7.276 4.776,7.5 4.5,7.5 C4.224,7.5 4,7.276 4,7 L4,5 L2,5 C1.724,5 1.5,4.776 1.5,4.5 C1.5,4.224 1.724,4 2,4 L4,4 L4,2 C4,1.724 4.224,1.5 4.5,1.5 Z" id="Combined-Shape" fill="#FFFFFF"></path>
</g>
<line x1="15" y1="9" x2="20" y2="9" id="Fill-12" fill="#16C153"></line>
<path d="M3,4 L5,4 L5,3 L3,3 L3,4 Z M2,2 L6,2 L6,5 L2,5 L2,2 Z" id="Rectangle-27" fill="#333334" fill-rule="nonzero"></path>
<path d="M3,9 L10,9 L10,7 L3,7 L3,9 Z M2,6 L11,6 L11,10 L2,10 L2,6 Z" id="Rectangle-27-Copy-2" fill="#333334" fill-rule="nonzero"></path>
<path d="M8,4 L10,4 L10,3 L8,3 L8,4 Z M7,2 L11,2 L11,5 L7,5 L7,2 Z" id="Rectangle-27-Copy" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

7
designer-base/src/main/resources/com/fr/design/images/sheet/next_page_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_sheet_下一页_disabled</title>
<g id="icon_sheet_下一页_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.4">
<path d="M6.34142136,4.34142136 L10,8 L10,8 L6.34142136,11.6585786 C6.2633165,11.7366835 6.1366835,11.7366835 6.05857864,11.6585786 C6.02107137,11.6210714 6,11.5702006 6,11.5171573 L6,4.48284271 C6,4.37238576 6.08954305,4.28284271 6.2,4.28284271 C6.2530433,4.28284271 6.30391408,4.30391408 6.34142136,4.34142136 Z" id="Rectangle-29" fill="#333334"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 732 B

7
designer-base/src/main/resources/com/fr/design/images/sheet/next_page_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_sheet_下一页_normal</title>
<g id="icon_sheet_下一页_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M6.34142136,4.34142136 L10,8 L10,8 L6.34142136,11.6585786 C6.2633165,11.7366835 6.1366835,11.7366835 6.05857864,11.6585786 C6.02107137,11.6210714 6,11.5702006 6,11.5171573 L6,4.48284271 C6,4.37238576 6.08954305,4.28284271 6.2,4.28284271 C6.2530433,4.28284271 6.30391408,4.30391408 6.34142136,4.34142136 Z" id="Rectangle-29" fill="#333334"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 714 B

9
designer-base/src/main/resources/com/fr/design/images/sheet/polysheet_normal.svg

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_sheet_normal </title>
<g id="icon_sheet_normal-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M3,4 L5,4 L5,3 L3,3 L3,4 Z M2,2 L6,2 L6,5 L2,5 L2,2 Z" id="Rectangle-27" fill="#333334" fill-rule="nonzero"></path>
<path d="M3,9 L10,9 L10,7 L3,7 L3,9 Z M2,6 L11,6 L11,10 L2,10 L2,6 Z" id="Rectangle-27-Copy-2" fill="#333334" fill-rule="nonzero"></path>
<path d="M8,4 L10,4 L10,3 L8,3 L8,4 Z M7,2 L11,2 L11,5 L7,5 L7,2 Z" id="Rectangle-27-Copy" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 753 B

7
designer-base/src/main/resources/com/fr/design/images/sheet/pre_page_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_sheet_上一页_disabled</title>
<g id="icon_sheet_上一页_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.4">
<path d="M6.34142136,4.34142136 L10,8 L10,8 L6.34142136,11.6585786 C6.2633165,11.7366835 6.1366835,11.7366835 6.05857864,11.6585786 C6.02107137,11.6210714 6,11.5702006 6,11.5171573 L6,4.48284271 C6,4.37238576 6.08954305,4.28284271 6.2,4.28284271 C6.2530433,4.28284271 6.30391408,4.30391408 6.34142136,4.34142136 Z" id="Rectangle-29" fill="#333334" transform="translate(8.000000, 8.000000) scale(-1, 1) translate(-8.000000, -8.000000) "></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 820 B

7
designer-base/src/main/resources/com/fr/design/images/sheet/pre_page_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_sheet_上一页_normal</title>
<g id="icon_sheet_上一页_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M6.34142136,4.34142136 L10,8 L10,8 L6.34142136,11.6585786 C6.2633165,11.7366835 6.1366835,11.7366835 6.05857864,11.6585786 C6.02107137,11.6210714 6,11.5702006 6,11.5171573 L6,4.48284271 C6,4.37238576 6.08954305,4.28284271 6.2,4.28284271 C6.2530433,4.28284271 6.30391408,4.30391408 6.34142136,4.34142136 Z" id="Rectangle-29" fill="#333334" transform="translate(8.000000, 8.000000) scale(-1, 1) translate(-8.000000, -8.000000) "></path>
</g>
</svg>

After

Width:  |  Height:  |  Size: 802 B

16
designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java

@ -40,7 +40,7 @@ public class FormParaPane extends JPanel {
private static final int TOOLTIP_X = 5;
private static final int TOOLTIP_Y = 10;
private static Dimension originalSize;
private static volatile FormParaPane THIS;
private java.util.List<WidgetOption> predifinedwidgeList = new ArrayList<WidgetOption>();
private UIButton predefineButton;
@ -48,25 +48,25 @@ public class FormParaPane extends JPanel {
private FormDesigner designer;
static {
GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
@Override
public void on(PluginEvent event) {
THIS = null;
}
}, new PluginFilter() {
@Override
public boolean accept(PluginContext context) {
return context.contain(PluginModule.ExtraDesign);
}
});
}
public static final FormParaPane getInstance(FormDesigner designer) {
if(THIS == null) {
THIS = new FormParaPane();
@ -82,7 +82,7 @@ public class FormParaPane extends JPanel {
public FormParaPane() {
predefineButton = new UIButton(UIConstants.PRE_WIDGET_ICON) {
predefineButton = new UIButton(UIConstants.PRE_WIDGET_NORMAL_ICON) {
@Override
public Dimension getPreferredSize() {
Dimension dim = super.getPreferredSize();

33
designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java

@ -24,6 +24,7 @@ import javax.swing.UIManager;
import com.fr.base.BaseUtils;
import com.fr.base.GraphHelper;
import com.fr.base.svg.SVGIcon;
import com.fr.base.vcs.DesignerMode;
import com.fr.design.actions.UpdateAction;
import com.fr.design.constants.UIConstants;
@ -57,14 +58,14 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
private static final Color LINE_COLOR = new Color(0xababab);
private static final Icon ADD_WORK_SHEET = IOUtils.readIcon("com/fr/base/images/oem/addworksheet.png");
protected static final Icon ADD_POLY_SHEET = IOUtils.readIcon("com/fr/design/images/sheet/addpolysheet.png");
private static final Icon WORK_SHEET_ICON = IOUtils.readIcon("com/fr/base/images/oem/worksheet.png");
private static final Icon POLY_SHEET_ICON = IOUtils.readIcon("com/fr/design/images/sheet/polysheet.png");
private static final Icon LEFT_ICON = IOUtils.readIcon("com/fr/design/images/sheet/left_normal@1x.png");
private static final Icon RIGHT_ICON = IOUtils.readIcon("com/fr/design/images/sheet/right_normal@1x.png");
private static final Icon DISABLED_LEFT_ICON = IOUtils.readIcon("com/fr/design/images/sheet/left_hover@1x.png");
private static final Icon DISABLED_RIGHT_ICON = IOUtils.readIcon("com/fr/design/images/sheet/right_hover@1x.png");
private static final Icon ADD_WORK_SHEET = SVGIcon.readSVGIcon("com/fr/base/images/oem/add_worksheet_normal.svg", 22, 12);
protected static final Icon ADD_POLY_SHEET = SVGIcon.readSVGIcon("com/fr/design/images/sheet/add_polysheet_normal.svg", 22, 12);
private static final Icon WORK_SHEET_ICON = SVGIcon.readSVGIcon("com/fr/base/images/oem/worksheet_normal.svg", 12, 12);
private static final Icon POLY_SHEET_ICON = SVGIcon.readSVGIcon("com/fr/design/images/sheet/polysheet_normal.svg", 12, 12);
private static final Icon LEFT_ICON = SVGIcon.readSVGIcon("com/fr/design/images/sheet/pre_page_normal.svg");
private static final Icon RIGHT_ICON = SVGIcon.readSVGIcon("com/fr/design/images/sheet/next_page_normal.svg");
private static final Icon DISABLED_LEFT_ICON = SVGIcon.readSVGIcon("com/fr/design/images/sheet/pre_page_disabled.svg");
private static final Icon DISABLED_RIGHT_ICON = SVGIcon.readSVGIcon("com/fr/design/images/sheet/next_page_disabled.svg");
private static final int NUM = 10;
private static final int ICON_SEP_DISTANCE = 8;
@ -134,7 +135,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
* 编辑的对象实例
*/
private ReportComponentComposite reportComposite;
private int selectedIndex = -1;
private JPanel buttonPane;
@ -332,7 +333,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
leftButton.setEnabled(buttonEnabled);
rightButton.setEnabled(buttonEnabled);
}
/**
* 抽出来方便OEM
* @return
@ -417,10 +418,10 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
// 画两个添加sheet图标
iconLocation = isOvertakeWidth ? (int) (maxWidth) : addIconlocation + GRAP;
paintAddButton(g2d);
}
protected void paintAddButton(Graphics2D g2d){
getAddWorkSheet().paintIcon(this, g2d, iconLocation, 3);
ADD_POLY_SHEET.paintIcon(this, g2d, iconLocation + getAddWorkSheet().getIconWidth() + ICON_SEP_DISTANCE, 3);
@ -626,7 +627,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
processRightMouseButton(evtX, evtY);
}
}
private void processRightMouseButton(int evtX, int evtY){
MenuDef def = new MenuDef();
addInsertGridShortCut(def);
@ -636,14 +637,14 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
def.updateMenu();
GUICoreUtils.showPopupMenu(tabPop, this, evtX - 1, evtY - 1);
}
private void processLeftMouseButton(int evtX){
if (evtX > iconLocation && evtX < iconLocation + GRID_TOSHEET_RIGHT) {
firstInsertActionPerformed();
} else if (evtX > iconLocation + POLY_TOSHEET_LEFT && evtX < iconLocation + POLY_TOSHEET_RIGHT) {
new PolyReportInsertAction().actionPerformed(null);
}
}
protected void addInsertGridShortCut(MenuDef def){
@ -847,7 +848,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
}
protected class GridReportInsertAction extends SheetInsertAction {
@Override
protected TemplateReport newTemplateReport() {
return new WorkSheet();

Loading…
Cancel
Save