renekton 4 months ago
parent
commit
d92d0e7b18
  1. 2
      designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java
  2. 4
      designer-base/src/main/resources/com/fine/theme/icon/param/advanced_editor.svg
  3. 10
      designer-base/src/main/resources/com/fine/theme/icon/widget/user_widget.svg
  4. 1
      designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json
  5. 4
      designer-base/src/main/resources/com/fr/design/images/edit/advancedEditor.svg
  6. 2
      designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java

2
designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java

@ -104,7 +104,7 @@ public class FunctionManagerPane extends BasicPane {
@Override @Override
public NameableCreator[] createNameableCreators() { public NameableCreator[] createNameableCreators() {
NameableCreator funcDef = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function"), NameableCreator funcDef = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function"),
new LazyIcon("param"), FunctionDef.class, FunctionContentPane.class); new LazyIcon("page_query"), FunctionDef.class, FunctionContentPane.class);
return new NameableCreator[]{funcDef}; return new NameableCreator[]{funcDef};
} }

4
designer-base/src/main/resources/com/fine/theme/icon/param/advanced_editor.svg

@ -1,4 +0,0 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M29.0353 2.70388C28.429 2.09756 27.446 2.09757 26.8397 2.70389L14.4417 15.1019L13.2902 18.449L16.6374 17.2975L29.0353 4.89956C29.6417 4.29324 29.6417 3.3102 29.0353 2.70388Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M6 2.99997H22.1733L20.1733 4.99997H6L6 28H26V11.8899L28 9.88986V28C28 29.1045 27.1046 30 26 30H6C4.89543 30 4 29.1045 4 28V4.99997C4 3.8954 4.89543 2.99997 6 2.99997Z" fill="#0A1C38" fill-opacity="0.9"/>
</svg>

Before

Width:  |  Height:  |  Size: 536 B

10
designer-base/src/main/resources/com/fine/theme/icon/widget/user_widget.svg

@ -1,10 +0,0 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_5516_63505)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M30 16C30 23.732 23.732 30 16 30C8.26801 30 2 23.732 2 16C2 8.26801 8.26801 2 16 2C23.732 2 30 8.26801 30 16ZM32 16C32 24.8366 24.8366 32 16 32C7.16344 32 0 24.8366 0 16C0 7.16344 7.16344 0 16 0C24.8366 0 32 7.16344 32 16ZM8 24.3492C8 24.6254 8.22386 24.8492 8.5 24.8492H10.8284L22.412 13.2657L19.5836 10.4372L8 22.0208V24.3492ZM24.2635 11.4142L23.8262 11.8514L20.9978 9.02302L21.435 8.58579C22.2161 7.80474 23.4824 7.80474 24.2635 8.58579C25.0445 9.36684 25.0445 10.6332 24.2635 11.4142Z" fill="#0A1C38" fill-opacity="0.9"/>
</g>
<defs>
<clipPath id="clip0_5516_63505">
<rect width="32" height="32" fill="white"/>
</clipPath>
</defs>
</svg>

Before

Width:  |  Height:  |  Size: 826 B

1
designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json

@ -146,6 +146,7 @@
"image": "insert/image.svg", "image": "insert/image.svg",
"bias": "insert/bias.svg", "bias": "insert/bias.svg",
"sub_report": "insert/sub_report.svg", "sub_report": "insert/sub_report.svg",
"float_normal": "insert/float_normal.svg",
"popup": { "popup": {
"normal": "popup/popup.svg" "normal": "popup/popup.svg"
}, },

4
designer-base/src/main/resources/com/fr/design/images/edit/advancedEditor.svg

@ -1,4 +0,0 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M29.0353 2.70388C28.429 2.09756 27.446 2.09757 26.8397 2.70389L14.4417 15.1019L13.2902 18.449L16.6374 17.2975L29.0353 4.89956C29.6417 4.29324 29.6417 3.3102 29.0353 2.70388Z" fill="#0A1C38" fill-opacity="0.9"/>
<path d="M6 2.99997H22.1733L20.1733 4.99997H6L6 28H26V11.8899L28 9.88986V28C28 29.1045 27.1046 30 26 30H6C4.89543 30 4 29.1045 4 28V4.99997C4 3.8954 4.89543 2.99997 6 2.99997Z" fill="#0A1C38" fill-opacity="0.9"/>
</svg>

Before

Width:  |  Height:  |  Size: 536 B

2
designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java

@ -297,7 +297,7 @@ public class HFComponent extends UILabel implements MoveActionListener {
} else if (hfElement.getClass().equals(ImageHFElement.class)) { } else if (hfElement.getClass().equals(ImageHFElement.class)) {
return new LazyIcon("image"); return new LazyIcon("image");
} else if (hfElement.getClass().equals(NewLineHFElement.class)) { } else if (hfElement.getClass().equals(NewLineHFElement.class)) {
return new LazyIcon("newline"); return new LazyIcon("new_line");
} }
return BaseUtils.readIcon("/com/fr/base/images/dialog/headerfooter/undefined.png"); return BaseUtils.readIcon("/com/fr/base/images/dialog/headerfooter/undefined.png");

Loading…
Cancel
Save