feat: 修正bug

profile/.env.cjzfire

@@ -9,7 +9,7 @@ VITE_FUSE_API='https://mix3d.4dkankan.com/'
 VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&host=https://4dkk.4dage.com/v4/www&server=https://www.4dkankan.com&oss=https://4dkk.4dage.com/'
 VITE_CLOUD_VIEW='https://laser.4dkankan.com/index.html?m={m}&lang=zh'
 VITE_FUSE_VIEW='https://mix3d.4dkankan.com/'
-VITE_LOGIN_VIEW='https://test-mix3d.4dkankan.com/fire/?redirect={redirect}#login'
+VITE_LOGIN_VIEW='https://test-mix3d.4dkankan.com/cjzfire/index.html?redirect={redirect}#login'
 
 VITE_BUILD_DIR="cjzfire"
 VITE_ICO="./icos/logo_big.ico"

profile/.env.cjzfiretest

@@ -12,7 +12,7 @@ VITE_FUSE_API='https://test-mix3d.4dkankan.com/'
 VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&host=https://4dkk.4dage.com/v4-test/www&server=https://test.4dkankan.com&oss=https://4dkk.4dage.com/'
 VITE_CLOUD_VIEW='https://uat-laser.4dkankan.com/uat/index.html?m={m}&lang=zh'
 VITE_FUSE_VIEW='https://test-mix3d.4dkankan.com/'
-VITE_LOGIN_VIEW='https://test-mix3d.4dkankan.com/fire/?redirect={redirect}#login'
+VITE_LOGIN_VIEW='https://test-mix3d.4dkankan.com/cjzfire/index.html?redirect={redirect}#login'
 
 VITE_BUILD_DIR="cjzfire"
 VITE_ICO="./icos/logo_big.ico"

profile/.env.criminal

@@ -9,7 +9,7 @@ VITE_FUSE_API='https://mix3d.4dkankan.com/'
 VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&host=https://4dkk.4dage.com/v4/www&server=https://www.4dkankan.com&oss=https://4dkk.4dage.com/'
 VITE_CLOUD_VIEW='https://laser.4dkankan.com/index.html?m={m}&lang=zh'
 VITE_FUSE_VIEW='https://mix3d.4dkankan.com/'
-VITE_LOGIN_VIEW='https://test-mix3d.4dkankan.com/fire/?redirect={redirect}#login'
+VITE_LOGIN_VIEW='https://test-mix3d.4dkankan.com/criminal/index.html?redirect={redirect}#login'
 
 VITE_BUILD_DIR="criminal"
 VITE_ICO="./icos/criminal.ico"

profile/.env.criminaldev

@@ -12,6 +12,6 @@ VITE_FUSE_API='/fuseAPI/'
 VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&host=https://4dkk.4dage.com/v4-test/www&server=https://test.4dkankan.com&oss=https://4dkk.4dage.com/'
 VITE_CLOUD_VIEW='https://uat-laser.4dkankan.com/uat/index.html?m={m}&lang=zh'
 VITE_FUSE_VIEW='https://test-mix3d.4dkankan.com/'
-VITE_LOGIN_VIEW='https://test-mix3d.4dkankan.com/fire/?redirect={redirect}#login'
+VITE_LOGIN_VIEW='https://test-mix3d.4dkankan.com/criminal/index.html?redirect={redirect}#login'
 
 VITE_ICO="./icos/criminal.ico"

profile/.env.criminaltest

@@ -12,7 +12,7 @@ VITE_FUSE_API='https://test-mix3d.4dkankan.com/'
 VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&host=https://4dkk.4dage.com/v4-test/www&server=https://test.4dkankan.com&oss=https://4dkk.4dage.com/'
 VITE_CLOUD_VIEW='https://uat-laser.4dkankan.com/uat/index.html?m={m}&lang=zh'
 VITE_FUSE_VIEW='https://test-mix3d.4dkankan.com/'
-VITE_LOGIN_VIEW='https://test-mix3d.4dkankan.com/fire/?redirect={redirect}#login'
+VITE_LOGIN_VIEW='https://test-mix3d.4dkankan.com/criminal/index.html?redirect={redirect}#login'
 
 VITE_BUILD_DIR="criminal"
 VITE_ICO="./icos/criminal.ico"

profile/.env.xmfire

@@ -9,7 +9,7 @@ VITE_FUSE_API='https://mix3d.4dkankan.com/'
 VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&host=https://4dkk.4dage.com/v4/www&server=https://www.4dkankan.com&oss=https://4dkk.4dage.com/'
 VITE_CLOUD_VIEW='https://laser.4dkankan.com/index.html?m={m}&lang=zh'
 VITE_FUSE_VIEW='https://mix3d.4dkankan.com/'
-VITE_LOGIN_VIEW='https://test-mix3d.4dkankan.com/fire/?redirect={redirect}#login'
+VITE_LOGIN_VIEW='https://test-mix3d.4dkankan.com/xmfire/index.html?redirect={redirect}#login'
 
 VITE_BUILD_DIR="xmfire"
 VITE_ICO="./icos/xmfire.ico"

profile/.env.xmfiretest

