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

U 优化批量导入

pull/172/head
vapao 2020-08-05 18:24:23 +08:00
parent 9e011fdadb
commit bbac420234
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spug_api/apps/host/views.py
View File

@ -98,7 +98,7 @@ def post_import(request):
password = request.POST.get('password') password = request.POST.get('password')
file = request.FILES['file'] file = request.FILES['file']
ws = load_workbook(file, read_only=True)['Sheet1'] ws = load_workbook(file, read_only=True)['Sheet1']
summary = {'invalid': [], 'skip': [], 'fail': [], 'network': [], 'repeat': [], 'success': []} summary = {'invalid': [], 'skip': [], 'fail': [], 'network': [], 'repeat': [], 'success': [], 'error': []}
for i, row in enumerate(ws.rows): for i, row in enumerate(ws.rows):
if i == 0: # 第1行是表头 略过 if i == 0: # 第1行是表头 略过
continue continue
@ -128,6 +128,9 @@ def post_import(request):
except socket.error: except socket.error:
summary['network'].append(i) summary['network'].append(i)
continue continue
except Exception:
summary['error'].append(i)
continue
if Host.objects.filter(name=data.name, deleted_by_id__isnull=True).exists(): if Host.objects.filter(name=data.name, deleted_by_id__isnull=True).exists():
summary['repeat'].append(i) summary['repeat'].append(i)
continue continue

15
spug_web/src/pages/host/Import.js
View File

@ -46,15 +46,21 @@ class ComImport extends React.Component {
{res['repeat'].length > 0 && <Form.Item style={{margin: 0, color: '#1890ff'}} label="重复主机名"> {res['repeat'].length > 0 && <Form.Item style={{margin: 0, color: '#1890ff'}} label="重复主机名">
<Tooltip title={`相关行：${res['repeat'].join(', ')}`}>{res['repeat'].length}</Tooltip> <Tooltip title={`相关行：${res['repeat'].join(', ')}`}>{res['repeat'].length}</Tooltip>
</Form.Item>} </Form.Item>}
{res['error'].length > 0 && <Form.Item style={{margin: 0, color: '#1890ff'}} label="其他错误">
<Tooltip title={`请通过新建主机查看具体错误信息，相关行：${res['error'].join(', ')}`}>{res['error'].length}</Tooltip>
</Form.Item>}
</Form> </Form>
}) })
}) })
.finally(() => this.setState({loading: false})) .finally(() => this.setState({loading: false}))
}; };
beforeUpload = (file) => { handleUpload = (v) => {
this.setState({fileList: [file]}); if (v.fileList.length === 0) {
return false this.setState({fileList: []})
} else {
this.setState({fileList: [v.file]})
}
}; };
render() { render() {
@ -83,7 +89,8 @@ class ComImport extends React.Component {
placeholder="请输入默认主机密码"/> placeholder="请输入默认主机密码"/>
</Form.Item> </Form.Item>
<Form.Item required label="导入数据"> <Form.Item required label="导入数据">
<Upload name="file" accept=".xls, .xlsx" fileList={this.state.fileList} beforeUpload={this.beforeUpload}> <Upload name="file" accept=".xls, .xlsx" fileList={this.state.fileList} beforeUpload={() => false}
onChange={this.handleUpload}>
<Button> <Button>
<Icon type="upload"/> 点击上传 <Icon type="upload"/> 点击上传
</Button> </Button>