推荐

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

@@ -1059,7 +1059,8 @@ export const ImportActionTable = (props) => {
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;支持拖拽方式调整模型字段顺序<br />
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;点击表格外部任意位置退出字段编辑状态<br />
               删除: 点击操作列垃圾桶图标删除该字段<br />
-              保存: 页面右下角保存按钮
+              保存: 页面右下角保存按钮<br />
+              中/英文输入框回车键触发推荐浮窗
             </span>}>
               <QuestionCircleOutlined className='pointer' /> 
             </Popover> 

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

@@ -14,14 +14,21 @@ const FC = (props) => {
   const [selectedRows, setSelectedRows] = React.useState()
   const [havaMore, setMore] = React.useState(false)
   const [offset, setOffset] = React.useState(1)
+  const [animating, setAnimating] = React.useState(false)
 
   React.useEffect(() => {
-    getSuggests()
+    if (visible) {
+      setAnimating(true)
+      setTimeout(() => {
+        setAnimating(false)
+        getSuggests()
+      }, 300)
+    }
   }, [visible])
 
   const onSourceClick = (id, name) => {
     const timestamp = new Date().getTime();
-    const tempArray = id.split('=');
+    const tempArray = (id??'').split('=');
     if (tempArray.length>=3) {
 
       dispatch({
@@ -30,7 +37,7 @@ const FC = (props) => {
           id
         },
         callback: data => {
-          window.open(`/center-home/metadetail?mid=${encodeURIComponent(data._id)}&action=metadetail&type=detail&manager=false&activekey=1&name=${encodeURIComponent(name||'')}`);
+          window.open(`/center-home/metadetail?mid=${encodeURIComponent(data?._id)}&action=metadetail&type=detail&manager=false&activekey=1&name=${encodeURIComponent(name||'')}`);
         }
       })
     } else {
@@ -45,8 +52,7 @@ const FC = (props) => {
       {
         title: '中文名称',
         dataIndex: 'cnName',
-        width: isSzseEnv?360:160,
-        ellipsis: true,
+        width: 200,
         render: (text, _, __) => {
           return (
             <Tooltip title={text||''}>
@@ -58,8 +64,6 @@ const FC = (props) => {
       {
         title: '英文名称',
         dataIndex: 'name',
-        width: isSzseEnv?360:160,
-        ellipsis: true,
         render: (text, _, __) => {
           return (
             <Tooltip title={text||''}>
@@ -69,10 +73,29 @@ const FC = (props) => {
         }
       },
       {
+        title: '类型',
+        dataIndex: 'datatype',
+        width: 160,
+        render: (_, record, __) => {
+          if (record?.datatype) {
+  
+            if ((record?.datatype?.name==='Char'||record?.datatype?.name==='Varchar') && record?.datatype?.parameterValues?.length>0) {
+  
+              return `${record?.datatype?.name||''}(${(record?.datatype?.parameterValues[0]?record.datatype.parameterValues[0]:0)})`;
+            
+            } else if ((record?.datatype?.name==='Decimal'||record?.datatype?.name==='Numeric') && record?.datatype?.parameterValues?.length>1) {
+              return `${record?.datatype?.name||''}(${(record?.datatype?.parameterValues[0]?record.datatype.parameterValues[0]:0)},${(record?.datatype?.parameterValues[1]?record.datatype.parameterValues[1]:0)})`;
+            }
+  
+            return record.datatype.name||'';
+          }
+  
+          return '';
+        }
+      },
+      {
         title: '业务含义',
         dataIndex: 'remark',
-        width: isSzseEnv?360:160,
-        ellipsis: true,
         render: (text, _, __) => {
           return (
             <Tooltip title={text||''}>
@@ -98,7 +121,6 @@ const FC = (props) => {
         title: '使用次数',
         dataIndex: 'referencesCount',
         width: 80,
-        ellipsis: true,
         render: (_, record) => {
           return (
             <span>{record.recommendedStats?.referencesCount}</span>
@@ -108,7 +130,6 @@ const FC = (props) => {
       {
         title: '来源',
         dataIndex: 'source',
-        ellipsis: true,
         render: (_, record) => {
           return (
             <SourceComponent data={record.recommendedStats?.sourceInfos||[]} name={record.name||''} onClick={onSourceClick} />
@@ -159,6 +180,7 @@ const FC = (props) => {
 
   const close = () => {
     setLoading(false)
+    setAnimating(false)
     setSuggests()
     setOffset(1)
     setMore(false)
@@ -196,34 +218,36 @@ const FC = (props) => {
       centered destroyOnClose
       onCancel={() => { close() }}
     >
-      <Spin spinning={loading}>
-        <Table
-          extraColWidth='32px'
-          size='small'
-          rowKey='iid'
-          dataSource={suggests||[]}
-          columns={cols}
-          pagination={false}
-          rowClassName={(record, index) => {
-            return 'pointer';
-          }}
-          onRowClick={(event, record) => {
-            setSelectedRows([record])
-          }}
-          rowSelection={{
-            type: 'radio',
-            selectedRowKeys: (selectedRows??[]).map(item => item.iid),
-            onChange: (selectedRowKeys, selectedRows) => {
-              setSelectedRows(selectedRows)
-            },
-          }}
-        />
-        <div className='flex pt-3' style={{ justifyContent: 'center' }}>
-          <Tooltip title={!havaMore?'没有更多推荐字段':''}>
-            <Button onClick={getSuggests} disabled={!havaMore} >加载更多</Button>
-          </Tooltip>
-        </div> 
-      </Spin>
+      {
+        !animating && <Spin spinning={loading}>
+          <Table
+            extraColWidth={32}
+            size='small'
+            rowKey='iid'
+            dataSource={suggests||[]}
+            columns={cols}
+            pagination={false}
+            rowClassName={(record, index) => {
+              return 'pointer';
+            }}
+            onRowClick={(event, record) => {
+              setSelectedRows([record])
+            }}
+            rowSelection={{
+              type: 'radio',
+              selectedRowKeys: (selectedRows??[]).map(item => item.iid),
+              onChange: (selectedRowKeys, selectedRows) => {
+                setSelectedRows(selectedRows)
+              },
+            }}
+          />
+          <div className='flex pt-3' style={{ justifyContent: 'center' }}>
+            <Tooltip title={!havaMore?'没有更多推荐字段':''}>
+              <Button onClick={getSuggests} disabled={!havaMore} >加载更多</Button>
+            </Tooltip>
+          </div> 
+        </Spin>
+      }
     </Modal>
   )
 }