Skip to content

D
dataease
Unverified 提交 639e320f authored 作者: fit2cloud-chenyw's avatar fit2cloud-chenyw 提交者： GitHub
浏览文件
操作

Merge pull request #110 from dataease/pr@dev@feat_组织管理增加可拖拽移动功能

feat: 组织管理增加可拖拽移动功能
上级 1f86ce17 8acf0c3f
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 10 行增加 和 2 行删除
backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
浏览文件 @ 639e320f
...@@ -38,6 +38,7 @@ public class ShiroServiceImpl implements ShiroService { ...@@ -38,6 +38,7 @@ public class ShiroServiceImpl implements ShiroService {
filterChainDefinitionMap.put("/link/**", ANON); filterChainDefinitionMap.put("/link/**", ANON);
filterChainDefinitionMap.put("/index.html", ANON); filterChainDefinitionMap.put("/index.html", ANON);
filterChainDefinitionMap.put("/link.html", ANON); filterChainDefinitionMap.put("/link.html", ANON);
filterChainDefinitionMap.put("/axios.map", ANON);
//验证链接 //验证链接
filterChainDefinitionMap.put("/api/link/validate**", ANON); filterChainDefinitionMap.put("/api/link/validate**", ANON);
......
backend/src/main/java/io/dataease/plugins/server/XDeptServer.java
浏览文件 @ 639e320f
...@@ -7,6 +7,7 @@ import io.dataease.plugins.common.entity.XpackGridRequest; ...@@ -7,6 +7,7 @@ import io.dataease.plugins.common.entity.XpackGridRequest;
import io.dataease.plugins.config.SpringContextUtil; import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.xpack.dept.dto.request.XpackCreateDept; import io.dataease.plugins.xpack.dept.dto.request.XpackCreateDept;
import io.dataease.plugins.xpack.dept.dto.request.XpackDeleteDept; import io.dataease.plugins.xpack.dept.dto.request.XpackDeleteDept;
import io.dataease.plugins.xpack.dept.dto.request.XpackMoveDept;
import io.dataease.plugins.xpack.dept.dto.response.XpackDeptTreeNode; import io.dataease.plugins.xpack.dept.dto.response.XpackDeptTreeNode;
import io.dataease.plugins.xpack.dept.dto.response.XpackSysDept; import io.dataease.plugins.xpack.dept.dto.response.XpackSysDept;
import io.dataease.plugins.xpack.dept.service.DeptXpackService; import io.dataease.plugins.xpack.dept.service.DeptXpackService;
...@@ -77,4 +78,10 @@ public class XDeptServer { ...@@ -77,4 +78,10 @@ public class XDeptServer {
DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class); DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class);
return deptService.searchTree(deptId); return deptService.searchTree(deptId);
} }
@PostMapping("/move")
public void move(@RequestBody XpackMoveDept xpackMoveDept){
DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class);
deptService.move(xpackMoveDept);
}
} }
frontend/public/axios.js 0 → 100644
浏览文件 @ 639e320f
差异被折叠。
frontend/public/index.html
浏览文件 @ 639e320f
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<script src="https://unpkg.com/axios/dist/axios.min.js"></script> <script src="axios.js"></script>
<title><%= webpackConfig.name %></title> <title><%= webpackConfig.name %></title>
</head> </head>
<body> <body>
......
frontend/src/utils/request.js
浏览文件 @ 639e320f
import axios from 'axios' // import axios from 'axios'
// import { MessageBox, Message } from 'element-ui' // import { MessageBox, Message } from 'element-ui'
import store from '@/store' import store from '@/store'
import { $alert, $error } from './message' import { $alert, $error } from './message'
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论