From 1e6a7e1588c91ea334b03c728b370981350d045d Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Sat, 15 Jul 2023 19:31:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FRuleEditor/Debug/index.vue    |  1 +
 src/components/FRuleEditor/index.vue          |  4 ---
 .../components/Subscribe/components/Bind.vue  | 35 ++++++++++---------
 .../Base/components/VirtualRule/Rule.vue      |  4 ---
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/components/FRuleEditor/Debug/index.vue b/src/components/FRuleEditor/Debug/index.vue
index fefd8df4..f7a65685 100644
--- a/src/components/FRuleEditor/Debug/index.vue
+++ b/src/components/FRuleEditor/Debug/index.vue
@@ -197,6 +197,7 @@ const runScript = () => {
         onlyMessage('请编辑规则', 'warning');
         return;
     }
+
     ws.value = getWebSocket(
         `virtual-property-debug-${props.id}-${new Date().getTime()}`,
         '/virtual-property-debug',
diff --git a/src/components/FRuleEditor/index.vue b/src/components/FRuleEditor/index.vue
index 8968e036..9415e7fb 100644
--- a/src/components/FRuleEditor/index.vue
+++ b/src/components/FRuleEditor/index.vue
@@ -94,10 +94,6 @@ const addOperatorValue = (val: string) => {
     editor.value.addOperatorValue(val);
 };
 
-watchEffect(() => {
-    console.log(props.value, _value.value, 'hhhhh')
-})
-
 watch(() => _value.value, () => {
     _disabled.value = true
 })
diff --git a/src/views/account/Center/components/Subscribe/components/Bind.vue b/src/views/account/Center/components/Subscribe/components/Bind.vue
index 2a9121ba..f3c2b740 100644
--- a/src/views/account/Center/components/Subscribe/components/Bind.vue
+++ b/src/views/account/Center/components/Subscribe/components/Bind.vue
@@ -1,6 +1,21 @@
 <template>
     <j-modal :width="'900px'" visible @cancel="emit('close')" :zIndex="1100">
-        <template v-if="getType === 'notifier-dingTalk'">
+        <template v-if="getType === 'notifier-weixin'">
+            <j-spin :spinning="loading">
+                <div class="code" style="height: 450px">
+                    <iframe
+                        id="notifier_iframe"
+                        class="code-item"
+                        width="100%"
+                        height="100%"
+                        :src="url"
+                        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+                        v-if="!loading"
+                    ></iframe>
+                </div>
+            </j-spin>
+        </template>
+        <template v-else-if="getType === 'notifier-dingTalk'">
             <j-spin :spinning="loading">
                 <div class="code" style="height: 600px;">
                     <iframe
@@ -14,20 +29,7 @@
                 </div>
             </j-spin>
         </template>
-        <template v-else-if="getType === 'notifier-weixin'">
-            <j-spin :spinning="loading">
-                <div class="code" style="height: 450px">
-                    <iframe
-                        id="notifier_iframe"
-                        class="code-item"
-                        width="100%"
-                        height="100%"
-                        :src="url"
-                        v-if="!loading"
-                    ></iframe>
-                </div>
-            </j-spin>
-        </template>
+        
         <template #footer>
             <j-button @click="emit('close')">关闭</j-button>
             <!-- <j-button type="primary" @click="emit('close')">确定</j-button> -->
@@ -103,8 +105,9 @@ const updateIframeStyle = () => {
     const iframe = document.querySelector(
         '#notifier_iframe',
     ) as HTMLIFrameElement;
+    console.log(iframe)
     iframe.onload = () => {
-        console.log(iframe?.contentWindow)
+        console.log(iframe?.contentWindow, '123')
         const currentUrl = iframe?.contentWindow?.location?.search || '';
         let authCode = '';
         if (currentUrl.startsWith('?')) {
diff --git a/src/views/device/components/Metadata/Base/components/VirtualRule/Rule.vue b/src/views/device/components/Metadata/Base/components/VirtualRule/Rule.vue
index cac7e4a8..6af66cbd 100644
--- a/src/views/device/components/Metadata/Base/components/VirtualRule/Rule.vue
+++ b/src/views/device/components/Metadata/Base/components/VirtualRule/Rule.vue
@@ -29,10 +29,6 @@ const onChange = (val: string | undefined) => {
     onClose()
 }
 
-watchEffect(() => {
-    console.log(props.virtualRule, props.value, '123')
-})
-
 const onClose = () => {
     visible.value = false
 }

From 83b62977805c0a220a02cace436c057f9b35d33b Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Sat, 15 Jul 2023 19:43:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccessConfig/components/Edge/index.vue    | 16 +++++++---
 .../AccessConfig/components/Network/index.vue | 29 +++++++------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/views/link/AccessConfig/components/Edge/index.vue b/src/views/link/AccessConfig/components/Edge/index.vue
index ecf61831..8c9acc00 100644
--- a/src/views/link/AccessConfig/components/Edge/index.vue
+++ b/src/views/link/AccessConfig/components/Edge/index.vue
@@ -52,8 +52,8 @@
                             >
                                 <template #other>
                                     <div class="other">
-                                        <j-tooltip placement="topLeft">
-                                            <div
+                                        <j-tooltip placement="top" :title="addressesTip(item.addresses)">
+                                            <!-- <div
                                                 v-if="
                                                     (item.addresses || [])
                                                         .length > 1
@@ -69,7 +69,7 @@
                                                         :status="getColor(i)"
                                                     />{{ i.address }}
                                                 </div>
-                                            </div>
+                                            </div> -->
                                             <div
                                                 v-for="i in (
                                                     item.addresses || []
@@ -86,7 +86,7 @@
                                                         (item.addresses || [])
                                                             .length > 1
                                                     "
-                                                    >...</span
+                                                    >等{{ item.addresses.length }}条</span
                                                 >
                                             </div>
                                         </j-tooltip>
@@ -354,6 +354,14 @@ watch(
         immediate: true,
     },
 );
+
+const addressesTip = (data:any)=>{
+    let tip:any = ''
+    data.forEach((item:any)=>{
+        tip =  tip + " " +item.address 
+    })
+    return tip
+} 
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/link/AccessConfig/components/Network/index.vue b/src/views/link/AccessConfig/components/Network/index.vue
index a34494a7..13e934a1 100644
--- a/src/views/link/AccessConfig/components/Network/index.vue
+++ b/src/views/link/AccessConfig/components/Network/index.vue
@@ -50,24 +50,7 @@
                             >
                                 <template #other>
                                     <div class="other">
-                                        <j-tooltip placement="topLeft">
-                                            <div
-                                                v-if="
-                                                    (item.addresses || [])
-                                                        .length > 1
-                                                "
-                                            >
-                                                <div
-                                                    v-for="i in item.addresses ||
-                                                    []"
-                                                    :key="i.address"
-                                                    class="item"
-                                                >
-                                                    <j-badge
-                                                        :status="getColor(i)"
-                                                    />{{ i.address }}
-                                                </div>
-                                            </div>
+                                        <j-tooltip placement="top" :title="addressesTip(item.addresses)">
                                             <div
                                                 v-for="i in (
                                                     item.addresses || []
@@ -84,7 +67,7 @@
                                                         (item.addresses || [])
                                                             .length > 1
                                                     "
-                                                    >...</span
+                                                    >等{{ item.addresses.length }}条</span
                                                 >
                                             </div>
                                         </j-tooltip>
@@ -652,6 +635,14 @@ watch(
         immediate: true,
     },
 );
+
+const addressesTip = (data:any)=>{
+    let tip:any = ''
+    data.forEach((item:any)=>{
+        tip =  tip + " " +item.address 
+    })
+    return tip
+} 
 </script>
 
 <style lang="less" scoped>