Browse Source

Pull request #7457: REPORT-65515【稳定共创】公式编辑器-存在插件函数时,选择数据集参数函数显示跳转显示有问题

Merge in DESIGN/design from ~HOKY.HE/design-hoky:final/11.0 to final/11.0

* commit '1c70e5e27c2c9cf02e17d58a92795999a2c57267':
  REPORT-65515【稳定共创】公式编辑器-存在插件函数时,选择数据集参数函数显示跳转显示有问题 1.选择参数的时候返回默认值
new-design
Hoky.He 3 years ago
parent
commit
d1ad418c51
  1. 6
      designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

6
designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@ -555,6 +555,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
private void fixFunctionNameList(String functionName) { private void fixFunctionNameList(String functionName) {
int signOfContinue = 1; int signOfContinue = 1;
int indexOfFunction = 0; int indexOfFunction = 0;
boolean found = false;
for (int i = 0; i < functionTypeListModel.size(); i++) { for (int i = 0; i < functionTypeListModel.size(); i++) {
int signOfType = 0; int signOfType = 0;
FunctionGroup functionType = (FunctionGroup) functionTypeListModel.getElementAt(i); FunctionGroup functionType = (FunctionGroup) functionTypeListModel.getElementAt(i);
@ -568,6 +569,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
signOfType = 1; signOfType = 1;
signOfContinue = 0; signOfContinue = 0;
indexOfFunction = k; indexOfFunction = k;
found = true;
} }
} }
@ -577,8 +579,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
} }
} }
} }
if (found) {
functionNameList.setSelectedIndex(indexOfFunction); functionNameList.setSelectedIndex(indexOfFunction);
functionNameList.ensureIndexIsVisible(indexOfFunction); functionNameList.ensureIndexIsVisible(indexOfFunction);
} else {
functionTypeList.setSelectedIndex(0);
}
} }
private int getBeginPosition() { private int getBeginPosition() {

Loading…
Cancel
Save