Browse Source

REPORT-44961 【10.0.12冒烟】附件模板打开设计器卡死,且布局发生变化

【问题原因】带有数据字典的设计器控件,在选中的时候会去连接获取字段信息,当系统中有同名数据连接但是无法连接到数据库的时候,会发生假死。如果没有这个数据连接的名字,那么会直接报错不会假死。主要还是这个数据字典获取数据的操作是耗时操作,不应该在UI线程进行耗时操作。
【改动方案】主要分为两部分,第一是将原本的tdChange()方法中的耗时操作放到SwingWorker中的工作线程中,这样的话即使后台数据连接失败,设计器也不会一直阻塞直到重连超时;第二是应产品的要求,将选中控件就会去请求连接并获取属于当前控件的列名这部分逻辑,修改为用户点击右侧面板中的数据字典旁边的button,showDictPane的时候才会去请求连接
persist/11.0
Yvan 4 years ago
parent
commit
9b71b1241e
  1. 40
      designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java
  2. 3
      designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleDictionaryEditor.java
  3. 4
      designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java
  4. 85
      designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java

40
designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java

@ -7,6 +7,7 @@ import com.fr.design.DesignModelAdapter;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.data.datapane.preview.PreviewTablePane;
import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
import com.fr.design.utils.DesignUtils;
import com.fr.general.ComparatorUtils;
@ -35,18 +36,18 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
/**
* 获取数据集的所有列名list
*
*
* @return 数据集的所有列名list
*
*
*
* @date 2014-11-24-下午3:51:41
*
*
*/
public List<String> calculateColumnNameList() {
if(columnNameList != null){
return columnNameList;
}
DesignModelAdapter adapter = DesignModelAdapter.getCurrentModelAdapter();
TableDataSource tds = adapter == null ? null : adapter.getBook();
String[] colNames = tabledata.getColumnNames(tds);
@ -56,13 +57,14 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
} else if (ArrayUtils.isNotEmpty(colNamesInCache)) {
return toColumnNameList(colNamesInCache);
}
EmbeddedTableData embeddedTableData = null;
try {
embeddedTableData = DesignTableDataManager.previewTableDataNotNeedInputParameters(tds, tabledata, TableData.RESULT_NOT_NEED, false);
} catch (Exception e) {
if (e.getMessage()!=null) {
DesignUtils.errorMessage(e.getMessage());
// 这个弹窗可能会成为数据字典页面的二级弹窗,所以修改下父窗口避免出现mac下的二级弹窗问题
FineJOptionPane.showMessageDialog(null, e.getMessage());
}
}
columnNameList = DesignTableDataManager.getColumnNamesByTableData(embeddedTableData);
@ -78,12 +80,12 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
/**
* 生成子节点
*
*
* @return 生成子节点
*
*
*
* @date 2014-11-24-下午3:51:17
*
*
*/
public ExpandMutableTreeNode[] load() {
List<String> namelist = calculateColumnNameList();
@ -97,10 +99,10 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
/**
* 预览数据集
*
*
*
* @date 2014-11-24-下午3:50:20
*
*
*/
public void previewData() {
PreviewTablePane.previewTableData(tabledata);
@ -108,30 +110,30 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
/**
* 预览数据集,带有显示值和实际值的标记结果
*
*
* @param keyIndex 实际值
* @param valueIndex 显示值
*
*
*
* @date 2014-11-24-下午3:50:20
*
*
*/
public void previewData(final int keyIndex,final int valueIndex){
PreviewTablePane.previewTableData(tabledata, keyIndex, valueIndex);
}
@Override
public String getTableDataName(){
return name;
return name;
}
/**
* 获取数据集的面板
*
*
* @return 数据集面板
*
*
*
* @date 2014-11-24-下午3:50:00
*
*
*/
public AbstractTableDataPane<?> creatTableDataPane() {
return TableDataFactory.creatTableDataPane(tabledata, name);
@ -143,4 +145,4 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
&& ComparatorUtils.equals(this.tabledata, ((AbstractTableDataWrapper) obj).getTableData());
}
}
}

3
designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleDictionaryEditor.java

@ -21,6 +21,7 @@ public class AccessibleDictionaryEditor extends UneditableAccessibleEditor {
protected void showEditorPane() {
if (dictPane == null) {
dictPane = new DictionaryPane();
dictPane.getTableDataDictPane().setNeedTableDataChange(true);
}
BasicDialog dlg = dictPane.showWindow(SwingUtilities.getWindowAncestor(this));
@ -58,4 +59,4 @@ public class AccessibleDictionaryEditor extends UneditableAccessibleEditor {
public Dictionary updateBean() {
return (Dictionary) this.getValue();
}
}
}

4
designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java

@ -83,4 +83,8 @@ public class DictionaryPane extends UIComboBoxPane<Dictionary> implements DataCr
public void registerDSChangeListener() {
tableDataDictPane.registerDSChangeListener();
}
public TableDataDictPane getTableDataDictPane() {
return tableDataDictPane;
}
}

