Browse Source

Pull request #14823: REPORT-121536 回归-FR-模板web属性-引用的css未生效

Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/release to fbp/release

* commit '0342339841da5a7e13d7ddb82046372a70524481':
  REPORT-121536 回归-FR-模板web属性-引用的css未生效
fbp/release
Destiny.Lin-林锦龙 2 months ago
parent
commit
f9de03763a
  1. 4
      designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
  2. 4
      designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java

4
designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java

@ -80,8 +80,8 @@ public class WebCssPane extends BasicPane {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
FILEChooserPane fileChooser = FILEChooserPane.getInstanceWithDesignatePath(ProjectConstants.RESOURCES_NAME, FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true,
new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")), ProjectConstants.RESOURCES_NAME); new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
final FILE file = fileChooser.getSelectedFILE(); final FILE file = fileChooser.getSelectedFILE();

4
designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java

@ -158,8 +158,8 @@ public class WebJsPane extends BasicPane {
private ActionListener chooseFileListener = new ActionListener() { private ActionListener chooseFileListener = new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
FILEChooserPane fileChooser = FILEChooserPane.getInstanceWithDesignatePath(ProjectConstants.RESOURCES_NAME , FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true,
new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")), ProjectConstants.RESOURCES_NAME); new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
final FILE file = fileChooser.getSelectedFILE(); final FILE file = fileChooser.getSelectedFILE();

Loading…
Cancel
Save