fix: '1.增加已附加字段取消附加功能2.运维表编辑内部字段删除按钮disabled'

src/pages/bsmanager/base/tablemanager/components/TableView.jsx

@@ -67,6 +67,7 @@ const EditableCell = ({
   dataSource,
   tableDataCount,
   defaultData,
+  setDefaultData,
   ...restProps
 }) => {
   const [editing, setEditing] = useState(false);
@@ -85,7 +86,7 @@ const EditableCell = ({
         [dataIndex]: record[dataIndex],
       });
     }
-  }, []);
+  }, [dataSource]);
 
   useEffect(() => {
     if (editing && inputRef.current) {
@@ -125,6 +126,13 @@ const EditableCell = ({
       [dataIndex]: values.IsAddFieldConfig,
     });
     handleSave({ ...record, ...values, index });
+    let defaultArr = JSON.parse(JSON.stringify(defaultData));
+    defaultArr.forEach(item => {
+      if (item.Name === record.Name) {
+        item.IsAddFieldConfig = values.IsAddFieldConfig;
+      }
+    });
+    setDefaultData(defaultArr);
   };
 
   const rendeFrom = val => {
@@ -596,15 +604,24 @@ const TableView = props => {
     }
     setDataSource(list);
   };
-  const deleteAddField = (index, name) => {
+  const deleteAddField = (row, index) => {
     let arr = JSON.parse(JSON.stringify(dataSource));
     arr.forEach(item => {
-      if (item.Name === name) {
+      if (item.Name === row.Name) {
         item.IsAddFieldConfig = false;
       }
     });
-    console.log(arr, name, 'arrarrarrarrarrarr');
+    if (!showDefault) {
+      let defaultArr = JSON.parse(JSON.stringify(defaultData));
+      defaultArr.forEach(item => {
+        if (item.Name === row.Name) {
+          item.IsAddFieldConfig = false;
+        }
+      });
+      setDefaultData(defaultArr);
+    }
     setDataSource(arr);
+    // }
   };
   // 表格设置
   const components = {
@@ -717,10 +734,16 @@ const TableView = props => {
       render: (_, record, index) =>
         dataSource.length >= 1 ? (
           <Tooltip title="删除">
-            <DeleteOutlined
+            <Button
+              style={{ border: 'none', padding: '4px 5px', background: 'none' }}
               onClick={() => handleDelete(record, index)}
-              style={{ fontSize: '16px', color: `${record.ReadOnly ? '#ccc' : '#e86060'}` }}
-            />
+              disabled={record.ReadOnly}
+            >
+              <DeleteOutlined
+                style={{ fontSize: '16px', color: `${record.ReadOnly ? '#ccc' : '#e86060'}` }}
+                disabled={record.ReadOnly}
+              />
+            </Button>
           </Tooltip>
         ) : null,
     },
@@ -743,6 +766,7 @@ const TableView = props => {
         dataSource,
         tableDataCount,
         defaultData,
+        setDefaultData,
         handleSave,
       }),
     };
@@ -858,10 +882,7 @@ const TableView = props => {
                 item.IsAddFieldConfig ? (
                   <div className={styles.subItem}>
                     <span>{item.Alias || item.Name}</span>{' '}
-                    <span
-                      className={styles.deleteItem}
-                      onClick={() => deleteAddField(index, item.Name)}
-                    >
+                    <span className={styles.deleteItem} onClick={() => deleteAddField(item, index)}>
                       X
                     </span>
                   </div>

src/pages/bsmanager/base/tablemanager/components/TableView.less

@@ -40,7 +40,9 @@
           //   cursor: pointer;
           // }
           .deleteItem {
-            display: none;
+            &:hover {
+              cursor: pointer;
+            }
           }
         }
       }