From a31aa125ee0fb2d8fbc20a985d7d721dcde7d0e1 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Mon, 1 Mar 2021 14:37:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtag=E5=B1=85=E4=B8=AD?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/lib/widgets/example_scaffold.dart | 5 ----- lib/tag/as_tag.dart | 26 ++++++++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/example/lib/widgets/example_scaffold.dart b/example/lib/widgets/example_scaffold.dart index e938d1d..35303f1 100644 --- a/example/lib/widgets/example_scaffold.dart +++ b/example/lib/widgets/example_scaffold.dart @@ -49,11 +49,6 @@ class _ExampleScaffoldState extends State isScrollable: true, controller: _tabController, ), - endDrawer: ASDrawer( - children: [ - Text('DRAWER'), - ], - ), body: ListView( children: [ Builder( diff --git a/lib/tag/as_tag.dart b/lib/tag/as_tag.dart index 14a9954..73bb3d2 100644 --- a/lib/tag/as_tag.dart +++ b/lib/tag/as_tag.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:ansu_ui/styles/as_colors.dart'; +import 'package:ansu_ui/extension/num_extension.dart'; class ASTag extends StatefulWidget { ///宽度 @@ -116,18 +117,23 @@ class _ASTagState extends State { Widget build(BuildContext context) { return Container( padding: widget.padding ?? - EdgeInsets.symmetric(horizontal: 6.w, vertical: 2.w), + EdgeInsets.symmetric( + horizontal: 6.w, + vertical: 2.w, + ), width: widget.width, - height: widget.height, + height: widget.height ?? 19.w, decoration: BoxDecoration( - color: widget.bgColor ?? kDarkPrimaryColor, - border: widget.outline - ? Border.all( - width: 1.w, - color: widget.outlineColor ?? kSecondaryColor, - ) - : Border.fromBorderSide(BorderSide.none), - borderRadius: BorderRadius.circular(widget.radius ?? 9.w)), + color: widget.bgColor ?? kDarkPrimaryColor, + border: widget.outline + ? Border.all( + width: 1.w, + color: widget.outlineColor ?? kSecondaryColor, + ) + : Border.fromBorderSide(BorderSide.none), + borderRadius: (widget.radius ?? 9.w).radius, + ), + alignment: Alignment.center, child: Text( widget.text, style: widget.textStyle ??