@@ -12,7 +12,7 @@ VITE_FUSE_API='https://test-mix3d.4dkankan.com/'
 VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&host=https://4dkk.4dage.com/v4-test/www&server=https://test.4dkankan.com&oss=https://4dkk.4dage.com/'
 VITE_CLOUD_VIEW='https://uat-laser.4dkankan.com/uat/index.html?m={m}&lang=zh'
 VITE_FUSE_VIEW='https://test-mix3d.4dkankan.com/'
-VITE_LOGIN_VIEW='https://test-mix3d.4dkankan.com/fire/?redirect={redirect}#login'
+VITE_LOGIN_VIEW='https://test-mix3d.4dkankan.com/xmfire/index.html?redirect={redirect}#login'
 
 VITE_BUILD_DIR="xmfire"
 VITE_ICO="./icos/xmfire.ico"

public/static/kankan-icons/show_plane_n.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 2C5.55228 2 6 2.44772 6 3C6 3.55228 5.55228 4 5 4H4V10H7C7.55228 10 8 10.4477 8 11C8 11.5523 7.55228 12 7 12H4V20H13V18C13 17.4477 13.4477 17 14 17C14.5523 17 15 17.4477 15 18V20H20V12H15C13.8954 12 13 11.1046 13 10V4H12C11.4477 4 11 3.55228 11 3C11 2.44772 11.4477 2 12 2H13C14.1046 2 15 2.89543 15 4V10H20C21.1046 10 22 10.8954 22 12V20C22 21.1046 21.1046 22 20 22H4C2.89543 22 2 21.1046 2 20V4C2 2.89543 2.89543 2 4 2H5Z" fill="white"/>
+</svg>

public/static/kankan-icons/show_plane_s.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 2C14.1046 2 15 2.89543 15 4V10H20C21.1046 10 22 10.8954 22 12V20C22 21.1046 21.1046 22 20 22H15V18C15 17.4477 14.5523 17 14 17C13.4477 17 13 17.4477 13 18V22H4C2.89543 22 2 21.1046 2 20V12H7C7.55228 12 8 11.5523 8 11C8 10.4477 7.55228 10 7 10H2V4C2 2.89543 2.89543 2 4 2H13Z" fill="white"/>
+</svg>

public/static/kankan.html

@@ -65,8 +65,39 @@
       margin-bottom: 0;
       max-height: calc(100vh - 80px);
       overflow-y: auto;
+      max-width: 30px;
+      overflow: hidden;
+      text-overflow:ellipsis;
+      white-space: nowrap;
+    }
+    #modes {
+      min-width: auto;
     }
 
+    .select img {
+      display: block;
+      pointer-events: none;
+    }
+
+    #modes {
+      max-width: initial;
+      padding: 0;
+    }
+    #mode,
+    #modes  li {
+    width: 30px;
+    height: 30px !important;
+    /* height: auto; */
+    /* min-width: auto; */
+    padding: 5px;
+    display: flex
+;
+    align-items: center;
+    justify-content: center;
+    }
+    #modes  .active {
+      display: none;
+    }
     .select .value {
       background: rgba(0, 0, 0, .3);
       border-radius: 6px 6px 6px 6px;
@@ -104,15 +135,15 @@
   <div id="scene" class="scene"></div>
   <div class="map">
     <div class="select">
-      <ul class="option" id="floors" style="display: none;"></ul>
+      <ul class="option" id="floors" style="display: block;"></ul>
       <div class="place"></div>
       <div class="value" id="floor"></div>
     </div>
     <div class="select">
-      <ul class="option" id="modes" style="display: none;">
-        <li attr-id="panorama">漫游</li>
-        <li attr-id="floorplan">平面图</li>
-        <li attr-id="dollhouse">3D</li>
+      <ul class="option" id="modes" style="display: block;">
+        <li attr-id="panorama"> <img src="./kankan-icons/show_roam_n.svg"></li>
+        <li attr-id="floorplan"><img src="./kankan-icons/show_plane_n.svg"></li>
+        <li attr-id="dollhouse"><img src="./kankan-icons/show_3d_n.svg"></li>
         <!-- <li attr-id="panorama">漫游</li>
         <li attr-id="floorplan">平面图</li>
         <li attr-id="dollhouse">3D</li> -->
@@ -166,7 +197,7 @@
         $floors.style.display = 'block'
       })
       $floors.parentElement.addEventListener('mouseleave', () => {
-        $floors.style.display = 'none'
+        $floors.style.display = 'block'
       })
     }
 
@@ -196,7 +227,7 @@
         $modes.style.display = 'block'
       })
       $modes.parentElement.addEventListener('mouseleave', () => {
-        $modes.style.display = 'none'
+        $modes.style.display = 'block'
       })
       setCurrentMode('panorama')
 

src/core/components/image/image.vue

@@ -49,6 +49,7 @@ const { shape, tData, data, operateMenus, describes } = useComponentStatus<
       },
       getRepShape(shape) {
         const imgShape = (shape as Group).findOne(".repShape") as Image;
+        console.log("---->", imgShape, shape);
         const rect = new Rect();
         const update = () => {
           rect.width(imgShape.width());

src/core/components/image/temp-image.vue

@@ -7,9 +7,9 @@
         shadowForStrokeEnabled: true,
         id: undefined,
         zIndex: undefined,
+        name: 'repShape',
       }"
       v-if="image"
-      name="repShape"
     />
   </v-group>
 </template>