Browse Source

Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/design into release/10.0

feature/big-screen
Harrison 5 years ago
parent
commit
e7584b8ea0
  1. 3
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/MobileAdvanceDefinePane.java
  2. 14
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileComponentFrozenPane.java
  3. 4
      designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java

3
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/MobileAdvanceDefinePane.java

@ -139,6 +139,9 @@ public class MobileAdvanceDefinePane extends MobileWidgetDefinePane {
MobileBookMark bookMark = xCreator.toData().getMobileBookMark();
bookMark.setUseBookMark(this.useBookMarkCheck.isSelected());
String newBookMarkName = this.bookMarkNameField.getText();
if (ComparatorUtils.equals(newBookMarkName, bookMark.getBookMarkName())) {
return;
}
if (!isExist(newBookMarkName)) {
bookMark.setBookMarkName(newBookMarkName);
} else {

14
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileComponentFrozenPane.java

@ -64,17 +64,25 @@ public class MobileComponentFrozenPane extends BasicPane {
public void update(XCreator xCreator) {
List<String> selected = new ArrayList<>();
WSortLayout wSortLayout = ((WSortLayout) xCreator.toData());
List<String> all = wSortLayout.getNonContainerWidgetList();
for (String widgetName : all) {
updateMobileBookMark(wSortLayout, widgetName, false);
}
Object[] values = uiComboCheckBox.getSelectedValues();
for (Object value : values) {
String widgetName = (String) value;
selected.add(widgetName);
updateMobileBookMark(wSortLayout, widgetName, true);
}
wSortLayout.updateFrozenWidgets(selected);
}
private void updateMobileBookMark(WSortLayout wSortLayout, String widgetName, boolean frozen) {
Widget widget = FormWidgetHelper.findWidgetWithBound(wSortLayout, widgetName);
if (widget != null) {
widget.getMobileBookMark().setFrozen(true);
widget.getMobileBookMark().setFrozen(frozen);
}
}
wSortLayout.updateFrozenWidgets(selected);
}
public void populate(XCreator xCreator) {
WSortLayout wSortLayout = ((WSortLayout) xCreator.toData());

4
designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java

@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
import com.fr.base.Parameter;
import com.fr.base.parameter.ParameterUI;
import com.fr.base.vcs.DesignerMode;
import com.fr.design.DesignModelAdapter;
import com.fr.design.DesignState;
import com.fr.design.actions.AllowAuthorityEditAction;
import com.fr.design.actions.ExitAuthorityEditAction;
@ -326,7 +327,8 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
}
private boolean isWithoutParaXCreator() {
return paraDesignEditor.isWithoutParaXCreator(allParameters);
// allParameters只包含全部的模板参数
return paraDesignEditor.isWithoutParaXCreator(DesignModelAdapter.getCurrentModelAdapter().getParameters());
}
/**

Loading…
Cancel
Save