字段搜索大小写不敏感

src/view/Manage/AssetManage/Component/AssetAction.jsx

@@ -135,11 +135,13 @@ const AssetAction = (props) => {
       render: (text, record, _) => {
         return (
           <Tooltip title={text||''}>
+            <Typography.Text ellipsis={true}>
               <a onClick={() => {
                 window.open(`/center-home/metadetail?mid=${record._id}&action=metadetail&type=detail&manager=false&activekey=1`);
               }}>
               {highlightSearchContentByTerms(text||'', terms)}
               </a>
+            </Typography.Text>
           </Tooltip>
         );
       }
@@ -149,7 +151,11 @@ const AssetAction = (props) => {
       dataIndex: 'cnName',
       // width: 200,
       ellipsis: true,
-      render: (text, _, index) => highlightSearchContentByTerms(text||'', terms) 
+      render: (text, _, index) => <Tooltip title={text||''}>
+        <Typography.Text ellipsis={true}>
+        {highlightSearchContentByTerms(text||'', terms)}
+        </Typography.Text>
+      </Tooltip>
     },
     {
       title: '是否有权限',
@@ -170,12 +176,12 @@ const AssetAction = (props) => {
       dataIndex: 'businessRules',
       width: 240,
       ellipsis: true,
-      render: (text, _, index) => <MetadataColumnEditableItem 
+      render: (text, record, index) => <MetadataColumnEditableItem 
         value={text} 
         isEdit={isMetadataEdit} 
         terms={terms} 
         onChange={(e) => {
-          onMetadataColumnEditableItemChange(e.target.value, 'businessRules', index)
+          onMetadataColumnEditableItemChange(e.target.value, 'businessRules', record._id)
         }} 
       /> 
     },
@@ -183,12 +189,12 @@ const AssetAction = (props) => {
       title: '计量单位',
       dataIndex: 'unitOfMeasurement',
       ellipsis: true,
-      render: (text, _, index) => <MetadataColumnEditableItem 
+      render: (text, record, index) => <MetadataColumnEditableItem 
         value={text} 
         isEdit={isMetadataEdit} 
         terms={terms} 
         onChange={(e) => {
-          onMetadataColumnEditableItemChange(e.target.value, 'unitOfMeasurement', index)
+          onMetadataColumnEditableItemChange(e.target.value, 'unitOfMeasurement', record._id)
         }} 
       /> 
     },
@@ -196,12 +202,12 @@ const AssetAction = (props) => {
       title: '备注信息',
       dataIndex: 'remarks',
       ellipsis: true,
-      render: (text, _, index) => <MetadataColumnEditableItem 
+      render: (text, record, index) => <MetadataColumnEditableItem 
         value={text} 
         isEdit={isMetadataEdit} 
         terms={terms} 
         onChange={(e) => {
-          onMetadataColumnEditableItemChange(e.target.value, 'remarks', index)
+          onMetadataColumnEditableItemChange(e.target.value, 'remarks', record._id)
         }} 
       /> 
     },
@@ -225,7 +231,9 @@ const AssetAction = (props) => {
       render: (_, record) => {
         return <AppContext.Consumer>
         {
-          appValue => <a onClick={() => {
+          appValue => <Tooltip title={record.standard?.standardName??''}>
+            <Typography.Text ellipsis={true}>
+              <a onClick={() => {
                 appValue?.setGlobalState && appValue?.setGlobalState({
                   message: 'data-govern-show-index-detail-message',
                   data: { id: record.standard?.standardId } 
@@ -233,6 +241,8 @@ const AssetAction = (props) => {
               }}>
                 <span>{record.standard?.standardName}</span>
               </a>
+            </Typography.Text>
+          </Tooltip>
         }
         </AppContext.Consumer>
       }
@@ -248,11 +258,13 @@ const AssetAction = (props) => {
       render: (text, record, _) => {
         return (
           <Tooltip title={text||''}>
+            <Typography.Text ellipsis={true}>
               <a onClick={() => {
                 window.open(`/center-home/metadetail?mid=${record._id}&action=metadetail&type=detail&manager=false&activekey=1`);
               }}>
               {highlightSearchContentByTerms(text||'', terms)}
               </a>
+            </Typography.Text>
           </Tooltip>
         );
       }
@@ -262,7 +274,11 @@ const AssetAction = (props) => {
       dataIndex: 'cnName',
       // width: 200,
       ellipsis: true,
-      render: (text, _, index) => highlightSearchContentByTerms(text||'', terms)
+      render: (text, _, index) => <Tooltip title={text||''}>
+        <Typography.Text ellipsis={true}>
+        {highlightSearchContentByTerms(text||'', terms)}
+        </Typography.Text>
+      </Tooltip>
     },
     {
       title: '是否有权限',
@@ -283,12 +299,12 @@ const AssetAction = (props) => {
       dataIndex: 'businessDefinition',
       width: 240,
       ellipsis: true,
-      render: (text, _, index) => <MetadataColumnEditableItem 
+      render: (text, record, index) => <MetadataColumnEditableItem 
         value={text} 
         isEdit={isMetadataEdit} 
         terms={terms} 
         onChange={(e) => {
-          onMetadataColumnEditableItemChange(e.target.value, 'businessDefinition', index)
+          onMetadataColumnEditableItemChange(e.target.value, 'businessDefinition', record._id)
         }} 
       /> 
     },
@@ -296,12 +312,12 @@ const AssetAction = (props) => {
       title: '备注信息',
       dataIndex: 'remarks',
       ellipsis: true,
-      render: (text, _, index) => <MetadataColumnEditableItem 
+      render: (text, record, index) => <MetadataColumnEditableItem 
         value={text} 
         isEdit={isMetadataEdit} 
         terms={terms} 
         onChange={(e) => {
-          onMetadataColumnEditableItemChange(e.target.value, 'remarks', index)
+          onMetadataColumnEditableItemChange(e.target.value, 'remarks', record._id)
         }} 
       /> 
     },
@@ -309,12 +325,12 @@ const AssetAction = (props) => {
       title: '数据owner',
       dataIndex: 'dataOwner',
       ellipsis: true,
-      render: (text, _, index) => <MetadataColumnEditableItem 
+      render: (text, record, index) => <MetadataColumnEditableItem 
         value={text} 
         isEdit={isMetadataEdit} 
         terms={terms} 
         onChange={(e) => {
-          onMetadataColumnEditableItemChange(e.target.value, 'dataOwner', index)
+          onMetadataColumnEditableItemChange(e.target.value, 'dataOwner', record._id)
         }} 
       /> 
     },
@@ -323,12 +339,12 @@ const AssetAction = (props) => {
       dataIndex: 'confidentialityLevel',
       width: 100,
       ellipsis: true,
-      render: (text, _, index) => <MetadataColumnEditableItem 
+      render: (text, record, index) => <MetadataColumnEditableItem 
         value={text} 
         isEdit={isMetadataEdit} 
         terms={terms} 
         onChange={(e) => {
-          onMetadataColumnEditableItemChange(e.target.value, 'confidentialityLevel', index)
+          onMetadataColumnEditableItemChange(e.target.value, 'confidentialityLevel', record._id)
         }} 
       />
     },
@@ -339,7 +355,9 @@ const AssetAction = (props) => {
       render: (_, record) => {
         return <AppContext.Consumer>
         {
-          appValue => <a onClick={() => {
+          appValue => <Tooltip title={record.standard?.standardName??''}>
+            <Typography.Text ellipsis={true}>
+              <a onClick={() => {
                 appValue?.setGlobalState && appValue?.setGlobalState({
                   message: 'data-govern-show-index-detail-message',
                   data: { id: record.standard?.standardId } 
@@ -347,6 +365,8 @@ const AssetAction = (props) => {
               }}>
                 <span>{record.standard?.standardName}</span>
               </a>
+            </Typography.Text>
+          </Tooltip>
         }
         </AppContext.Consumer>
       }
@@ -368,7 +388,11 @@ const AssetAction = (props) => {
           dataIndex: 'code',
           width: 100,
           ellipsis: true,
-          render: (text, _) => highlightSearchContentByTerms(text||'', terms)      
+          render: (text, _) => <Tooltip title={text||''}>
+            <Typography.Text ellipsis={true}>
+            {highlightSearchContentByTerms(text||'', terms)}
+            </Typography.Text>
+          </Tooltip>    
         });
       }
 
@@ -443,28 +467,30 @@ const AssetAction = (props) => {
     return [];
   }, [currentDomainGroup, currentBussinessDomain, treeDataMap])
 
-  const tableData = useMemo(() => {
+  const [tableData, total] = useMemo(() => {
     let currentMetadataColumnList = isMetadataEdit ? [...modifyMetadataColumnList||[]] : [...metadataColumnList||[]]
 
     if ((currentMetadataColumnList??[]).length>0 && standardList && assets?.templateType) {
-      const newMetadataColumnList = [];
+      let newMetadataColumnList = [];
 
-      currentMetadataColumnList = (assets?.templateType==='mdg') ? currentMetadataColumnList.filter(item => {
+      const filterMetadataColumnList = (assets?.templateType==='mdg') ? (metadataColumnList??[]).filter(item => {
         return (
           !keyword
-          || (item.name??'').indexOf(keyword)!==-1
-          || (item.cnName??'').indexOf(keyword)!==-1
-          || (item.businessDefinition??'').indexOf(keyword)!==-1
+          || (item.name??'').toLowerCase().indexOf(keyword.toLowerCase())!==-1
+          || (item.cnName??'').toLowerCase().indexOf(keyword.toLowerCase())!==-1
+          || (item.businessDefinition??'').toLowerCase().indexOf(keyword.toLowerCase())!==-1
         )
-      }) : currentMetadataColumnList.filter(item => {
+      }) : (metadataColumnList??[]).filter(item => {
         return (
           !keyword
-          || (item.name??'').indexOf(keyword)!==-1
-          || (item.cnName??'').indexOf(keyword)!==-1
-          || (item.businessRules??'').indexOf(keyword)!==-1
+          || (item.name??'').toLowerCase().indexOf(keyword.toLowerCase())!==-1
+          || (item.cnName??'').toLowerCase().indexOf(keyword.toLowerCase())!==-1
+          || (item.businessRules??'').toLowerCase().indexOf(keyword.toLowerCase())!==-1
         )
       });
 
+      currentMetadataColumnList = currentMetadataColumnList.filter(item => filterMetadataColumnList.map(_item=>_item._id).indexOf(item._id)!==-1);
+
       currentMetadataColumnList.forEach(item => {
         const index = standardList?.findIndex(_item => _item.metadataId === item._id);
         let newItem = {...item};
@@ -475,10 +501,10 @@ const AssetAction = (props) => {
         newMetadataColumnList.push(newItem);
       });
 
-      return paginate(newMetadataColumnList, pageNum, pageSize);
+      return [paginate(newMetadataColumnList, pageNum, pageSize), newMetadataColumnList.length];
     }
 
-    return [];
+    return [[], 0];
   }, [metadataColumnList, modifyMetadataColumnList, standardList, pagination, keyword, isMetadataEdit, assets])
 
   const getPermission = () => {
@@ -792,7 +818,7 @@ const AssetAction = (props) => {
             }
           },
           callback: data => {
-            setStandardList(data?.content);
+            setStandardList(data?.content??[]);
           },
         });
       }
@@ -801,12 +827,12 @@ const AssetAction = (props) => {
     })
   }
 
-  const onMetadataColumnEditableItemChange = (val, dataIndex, index) => {
-    const _index = (pageNum-1)*pageSize + index;
+  const onMetadataColumnEditableItemChange = (val, dataIndex, id) => {
     setModifyMetadataColumnList(
       produce(modifyMetadataColumnList, (draft) => {
-        if ((draft??[]).length > _index) {
-          draft[_index][`${dataIndex}`] = val
+        const index = (draft??[]).findIndex(item => item._id === id)
+        if (index !== -1) {
+          draft[index][dataIndex] = val
         }
       })
     )
@@ -1520,7 +1546,7 @@ const AssetAction = (props) => {
                 pagination={{
                   position: ['bottomLeft'],
                   size: 'small',
-                  total: (metadataColumnList||[]).length,
+                  total,
                   showTotal: (total) => `共${total}项`,
                   showSizeChanger: true,
                   current: pageNum,
@@ -1608,9 +1634,11 @@ const MetadataColumnEditableItem = ({ value, isEdit, terms, onChange }) => {
       isEdit ? <Input size='small' 
         value={value} 
         onChange={(e) => { onChange?.(e) }} 
-      /> : <span>
+      /> : <Tooltip title={value??''}>
+        <Typography.Text ellipsis={true}>
         {highlightSearchContentByTerms(value, terms)}
-      </span>
+        </Typography.Text>
+      </Tooltip>
     }
     </React.Fragment>
   )