Merge remote-tracking branch 'origin/master'

web/src/views/system/menu/api.ts

@@ -1,65 +1,82 @@
-import { request } from '/@/utils/service';
-import { UserPageQuery, AddReq, DelReq, EditReq, InfoReq } from '@fast-crud/fast-crud';
+import {request} from '/@/utils/service';
+import {UserPageQuery, AddReq, DelReq, EditReq, InfoReq} from '@fast-crud/fast-crud';
 
 export const apiPrefix = '/api/system/menu/';
+
 export function GetList(query: UserPageQuery) {
-	return request({
-		url: apiPrefix,
-		method: 'get',
-		params: query,
-	});
+    return request({
+        url: apiPrefix,
+        method: 'get',
+        params: query,
+    });
 }
 
 export function GetObj(id: InfoReq) {
-	return request({
-		url: apiPrefix + id + '/',
-		method: 'get',
-	});
+    return request({
+        url: apiPrefix + id + '/',
+        method: 'get',
+    });
 }
 
 export function AddObj(obj: AddReq) {
-	return request({
-		url: apiPrefix,
-		method: 'post',
-		data: obj,
-	});
+    return request({
+        url: apiPrefix,
+        method: 'post',
+        data: obj,
+    });
 }
 
 export function UpdateObj(obj: EditReq) {
-	return request({
-		url: apiPrefix + obj.id + '/',
-		method: 'put',
-		data: obj,
-	});
+    return request({
+        url: apiPrefix + obj.id + '/',
+        method: 'put',
+        data: obj,
+    });
 }
 
 export function DelObj(obj: DelReq) {
-	return request({
-		url: apiPrefix + obj.id + '/',
-		method: 'delete',
-	});
+    return request({
+        url: apiPrefix + obj.id + '/',
+        method: 'delete',
+    });
 }
 
 export function GetAllMenu(query: UserPageQuery) {
-	return request({
-		url: apiPrefix + 'get_all_menu/',
-		method: 'get',
-		params: query,
-	});
+    return request({
+        url: apiPrefix + 'get_all_menu/',
+        method: 'get',
+        params: query,
+    });
 }
 
 export function lazyLoadMenu(query: UserPageQuery) {
-	return request({
-		url: apiPrefix,
-		method: 'get',
-		params: query,
-	});
+    return request({
+        url: apiPrefix,
+        method: 'get',
+        params: query,
+    });
 }
 
 export function dragMenu(obj: AddReq) {
-	return request({
-		url: apiPrefix + 'drag_menu/',
-		method: 'post',
-		data: obj,
-	});
+    return request({
+        url: apiPrefix + 'drag_menu/',
+        method: 'post',
+        data: obj,
+    });
+}
+
+export function moveUp(obj: AddReq) {
+    return request({
+        url: apiPrefix + 'move_up/',
+        method: 'post',
+        data: obj,
+    });
+}
+
+export function moveDown(obj: AddReq) {
+    return request({
+        url: apiPrefix + 'move_down/',
+        method: 'post',
+        data: obj,
+    });
 }

web/src/views/system/menu/index.vue

@@ -435,12 +435,16 @@ const handleSort = (type: string) => {
 
 	if (type === 'up') {
 		if (index === 0) return;
-		parentList.splice(index - 1, 0, record as any);
-		parentList.splice(index + 1, 1);
+		api.moveUp({ menu_id: form.id }).then((res: APIResponseData) => {
+			getData();
+			successMessage(res.msg as string);
+		});
 	}
 	if (type === 'down') {
-		parentList.splice(index + 2, 0, record as any);
-		parentList.splice(index, 1);
+		api.moveDown({ menu_id: form.id }).then((res: APIResponseData) => {
+			getData();
+			successMessage(res.msg as string);
+		});
 	}
 };