From c78c24b8592c5666a01fca4b7210171334c5793d Mon Sep 17 00:00:00 2001 From: vapao Date: Wed, 14 Apr 2021 22:38:49 +0800 Subject: [PATCH] fix issue #270 --- spug_api/apps/config/models.py | 3 +- spug_api/apps/config/views.py | 22 ++++ .../src/pages/config/environment/Table.js | 111 ++++++++++-------- .../src/pages/config/environment/store.js | 8 +- 4 files changed, 91 insertions(+), 53 deletions(-) diff --git a/spug_api/apps/config/models.py b/spug_api/apps/config/models.py index 88115dd..216a2df 100644 --- a/spug_api/apps/config/models.py +++ b/spug_api/apps/config/models.py @@ -10,6 +10,7 @@ class Environment(models.Model, ModelMixin): name = models.CharField(max_length=50) key = models.CharField(max_length=50) desc = models.CharField(max_length=255, null=True) + sort_id = models.IntegerField(default=0, db_index=True) created_at = models.CharField(max_length=20, default=human_datetime) created_by = models.ForeignKey(User, on_delete=models.PROTECT) @@ -18,7 +19,7 @@ class Environment(models.Model, ModelMixin): class Meta: db_table = 'environments' - ordering = ('-id',) + ordering = ('-sort_id',) class Service(models.Model, ModelMixin): diff --git a/spug_api/apps/config/views.py b/spug_api/apps/config/views.py index 68c9123..a3e348d 100644 --- a/spug_api/apps/config/views.py +++ b/spug_api/apps/config/views.py @@ -33,10 +33,32 @@ class EnvironmentView(View): Environment.objects.filter(pk=form.id).update(**form) else: env = Environment.objects.create(created_by=request.user, **form) + env.sort_id = env.id + env.save() if request.user.role: request.user.role.add_deploy_perm('envs', env.id) return json_response(error=error) + def patch(self, request): + form, error = JsonParser( + Argument('id', type=int, help='参数错误'), + Argument('sort', filter=lambda x: x in ('up', 'down'), required=False) + ).parse(request.body) + if error is None: + env = Environment.objects.filter(pk=form.id).first() + if not env: + return json_response(error='未找到指定环境') + if form.sort: + if form.sort == 'up': + tmp = Environment.objects.filter(sort_id__gt=env.sort_id).last() + else: + tmp = Environment.objects.filter(sort_id__lt=env.sort_id).first() + if tmp: + tmp.sort_id, env.sort_id = env.sort_id, tmp.sort_id + tmp.save() + env.save() + return json_response(error=error) + def delete(self, request): form, error = JsonParser( Argument('id', type=int, help='请指定操作对象') diff --git a/spug_web/src/pages/config/environment/Table.js b/spug_web/src/pages/config/environment/Table.js index 7962ee2..d9f0345 100644 --- a/spug_web/src/pages/config/environment/Table.js +++ b/spug_web/src/pages/config/environment/Table.js @@ -3,21 +3,20 @@ * Copyright (c) * Released under the AGPL-3.0 License. */ -import React from 'react'; +import React, { useEffect } from 'react'; import { observer } from 'mobx-react'; -import { Table, Modal, message } from 'antd'; -import { PlusOutlined } from '@ant-design/icons'; +import { Table, Modal, Divider, message } from 'antd'; +import { PlusOutlined, UpSquareOutlined, DownSquareOutlined } from '@ant-design/icons'; import { Action, TableCard, AuthButton } from 'components'; import { http, hasPermission } from 'libs'; import store from './store'; -@observer -class ComTable extends React.Component { - componentDidMount() { +function ComTable() { + useEffect(() => { store.fetchRecords() - } + }, []) - handleDelete = (text) => { + function handleDelete(text) { Modal.confirm({ title: '删除确认', content: `确定要删除【${text['name']}】?`, @@ -29,49 +28,59 @@ class ComTable extends React.Component { }) } }) - }; - - render() { - let data = store.records; - if (store.f_name) { - data = data.filter(item => item['name'].toLowerCase().includes(store.f_name.toLowerCase())) - } - return ( - } - onClick={() => store.showForm()}>新建 - ]} - pagination={{ - showSizeChanger: true, - showLessItems: true, - hideOnSinglePage: true, - showTotal: total => `共 ${total} 条`, - pageSizeOptions: ['10', '20', '50', '100'] - }}> - index + 1}/> - - - - {hasPermission('config.env.edit|config.env.del') && ( - ( - - store.showForm(info)}>编辑 - this.handleDelete(info)}>删除 - - )}/> - )} - - ) } + + function handleSort(info, sort) { + store.fetching = true; + http.patch('/api/config/environment/', {id: info.id, sort}) + .then(store.fetchRecords, () => store.fetching = false) + } + + return ( + } + onClick={() => store.showForm()}>新建 + ]} + pagination={{ + showSizeChanger: true, + showLessItems: true, + hideOnSinglePage: true, + showTotal: total => `共 ${total} 条`, + pageSizeOptions: ['10', '20', '50', '100'] + }}> + ( +
+ handleSort(info, 'up')} + style={{cursor: 'pointer', color: '#1890ff'}}/> + + handleSort(info, 'down')} + style={{cursor: 'pointer', color: '#1890ff'}}/> +
+ )}/> + + + + {hasPermission('config.env.edit|config.env.del') && ( + ( + + store.showForm(info)}>编辑 + handleDelete(info)}>删除 + + )}/> + )} + + ) } -export default ComTable +export default observer(ComTable) diff --git a/spug_web/src/pages/config/environment/store.js b/spug_web/src/pages/config/environment/store.js index 1d8d638..941411b 100644 --- a/spug_web/src/pages/config/environment/store.js +++ b/spug_web/src/pages/config/environment/store.js @@ -3,7 +3,7 @@ * Copyright (c) * Released under the AGPL-3.0 License. */ -import { observable } from "mobx"; +import { observable, computed } from "mobx"; import http from 'libs/http'; class Store { @@ -15,6 +15,12 @@ class Store { @observable f_name; + @computed get dataSource() { + let records = this.records; + if (this.f_name) records = records.filter(x => x.name.toLowerCase().includes(this.f_name.toLowerCase())); + return records + } + fetchRecords = () => { this.isFetching = true; return http.get('/api/config/environment/')