fix: Merge branch 'master' of http://192.168.0.115:3000/bill/kankan-mix

# Conflicts:
#	src/sdk/cover/index.js

src/components/bill-ui/components/icon/iconfont/demo_index.html

@@ -47,7 +47,7 @@
         <li class="dib"><span>Symbol</span></li>
       </ul>
       
-      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=3549513" target="_blank" class="nav-more">查看项目</a>
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=4647199" target="_blank" class="nav-more">查看项目</a>
       
     </div>
     <div class="tab-container">
@@ -55,6 +55,78 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe72b;</span>
+                <div class="name">show_3d_s</div>
+                <div class="code-name">&amp;#xe72b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe72e;</span>
+                <div class="name">show_3d_n</div>
+                <div class="code-name">&amp;#xe72e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe730;</span>
+                <div class="name">show_roaming_s</div>
+                <div class="code-name">&amp;#xe730;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe731;</span>
+                <div class="name">show_roaming_n</div>
+                <div class="code-name">&amp;#xe731;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe76d;</span>
+                <div class="name">index</div>
+                <div class="code-name">&amp;#xe76d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe76e;</span>
+                <div class="name">symbol</div>
+                <div class="code-name">&amp;#xe76e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe76f;</span>
+                <div class="name">arrows</div>
+                <div class="code-name">&amp;#xe76f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe770;</span>
+                <div class="name">text</div>
+                <div class="code-name">&amp;#xe770;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe767;</span>
+                <div class="name">fire_firmware</div>
+                <div class="code-name">&amp;#xe767;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe768;</span>
+                <div class="name">fire_app</div>
+                <div class="code-name">&amp;#xe768;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe74d;</span>
+                <div class="name">fire_statistics</div>
+                <div class="code-name">&amp;#xe74d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe74b;</span>
+                <div class="name">query_home</div>
+                <div class="code-name">&amp;#xe74b;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe740;</span>
                 <div class="name">list-detail</div>
                 <div class="code-name">&amp;#xe740;</div>
@@ -480,9 +552,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1692865200116') format('woff2'),
-       url('iconfont.woff?t=1692865200116') format('woff'),
-       url('iconfont.ttf?t=1692865200116') format('truetype');
+  src: url('iconfont.woff2?t=1723082881853') format('woff2'),
+       url('iconfont.woff?t=1723082881853') format('woff'),
+       url('iconfont.ttf?t=1723082881853') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -509,6 +581,114 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-show_3d_s"></span>
+            <div class="name">
+              show_3d_s
+            </div>
+            <div class="code-name">.icon-show_3d_s
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-show_3d_n"></span>
+            <div class="name">
+              show_3d_n
+            </div>
+            <div class="code-name">.icon-show_3d_n
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-show_roaming_s"></span>
+            <div class="name">
+              show_roaming_s
+            </div>
+            <div class="code-name">.icon-show_roaming_s
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-show_roaming_n"></span>
+            <div class="name">
+              show_roaming_n
+            </div>
+            <div class="code-name">.icon-show_roaming_n
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-index"></span>
+            <div class="name">
+              index
+            </div>
+            <div class="code-name">.icon-index
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-symbol"></span>
+            <div class="name">
+              symbol
+            </div>
+            <div class="code-name">.icon-symbol
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-arrows1"></span>
+            <div class="name">
+              arrows
+            </div>
+            <div class="code-name">.icon-arrows1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-text1"></span>
+            <div class="name">
+              text
+            </div>
+            <div class="code-name">.icon-text1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fire_firmware"></span>
+            <div class="name">
+              fire_firmware
+            </div>
+            <div class="code-name">.icon-fire_firmware
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fire_app"></span>
+            <div class="name">
+              fire_app
+            </div>
+            <div class="code-name">.icon-fire_app
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fire_statistics"></span>
+            <div class="name">
+              fire_statistics
+            </div>
+            <div class="code-name">.icon-fire_statistics
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-query_home"></span>
+            <div class="name">
+              query_home
+            </div>
+            <div class="code-name">.icon-query_home
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-list-detail"></span>
             <div class="name">
               list-detail
@@ -1149,6 +1329,102 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-show_3d_s"></use>
+                </svg>
+                <div class="name">show_3d_s</div>
+                <div class="code-name">#icon-show_3d_s</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-show_3d_n"></use>
+                </svg>
+                <div class="name">show_3d_n</div>
+                <div class="code-name">#icon-show_3d_n</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-show_roaming_s"></use>
+                </svg>
+                <div class="name">show_roaming_s</div>
+                <div class="code-name">#icon-show_roaming_s</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-show_roaming_n"></use>
+                </svg>
+                <div class="name">show_roaming_n</div>
+                <div class="code-name">#icon-show_roaming_n</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-index"></use>
+                </svg>
+                <div class="name">index</div>
+                <div class="code-name">#icon-index</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-symbol"></use>
+                </svg>
+                <div class="name">symbol</div>
+                <div class="code-name">#icon-symbol</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-arrows1"></use>
+                </svg>
+                <div class="name">arrows</div>
+                <div class="code-name">#icon-arrows1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-text1"></use>
+                </svg>
+                <div class="name">text</div>
+                <div class="code-name">#icon-text1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fire_firmware"></use>
+                </svg>
+                <div class="name">fire_firmware</div>
+                <div class="code-name">#icon-fire_firmware</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fire_app"></use>
+                </svg>
+                <div class="name">fire_app</div>
+                <div class="code-name">#icon-fire_app</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fire_statistics"></use>
+                </svg>
+                <div class="name">fire_statistics</div>
+                <div class="code-name">#icon-fire_statistics</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-query_home"></use>
+                </svg>
+                <div class="name">query_home</div>
+                <div class="code-name">#icon-query_home</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-list-detail"></use>
                 </svg>
                 <div class="name">list-detail</div>