85
designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java

@ -32,6 +32,7 @@ import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.ArrayUtils;
import com.fr.stable.StringUtils;
@ -41,7 +42,9 @@ import javax.swing.event.ChangeListener;
import java.awt.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
/**
* 数据字典的数据查询面板
@ -60,6 +63,8 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
private DoubleDeckValueEditorPane valueDictPane;
private ItemListener itemListener;
private UIObserverListener uiObserverListener;
private FormulaEditor formulaEditor1 = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
private boolean needTableDataChange = false;
public TableDataDictPane() {
initBasicComponets();
@ -67,6 +72,10 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
iniListener();
}
public void setNeedTableDataChange(boolean needTableDataChange) {
this.needTableDataChange = needTableDataChange;
}
public static void main(String[] args) {
JFrame jf = new JFrame("test");
jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@ -83,7 +92,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
tableDataNameComboBox.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
tdChange(e);
tdChange(e, needTableDataChange);
}
}
});
@ -153,44 +162,62 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dic_Data_Query");
}
private void tdChange(final ItemEvent e) {
private void tdChange(final ItemEvent e, boolean needTableDataChange) {
TableDataWrapper tableDataWrappe = this.tableDataNameComboBox.getSelectedItem();
if (tableDataWrappe == null) {
return;
}
List<String> namelist = tableDataWrappe.calculateColumnNameList();
String[] columnNames = null;
if (!namelist.isEmpty()) {
columnNames = namelist.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
} else {
columnNames = new String[]{""};
if (itemListener != null) {
itemListener.itemStateChanged(e);
formulaEditor1.addChangeListener(event -> {
itemListener.itemStateChanged(e);
});
}
if (needTableDataChange) {
changeColumnsName();
}
ColumnNameEditor columnNameEditor1 = new ColumnNameEditor(columnNames);
columnNameEditor1.addItemListener(itemListener);
ColumnIndexEditor columnIndexEditor1 = new ColumnIndexEditor(columnNames.length);
columnIndexEditor1.addItemListener(itemListener);
keyColumnPane.setEditors(new Editor[]{columnNameEditor1, columnIndexEditor1}, columnNames[0]);
}
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
formulaEditor.setEnabled(true);
formulaEditor.addChangeListener(new ChangeListener() {
private void changeColumnsName() {
TableDataWrapper tableDataWrappe = this.tableDataNameComboBox.getSelectedItem();
SwingWorker<List<String>, Object> worker = new SwingWorker<List<String>, Object>() {
@Override
protected List<String> doInBackground() throws Exception {
if (tableDataWrappe == null) {
return new ArrayList<>();
}
return tableDataWrappe.calculateColumnNameList();
}
@Override
public void stateChanged(ChangeEvent ee) {
if (itemListener != null) {
itemListener.itemStateChanged(e);
protected void done() {
try {
List<String> namelist = get();
String[] columnNames = null;
if (!namelist.isEmpty()) {
columnNames = namelist.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
} else {
columnNames = new String[]{""};
}
ColumnNameEditor columnNameEditor1 = new ColumnNameEditor(columnNames);
columnNameEditor1.addItemListener(itemListener);
ColumnIndexEditor columnIndexEditor1 = new ColumnIndexEditor(columnNames.length);
columnIndexEditor1.addItemListener(itemListener);
keyColumnPane.setEditors(new Editor[]{columnNameEditor1, columnIndexEditor1}, columnNames[0]);
formulaEditor1.setEnabled(true);
ColumnNameEditor columnNameEditor2 = new ColumnNameEditor(columnNames);
columnNameEditor2.addItemListener(itemListener);
ColumnIndexEditor columnIndexEditor2 = new ColumnIndexEditor(columnNames.length);
columnIndexEditor2.addItemListener(itemListener);
valueDictPane.setEditors(new Editor[]{columnNameEditor2, columnIndexEditor2, formulaEditor1}, columnNames[0]);
} catch (InterruptedException | ExecutionException e) {
FineLoggerFactory.getLogger().error(e.getMessage());
}
}
});
ColumnNameEditor columnNameEditor2 = new ColumnNameEditor(columnNames);
columnNameEditor2.addItemListener(itemListener);
ColumnIndexEditor columnIndexEditor2 = new ColumnIndexEditor(columnNames.length);
columnIndexEditor2.addItemListener(itemListener);
valueDictPane.setEditors(new Editor[]{columnNameEditor2, columnIndexEditor2, formulaEditor}, columnNames[0]);
if (itemListener != null) {
itemListener.itemStateChanged(e);
}
};
worker.execute();
}
@Override

Loading…
Cancel
Save