bill 2 年 前
コミット
f9ecb68e0e

+ 1 - 1
src/store/sync.ts

@@ -62,7 +62,7 @@ export const api = !global.android
           paths[paths.length - 1].includes(type)
         );
         if (notBase64) {
-          await new Promise((resolve) => setTimeout(resolve, 2000));
+          // await new Promise((resolve) => setTimeout(resolve, 2000));
           return baseURL + url;
         } else {
           const data = await axios.get(url, { responseType: "blob" });

+ 13 - 2
src/views/graphic/geos/normalLine.vue

@@ -6,7 +6,7 @@
 <script lang="ts" setup>
 import GeoTeleport from "@/views/graphic/geos/geo-teleport.vue";
 import { drawRef, FocusVector, VectorType } from "@/hook/useGraphic";
-import { computed, ref, toRaw, UnwrapRef } from "vue";
+import { computed, ref, toRaw, UnwrapRef, watchEffect } from "vue";
 import { dataService } from "@/graphic/Service/DataService";
 import GeoActions from "@/graphic/enum/GeoActions";
 import { UITypeExtend } from "@/views/graphic/menus";
@@ -110,7 +110,7 @@ const appendMenus =
         {
           key: VectorEvents.AddCrossPoint,
           icon: "control_a",
-          text: "控制点",
+          text: "控制点",
           onClick: clickHandlerFactory(VectorEvents.AddCrossPoint),
         },
         // {
@@ -151,6 +151,17 @@ const menus = ref([
   },
 ]);
 
+watchEffect(() => {
+  const data = menus.value.find((item) => item.key === VectorEvents.AddCrossPoint);
+  if (!data) return;
+  data.hide = [
+    VectorStyle.DoubleDashedLine,
+    VectorStyle.DoubleSolidLine,
+    VectorStyle.Greenbelt,
+    VectorStyle.BrokenLine,
+  ].includes(style.value);
+});
+
 const active = computed(() =>
   toRaw(childMenus.value) === lineTypeMenu
     ? menus.value[0]

+ 0 - 1
src/views/graphic/geos/roadEdge.vue

@@ -1,5 +1,4 @@
 <template>
-  {{ style }}
   <GeoTeleport :menus="menus" class="geo-teleport-use" :active="active" />
   <GeoTeleport :menus="childMenus" v-if="childMenus" class="type-geo" />
 </template>

+ 2 - 1
src/views/graphic/header.vue

@@ -189,7 +189,8 @@ const saveHandler = async () => {
     });
   } else {
     if (router.currentRoute.value.params.action === "update") {
-      loadData(data.value, data.value.id);
+      await loadData(data.value, data.value.id);
+      backImageChang(graphicState.value.showBackImage);
     } else {
       router.replace({
         name: writeRouteName.graphic,