add node

Author: xlorne

antd-pro/config/routes.ts

@@ -93,13 +93,6 @@ export default [
       },
     ],
   },
-  {
-    name: 'test',
-    icon: 'bug',
-    path: '/test',
-    component: './test',
-    access: 'hasAuthentication',
-  },
   {
     path: '/',
     redirect: '/welcome',

antd-pro/src/pages/table/index.tsx

@@ -1,9 +1,9 @@
-import { list, save, del } from '@/services/api/table';
+import { list, save, del, resort } from '@/services/api/table';
 import { PlusOutlined } from '@ant-design/icons';
 import type { ActionType, ProColumns } from '@ant-design/pro-components';
-import { ModalForm, PageContainer, ProFormSelect, ProFormText, ProTable } from '@ant-design/pro-components';
+import { ModalForm, PageContainer, ProFormSelect, ProFormText, ProFormDigit } from '@ant-design/pro-components';
 import { Button, Form, message, Popconfirm } from 'antd';
-import { MyTable } from 'coding-components';
+import { MyTable } from './MyTable';
 import React, { useRef, useState } from 'react';
 
 const TablePage: React.FC = () => {
@@ -50,20 +50,24 @@ const TablePage: React.FC = () => {
       dataIndex: 'id',
       sorter: true,
       search: false,
+      width: 100,
     },
     {
       title: "服务名称",
       dataIndex: 'name',
       sorter: true,
+      width: 100,
     },
     {
       title: "地址",
       dataIndex: 'url',
       search: false,
+      width: 100,
     },
     {
       title: "状态",
       dataIndex: 'state',
+      width: 100,
       filters: [
         {
           text: '禁用',
@@ -85,10 +89,17 @@ const TablePage: React.FC = () => {
         },
       },
     },
+    {
+      title: "排序",
+      dataIndex: 'sort',
+      search: false,
+      width: 100,
+    },
     {
       title: "操作",
       dataIndex: 'option',
       valueType: 'option',
+      width: 100,
       render: (_, record) => [
         <a
           key="config"
@@ -123,9 +134,23 @@ const TablePage: React.FC = () => {
   return (
     <PageContainer>
       <MyTable
+        sortable={true}
+        dragSortKey="id"
+        onDragSortEnd={
+          async (beforeIndex: number, afterIndex: number,oldDataSource: any[], newDataSource: any[], rowKey: string) => {
+            console.log(beforeIndex, afterIndex, oldDataSource, newDataSource, rowKey);
+            const beforeId = oldDataSource[beforeIndex][rowKey];
+            const afterId = oldDataSource[afterIndex][rowKey];
+            const body = {
+              beforeId: beforeId,
+              afterId: afterId,
+            };
+            resort(body)
+          }
+        }
         headerTitle="服务节点配置"
         actionRef={actionRef}
-        rowKey="key"
+        rowKey="id"
         toolBarRender={() => [
           <Button
             type="primary"
@@ -138,7 +163,6 @@ const TablePage: React.FC = () => {
           </Button>,
         ]}
         request={async (params, sort, filter) => {
-          console.log(params, sort, filter);
           const res = await list({
             ...params,
             sort: Buffer.from(JSON.stringify(sort)).toString('base64'),
@@ -225,6 +249,18 @@ const TablePage: React.FC = () => {
           ]}
           name="state"
         />
+
+        <ProFormDigit
+          label="排序"
+          rules={[
+            {
+              required: true,
+              message: "请输入排序",
+            },
+          ]}
+          placeholder="请输入排序"
+          name="sort" />
+
       </ModalForm>
 
     </PageContainer>

antd-pro/src/pages/test/index.tsx

@@ -4,13 +4,7 @@ import {get, post} from "@/services/api/index";
 
 
 export async function list(
-  params: {
-    // query
-    /** 当前的页码 */
-    current?: number;
-    /** 页面的容量 */
-    pageSize?: number;
-  }
+  params: any
 ) {
   return get('/api/node/list', params);
 }
@@ -20,6 +14,10 @@ export async function save(body: any) {
   return post('/api/node/save', body);
 }
 
+export async function resort(body: any) {
+  return post('/api/node/resort', body);
+}
+
 
 export async function del(body: {
   id:string,

antd-pro/src/services/api/table.ts

@@ -8,6 +8,7 @@
 import com.codingapi.springboot.framework.dto.response.MultiResponse;
 import com.codingapi.springboot.framework.dto.response.Response;
 import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Sort;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -21,9 +22,16 @@ public class NodeController {
 
     @GetMapping("/list")
     public MultiResponse<Node> list(SearchRequest request) {
+        request.addSort(Sort.by("sort").ascending());
         return MultiResponse.of(nodeRepository.searchRequest(request));
     }
 
+    @PostMapping("/resort")
+    public Response resort(@RequestBody SortRequest sortRequest) {
+        nodeRepository.reSort(sortRequest);
+        return Response.buildSuccess();
+    }
+
     @PostMapping("/save")
     public Response save(@RequestBody Node node) {
         nodeService.save(node);

components-server/components-server/src/main/java/com/codingapi/server/controller/NodeController.java

@@ -0,0 +1,12 @@
+package com.codingapi.server.controller;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class SortRequest {
+
+    private Object beforeId;
+    private Object afterId;
+}

components-server/components-server/src/main/java/com/codingapi/server/controller/SortRequest.java

@@ -0,0 +1,8 @@
+package com.codingapi.server.domain;
+
+public interface ISort {
+
+    void setSort(Integer sort);
+
+    Integer getSort();
+}

components-server/components-server/src/main/java/com/codingapi/server/domain/ISort.java

@@ -19,7 +19,7 @@
 @NoArgsConstructor
 @ToString
 @Entity
-public class Node implements Cloneable {
+public class Node implements ISort,Cloneable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -33,6 +33,10 @@ public class Node implements Cloneable {
     @JsonSerialize(using = EnumSerializer.class)
     private State state;
 
+
+    private Integer sort;
+
+
     @SneakyThrows
     public void swap(Node target) {
         Node old = (Node) this.clone();

components-server/components-server/src/main/java/com/codingapi/server/domain/Node.java

@@ -3,6 +3,6 @@
 import com.codingapi.server.domain.Node;
 import com.codingapi.springboot.fast.jpa.repository.FastRepository;
 
-public interface NodeRepository extends FastRepository<Node, Integer> {
+public interface NodeRepository extends FastRepository<Node, Integer>,SortRepository<Node,Integer> {
 
 }

components-server/components-server/src/main/java/com/codingapi/server/repository/NodeRepository.java

@@ -0,0 +1,26 @@
+package com.codingapi.server.repository;
+
+import com.codingapi.server.controller.SortRequest;
+import com.codingapi.server.domain.ISort;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.NoRepositoryBean;
+
+@NoRepositoryBean
+public interface SortRepository<T extends ISort, ID> extends JpaRepository<T, ID> {
+
+
+    default void reSort(SortRequest request) {
+        T after = this.getReferenceById((ID) request.getAfterId());
+        T before = this.getReferenceById((ID) request.getBeforeId());
+
+        Integer beforeSort = before.getSort();
+        Integer afterSort = after.getSort();
+
+        before.setSort(afterSort);
+        after.setSort(beforeSort);
+
+        save(before);
+        save(after);
+    }
+
+}