Browse Source

Merge pull request #656 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'b38901e8b13ed29e0842f37299bf9a95eaa7b528':
  代码质量
  代码质量
  REPORT-12974 pc端》参数、表单界面》扫码优化》移动端属性没有设置扫码选项
  REPORT-12974 pc端》参数、表单界面》扫码优化》移动端属性没有设置扫码选项
final/10.0
Hades 6 years ago
parent
commit
29be48d84e
  1. 13
      designer-form/src/main/java/com/fr/design/designer/creator/XWScaleLayout.java

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

@ -10,6 +10,7 @@ import java.awt.event.ContainerEvent;
import com.fr.design.designer.beans.LayoutAdapter; import com.fr.design.designer.beans.LayoutAdapter;
import com.fr.design.designer.beans.adapters.layout.FRScaleLayoutAdapter; import com.fr.design.designer.beans.adapters.layout.FRScaleLayoutAdapter;
import com.fr.design.form.layout.FRScaleLayout; import com.fr.design.form.layout.FRScaleLayout;
import com.fr.design.fun.WidgetPropertyUIProvider;
import com.fr.form.ui.Widget; import com.fr.form.ui.Widget;
import com.fr.form.ui.container.WScaleLayout; import com.fr.form.ui.container.WScaleLayout;
import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget; import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
@ -166,4 +167,16 @@ public class XWScaleLayout extends DedicateLayoutContainer {
XCreator child = getXCreator(INDEX); XCreator child = getXCreator(INDEX);
child.firePropertyChange(); child.firePropertyChange();
} }
/**
* 获取被包装的XCreator扩展的属性tab
* @return
*/
@Override
public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
if (this.getXCreatorCount() > 0) {
return this.getXCreator(0).getWidgetPropertyUIProviders();
}
return super.getWidgetPropertyUIProviders();
}
} }
Loading…
Cancel
Save