mirror of
https://github.com/alibaba/flutter-go.git
synced 2025-07-15 03:04:25 +08:00
Merge branch 'develop' into dev/yisheng
# Conflicts: # lib/widgets/components/Bar/AppBar/index.dart # lib/widgets/components/Bar/BottomAppBar/demo.dart # lib/widgets/components/Bar/BottomAppBar/index.dart # lib/widgets/components/Bar/ButtonBar/index.dart # lib/widgets/components/Bar/FlexibleSpaceBar/index.dart # lib/widgets/components/Bar/SliverAppBar/index.dart # lib/widgets/components/Bar/SnackBar/index.dart # lib/widgets/components/Bar/SnackBarAction/index.dart # lib/widgets/components/Card/Card/index.dart # lib/widgets/components/LIst/ListBody/index.dart # lib/widgets/components/LIst/ListView/index.dart # lib/widgets/elements/Form/Button/DropdownButton/index.dart # lib/widgets/elements/Form/Button/FlatButton/index.dart # lib/widgets/elements/Form/Button/PopupMenuButton/index.dart # lib/widgets/elements/Form/CheckBox/Checkbox/index.dart # lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart # lib/widgets/elements/Frame/Axis/crossAxis/index.dart # lib/widgets/elements/Frame/Axis/flipAxis/index.dart # lib/widgets/elements/Frame/Axis/mainAxis/index.dart # lib/widgets/elements/Media/Image/precacheImage/index.dart
This commit is contained in:
@ -6,7 +6,6 @@
|
||||
* email: zhu.yan@alibaba-inc.com
|
||||
* tartget: RaisedButton 的示例
|
||||
*/
|
||||
import 'dart:math';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
/*
|
||||
@ -20,7 +19,7 @@ class PopupMenuButtonDefault extends StatelessWidget {
|
||||
final String type;
|
||||
|
||||
const PopupMenuButtonDefault(
|
||||
[String this.type = 'default1', bool this.isDisabled = true])
|
||||
[ this.type = 'default1', this.isDisabled = true])
|
||||
: assert(isDisabled != null),
|
||||
super();
|
||||
|
||||
@ -107,7 +106,7 @@ class PopupMenuButtonCustom extends StatelessWidget {
|
||||
label: Text(
|
||||
'自定义按钮', style: TextStyle(color: Colors.white),
|
||||
semanticsLabel: 'FLAT BUTTON'),
|
||||
// onPressed:(){} // 激活状态按钮
|
||||
onPressed:(){} // 激活状态按钮
|
||||
),
|
||||
// 打开时放置菜单的z坐标。这可以控制菜单下方阴影的大小。
|
||||
elevation:10.0,
|
||||
|
@ -9,7 +9,7 @@
|
||||
*/
|
||||
|
||||
import '../../../../../common/widget_demo.dart';
|
||||
import 'dart:math';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_markdown/flutter_markdown.dart';
|
||||
import './demo.dart' as popupMenuButton;
|
||||
@ -37,8 +37,9 @@ const String _titleText2 = """
|
||||
class Demo extends StatefulWidget {
|
||||
static const String routeName = '/element/Form/Button/PopupMenuButton';
|
||||
final Map<String,String> options = {'defaultSelect': '选项二的内容'};
|
||||
@override
|
||||
final _DemoState self = _DemoState();
|
||||
|
||||
@override
|
||||
_DemoState createState() => self;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user