Browse Source

Merge pull request #2177 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '4a973c889d5852e25d760de851c79c6d18d36f0b':
  REPORT-37870【共创】远程目录切换回本地,点击服务器-插件管理,页面显示异常;再打开一个模板,模板内容显示错乱
  REPORT-37968 设计器修改单元格属性时会顺带修改下一个点击的单元格
research/11.0
superman 4 years ago
parent
commit
2e856ca887
  1. 8
      designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowPane.java
  2. 1
      designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java
  3. 3
      designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java

8
designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowPane.java

@ -200,13 +200,17 @@ public class ColumnRowPane extends JPanel implements UIObserver {
column = 0; column = 0;
} }
removeDocumentListener(d); removeDocumentListener(d);
columnSpinner.setValue(StableUtils.convertIntToABC(column + 1)); String colValue = StableUtils.convertIntToABC(column + 1);
columnSpinner.setValue(colValue);
((DefaultEditor) columnSpinner.getEditor()).getTextField().setText(colValue);
int row = columnRow.getRow(); int row = columnRow.getRow();
// shoc 小于0就蹦了 // shoc 小于0就蹦了
if (row < 0) { if (row < 0) {
row = 0; row = 0;
} }
rowSpinner.setValue("" + (row + 1)); String rowValue = Integer.toString(row + 1);
rowSpinner.setValue(rowValue);
((DefaultEditor) rowSpinner.getEditor()).getTextField().setText(rowValue);
addDocumentListener(d); addDocumentListener(d);
fireChanged(); fireChanged();
} }

1
designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java

@ -146,6 +146,7 @@ public class DesignModuleFactory {
try { try {
return (ParameterDesignerProvider) instance.formParaDesigner.newInstance(); return (ParameterDesignerProvider) instance.formParaDesigner.newInstance();
} catch (Exception e) { } catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
FineLoggerFactory.getLogger().error("error in form para designer"); FineLoggerFactory.getLogger().error("error in form para designer");
} }
} }

3
designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java

@ -95,7 +95,8 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
setComponentBg(this); setComponentBg(this);
paraDesignEditor = DesignModuleFactory.getFormParaDesigner(); paraDesignEditor = DesignModuleFactory.getFormParaDesigner();
if (paraDesignEditor == null) { if (paraDesignEditor == null) {
return; // 为空时 设置默认值
paraDesignEditor = new FormParaDesigner();
} }
paraDesignEditor.initWidgetToolbarPane(); paraDesignEditor.initWidgetToolbarPane();

Loading…
Cancel
Save