Browse Source

Merge pull request #1209 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'f791ce188fef01026e7db8225b6609390cdd468b':
  REPORT-22795 【1004回归】设计面板-控件设置-文本控件基本设置 && REPORT-21152 英文、韩文设计器cell->other跳转错误
feature/big-screen
Hades 5 years ago
parent
commit
8d48b664ca
  1. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java
  2. 2
      designer-realize/src/main/java/com/fr/design/actions/cell/CellAttributeAction.java

2
designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java

@ -111,8 +111,8 @@ public class RegPane extends BasicPane {
cardPane.setPreferredSize(new Dimension(0,0 ));
detailedCardLayout.show(cardPane, "Default");
}
fireRegChangeAction();
}
fireRegChangeAction();
}
});
}

2
designer-realize/src/main/java/com/fr/design/actions/cell/CellAttributeAction.java

@ -17,7 +17,7 @@ public class CellAttributeAction extends CellAttributeTableAction {
@Override
protected String getID() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Other_Attributes");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Datasource_Other_Attributes");
}
}
Loading…
Cancel
Save