merge: merge refactor/yuananting/20210615/category-tree-related

src/data-source/aidTool/request-apis.ts

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Date: 2021-03-03 15:13:12
  * @LastEditors: fusanqiasng
- * @LastEditTime: 2021-06-15 17:54:04
+ * @LastEditTime: 2021-06-16 09:57:18
  * @Description: 助学工具接口
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -29,8 +29,8 @@ export function editCategory(params: object) {
   return Service.Hades('public/hades/editCategory', params);
 }
 
-export function moveCategoryTree(params: object) {
-  return Service.Hades('public/hades/editCategoryTree', params);
+export function moveCategory(params: object) {
+  return Service.Hades('public/hades/moveCategory', params);
 }
 
 export function queryQuestionPageList(params: object) {

src/domains/aid-tool-domain/AidToolService.ts

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Date: 2021-03-11 11:34:37
  * @LastEditors: fusanqiasng
- * @LastEditTime: 2021-06-15 11:25:18
+ * @LastEditTime: 2021-06-16 09:56:46
  * @Description: 助学工具接口
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -12,7 +12,7 @@ import {
   addCategory,
   delCategory,
   editCategory,
-  moveCategoryTree,
+  moveCategory,
   addQuestion,
   queryQuestionPageList,
   deleteQuestion,
@@ -59,8 +59,8 @@ export default class AidToolService {
   }
 
   // 拖拽移动分类树
-  static moveCategoryTree(params: any) {
-    return moveCategoryTree(params);
+  static moveCategory(params: any) {
+    return moveCategory(params);
   }
 
   // 查询题目列表

src/modules/teach-tool/components/CourseCategoryManage.jsx

@@ -2,7 +2,11 @@
  * @Author: yuananting
  * @Date: 2021-02-23 18:28:50
  * @LastEditors: fusanqiasng
+<<<<<<< HEAD
  * @LastEditTime: 2021-06-15 17:55:03
+=======
+ * @LastEditTime: 2021-06-16 09:59:04
+>>>>>>> refactor/yuananting/20210615/category-tree-related
  * @Description: 助学工具-课程分类
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -482,7 +486,6 @@ class CourseCategoryManage extends Component {
       tenantId: User.getStoreId(),
       userId: User.getStoreUserId(),
     };
-
     let movedCategory = this.movedNodeFind(newTreeData, info.dragNode.id);
     let parentCategory = movedCategory.parentId === '0' ? firstParentNode : this.movedNodeFind(newTreeData, targetParentId);
     // let params = {
@@ -501,7 +504,7 @@ class CourseCategoryManage extends Component {
       userId: User.getStoreUserId(),
     };
 
-    AidToolService.moveCategoryTree(params).then((res) => {
+    AidToolService.moveCategory(params).then((res) => {
       this.queryCategoryTree('remain');
     });
   };