@gmfe/table-x 2.13.0-beta.2 → 2.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gmfe/table-x",
-  "version": "2.13.0-beta.2",
+  "version": "2.13.1",
   "description": "",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gmfe#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@gm-common/tool": "^1.0.0",
-    "@gmfe/locales": "^2.13.0-beta.2",
-    "@gmfe/react": "^2.13.0-beta.2",
+    "@gmfe/locales": "^2.13.1",
+    "@gmfe/react": "^2.13.1",
     "classnames": "^2.2.5",
     "lodash": "^4.17.14",
     "prop-types": "^15.7.2",
@@ -36,5 +36,5 @@
     "react-window": "^1.8.5",
     "sortablejs": "^1.10.1"
   },
-  "gitHead": "fd3a8e87722bfa50b2d82a37f938b619a86987cf"
+  "gitHead": "5fe17bc2d89949e39d7a9eeca34b7c991cb01337"
 }

package/src/hoc/sortable_table_x.js

@@ -2,6 +2,7 @@ import React, { useEffect } from 'react'
 import PropTypes from 'prop-types'
 import TableX from '../base'
 import SortableJS from 'sortablejs'
+import _ from 'lodash'
 
 function sortableTableX(Component) {
   const SortableTableX = ({ id, data, onSortChange, keyField, ...rest }) => {
@@ -15,21 +16,16 @@ function sortableTableX(Component) {
         onStart: () => {
           target.classList.add('gm-table-x-sortable-active')
         },
-        onEnd: ({ newIndex, oldIndex }) => {
+        onEnd: () => {
           target.classList.remove('gm-table-x-sortable-active')
-          // 删除原本位置的数据
-          const deleteData = data.splice(oldIndex, 1)
-          // 将删除的数据添加到新的位置
-          data.splice(newIndex, 0, deleteData[0])
-          onSortChange(data)
+        },
+        onUpdate: evt => {
+          const newIds = sortable.toArray()
+          const newData = _.sortBy(data.slice(), v =>
+            newIds.indexOf(v[keyField])
+          )
+          onSortChange(newData)
         }
-        // onUpdate: evt => {
-        // const newIds = sortable.toArray()
-        // const newData = _.sortBy(data.slice(), v => {
-        //   return newIds.indexOf(v[keyField]) // 返回位置
-        // })
-        // onSortChange(newData)
-        // }
       })
 
       return () => {

package/src/stories/table_x_hoc.stories.js

@@ -165,7 +165,7 @@ const columns = [
     accessor: 'index',
     fixed: 'left',
     width: TABLE_X.WIDTH_NO,
-    Cell: ({ row }) => {return row.index + 1}
+    Cell: ({ row }) => row.index + 1
   },
   // 常规用法
   {
@@ -396,8 +396,7 @@ storiesOf('TableX|HOC', module)
       keyField='id'
       onSortChange={newData => {
         console.log(newData.map(v => v.id))
-        // 不需要将newData重新赋值给data
-        // store.setData(newData)
+        store.setData(newData)
       }}
     />
   ))