Browse Source

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

* commit '268d569545c12dcf6612045e1148105ad1993f34':
  REPORT-26085 在参数面板添加定义的全局参数,两个参数控件会重叠
feature/big-screen
Hades 5 years ago
parent
commit
ccf17a474d
  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