github
/
spug
mirror of https://github.com/openspug/spug
1
0
Fork 0
Code Issues Releases Wiki Activity

upgrade antd 4.9.4

pull/289/head
vapao 2020-12-23 10:35:09 +08:00
parent 4c9468da65
commit 690b84584a
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spug_api/apps/host/group.py
View File

@ -68,8 +68,11 @@ class GroupView(View):
dst = Group.objects.get(pk=form.d_id) dst = Group.objects.get(pk=form.d_id)
if form.action == 0: if form.action == 0:
src.parent_id = dst.id src.parent_id = dst.id
src.save() dst = Group.objects.filter(parent_id=dst.id).first()
return json_response() if not dst:
src.save()
return json_response()
form.action = -1
src.parent_id = dst.parent_id src.parent_id = dst.parent_id
if src.sort_id > dst.sort_id: if src.sort_id > dst.sort_id:
if form.action == -1: if form.action == -1:

2
spug_web/package.json
View File

@ -5,7 +5,7 @@
"dependencies": { "dependencies": {
"@ant-design/icons": "^4.3.0", "@ant-design/icons": "^4.3.0",
"ace-builds": "^1.4.7", "ace-builds": "^1.4.7",
"antd": "^4.8.5", "antd": "^4.9.4",
"axios": "^0.21.0", "axios": "^0.21.0",
"bizcharts": "^3.5.9", "bizcharts": "^3.5.9",
"history": "^4.10.1", "history": "^4.10.1",

2
spug_web/src/pages/host/Group.js
View File

@ -15,7 +15,6 @@ import {
ScissorOutlined ScissorOutlined
} from '@ant-design/icons'; } from '@ant-design/icons';
import { LoadingOutlined } from '@ant-design/icons'; import { LoadingOutlined } from '@ant-design/icons';
import styles from './index.module.css';
import { http } from 'libs'; import { http } from 'libs';
import store from './store'; import store from './store';
import lds from 'lodash'; import lds from 'lodash';
@ -141,7 +140,6 @@ export default observer(function () {
trigger={['contextMenu']} trigger={['contextMenu']}
onVisibleChange={v => v || setVisible(v)}> onVisibleChange={v => v || setVisible(v)}>
<Tree.DirectoryTree <Tree.DirectoryTree
className={styles.dragBox}
autoExpandParent autoExpandParent
draggable={draggable} draggable={draggable}
treeData={store.treeData} treeData={store.treeData}

2
spug_web/src/pages/host/Selector.js
View File

@ -1,7 +1,6 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { observer } from 'mobx-react'; import { observer } from 'mobx-react';
import { Modal, Row, Col, Tree, Table } from 'antd'; import { Modal, Row, Col, Tree, Table } from 'antd';
import styles from './index.module.css';
import store from './store'; import store from './store';
export default observer(function (props) { export default observer(function (props) {
@ -65,7 +64,6 @@ export default observer(function (props) {
<Col span={6}> <Col span={6}>
<Tree.DirectoryTree <Tree.DirectoryTree
selectedKeys={[group.key]} selectedKeys={[group.key]}
className={styles.dragBox}
treeData={store.treeData} treeData={store.treeData}
titleRender={treeRender} titleRender={treeRender}
onSelect={(_, {node}) => setGroup(node)} onSelect={(_, {node}) => setGroup(node)}

4
spug_web/src/pages/host/index.module.css
View File

@ -1,4 +0,0 @@
.dragBox :global(.ant-tree-node-content-wrapper) {
border-top: 2px transparent solid;
border-bottom: 2px transparent solid;
}