- spi: use ip as name if empty
- server tab ui
- only display io speed when available
This commit is contained in:
lollipopkit
2023-11-03 22:13:18 +08:00
parent a1b9cecebb
commit e80f6d4cc2
3 changed files with 16 additions and 16 deletions

View File

@@ -44,8 +44,9 @@ class DiskIO extends TimeSeq<DiskIOPiece> {
(String?, String?) getSpeed(String dev) { (String?, String?) getSpeed(String dev) {
final (read_, write_) = _getSpeed(dev); final (read_, write_) = _getSpeed(dev);
final read = '${read_?.convertBytes}/s'; if (read_ == null || write_ == null) return (null, null);
final write = '${write_?.convertBytes}/s'; final read = '${read_.convertBytes}/s';
final write = '${write_.convertBytes}/s';
return (read, write); return (read, write);
} }

View File

@@ -393,7 +393,9 @@ class _ServerEditPageState extends State<ServerEditPage> {
} }
final spi = ServerPrivateInfo( final spi = ServerPrivateInfo(
name: _nameController.text, name: _nameController.text.isEmpty
? _ipController.text
: _nameController.text,
ip: _ipController.text, ip: _ipController.text,
port: int.parse(_portController.text), port: int.parse(_portController.text),
user: _usernameController.text, user: _usernameController.text,

View File

@@ -212,8 +212,8 @@ class _ServerPageState extends State<ServerPage>
Widget _wrapWithSizedbox(Widget child) { Widget _wrapWithSizedbox(Widget child) {
return SizedBox( return SizedBox(
width: _useDoubleColumn width: _useDoubleColumn
? (_media.size.width - 146) / 10 ? (_media.size.width - 137) / 8
: (_media.size.width - 74) / 5, : (_media.size.width - 74) / 4,
child: child, child: child,
); );
} }
@@ -307,9 +307,7 @@ class _ServerPageState extends State<ServerPage>
List<Widget> _buildNormalCard(ServerStatus ss, ServerPrivateInfo spi) { List<Widget> _buildNormalCard(ServerStatus ss, ServerPrivateInfo spi) {
return [ return [
UIs.height13, UIs.height13,
Padding( Row(
padding: const EdgeInsets.symmetric(horizontal: 13),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
_wrapWithSizedbox(_buildPercentCircle(ss.cpu.usedPercent())), _wrapWithSizedbox(_buildPercentCircle(ss.cpu.usedPercent())),
@@ -318,7 +316,6 @@ class _ServerPageState extends State<ServerPage>
_wrapWithSizedbox(_buildDisk(ss, spi.id)), _wrapWithSizedbox(_buildDisk(ss, spi.id)),
], ],
), ),
),
UIs.height13, UIs.height13,
if (Stores.setting.moveOutServerTabFuncBtns.fetch() && if (Stores.setting.moveOutServerTabFuncBtns.fetch() &&
// Discussion #146 // Discussion #146