Browse Source

Pull request #8526: 无jira任务,屏蔽部分功能入口

Merge in DESIGN/design from ~PENGDA/design:release/11.0 to release/11.0

* commit 'bc9ce4fb3ed0edb5c87f10718d83cc6c8fe0aae5':
  无jira任务,屏蔽部分功能入口
bugfix/11.0
pengda 3 years ago
parent
commit
a3636dfd83
  1. 3
      designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java
  2. 2
      designer-base/src/main/java/com/fr/design/gui/style/TextFormatPane.java

3
designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java

@ -288,8 +288,7 @@ public final class FunctionConstants {
private static NameAndFunctionList getNewFunctionList() { private static NameAndFunctionList getNewFunctionList() {
return new NameAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_New"), new Function[]{ return new NameAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_New"), new Function[]{
new ENDOFMONTH(), new NUMTOZH(), new MIDCHAR(), new ISWORKDAY(), new ENBYSTRNUM(), new TEXTGETNUM(), new ENDOFMONTH(), new NUMTOZH(), new MIDCHAR(), new ISWORKDAY()
new GETCHARNUM(), new GCD(), new LCM()
}); });
} }

2
designer-base/src/main/java/com/fr/design/gui/style/TextFormatPane.java

@ -58,7 +58,7 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
private static final Integer[] TYPES = new Integer[]{ private static final Integer[] TYPES = new Integer[]{
FormatContents.NULL, FormatContents.NUMBER, FormatContents.NULL, FormatContents.NUMBER,
FormatContents.CURRENCY, FormatContents.PERCENT, FormatContents.CURRENCY, FormatContents.PERCENT,
FormatContents.THOUSANDTHS, FormatContents.SCIENTIFIC, FormatContents.SCIENTIFIC,
FormatContents.DATE, FormatContents.TIME, FormatContents.DATE, FormatContents.TIME,
FormatContents.TEXT}; FormatContents.TEXT};

Loading…
Cancel
Save