From 62d7f31007a4c97188ffe9bacf2bb19883bc2473 Mon Sep 17 00:00:00 2001 From: "yifeng.yl" Date: Tue, 19 Feb 2019 12:59:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=E6=8C=89=E8=A7=84=E8=8C=83=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=A3=E7=A0=81=E3=80=81=E6=B3=A8=E9=87=8A=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/widgets/elements/Form/Button/DropdownButton/demo.dart | 4 ---- lib/widgets/elements/Form/Button/DropdownButton/index.dart | 4 ---- 2 files changed, 8 deletions(-) diff --git a/lib/widgets/elements/Form/Button/DropdownButton/demo.dart b/lib/widgets/elements/Form/Button/DropdownButton/demo.dart index 606fac82..42450c81 100644 --- a/lib/widgets/elements/Form/Button/DropdownButton/demo.dart +++ b/lib/widgets/elements/Form/Button/DropdownButton/demo.dart @@ -9,10 +9,6 @@ import 'package:flutter/material.dart'; // DropdownButton 默认按钮的实例 // isDisabled:是否是禁用，isDisabled 默认为true -<<<<<<< HEAD -======= - ->>>>>>> 59253b7d99a8ef6fd83cd183d86e7416cf5a6235 var selectItValue; var selectItemValue; diff --git a/lib/widgets/elements/Form/Button/DropdownButton/index.dart b/lib/widgets/elements/Form/Button/DropdownButton/index.dart index d10722b1..fc7b8fd3 100644 --- a/lib/widgets/elements/Form/Button/DropdownButton/index.dart +++ b/lib/widgets/elements/Form/Button/DropdownButton/index.dart @@ -56,11 +56,7 @@ class _DemoState extends State { } } -<<<<<<< HEAD - // 所有的 DropdownButton 按钮 -======= // 所有的 DropdownButton 按钮 ->>>>>>> 59253b7d99a8ef6fd83cd183d86e7416cf5a6235 Widget allDropdownButtons(BuildContext context,_DemoState that){ return Container( //padding: EdgeInsets.only(bottom: 20.0, top: 20.0, left: 0, right: 0),