Browse Source

1、测量库更新

guanxinyi 8 months ago
parent
commit
f1b262499c
2 changed files with 21 additions and 7 deletions
  1. 20 6
      lib/view/measure/measure_search_input.dart
  2. 1 1
      pubspec.yaml

+ 20 - 6
lib/view/measure/measure_search_input.dart

@@ -7,7 +7,6 @@ import 'package:fis_measure/process/workspace/measure_handler.dart';
 import 'package:fis_measure/utils/prompt_box.dart';
 import 'package:fis_measure/utils/prompt_box.dart';
 import 'package:fis_ui/index.dart';
 import 'package:fis_ui/index.dart';
 import 'package:fis_ui/interface/interactive_container.dart';
 import 'package:fis_ui/interface/interactive_container.dart';
-import 'package:fis_ui/widgets/functional/text_tooltip.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:get/get.dart';
 
 
@@ -15,7 +14,12 @@ class LeftSelectInput extends FStatefulWidget implements FInteractiveContainer {
   @override
   @override
   final String pageName = 'LeftSelectInput';
   final String pageName = 'LeftSelectInput';
 
 
-  const LeftSelectInput({super.key});
+  final bool? isLab;
+
+  const LeftSelectInput({
+    super.key,
+    this.isLab = false,
+  });
   @override
   @override
   FState<LeftSelectInput> createState() => _LeftSelectInputState();
   FState<LeftSelectInput> createState() => _LeftSelectInputState();
 }
 }
@@ -30,6 +34,9 @@ class _LeftSelectInputState extends FState<LeftSelectInput> {
 
 
   String annotationItem = '';
   String annotationItem = '';
 
 
+  /// 按钮颜色
+  static const buttonColor = Color(0xFF11234F);
+
   /// 添加操作后更新注释
   /// 添加操作后更新注释
   void getAnnotationList() async {
   void getAnnotationList() async {
     List<String> annotationList = [];
     List<String> annotationList = [];
@@ -76,8 +83,13 @@ class _LeftSelectInputState extends FState<LeftSelectInput> {
             hintSize: 16,
             hintSize: 16,
             contentSize: 16,
             contentSize: 16,
             maxLength: 20,
             maxLength: 20,
-            fillColor: Colors.white,
-            borderColor: const Color.fromARGB(255, 187, 180, 180),
+            fillColor: widget.isLab! ? const Color(0xFF1b1d23) : Colors.white,
+            textStyle: TextStyle(
+              color: widget.isLab! ? Colors.white : const Color(0xff2c77e5),
+            ),
+            borderColor: widget.isLab!
+                ? const Color(0xFF8f98b2)
+                : const Color.fromARGB(255, 187, 180, 180),
             suffixIcon: FMaterial(
             suffixIcon: FMaterial(
               color: Colors.transparent,
               color: Colors.transparent,
               child: FIconButton(
               child: FIconButton(
@@ -101,8 +113,9 @@ class _LeftSelectInputState extends FState<LeftSelectInput> {
                     }
                     }
                   }
                   }
                 },
                 },
-                icon: const FIcon(
+                icon: FIcon(
                   Icons.add,
                   Icons.add,
+                  color: widget.isLab! ? Colors.white : const Color(0xff2c77e5),
                 ),
                 ),
                 businessParent: widget,
                 businessParent: widget,
               ),
               ),
@@ -129,7 +142,8 @@ class _LeftSelectInputState extends FState<LeftSelectInput> {
               child: FElevatedButton(
               child: FElevatedButton(
                   style: ButtonStyle(
                   style: ButtonStyle(
                     padding: const MaterialStatePropertyAll(EdgeInsets.all(0)),
                     padding: const MaterialStatePropertyAll(EdgeInsets.all(0)),
-                    backgroundColor: MaterialStateProperty.all(Colors.grey),
+                    backgroundColor: MaterialStateProperty.all(
+                        widget.isLab! ? buttonColor : Colors.grey),
                   ),
                   ),
                   child: const FIcon(Icons.restart_alt),
                   child: const FIcon(Icons.restart_alt),
                   onPressed: resetUserCommentsAsync,
                   onPressed: resetUserCommentsAsync,

+ 1 - 1
pubspec.yaml

@@ -82,7 +82,7 @@ dependency_overrides:
   fis_ui:
   fis_ui:
     git:
     git:
       url: http://git.ius.plus/Project-Wing/fis_lib_ui.git
       url: http://git.ius.plus/Project-Wing/fis_lib_ui.git
-      ref: 1847d58
+      ref: 650c562
     #path: ../fis_lib_ui
     #path: ../fis_lib_ui
   vid:
   vid:
     git:
     git: