|
|
|
@ -39,6 +39,7 @@ import com.fr.design.designer.creator.XWParameterLayout;
|
|
|
|
|
import com.fr.design.designer.properties.FormWidgetAuthorityEditPane; |
|
|
|
|
import com.fr.design.event.TargetModifiedEvent; |
|
|
|
|
import com.fr.design.event.TargetModifiedListener; |
|
|
|
|
import com.fr.design.file.HistoryTemplateListCache; |
|
|
|
|
import com.fr.design.fun.FormAdaptiveConfigUIProcessor; |
|
|
|
|
import com.fr.design.fun.PreviewProvider; |
|
|
|
|
import com.fr.design.fun.PropertyItemPaneProvider; |
|
|
|
@ -1199,24 +1200,26 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
|
|
|
|
|
|
|
|
|
|
getTarget().setTemplateTheme(newTheme, compatible); |
|
|
|
|
|
|
|
|
|
fireTargetModified(shouldCreateUndoState); |
|
|
|
|
formDesign.refreshRoot(); |
|
|
|
|
// 刷新界面后恢复原来的尺寸
|
|
|
|
|
formDesign.getArea().setAreaSize(areaSize, horizontalValue, verticalValue, widthValue, heightValue, slideValue); |
|
|
|
|
if (this.index != FORM_TAB) { |
|
|
|
|
refreshToolArea(); |
|
|
|
|
} else { |
|
|
|
|
// CHART-20568: 当图表块处于编辑状态时,任何界面内容的修改都会导致其进行截图操作,进而引起设计器界面再次重绘,导致死循环,因而需要停止编辑 恢复浮层展示
|
|
|
|
|
TreePath[] treePaths = FormHierarchyTreePane.getInstance(formDesign).getComponentTree().getSelectedTreePath(); |
|
|
|
|
if (treePaths != null) { |
|
|
|
|
for (TreePath path : treePaths) { |
|
|
|
|
if (path != null) { |
|
|
|
|
formDesign.stopEditing(path); |
|
|
|
|
if (HistoryTemplateListCache.getInstance().getCurrentEditingTemplate() == this) { |
|
|
|
|
fireTargetModified(shouldCreateUndoState); |
|
|
|
|
formDesign.refreshRoot(); |
|
|
|
|
// 刷新界面后恢复原来的尺寸
|
|
|
|
|
formDesign.getArea().setAreaSize(areaSize, horizontalValue, verticalValue, widthValue, heightValue, slideValue); |
|
|
|
|
if (this.index != FORM_TAB) { |
|
|
|
|
refreshToolArea(); |
|
|
|
|
} else { |
|
|
|
|
// CHART-20568: 当图表块处于编辑状态时,任何界面内容的修改都会导致其进行截图操作,进而引起设计器界面再次重绘,导致死循环,因而需要停止编辑 恢复浮层展示
|
|
|
|
|
TreePath[] treePaths = FormHierarchyTreePane.getInstance(formDesign).getComponentTree().getSelectedTreePath(); |
|
|
|
|
if (treePaths != null) { |
|
|
|
|
for (TreePath path : treePaths) { |
|
|
|
|
if (path != null) { |
|
|
|
|
formDesign.stopEditing(path); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
FormHierarchyTreePane.getInstance().refreshRoot(); |
|
|
|
|
} |
|
|
|
|
FormHierarchyTreePane.getInstance().refreshRoot(); |
|
|
|
|
|
|
|
|
|
super.setTemplateTheme(newTheme, compatible); |
|
|
|
|
} |
|
|
|
|