src/components/bill-ui/components/icon/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 3549513 */
-  src: url('iconfont.woff2?t=1692865200116') format('woff2'),
-       url('iconfont.woff?t=1692865200116') format('woff'),
-       url('iconfont.ttf?t=1692865200116') format('truetype');
+  font-family: "iconfont"; /* Project id 4647199 */
+  src: url('iconfont.woff2?t=1723082881853') format('woff2'),
+       url('iconfont.woff?t=1723082881853') format('woff'),
+       url('iconfont.ttf?t=1723082881853') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,54 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-show_3d_s:before {
+  content: "\e72b";
+}
+
+.icon-show_3d_n:before {
+  content: "\e72e";
+}
+
+.icon-show_roaming_s:before {
+  content: "\e730";
+}
+
+.icon-show_roaming_n:before {
+  content: "\e731";
+}
+
+.icon-index:before {
+  content: "\e76d";
+}
+
+.icon-symbol:before {
+  content: "\e76e";
+}
+
+.icon-arrows1:before {
+  content: "\e76f";
+}
+
+.icon-text1:before {
+  content: "\e770";
+}
+
+.icon-fire_firmware:before {
+  content: "\e767";
+}
+
+.icon-fire_app:before {
+  content: "\e768";
+}
+
+.icon-fire_statistics:before {
+  content: "\e74d";
+}
+
+.icon-query_home:before {
+  content: "\e74b";
+}
+
 .icon-list-detail:before {
   content: "\e740";
 }

src/components/bill-ui/components/icon/iconfont/iconfont.json

