From 035c69898f34cc0e9f45822d8c5cf083d5af7c1f Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Thu, 2 Sep 2021 19:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/services/env.ts    |  6 ++--
 src/pages/env/index.tsx | 68 ++++++++++++++++++-----------------------
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/back/services/env.ts b/back/services/env.ts
index 1a4f1227..658361fc 100644
--- a/back/services/env.ts
+++ b/back/services/env.ts
@@ -89,7 +89,7 @@ export default class EnvService {
       fromIndex: number;
       toIndex: number;
     },
-  ) {
+  ): Promise<Env> {
     let targetPosition: number;
     const isUpward = fromIndex > toIndex;
     const envs = await this.envs();
@@ -102,11 +102,11 @@ export default class EnvService {
         ? (envs[toIndex].position + envs[toIndex - 1].position) / 2
         : (envs[toIndex].position + envs[toIndex + 1].position) / 2;
     }
-    this.update({
+    const newDoc = await this.update({
       _id,
       position: targetPosition,
     });
-    await this.set_envs();
+    return newDoc;
   }
 
   public async envs(
diff --git a/src/pages/env/index.tsx b/src/pages/env/index.tsx
index 6088ce81..defcae5f 100644
--- a/src/pages/env/index.tsx
+++ b/src/pages/env/index.tsx
@@ -25,7 +25,6 @@ import EditNameModal from './editNameModal';
 import { DndProvider, useDrag, useDrop } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import './index.less';
-import { useCtx } from '@/utils/hooks';
 
 const { Text } = Typography;
 const { Search } = Input;
@@ -60,36 +59,30 @@ const DragableBodyRow = ({
   ...restProps
 }: any) => {
   const ref = useRef();
-  const [{ isOver, dropClassName }, drop] = useDrop(
-    () => ({
-      accept: type,
-      collect: (monitor) => {
-        const { index: dragIndex } = monitor.getItem() || ({} as any);
-        if (dragIndex === index) {
-          return {};
-        }
-        return {
-          isOver: monitor.isOver(),
-          dropClassName:
-            dragIndex < index ? ' drop-over-downward' : ' drop-over-upward',
-        };
-      },
-      drop: (item: any) => {
-        moveRow(item.index, index);
-      },
+  const [{ isOver, dropClassName }, drop] = useDrop({
+    accept: type,
+    collect: (monitor) => {
+      const { index: dragIndex } = (monitor.getItem() as any) || {};
+      if (dragIndex === index) {
+        return {};
+      }
+      return {
+        isOver: monitor.isOver(),
+        dropClassName:
+          dragIndex < index ? ' drop-over-downward' : ' drop-over-upward',
+      };
+    },
+    drop: (item: any) => {
+      moveRow(item.index, index);
+    },
+  });
+  const [, drag] = useDrag({
+    type,
+    item: { index },
+    collect: (monitor) => ({
+      isDragging: monitor.isDragging(),
     }),
-    [index],
-  );
-  const [, drag, preview] = useDrag(
-    () => ({
-      type,
-      item: { index },
-      collect: (monitor) => ({
-        isDragging: monitor.isDragging(),
-      }),
-    }),
-    [index],
-  );
+  });
   drop(drag(ref));
 
   return (
@@ -98,9 +91,7 @@ const DragableBodyRow = ({
       className={`${className}${isOver ? dropClassName : ''}`}
       style={{ cursor: 'move', ...style }}
       {...restProps}
-    >
-      {restProps.children}
-    </tr>
+    />
   );
 };
 
@@ -350,16 +341,17 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
         return;
       }
       const dragRow = value[dragIndex];
-      const newData = [...value];
-      newData.splice(dragIndex, 1);
-      newData.splice(hoverIndex, 0, dragRow);
-      setValue([...newData]);
       request
         .put(`${config.apiPrefix}envs/${dragRow._id}/move`, {
           data: { fromIndex: dragIndex, toIndex: hoverIndex },
         })
         .then((data: any) => {
-          if (data.code !== 200) {
+          if (data.code === 200) {
+            const newData = [...value];
+            newData.splice(dragIndex, 1);
+            newData.splice(hoverIndex, 0, { ...dragRow, ...data.data });
+            setValue([...newData]);
+          } else {
             message.error(data);
           }
         });