Merge branch 'master' of http://git.ius.plus:88/melon.yin/fis_lib_measure

lib/view/measure/measure_main_view.dart

@@ -35,6 +35,7 @@ import 'package:fis_ui/index.dart';
 import 'package:fis_ui/widgets/layout/offstage.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
+import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 
 import 'package:fis_measure/view/canvas/active_canvas.dart';
@@ -321,45 +322,58 @@ class _MeasureMainViewState extends State<MeasureMainView> {
         Get.back();
       },
       children: [
-        buildCalibrationLineItem(
+        _buildSpaceSizedBox(),
+        _buildCalibrationLineItem(
           i18nBook.measure.length.t,
-          FTextField(
-            decoration: InputDecoration(
-              hintText:
-                  i18nBook.common.input.translate([i18nBook.measure.length.t]),
-              hintStyle: const TextStyle(
-                fontSize: 16,
+          FContainer(
+            width: 80,
+            height: 36,
+            padding: const EdgeInsets.symmetric(horizontal: 10),
+            alignment: Alignment.centerLeft,
+            decoration: BoxDecoration(
+              border: Border.all(
+                color: const Color.fromRGBO(200, 200, 200, 1),
+                width: 0.5,
+                style: BorderStyle.solid,
               ),
-              enabledBorder: OutlineInputBorder(
-                borderSide: BorderSide(
-                  color: Colors.white.withOpacity(0.5),
-                  width: 0.5,
-                  style: BorderStyle.solid,
+              borderRadius: const BorderRadius.all(
+                Radius.circular(
+                  4.0,
                 ),
               ),
-              focusedBorder: const OutlineInputBorder(
-                borderSide: BorderSide(
-                  color: Colors.blue,
-                  width: 0.5,
-                  style: BorderStyle.solid,
+            ),
+            child: FTextField(
+              inputFormatters: [
+                FilteringTextInputFormatter.allow(
+                  RegExp(r'[0-9]'),
                 ),
+              ],
+              decoration: null,
+              controller: TextEditingController(
+                text: calibrationLine.toString(),
               ),
-              filled: true,
+              onChanged: (val) => calibrationLine = double.parse(val),
             ),
-            onChanged: (val) => calibrationLine = double.parse(val),
           ),
         ),
-        buildCalibrationLineItem(
+        _buildCalibrationLineItem(
           i18nBook.measure.unit.t,
           const FText('cm'),
         ),
+        _buildSpaceSizedBox(),
       ],
     );
   }
 
-  FWidget buildCalibrationLineItem(String name, FWidget itemWidget) {
+  FWidget _buildSpaceSizedBox() {
+    return const FSizedBox(
+      height: 10,
+    );
+  }
+
+  FWidget _buildCalibrationLineItem(String name, FWidget itemWidget) {
     return FContainer(
-      padding: const EdgeInsets.symmetric(vertical: 15, horizontal: 25),
+      padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 25),
       child: FRow(
         children: [
           FContainer(

pubspec.yaml

@@ -82,7 +82,7 @@ dependency_overrides:
   fis_ui:
     git:
       url: http://git.ius.plus/Project-Wing/fis_lib_ui.git
-      ref: 168a553
+      ref: f469064
     #path: ../fis_lib_ui
   vid:
     git: