Commit 6147c07f by zhaochengxiang

bug fix

parent 4ab01d0e
...@@ -736,7 +736,7 @@ class Model extends React.Component { ...@@ -736,7 +736,7 @@ class Model extends React.Component {
let disableStartFlow = false, startFlowTip = ''; let disableStartFlow = false, startFlowTip = '';
if ((currentView==='dir'&&currentModelState==='2')||(currentView!=='dir'&&catalogId==='2')) { if ((currentView==='dir'&&currentModelState==='2')||(currentView!=='dir'&&catalogId==='2')) {
disableStartFlow = true; disableStartFlow = true;
startFlowTip = '只有草稿状态下的模型才能送审'; startFlowTip = '';
} else if ((selectModelerIds||[]).length===0) { } else if ((selectModelerIds||[]).length===0) {
disableStartFlow = true; disableStartFlow = true;
startFlowTip = '请先选择模型'; startFlowTip = '请先选择模型';
...@@ -836,7 +836,7 @@ class Model extends React.Component { ...@@ -836,7 +836,7 @@ class Model extends React.Component {
{ {
currentView === 'branch' && <PermissionButton currentView === 'branch' && <PermissionButton
defaultPermission={true} defaultPermission={true}
tip={this.state.canBatchJoin?((selectModelerIds||[]).length===0?'请先选择已发布的分支模型':''):'只有已发布的分支模型才能合并到基线'} tip={this.state.canBatchJoin?((selectModelerIds||[]).length===0?'请先选择已发布的分支模型':''):''}
onClick={this.onBatchMerge} onClick={this.onBatchMerge}
disabled={(selectModelerIds||[]).length===0||!this.state.canBatchJoin} disabled={(selectModelerIds||[]).length===0||!this.state.canBatchJoin}
> >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment