Merge 0edda17 into 4ddff55

uxcore · Mar 6, 2019 · 4f2a0de · 4f2a0de
2 parents 4ddff55 + 0edda17
commit 4f2a0de
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/demo/GridEditDemo.jsx b/demo/GridEditDemo.jsx
@@ -354,7 +354,6 @@ class Demo extends React.Component {
         {
           title: '恢复所有行',
           callback: () => {
-            debugger
             me.table.resetAllRow();
           },
         },

diff --git a/src/ActionBar/ColumnOrder.jsx b/src/ActionBar/ColumnOrder.jsx
@@ -40,7 +40,7 @@ class ColumnOrder extends React.Component {
     const { includeActionColumn } = this.props
     this.props.onChange(dragInfo, data, otherColumns)
     // 如果不允许排序操作列，则此处需要添加回去
-    if (!includeActionColumn) {
+    if (!includeActionColumn && actionColumn) {
       data.splice(actionColumnPos - otherColumns.length, 0, actionColumn);
     }
     // 同样也要将fixedColumns和othersColumns添加回去

diff --git a/src/ActionBar/DraggableList.jsx b/src/ActionBar/DraggableList.jsx
@@ -69,7 +69,7 @@ class DraggableList extends React.Component {
       dragElement: null,
       isDragging: false
     })
-    const resultNodes = document.querySelectorAll(`.${prefixCls}-item`)
+    const resultNodes = (dragElement.parentNode ? dragElement.parentNode : document).querySelectorAll(`.${prefixCls}-item`)
     let newData = []
     for (let i = 0; i < resultNodes.length; i++) {
       const node = resultNodes[i]

diff --git a/src/ActionBar/RowOrder.jsx b/src/ActionBar/RowOrder.jsx
@@ -23,7 +23,8 @@ class RowOrder extends React.Component {
   constructor(props) {
     super(props)
     this.state = {
-      value: props.defaultValue
+      value: props.defaultValue,
+      overlayId: `overlay_${setTimeout(0)}`
     }
   }
   handleSelect = (data) => {
@@ -35,7 +36,7 @@ class RowOrder extends React.Component {
     this.setState({
       value,
     })
-    const overlay = document.querySelector('.list-action-bar-order-overlay')
+    const overlay = document.querySelector(`.${this.state.overlayId}`)
     if (overlay) {
       overlay.classList.add('kuma-popover-hidden')
     }
@@ -70,6 +71,7 @@ class RowOrder extends React.Component {
         trigger={'click'}
         overlayClassName={classnames({
           'list-action-bar-order-overlay': true,
+          [this.state.overlayId]: true,
           'kuma-popover-hidden': disabled
         })}
         placement={'bottomRight'}
@@ -85,4 +87,4 @@ class RowOrder extends React.Component {
   }
 }
 
-export default RowOrder;
+export default RowOrder;