合并到基线bug

src/view/Manage/Model/index.jsx

@@ -141,9 +141,9 @@ class Model extends React.Component {
         });
       } else {
         selectModelerIds?.forEach(id => {
-          if ((id??'').indexOf('-4') === -1) {
-            canBatchJoin = false;
-          }
+          const index = (tableData||[]).findIndex(item => item.id?.split('-')[0] === id?.split('-')[0]);
+          if (index !== -1 && !tableData[index].supportJoin) {
+            canBatchJoin = false
         });
       }
 
@@ -827,7 +827,7 @@ class Model extends React.Component {
               {
                 currentView === 'branch' && <PermissionButton 
                   defaultPermission={true} 
-                  tip={this.state.canBatchJoin?((selectModelerIds||[]).length===0?'请先选择已发布的模型':''):'只有已发布的模型才能合并到基线'}
+                  tip={this.state.canBatchJoin?((selectModelerIds||[]).length===0?'请先选择已发布的分支模型':''):'只有已发布的分支模型才能合并到基线'}
                   onClick={this.onBatchMerge} 
                   disabled={(selectModelerIds||[]).length===0||!this.state.canBatchJoin}
                 >