@@ -1,11 +1,95 @@
 {
-  "id": "3549513",
-  "name": "融合平台",
+  "id": "4647199",
+  "name": "多元数据融合系统",
   "font_family": "iconfont",
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
     {
+      "icon_id": "35129313",
+      "name": "show_3d_s",
+      "font_class": "show_3d_s",
+      "unicode": "e72b",
+      "unicode_decimal": 59179
+    },
+    {
+      "icon_id": "35129316",
+      "name": "show_3d_n",
+      "font_class": "show_3d_n",
+      "unicode": "e72e",
+      "unicode_decimal": 59182
+    },
+    {
+      "icon_id": "35129318",
+      "name": "show_roaming_s",
+      "font_class": "show_roaming_s",
+      "unicode": "e730",
+      "unicode_decimal": 59184
+    },
+    {
+      "icon_id": "35129319",
+      "name": "show_roaming_n",
+      "font_class": "show_roaming_n",
+      "unicode": "e731",
+      "unicode_decimal": 59185
+    },
+    {
+      "icon_id": "41299621",
+      "name": "index",
+      "font_class": "index",
+      "unicode": "e76d",
+      "unicode_decimal": 59245
+    },
+    {
+      "icon_id": "41299620",
+      "name": "symbol",
+      "font_class": "symbol",
+      "unicode": "e76e",
+      "unicode_decimal": 59246
+    },
+    {
+      "icon_id": "41299619",
+      "name": "arrows",
+      "font_class": "arrows1",
+      "unicode": "e76f",
+      "unicode_decimal": 59247
+    },
+    {
+      "icon_id": "41299618",
+      "name": "text",
+      "font_class": "text1",
+      "unicode": "e770",
+      "unicode_decimal": 59248
+    },
+    {
+      "icon_id": "41207891",
+      "name": "fire_firmware",
+      "font_class": "fire_firmware",
+      "unicode": "e767",
+      "unicode_decimal": 59239
+    },
+    {
+      "icon_id": "41207890",
+      "name": "fire_app",
+      "font_class": "fire_app",
+      "unicode": "e768",
+      "unicode_decimal": 59240
+    },
+    {
+      "icon_id": "39135106",
+      "name": "fire_statistics",
+      "font_class": "fire_statistics",
+      "unicode": "e74d",
+      "unicode_decimal": 59213
+    },
+    {
+      "icon_id": "38948724",
+      "name": "query_home",
+      "font_class": "query_home",
+      "unicode": "e74b",
+      "unicode_decimal": 59211
+    },
+    {
       "icon_id": "37076167",
       "name": "list-detail",
       "font_class": "list-detail",

src/layout/model-list/index.vue

@@ -45,7 +45,6 @@ const modelList = computed(() =>
 
 const modelChangeSelect = (model: FuseModel) => {
   if (getFuseModelShowVariable(model).value) {
-
     custom.currentModel = custom.currentModel !== model ? model : null;
   }
 };

src/layout/model-list/sign.vue

@@ -1,26 +1,12 @@
 <template>
-  <div
-    @click="!model.error && !(custom.showMode === 'pano' && active) && $emit('click')"
-    class="sign-layout"
-    :class="{ disabled: custom.showMode === 'pano' && !supperPano }"
-  >
+  <div @click="!model.error && !active && $emit('click')" class="sign-layout" :class="{ disabled: model.error }">
     <div class="model-header">
       <p>{{ model.title }}</p>
       <div class="model-action">
-        <ui-input
-          type="checkbox"
-          v-model="show"
-          @click.stop
-          :class="{
-            disabled: model.error || custom.showMode === 'pano',
-          }"
-        />
-        <ui-icon
-          v-if="custom.modelsChangeStore"
-          type="del"
-          ctrl
-          @click="$emit('delete')"
-        />
+        <ui-input type="checkbox" v-model="show" @click.stop :class="{
+    disabled: model.error || custom.showMode === 'pano',
+  }" />
+        <ui-icon v-if="custom.modelsChangeStore" type="del" ctrl @click="$emit('delete')" />
       </div>
     </div>
     <div class="model-desc" v-if="active">
@@ -32,19 +18,11 @@
 
   <Teleport to="#left-pano" v-if="active && supperPano">
     <div class="mode-tab strengthen">
-      <div
-        class="mode-icon-layout"
-        @click="custom.showMode = 'fuse'"
-        :class="{ active: custom.showMode === 'fuse' }"
-      >
-        <ui-icon type="joint" class="icon" />
+      <div class="mode-icon-layout" @click="custom.showMode = 'fuse'" :class="{ active: custom.showMode === 'fuse' }">
+        <ui-icon type="show_3d_n" class="icon" />
       </div>
-      <div
-        class="mode-icon-layout"
-        @click="custom.showMode = 'pano'"
-        :class="{ active: custom.showMode === 'pano' }"
-      >
-        <ui-icon type="pin" class="icon" />
+      <div class="mode-icon-layout" @click="custom.showMode = 'pano'" :class="{ active: custom.showMode === 'pano' }">
+        <ui-icon type="show_roaming_n" class="icon" />
       </div>
     </div>
   </Teleport>
@@ -78,11 +56,6 @@ type ModelEmits = {
 defineEmits<ModelEmits>();
 
 const show = getFuseModelShowVariable(props.model);
-
-const switchMode = () => {
-  console.log("click");
-  custom.showMode = "pano";
-};
 </script>
 
 <style lang="scss" scoped src="./style.scss"></style>

src/sdk/association/fuseMode.ts

@@ -145,19 +145,53 @@ const setModels = (sdk: SDK, models: FuseModels, oldModels: FuseModels) => {
 };
 
 export const associationModels = (sdk: SDK) => {
+  // watch(
+  //   () => custom.currentModel === item,
+  //   (selected) => {
+  //     isUnSet || getSceneModel(item)?.changeSelect(selected);
+  //   }
+  // );
+
   watch(
     () => ({
       showMode: custom.showMode,
       active: custom.currentModel,
     }),
-    (status, _, onCleanup) => {
-      if (status.showMode !== "pano" || !status.active) return;
-      const sceneModel = getSceneModel(status.active);
-      sceneModel?.flyInPano();
+    (status, oldStatus, onCleanup) => {
+      if (!status.active) return;
+      const sceneModel = getSceneModel(status.active)!;
 
       onCleanup(() => {
-        sceneModel?.flyOutPano();
+        console.log(status.active!.title, "noAcitve");
+        sceneModel.changeSelect(false);
       });
+
+      if (status.showMode === "pano") {
+        if (sceneModel.supportPano()) {
+          sceneModel.changeSelect(true);
+          sceneModel.flyInPano();
+          onCleanup(() => {
+            console.log(status.active!.title, "flyOutPano");
+            sceneModel.changeSelect(false);
+            sceneModel.flyOutPano();
+          });
+        } else {
+          custom.showMode = "fuse";
+          onCleanup(() => {});
+        }
+      } else {
+        if (oldStatus.showMode === "pano") {
+          setTimeout(() => {
+            sceneModel.changeSelect(true);
+          }, 100);
+        } else {
+          sceneModel.changeSelect(true);
+        }
+        onCleanup(() => {
+          console.log(status.active!.title, "noAcitve");
+          sceneModel.changeSelect(false);
+        });
+      }
     }
   );
 
@@ -221,13 +255,6 @@ export const associationModels = (sdk: SDK) => {
             { immediate: true }
           );
 
-          watch(
-            () => custom.currentModel === item,
-            (selected) => {
-              isUnSet || getSceneModel(item)?.changeSelect(selected);
-            }
-          );
-
           stopLoadedWatch();
         }
       }