evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化资产管理、我的资产页面排序

Browse Source
This commit is contained in:
dushixiang 2022-11-13 22:42:24 +08:00
parent 39a0678bb9
commit 76baf3e41e
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/repository/asset.go
View File

@ -99,9 +99,13 @@ func (r assetRepository) Find(c context.Context, pageIndex, pageSize int, name,
order = "desc"
}
if field == "name" {
field = "name"
} else {
switch field {
case "name":
case "protocol":
case "ip":
case "active":
default:
field = "created"
}
@ -319,9 +323,13 @@ func (r assetRepository) FindMyAssets(c context.Context, pageIndex, pageSize int
order = "desc"
}
if field == "name" {
field = "name"
} else {
switch field {
case "name":
case "protocol":
case "ip":
case "active":
default:
field = "created"
}

8
web/src/components/asset/Asset.js
View File

@ -71,6 +71,7 @@ const Asset = () => {
{
title: '名称',
dataIndex: 'name',
sorter: true,
render: (text, record) => {
if (record['description'] === '-') {
record['description'] = '';
@ -93,6 +94,7 @@ const Asset = () => {
title: '协议',
dataIndex: 'protocol',
key: 'protocol',
sorter: true,
render: (text, record) => {
return (
<Tag color={PROTOCOL_COLORS[text]}>{text}</Tag>
@ -116,6 +118,7 @@ const Asset = () => {
title: '网络',
dataIndex: 'network',
key: 'network',
sorter: true,
fieldProps: {
placeholder: '示例: 127.0.0.1:22'
},
@ -154,6 +157,7 @@ const Asset = () => {
title: '状态',
dataIndex: 'active',
key: 'active',
sorter: true,
render: (text, record) => {
if (record['testing'] === true) {
return (
@ -198,6 +202,7 @@ const Asset = () => {
title: '创建时间',
key: 'created',
dataIndex: 'created',
sorter: true,
hideInSearch: true,
},
{
@ -345,6 +350,9 @@ const Asset = () => {
let order = '';
if (Object.keys(sort).length > 0) {
field = Object.keys(sort)[0];
if (field === 'network') {
field = 'ip';
}
order = Object.values(sort)[0];
}

3
web/src/components/worker/MyAsset.js
View File

@ -21,6 +21,7 @@ const MyAsset = () => {
{
title: '名称',
dataIndex: 'name',
sorter: true,
render: (text, record) => {
if (record['description'] === '-') {
record['description'] = '';
@ -38,6 +39,7 @@ const MyAsset = () => {
title: '协议',
dataIndex: 'protocol',
key: 'protocol',
sorter: true,
render: (text, record) => {
return (
<Tag color={PROTOCOL_COLORS[text]}>{text}</Tag>
@ -89,6 +91,7 @@ const MyAsset = () => {
title: '状态',
dataIndex: 'active',
key: 'active',
sorter: true,
render: (text, record) => {
if (record['testing'] === true) {
return (