瀏覽代碼

修正问题

bill 2 年之前
父節點
當前提交
734219a0f7

+ 1 - 0
src/components/base/assets/scss/editor/_menu.scss

@@ -30,6 +30,7 @@
 
         &.bottom {
             margin-top: auto;
+            margin-bottom: calc(var(--boundMargin) - 8px);
         }
     }
 }

+ 16 - 3
src/components/group-button/index.vue

@@ -78,10 +78,20 @@ const menuStyle = computed(() => {
   transition: color .3s ease;
   color: #fff;
   border-radius: 4px;
+  align-items: center;
+  justify-content: center;
 
   &.border {
-  border-bottom: 1px solid rgba(255, 255, 255, 0.2);
-}
+    position: relative;
+    &:after {
+      content: "";
+      position: absolute;
+      border-bottom: 1px solid rgba(255, 255, 255, 0.2);
+      left: 10px;
+      right: 10px;
+      bottom: 0;
+    }
+  }
 
   &.active {
     color: var(--colors-primary-base);
@@ -96,10 +106,13 @@ const menuStyle = computed(() => {
     align-items: center;
     justify-content: center;
     font-size: 20px;
-    flex: 1;
+
   }
 
   p {
+    flex: 1;
+    flex: none;
+    margin-top: 4px;
     line-height: 17px;
     font-size: 14px;
     white-space:nowrap;

+ 1 - 1
src/store/sync.ts

@@ -193,7 +193,7 @@ export const api =
       };
 
 export const back = () => {
-  router.back()
+  api.closePage()
 };
 
 const loadStore = async () => {

+ 1 - 1
src/views/scene/covers/fixPoints.vue

@@ -73,7 +73,7 @@ const activeActionMenus = [
     color: "#161A1A",
     iconColor: "#2F8FFF",
     onClick() {
-      edit.value = customMap.activeFixPoint
+      edit.value = edit.value === customMap.activeFixPoint ? null : customMap.activeFixPoint
     }
   },
   {

+ 2 - 1
src/views/scene/menus/menus.ts

@@ -6,6 +6,7 @@ import {Mode} from "@/sdk";
 import {baseLines} from "@/store/baseLine";
 import {fixPoints} from "@/store/fixPoint";
 import {basePoints} from "@/store/basePoint";
+import {list} from "@/store/measure";
 
 export type MenuRaw = {
   key: string,
@@ -40,7 +41,7 @@ export const menus: MenuRaw[] = [
     icon: "clear",
     text: "清除",
     key: menuEnum.CLEAR,
-    disabled: () => (baseLines.value.length + fixPoints.value.length + basePoints.value.length) === 0,
+    disabled: () => (baseLines.value.length + fixPoints.value.length + list.value.length + basePoints.value.length) === 0,
     border: true
   },
   {

+ 2 - 1
src/views/scene/menus/pane.vue

@@ -114,8 +114,9 @@ onMounted(() => {
   &:after {
     position: absolute;
     content: "";
-    width: 100%;
     height: 1px;
+    left: 10px;
+    right: 10px;
     bottom: -15px;
     background-color: rgba(255, 255, 255, .2);