forked from fanruan/design
Browse Source
* commit '4a972a12e091a3c489c5d0b609c2f7f9d2d25762': REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题 REPORT-51199 模版数据集预览图标偏移 REPORT-49034 引用JS静态资源文件路径出错 REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题 REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题 REPORT-50096 处理下切换数据连接场景 REPORT-49686 决策报表自适应布局，添加参数面板后，无法通过右侧设置面板调整绝对画布块的大小 【问题原因】这里绝对画布块的高度调整要分为两种方式，一种是拖拽改变，另一种是在右侧面板中改变高度数值，问题的原因是此前REPORT-7588中，拖拽时会走到FormSelection#fixCreator()，这里面为绝对画布块做特殊处理时，漏算了参数面板的高度，然后在REPORT-34739中，FRFitLayoutAdapter#fix()方法中处理了一下参数面板造成的偏移，所以拖拽的逻辑都正常；但是如果在右侧面板中改变高度时，会直接走到FRFitLayoutAdapter#fix()中，此时是没有漏算参数面板高度的，因此经过处理之后，反而组件的backupBound会多了个参数面板高度，这样会造成每次改变都加上这个高度，就出现了bug现象 【改动思路】把判断参数面板是否漏算的逻辑放到FormSelection#fixCreator()中 REPORT-50096 数据填充时不需要触发监听 REPORT-50096 在设计器中更改数据库类型后 数据库名称字段操作和之前保持一致 REPORT-50096 fix 预防npe REPORT-50096 FR远程BI，未改动配置，确认保存后配置发生变化persist/10.0 10.0.15.2021.04.20
superman
4 years ago
10 changed files with 144 additions and 24 deletions
@ -0,0 +1,79 @@
|
||||
package com.fr.design.gui.icombobox; |
||||
|
||||
import com.fr.design.ui.util.UIUtil; |
||||
import com.fr.log.FineLoggerFactory; |
||||
|
||||
import javax.swing.JTree; |
||||
import javax.swing.SwingWorker; |
||||
import javax.swing.tree.TreeCellRenderer; |
||||
import java.util.concurrent.FutureTask; |
||||
|
||||
/** |
||||
* 模糊搜索前需执行完前置任务的TreeComboBox |
||||
* @author Lucian.Chen |
||||
* @version 10.0 |
||||
* Created by Lucian.Chen on 2021/4/14 |
||||
*/ |
||||
public class SearchPreTaskTreeComboBox extends FRTreeComboBox { |
||||
|
||||
/** |
||||
* 模糊搜索前任务 |
||||
*/ |
||||
private FutureTask<Void> preSearchTask; |
||||
|
||||
public SearchPreTaskTreeComboBox(JTree tree, TreeCellRenderer renderer, boolean editable) { |
||||
super(tree, renderer, editable); |
||||
} |
||||
|
||||
public FutureTask<Void> getPreSearchTask() { |
||||
return preSearchTask; |
||||
} |
||||
|
||||
public void setPreSearchTask(FutureTask<Void> preSearchTask) { |
||||
this.preSearchTask = preSearchTask; |
||||
} |
||||
|
||||
protected UIComboBoxEditor createEditor() { |
||||
return new SearchPreTaskComboBoxEditor(this); |
||||
} |
||||
|
||||
private class SearchPreTaskComboBoxEditor extends FrTreeSearchComboBoxEditor { |
||||
|
||||
public SearchPreTaskComboBoxEditor(FRTreeComboBox comboBox) { |
||||
super(comboBox); |
||||
} |
||||
|
||||
protected void changeHandler() { |
||||
if (isSetting()) { |
||||
return; |
||||
} |
||||
setPopupVisible(true); |
||||
// 模糊搜索异步
|
||||
new SwingWorker<Void, Void>() { |
||||
@Override |
||||
protected Void doInBackground() { |
||||
FutureTask<Void> task = getPreSearchTask(); |
||||
try { |
||||
// 确保模糊搜索前任务执行完成后，再进行模糊搜索
|
||||
if (task != null) { |
||||
task.get(); |
||||
} |
||||
} catch (Exception e) { |
||||
FineLoggerFactory.getLogger().error(e.getMessage(), e); |
||||
} |
||||
if (task != null) { |
||||
// 任务执行后置空，否则会被别的操作重复触发
|
||||
setPreSearchTask(null); |
||||
} |
||||
UIUtil.invokeLaterIfNeeded(new Runnable() { |
||||
@Override |
||||
public void run() { |
||||
search(); |
||||
} |
||||
}); |
||||
return null; |
||||
} |
||||
}.execute(); |
||||
} |
||||
} |
||||
} |
||||
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Loading…
Reference in new issue