不可点击按钮增加提示

src/view/Manage/Model/Component/ImportActionIndex.jsx

@@ -640,11 +640,19 @@ const ImportActionIndex = (props) => {
     setKeyword(e.target.value||'');
   }
 
+  let disableAdd = false, addTip = '';
+  if (editingKey!==null || keyword!=='') {
+    disableAdd = true;
+    addTip = '正在搜索或者编辑中,不允许新建';
+  }
+
   return (
     <div className='model-import-action-index'>
       <div className='d-flex mb-3' style={{ justifyContent: editable?'space-between':'flex-end' }}>
         { 
-          editable && <Button onClick={onAddClick} disabled={ editingKey!==null || keyword!=='' } >新建</Button>
+          editable && <Tooltip title={addTip}>
+            <Button onClick={onAddClick} disabled={disableAdd} >新建</Button>
+          </Tooltip>
         }
         <div className='d-flex' style={{ alignItems: 'center' }}>
           <Input 

src/view/Manage/Model/Component/ImportActionPartition.jsx

@@ -236,6 +236,7 @@ const ImportActionPartition = (props) => {
   }
 
   const remove = (record) => {
+    setData(null);
     onChange && onChange(null);
   }
 
@@ -395,11 +396,22 @@ const ImportActionPartition = (props) => {
     return columns;
   }
 
+  let disableAdd = false, addTip = '';
+  if (isEditing) {
+    disableAdd = true;
+    addTip = '正在编辑中,不允许新建';
+  } else if (data) {
+    disableAdd = true;
+    addTip = '已存在分区,不允许再新建';
+  }
+
   return (
     <div className='model-import-action-index'>
       {
         editable && <div className='d-flex mb-3'>
-          <Button onClick={onAddClick} disabled={ data||isEditing } >新建</Button>
+          <Tooltip title={addTip}>
+            <Button onClick={onAddClick} disabled={disableAdd} >新建</Button>
+          </Tooltip>
         </div>
       }
       <div className='mb-3' id="containerId">

src/view/Manage/Model/Component/ImportActionTable.jsx

@@ -949,11 +949,19 @@ const ImportActionTable = (props) => {
     onValuesChange(currentChangedValues, form.getFieldsValue(), suggestOffset);
   }
 
+  let disableAdd = false, addTip = '';
+  if (editingKey!=='' || keyword!=='') {
+    disableAdd = true;
+    addTip = '正在搜索或者编辑中,不允许新建';
+  }
+
   return (
     <div className='model-import-action-table'>
       <div className='d-flex mb-3' style={{ justifyContent: editable?'space-between':'flex-end' }}>
         { 
-          editable && <Button onClick={onAddClick}  disabled={ editingKey!=='' || keyword!=='' } >新建</Button>
+          editable && <Tooltip title={addTip}> 
+            <Button onClick={onAddClick}  disabled={disableAdd} >新建</Button>
+          </Tooltip>  
         }
         <div className='d-flex' style={{ alignItems: 'center' }}>
           <Input 

src/view/Manage/Model/Component/ModelTable.jsx

@@ -451,11 +451,16 @@ const ModelTable = (props) => {
     }
   }
 
+  let _columns = [...columns];
+  if ((modelId||'')!=='') {
+    _columns = columns.filter(item => item.dataIndex!=='key')
+  }
+
   return (
     <div className={classes}>
       <Table
         rowSelection={rowSelection} 
-        columns={columns||[]} 
+        columns={_columns||[]} 
         rowKey={'id'}
         dataSource={modelId?(subData||[]):(_data||[])}
         pagination={false}

src/view/Manage/Model/Component/VersionCompare.jsx

 import React, { useEffect, useState } from 'react';
-import { Form, Select, Spin } from 'antd';
+import { Form, Select, Spin, Tooltip } from 'antd';
 import showdown from 'showdown';
 
 import { dispatch, dispatchLatest } from '../../../../model'; 
@@ -116,9 +116,23 @@ const VersionCompare = (props) => {
           <Select loading={loading} value={basicVersion} style={{ width: 300 }} onChange={onBasicChange}  >
           {
             (basicVersions||[]).map((version, index) => {
+
+              if (index === 0) {
+                return (
+                  <Option key={index} value={version.id||''} disabled={true}>
+                    <Tooltip title={'最近版本只能在增量版本中被选中'}>
+                    {version.name||''}
+                    </Tooltip>
+                  </Option>
+                )
+              };
+
               return (
-                <Option key={index} value={version.id||''} disabled={index===0}>{version.name||''}</Option>
+                <Option key={index} value={version.id||''}>
+                {version.name||''}
+                </Option>
               );
+
             })
           }
           </Select>