Browse Source

Pull request #7404: REPORT-65107 决策报表-11frm,无法向tab组件上方拖入放置组件,10上操作还比较顺畅

Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x

* commit '0a3552adae241de1054855699a0a027d865b2b59':
  删除无用接口
  REPORT-65107 决策报表-11frm,无法向tab组件上方拖入放置组件,10上操作还比较顺畅
feature/x
fanglei 3 years ago
parent
commit
1fe48a5d45
  1. 8
      designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java
  2. 12
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java
  3. 9
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java
  4. 13
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTitleLayout.java
  5. 3
      designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java

8
designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java

@ -474,14 +474,6 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
return 0; return 0;
} }
/**
* 切换到非添加状态
*
* @param designer 表单设计器
*/
public void stopAddingState(FormDesigner designer) {
}
/** /**
* 寻找最近的为自适应布局的父容器 * 寻找最近的为自适应布局的父容器
* *

12
designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java

@ -179,18 +179,6 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
} }
} }
/**
* 切换到非添加状态
*
* @return designer 表单设计器
*/
@Override
public void stopAddingState(FormDesigner designer){
designer.stopAddingState();
return;
}
/** /**
* 添加card区域 * 添加card区域
* *

9
designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java

@ -187,15 +187,6 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
return DEFAULT_NAME; return DEFAULT_NAME;
} }
/**
* 切换到非添加状态
*
* @return designer 表单设计器
*/
@Override
public void stopAddingState(FormDesigner designer) {
designer.stopAddingState();
}
//新增时去tabFitLayout名字中最大的Index+1,防止重名 //新增时去tabFitLayout名字中最大的Index+1,防止重名
private int getTabNameIndex() { private int getTabNameIndex() {

13
designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTitleLayout.java

@ -166,18 +166,7 @@ public class XWCardTitleLayout extends XWBorderLayout {
XWCardTagLayout xwCardTagLayout = (XWCardTagLayout) this.getComponent(0); XWCardTagLayout xwCardTagLayout = (XWCardTagLayout) this.getComponent(0);
this.addTagPart(xwCardTagLayout); this.addTagPart(xwCardTagLayout);
} }
/**
* 切换到非添加状态
*
* @return designer 表单设计器
*/
@Override
public void stopAddingState(FormDesigner designer){
designer.stopAddingState();
return;
}
/** /**
* 该布局隐藏无需对边框进行操作 * 该布局隐藏无需对边框进行操作
* @param border 边框 * @param border 边框

3
designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java

@ -90,9 +90,6 @@ public class FormCreatorDropTarget extends DropTarget {
XLayoutContainer container = XCreatorUtils.getHotspotContainer(hoveredComponent); XLayoutContainer container = XCreatorUtils.getHotspotContainer(hoveredComponent);
boolean success = false; boolean success = false;
if (container != null) { if (container != null) {
//XWCardTagLayout 切换添加状态到普通状态
container.stopAddingState(designer);
// 如果是容器,则调用其acceptComponent接受组件 // 如果是容器,则调用其acceptComponent接受组件
AddingModel model = designer.getAddingModel(); AddingModel model = designer.getAddingModel();

Loading…
Cancel
Save