|
|
@ -25,7 +25,6 @@ import com.fr.design.fun.FormWidgetOptionProvider; |
|
|
|
import com.fr.design.mainframe.FormDesigner; |
|
|
|
import com.fr.design.mainframe.FormDesigner; |
|
|
|
import com.fr.design.mainframe.FormSelection; |
|
|
|
import com.fr.design.mainframe.FormSelection; |
|
|
|
import com.fr.design.mainframe.FormSelectionUtils; |
|
|
|
import com.fr.design.mainframe.FormSelectionUtils; |
|
|
|
import com.fr.design.mainframe.share.encrypt.clipboard.impl.EncryptSelectionClipboardHandler; |
|
|
|
|
|
|
|
import com.fr.design.utils.ComponentUtils; |
|
|
|
import com.fr.design.utils.ComponentUtils; |
|
|
|
import com.fr.design.utils.gui.LayoutUtils; |
|
|
|
import com.fr.design.utils.gui.LayoutUtils; |
|
|
|
import com.fr.general.ComparatorUtils; |
|
|
|
import com.fr.general.ComparatorUtils; |
|
|
@ -140,11 +139,28 @@ public class SelectionModel { |
|
|
|
if (cutSelection != null) { |
|
|
|
if (cutSelection != null) { |
|
|
|
cutSelection.cut2ClipBoard(clipboard); |
|
|
|
cutSelection.cut2ClipBoard(clipboard); |
|
|
|
designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_CUTED); |
|
|
|
designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_CUTED); |
|
|
|
|
|
|
|
setSelectedCreator(hasSelectedParaComponent() ? designer.getParaComponent() : designer.getRootComponent()); |
|
|
|
designer.repaint(); |
|
|
|
designer.repaint(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* 判断是否选中参数面板中的组件 |
|
|
|
|
|
|
|
* @return boolean |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
private boolean hasSelectedParaComponent() { |
|
|
|
|
|
|
|
XCreator[] roots = selection.getSelectedCreators(); |
|
|
|
|
|
|
|
if (roots.length > 0) { |
|
|
|
|
|
|
|
for (XCreator creator : roots) { |
|
|
|
|
|
|
|
if ((creator.getParent() instanceof XWParameterLayout)) { |
|
|
|
|
|
|
|
return true; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 复制当前选中的组件到剪切板 |
|
|
|
* 复制当前选中的组件到剪切板 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|