Преглед изворни кода

image_nine_grid 组件中 选择图片前 先隐藏键盘

glglove пре 2 недеља
родитељ
комит
928b559b88

+ 2 - 1
app/pubspec.yaml

@@ -4,7 +4,8 @@ description: Flutter Room 临时项目
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 

+ 2 - 1
packages/cpt_auth/pubspec.yaml

@@ -4,7 +4,8 @@ description: 物业系统的用户模块,用户的登录注册、密码信息
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 

+ 2 - 1
packages/cpt_community/pubspec.yaml

@@ -4,7 +4,8 @@ description: 物业系统的社区模块,用于展示动态朋友圈与个人
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 

+ 2 - 1
packages/cpt_facility/pubspec.yaml

@@ -4,7 +4,8 @@ description: 物业系统的设施模块,用于展示物业的公用设施的
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 

+ 2 - 1
packages/cpt_form/pubspec.yaml

@@ -4,7 +4,8 @@ description: 物业系统的表单模块,用于展示后端配置的各种表
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 

+ 2 - 1
packages/cpt_main/pubspec.yaml

@@ -4,7 +4,8 @@ description: 物业系统的主模块,用于首页,设置等页面
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 

+ 2 - 1
packages/cpt_notice_board/pubspec.yaml

@@ -4,7 +4,8 @@ description: 物业系统的公告板模块,用于展示物业发布的各类
 version: 1.0.0
 
 environment:
-  sdk: ">=3.0.2 <4.0.0"
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
   flutter_localizations:

+ 2 - 1
packages/cpt_payment/pubspec.yaml

@@ -4,7 +4,8 @@ description: 物业系统的支付模块,主要展示用户待支付账单与
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 

+ 2 - 1
packages/cpt_profile/pubspec.yaml

@@ -4,7 +4,8 @@ description: 物业系统的用户详情模块,主要展示用户的详细信
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 

+ 2 - 1
packages/cpt_property/pubspec.yaml

@@ -4,7 +4,8 @@ description: 物业系统的资产模块,主要展示用户的房子价值,
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 

+ 2 - 1
packages/cpt_rewards/pubspec.yaml

@@ -4,7 +4,8 @@ description: 物业系统的积分兑换奖励功能,主要是签到得积分
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 

+ 1 - 0
packages/cpt_services/lib/modules/services/service_repair_detail/service_repair_detail_vm.dart

@@ -281,6 +281,7 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
           // 清空报价备注信息
           clearUserNotesInput();
         },
+        clickMaskDismiss: false,
         widget: DialogContentWrap(
           loadingState: LoadState.State_Success,
           maxHeight: 400.0,

+ 2 - 1
packages/cpt_services/pubspec.yaml

@@ -4,7 +4,8 @@ description: 物业系统的服务广告,主要是各类广告的功能
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 

+ 2 - 1
packages/cs_domain/pubspec.yaml

@@ -4,7 +4,8 @@ description: 项目的实体,数据仓库等
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 

+ 2 - 1
packages/cs_initializer/pubspec.yaml

@@ -4,7 +4,8 @@ description: 基础包,用于给底层依赖组件服务或者第三方插件
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 

+ 2 - 1
packages/cs_plugin_basic/pubspec.yaml

@@ -4,7 +4,8 @@ description: 基础包,原生的封装控件,扩展控件,自定义控件
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 

+ 16 - 3
packages/cs_plugin_platform/lib/engine/image/image_nine_grid.dart

@@ -20,8 +20,9 @@ class ImageNineGrid extends StatefulWidget {
   final double spacing; // 横向竖向的间距
   final double borderRadius; //整体边框圆角
   final Function(List<String>) onImagesChanged;
+  bool Function() beforePickImageCallback;
 
-  const ImageNineGrid({
+  ImageNineGrid({
     Key? key,
     this.isSelectEnable = true,
     this.maxImages = 9,
@@ -30,7 +31,9 @@ class ImageNineGrid extends StatefulWidget {
     this.borderRadius = 5.0,
     required this.initialImages,
     required this.onImagesChanged,
-  }) : super(key: key);
+    bool Function()? beforePickImageCallback, // 修改构造函数
+  }) : beforePickImageCallback = beforePickImageCallback ?? (() => true), // 设置默认值
+        super(key: key);
 
   @override
   _ImageNineGridState createState() => _ImageNineGridState();
@@ -55,6 +58,10 @@ class _ImageNineGridState extends State<ImageNineGrid> {
 
   // 选择图片
   Future<void> _pickImage() async {
+    if (mounted) {
+      // 隐藏键盘
+      FocusScope.of(context).unfocus();
+    }
     ImagePickerUtils().show(context, (filePath) {
       if (Utils.isNotEmpty(filePath)) {
         setState(() {
@@ -113,7 +120,13 @@ class _ImageNineGridState extends State<ImageNineGrid> {
     if (widget.isSelectEnable && _images.length < widget.maxImages) {
       gridChildren.add(
         GestureDetector(
-          onTap: _pickImage,
+          onTap: () {
+            final  bool res = widget.beforePickImageCallback.call();
+            if (!res) {
+              return;
+            }
+            _pickImage();
+          },
           child: Container(
             decoration: BoxDecoration(
               color: context.appColors.imgGrayBg,

+ 3 - 2
packages/cs_plugin_platform/pubspec.yaml

@@ -4,7 +4,8 @@ description: 基础包,原生的封装控件,扩展控件,自定义控件
 version: 1.0.0
 
 environment:
-  sdk: '>=3.0.2 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
 
@@ -79,7 +80,7 @@ dependencies:
   win32: 5.5.4
 
   #Stripe支付
-#  flutter_stripe: 11.5.0
+  flutter_stripe: 10.2.0
 
 flutter:
   uses-material-design: true

BIN
packages/cs_resources/assets/community/garage_sale.webp


BIN
packages/cs_resources/assets/community/news.webp


BIN
packages/cs_resources/assets/service/history.webp


BIN
packages/cs_resources/assets/service/service-type.webp