Browse Source

Merge pull request #1411 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0

* commit '95200e200aeb9b54c5beb81d64e3a8198600fa4d':
  fix
  REPORT-26085 同步到final
final/10.0
Kara 5 years ago
parent
commit
20fdc2fa24
  1. 4
      designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java

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

Loading…
Cancel
Save