diff --git a/server/repository/asset.go b/server/repository/asset.go index 3fc56de..87d6397 100644 --- a/server/repository/asset.go +++ b/server/repository/asset.go @@ -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" } diff --git a/web/src/components/asset/Asset.js b/web/src/components/asset/Asset.js index a064619..aca77c6 100644 --- a/web/src/components/asset/Asset.js +++ b/web/src/components/asset/Asset.js @@ -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 ( {text} @@ -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]; } diff --git a/web/src/components/worker/MyAsset.js b/web/src/components/worker/MyAsset.js index 0e94574..8141038 100644 --- a/web/src/components/worker/MyAsset.js +++ b/web/src/components/worker/MyAsset.js @@ -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 ( {text} @@ -89,6 +91,7 @@ const MyAsset = () => { title: '状态', dataIndex: 'active', key: 'active', + sorter: true, render: (text, record) => { if (record['testing'] === true) { return (