bill недель назад: 3
Родитель
Сommit
a9322c91fb

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
public/icons/visible___n.svg


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
public/icons/visible___s.svg


+ 0 - 1
src/core/components/line-icon/temp-icon.vue

@@ -35,7 +35,6 @@ const rangInner = computed(() => line.value && isRangInner(line.value, props.dat
 
 const data = computed(() => {
   if (mat.value) {
-    console.log(props.data);
     const iconData = {
       ...props.data,
       mat: mat.value,

+ 14 - 14
src/example/components/header/actions.ts

@@ -36,6 +36,15 @@ export const getImage = (draw: Draw, format: string) =>
   }) as Promise<Blob | null>;
 
 export const getHeaderActions = (draw: Draw) => {
+  const floorCovers = computed(() =>
+    draw.store
+      .getTypeItems("image")
+      .filter((item) => item.key === "kankan-floor-cover")
+  );
+  const floorCoversHide = computed(() =>
+    floorCovers.value.some((image) => image.hide)
+  );
+
   return {
     undo: reactive({
       handler: () => draw.history.undo(),
@@ -73,26 +82,17 @@ export const getHeaderActions = (draw: Draw) => {
     toggleShow: reactive({
       handler: () => {
         draw.history.onceTrack(() => {
-          const images = draw.store
-            .getTypeItems("image")
-            .filter((item) => item.key === "kankan-floor-cover");
-          const hide = !images.some((image) => image.hide);
-          images.forEach((image) => {
+          floorCovers.value.forEach((image) => {
             draw.store.setItem("image", {
-              value: { ...image, hide },
+              value: { ...image, hide: !floorCoversHide.value },
               id: image.id,
             });
           });
         });
       },
-      text: computed(() => {
-        const images = draw.store
-          .getTypeItems("image")
-          .filter((item) => item.key === "kankan-floor-cover");
-        const hide = images.some((image) => image.hide);
-        return hide ? '显示底图' : '隐藏底图'
-      }),
-      icon: "a-visible",
+      text: computed(() => (floorCoversHide.value ? "显示底图" : "隐藏底图")),
+      icon: computed(() => "visible___" + (floorCoversHide.value ? "s" : "n")),
+      disabled: computed(() => !floorCovers.value.length)
     }),
     expose: reactive({
       disabled: computed(() => draw.drawing),

+ 4 - 4
src/example/dialog/basemap/leaflet/index.vue

@@ -3,7 +3,7 @@
     <div class="search">
       <el-input
         v-model="keyword"
-        :placeholder="`请输入${searchName}`"
+        :placeholder="`请输入${searchName}搜索`"
         class="input-with-select"
         @keydown.enter="searchHandler"
       >
@@ -25,8 +25,8 @@
       >
         <template v-if="mark">
           <h3>经纬度定位成功</h3>
-          <p>经度:{{ mark.lat }}</p>
-          <p>纬度:{{ mark.lng }}</p>
+          <p>经度:{{ mark.lng }}</p>
+          <p>纬度:{{ mark.lat }}</p>
         </template>
         <template v-else>
           <h3>经纬度定位失败</h3>
@@ -118,7 +118,7 @@ watchEffect(() => setTileLayers(tiles.value));
 
 const searchTypes = [
   { label: "经纬度", value: "latlng" },
-  { label: "名称", value: "name" },
+  { label: "地址", value: "name" },
 ];
 const searchType = ref(searchTypes[0].value as "latlng" | "name");
 const searchName = computed(

+ 17 - 12
src/example/env.ts

@@ -1,4 +1,4 @@
-import { computed, ref, watch, nextTick } from "vue";
+import { computed, ref, watch } from "vue";
 
 export const urlUpdateQuery = (
   link: string,
@@ -47,18 +47,18 @@ const updateParams = () => {
   const rParams = urlGetQuery(location.href);
   params.value = rParams;
   for (const key in params.value) {
-    if (['tabulationId', 'overviewId'].includes(key)) {
-      params.value[key] = Number(params.value[key])
+    if (["tabulationId", "overviewId"].includes(key)) {
+      params.value[key] = Number(params.value[key]);
     }
   }
 };
 updateParams();
 
-let updateNeedReload = true
+let updateNeedReload = true;
 export const preventReload = () => {
-  updateNeedReload = false
-  setTimeout(() => updateNeedReload = true)
-}
+  updateNeedReload = false;
+  setTimeout(() => (updateNeedReload = true));
+};
 watch(
   () => ({ ...params.value }),
   (nParams, oParams) => {
@@ -67,15 +67,20 @@ watch(
       params.value[key] && sParams.append(key, params.value[key]);
     }
     const ndx = location.hash.indexOf("?");
-    location.replace(
+    const path =
       location.hash.substring(0, ~ndx ? ndx : undefined) +
-        "?" +
-        sParams.toString()
-    );
+      "?" +
+      sParams.toString();
+
+    if (location.hash) {
+      location.replace(path);
+    } else {
+      location.replace(`#` + path);
+    }
     if (!updateNeedReload) {
       return;
     }
-    const keys =  new Set([...Object.keys(nParams), ...Object.keys(oParams)])
+    const keys = new Set([...Object.keys(nParams), ...Object.keys(oParams)]);
     for (const key of keys) {
       if (!nParams[key] || (nParams[key] && oParams[key])) {
         if (nParams[key] !== oParams[key]) {

+ 1 - 1
src/example/fuse/enter-case.ts

@@ -27,7 +27,7 @@ window.platform.login = (isBack = true) => {
         })
         .then((res) => {
           params.value.token = res.token;
-          setTimeout(() => location.reload(), 1000);
+          // setTimeout(() => location.reload(), 1000);
           isLoging = false;
         });
     }

+ 0 - 1
src/example/fuse/enter-shared.ts

@@ -25,7 +25,6 @@ export const viewURLS = {
   [SCENE_TYPE.cloud]: import.meta.env.VITE_CLOUD_VIEW,
   [SCENE_TYPE.fuse]: import.meta.env.VITE_FUSE_VIEW,
 };
-
 export const getHeaders = () => ({
   token: token.value || localStorage.getItem("token") || "",
   "page-type": "edit",

+ 5 - 4
src/example/fuse/enter.ts

@@ -71,10 +71,11 @@ if (window.platform.sceneDraw) {
 
 // 登录检测
 setTimeout(() => {
-  if (!token) {
+  if (!platform.getHeaders().token) {
     ElMessage.error("当前用户未登录");
-    platform.login();
+    window.platform.login();
   } else {
-    platform.getSceneList("");
+    console.log('0.0')
+    platform.getSceneList("").next();
   }
-}, 500);
+}, 500);