Merge branch 'master' into ga-2.0.0

profile/.env.cjzfire

@@ -2,14 +2,16 @@ VITE_PRIMARY='#D8000A'
 VITE_TITLE='绘图'
 VITE_ENTRY='/example/fuse/enter-mix.ts'
 VITE_ENTRY_EXAMPLE='./main.ts'
+
 VITE_MESH_OSS='https://4dkk.4dage.com/'
 VITE_MESH_API='https://www.4dkankan.com/'
 VITE_CLOUD_API='https://laser.4dkankan.com/backend/'
 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/cjzfire/index.html?redirect={redirect}#login'
+VITE_LOGIN_VIEW='https://mix3d.4dkankan.com/cjzfire/index.html?redirect={redirect}#login'
 
 VITE_BUILD_DIR="cjzfire"
 VITE_ICO="./icos/logo_big.ico"

profile/.env.criminal

@@ -2,14 +2,16 @@ VITE_PRIMARY='#0960bd'
 VITE_TITLE='绘图'
 VITE_ENTRY='/example/fuse/enter-mix.ts'
 VITE_ENTRY_EXAMPLE='./main.ts'
+
 VITE_MESH_OSS='https://4dkk.4dage.com/'
 VITE_MESH_API='https://www.4dkankan.com/'
 VITE_CLOUD_API='https://laser.4dkankan.com/backend/'
 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/criminal/index.html?redirect={redirect}#login'
+VITE_LOGIN_VIEW='https://mix3d.4dkankan.com/criminal/index.html?redirect={redirect}#login'
 
 VITE_BUILD_DIR="criminal"
 VITE_ICO="./icos/criminal.ico"

profile/.env.fire

@@ -2,14 +2,16 @@ VITE_PRIMARY='#D8000A'
 VITE_TITLE='绘图'
 VITE_ENTRY='/example/fuse/enter-mix.ts'
 VITE_ENTRY_EXAMPLE='./main.ts'
+
 VITE_MESH_OSS='https://4dkk.4dage.com/'
 VITE_MESH_API='https://www.4dkankan.com/'
 VITE_CLOUD_API='https://laser.4dkankan.com/backend/'
 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://mix3d.4dkankan.com/fire/?redirect={redirect}#login'
 
 VITE_BUILD_DIR="fire"
 VITE_ICO="./icos/fire.ico"

profile/.env.xmfire

@@ -2,14 +2,16 @@ VITE_PRIMARY='#D8000A'
 VITE_TITLE='绘图'
 VITE_ENTRY='/example/fuse/enter-mix.ts'
 VITE_ENTRY_EXAMPLE='./main.ts'
+
 VITE_MESH_OSS='https://4dkk.4dage.com/'
 VITE_MESH_API='https://www.4dkankan.com/'
 VITE_CLOUD_API='https://laser.4dkankan.com/backend/'
 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/xmfire/index.html?redirect={redirect}#login'
+VITE_LOGIN_VIEW='https://mix3d.4dkankan.com/xmfire/index.html?redirect={redirect}#login'
 
 VITE_BUILD_DIR="xmfire"
 VITE_ICO="./icos/xmfire.png"

src/example/fuse/views/overview/index.vue

@@ -7,7 +7,7 @@
     <template #header>
       <Header
         @selectVR="(scene) => (vrScene = scene)"
-        :title="title"
+        title="绘图"
         @save-after="() => mergeFuns(saveAfterHandlers)()"
         :ref="(r) => (header = r)"
       />

src/example/fuse/views/tabulation/index.vue

@@ -5,7 +5,7 @@
     :ref="(d: any) => (draw = d?.draw)"
   >
     <template #header>
-      <Header v-if="inited" :title="title" />
+      <Header v-if="inited" title="图纸" />
     </template>
     <template #slide>
       <Slide v-if="inited" @update-map-image="setMapHandler" />

src/example/fuse/views/tabulation/slide.vue

@@ -43,6 +43,7 @@ const paper = reactive({
 
 const drawMenu = copy(drawMenuRaw);
 drawMenu.children!.shift();
+drawMenu.name = "标注";
 
 let tileGroups: TileGroup[];
 loading(window.platform.getTileGroups()).then((data: any) => (tileGroups = data));