修改模型部分问题

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

@@ -5,7 +5,7 @@ import { DndProvider, useDrag, useDrop } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import update from 'immutability-helper';
 
-import './ImportActionTable.less';
+import './ImportActionIndex.less';
 
 const { Option } = Select;
 
@@ -292,10 +292,10 @@ const ImportActionIndex = (props) => {
 
   const onAddClick = () => {
   
-    const newData = [{name: ''}, ...data];
+    const newFilterData = [{name: ''}, ...filterData];
 
-    onChange && onChange(newData);
-    edit(newData[0]);
+    setFilterData(newFilterData);
+    edit(newFilterData[0]);
   }
 
   const edit = (record) => {
@@ -319,14 +319,15 @@ const ImportActionIndex = (props) => {
   }
 
   const cancel = () => {
-    const newData = [...data];
 
-    const index = newData.findIndex((item) => editingKey === item.name);
+    const newFilterData = [...filterData];
+
+    const index = newFilterData.findIndex((item) => editingKey === item.name);
 
-    const item = newData[index];
+    const item = newFilterData[index];
     if (!item.name || item.name==='') {
-      newData.splice(index, 1);
-      onChange && onChange(newData);
+      newFilterData.splice(index, 1);
+      setFilterData(newFilterData);
     }
 
     setEditingKey(null);
@@ -342,9 +343,14 @@ const ImportActionIndex = (props) => {
       const index = newData.findIndex((item) => editingKey === item.name);
   
       //判断索引名称是否唯一
+      let _index;
+      if (index === -1) {
+        _index = (data||[]).findIndex(item => item.name === row.name);
+      } else {
         const newDataExcludeSelf = [...data];
         newDataExcludeSelf.splice(index, 1);  
-      const _index = (newDataExcludeSelf||[]).findIndex(item => item.name === row.name);
+        _index = (newDataExcludeSelf||[]).findIndex(item => item.name === row.name);
+      }
 
       if (_index !== -1) {
         form.setFields([{ name: 'name', errors: ['索引名称不能重复'] }]);
@@ -369,12 +375,21 @@ const ImportActionIndex = (props) => {
         return;
       }
 
+      if (index === -1) {
+        newData.splice(0, 0, {
+          name: row.name,
+          unique: row.unique,
+          indexedEasyDataModelAttributes: _indexedEasyDataModelAttributes,
+          indexedAttributeOrders: _indexedAttributeOrders,
+        });
+      } else {
         newData.splice(index, 1, {...{
           name: row.name,
           unique: row.unique,
           indexedEasyDataModelAttributes: _indexedEasyDataModelAttributes,
           indexedAttributeOrders: _indexedAttributeOrders,
         }});
+      }
   
       onChange && onChange(newData, true);
 

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

+.model-import-action-index {
+
+  .yy-table {
+    max-height: 200px !important;
+    overflow: auto !important;
+  }
+}
\ No newline at end of file

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

@@ -129,7 +129,7 @@ const EditableCell = ({
           valuePropName={(inputType==='check')? 'checked': 'value'}
           rules={[
             {
-              required: (inputType === 'text' && dataIndex !== 'remark'),
+              required: (inputType === 'text'),
               message: `请输入${colTitle}!`,
             },
           ]}
@@ -249,10 +249,10 @@ const ImportActionTable = (props) => {
 
   const onAddClick = () => {
   
-    const newData = [{iid: generateUUID()}, ...data];
+    const newFilterData = [{iid: generateUUID()}, ...filterData];
     
-    onChange && onChange(newData);
-    edit(newData[0]);
+    setFilterData(newFilterData);
+    edit(newFilterData[0]);
   }
 
   const edit = (record) => {
@@ -274,14 +274,14 @@ const ImportActionTable = (props) => {
   }
 
   const cancel = () => {
-    const newData = [...data];
+    const newFilterData = [...filterData];
 
-    const index = newData.findIndex((item) => editingKey === item.iid);
+    const index = newFilterData.findIndex((item) => editingKey === item.iid);
 
-    const item = newData[index];
+    const item = newFilterData[index];
     if (!item.name || item.name==='') {
-      newData.splice(index, 1);
-      onChange && onChange(newData);
+      newFilterData.splice(index, 1);
+      setFilterData(newFilterData);
     }
 
     setEditingKey('');
@@ -307,8 +307,14 @@ const ImportActionTable = (props) => {
       const newData = [...data];
       const index = newData.findIndex((item) => editingKey === item.iid);
   
+      if (index === -1) {
+        
+        newData.splice(0, 0, row);
+
+      } else {
         const item = newData[index];
         newData.splice(index, 1, { ...item, ...row });
+      }
 
       onChange && onChange(newData, true);
 

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

 .model-import-action-table {
 
   .yy-table {
-    max-height: 500px !important;
+    max-height: 400px !important;
     overflow: auto !important;
   }
 

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

@@ -110,7 +110,7 @@ const ImportModal = (props) => {
 
   const cancel = () => {
     reset();
-    onCancel && onCancel();
+    onCancel && onCancel(false);
   }
 
   const save = async () => {