Merge 0df7e1a into c263d90

uxcore · Nov 21, 2018 · da83e9e · da83e9e
2 parents c263d90 + 0df7e1a
commit da83e9e
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 10 deletions.
diff --git a/demo/GridEditDemo.jsx b/demo/GridEditDemo.jsx
@@ -281,6 +281,20 @@ class Demo extends React.Component {
             },
             mode: Constants.MODE.EDIT,
           },
+          {
+            title: '上移',
+            callback: (rowData) => {
+              me.table.moveRowUp(rowData);
+            },
+            mode: Constants.MODE.VIEW,
+          },
+          {
+            title: '下移',
+            callback: (rowData) => {
+              me.table.moveRowDown(rowData);
+            },
+            mode: Constants.MODE.VIEW,
+          },
           {
             title: '删除',
             callback: (rowData) => {

diff --git a/demo/TreeGridDemo.jsx b/demo/TreeGridDemo.jsx
@@ -73,7 +73,15 @@ class Demo extends React.Component {
         actions: [
           {
             title: '上移',
-            callback: (rowData) => { this.table.moveRowUp(rowData); },
+            callback: (rowData) => {
+              this.table.moveRowUp(rowData);
+            },
+          },
+          {
+            title: '删除',
+            callback: (rowData) => {
+              this.table.delRow(rowData);
+            },
           },
           {
             title: '下移',

diff --git a/demo/index.jsx b/demo/index.jsx
@@ -17,9 +17,9 @@ import Demo5 from './TableGroup';
 import Demo6 from './TableRowGroup';
 import '../style';
 
-ReactDOM.render(<Demo />, document.getElementById('UXCoreDemo'));
+// ReactDOM.render(<Demo />, document.getElementById('UXCoreDemo'));
 // ReactDOM.render(<Demo2 />, document.getElementById('UXCoreDemo2'));
-// ReactDOM.render(<Demo3 />, document.getElementById('UXCoreDemo3'));
+ReactDOM.render(<Demo3 />, document.getElementById('UXCoreDemo3'));
 // ReactDOM.render(<Demo4 />, document.getElementById('UXCoreDemo4'));
 // ReactDOM.render(<Demo5 />, document.getElementById('UXCoreDemo5'));
 // ReactDOM.render(<Demo6 />, document.getElementById('UXCoreDemo6'));
diff --git a/src/innerMethods.js b/src/innerMethods.js
@@ -146,6 +146,24 @@ function syncRecord(obj, cb) {
     }
   });
 }
+/**
+ * update row's treeId
+ * @param rows
+ * @param prefix
+ */
+function updateTreeId(rows, prefix) {
+  if (!rows || !rows.length) {
+    return;
+  }
+  for (let i = 0; i < rows.length; i++) {
+    let row = rows[i];
+    let treeId = prefix ? `${prefix}-${i}` : `${i}`;
+    row.__treeId__ = treeId;
+    if (row.data) {
+      updateTreeId(row.data, treeId);
+    }
+  }
+}
 
 /**
  * remove some items from this.state.data & this.data
@@ -155,19 +173,26 @@ function removeRecords(obj, cb) {
   const me = this;
   const content = deepcopy(me.state.data);
   const data = content.data || content.datas;
+  const treeIdArr = obj.__treeId__.split('-').map(item => parseInt(item, 10));
+  let rows = data;
+  for (let i = 0; i < treeIdArr.length - 1; i++) {
+    const rowIndex = treeIdArr[i];
+    rows = rows[rowIndex].data;
+  }
   let objAux = deepcopy(obj);
   if (Object.prototype.toString.call(objAux) !== '[object Array]') {
     objAux = [objAux];
   }
   objAux.forEach((item) => {
-    for (let i = 0; i < data.length; i++) {
-      const element = data[i];
+    for (let i = 0; i < rows.length; i++) {
+      const element = rows[i];
       if (element.jsxid === item.jsxid) {
-        data.splice(i, 1);
+        rows.splice(i, 1);
         break;
       }
     }
   });
+  updateTreeId(content.data);
   me.data = content;
   this.setState({
     data: content,
@@ -185,4 +210,6 @@ export default {
   updateRecord,
   syncRecord,
   removeRecords,
+  updateTreeId
 };
+
diff --git a/src/methods.js b/src/methods.js
@@ -156,8 +156,6 @@ function moveRowUp(rowData, cb) {
     const lastIndex = treeIdArr.pop();
     if (lastIndex > 0) {
       rows.splice(lastIndex, 1);
-      // change treeId before setState;
-      rows[lastIndex - 1].__treeId__ = treeIdArr.concat([lastIndex]).join('-');
       rows.splice(lastIndex - 1, 0, { ...rowData, __treeId__: treeIdArr.concat([lastIndex - 1]).join('-') });
       this.data = content;
       this.setState({
@@ -168,6 +166,7 @@ function moveRowUp(rowData, cb) {
         }
       });
     }
+    this.updateTreeId(data)
   }
 }
 
@@ -183,8 +182,6 @@ function moveRowDown(rowData, cb) {
     }
     const lastIndex = treeIdArr.pop();
     if (lastIndex < rows.length - 1) {
-      // change treeId before setState;
-      rows[lastIndex + 1].__treeId__ = treeIdArr.concat([lastIndex]).join('-');
       rows.splice(lastIndex, 1);
       rows.splice(lastIndex + 1, 0, { ...rowData, __treeId__: treeIdArr.concat([lastIndex + 1]).join('-') });
       this.data = content;
@@ -196,6 +193,7 @@ function moveRowDown(rowData, cb) {
         }
       });
     }
+    this.updateTreeId(data)
   }
 }