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

lib/view/3d_view/measure_3d_view_switcher.dart

@@ -30,6 +30,9 @@ class _Measure3DViewSwitcherState extends State<Measure3DViewSwitcher> {
   void _onModeChanged(Object s, MeasureMode mode) {
     switch (mode) {
       case MeasureMode.vidMode:
+        setState(() {
+          enable3DView = false;
+        });
         break;
       case MeasureMode.carotid2DMode:
         setState(() {

lib/view/measure/measure_view.dart

@@ -382,7 +382,7 @@ class _MeasureLeftBoardState extends State<_MeasureLeftBoard> {
         break;
       case MeasureMode.carotid3DMode:
         setState(() {
-          showCarotid2DSelectMeasure = false;
+          showCarotid2DSelectMeasure = true;
           showMeasureItems = false;
         });
         break;
@@ -395,7 +395,9 @@ class _MeasureLeftBoardState extends State<_MeasureLeftBoard> {
       mainAxisSize: MainAxisSize.max,
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        const LeftSiderHold(),
+        if (showMeasureItems) ...[
+          LeftSiderHold(ifHideConfig: showCarotid2DSelectMeasure)
+        ],
         if (!isMeasureTool) ...[
           FContainer(
             width: 300,
@@ -411,7 +413,7 @@ class _MeasureLeftBoardState extends State<_MeasureLeftBoard> {
           ),
           _MeasureArrow(),
         ] else ...[
-          const LeftMeasureTools(),
+          if (showMeasureItems) ...[const LeftMeasureTools()],
           FExpanded(
             child: showMeasureItems
                 ? FContainer(

lib/view/measure/tool_chest_title.dart

@@ -21,7 +21,8 @@ enum TagEnum {
 
 /// 工具箱 样式配置之类
 class LeftSiderHold extends StatelessWidget implements FWidget {
-  const LeftSiderHold({Key? key}) : super(key: key);
+  const LeftSiderHold({Key? key, this.ifHideConfig = false}) : super(key: key);
+  final bool ifHideConfig; // 是否隐藏测量项配置入口
 
   @override
   FWidget build(BuildContext context) {
@@ -46,7 +47,7 @@ class LeftSiderHold extends StatelessWidget implements FWidget {
                   color: Colors.white,
                 ),
               ),
-              _LeftSiderHoldAllStyleConfig(),
+              _LeftSiderHoldAllStyleConfig(ifHideConfig: ifHideConfig),
             ],
           ),
           _LeftSiderTabBar(),
@@ -61,6 +62,9 @@ class LeftSiderHold extends StatelessWidget implements FWidget {
 
 /// 测量样式 和配置
 class _LeftSiderHoldAllStyleConfig extends StatelessWidget implements FWidget {
+  const _LeftSiderHoldAllStyleConfig({Key? key, this.ifHideConfig = false})
+      : super(key: key);
+  final bool ifHideConfig; // 是否隐藏测量项配置入口
   @override
   FWidget build(BuildContext context) {
     return FRow(
@@ -78,19 +82,21 @@ class _LeftSiderHoldAllStyleConfig extends StatelessWidget implements FWidget {
             ),
           ),
         ),
-        FTextButton(
-          onPressed: () {
-            Get.dialog(
-              const MeasureConfigurationPage(),
-            );
-          },
-          child: FText(
-            i18nBook.measure.config.t,
-            style: TextStyle(
-              color: FTheme.ins.colorScheme.primary,
+        if (!ifHideConfig) ...[
+          FTextButton(
+            onPressed: () {
+              Get.dialog(
+                const MeasureConfigurationPage(),
+              );
+            },
+            child: FText(
+              i18nBook.measure.config.t,
+              style: TextStyle(
+                color: FTheme.ins.colorScheme.primary,
+              ),
             ),
-          ),
-        ),
+          )
+        ]
       ],
     );
   }