From 8ff32975235199e708fe5f20f26d8ee00f68e6ac Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Wed, 2 Aug 2023 10:38:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B-=E5=B1=9E=E6=80=A7=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FRuleEditor/Operator/index.vue            | 7 +++----
 src/components/FRuleEditor/index.vue                     | 5 +++--
 src/style.less                                           | 4 ++++
 src/utils/websocket.ts                                   | 4 +---
 src/views/device/components/Metadata/Base/columns.tsx    | 9 +--------
 .../components/Metadata/Base/components/Source.vue       | 6 +++---
 .../Metadata/Base/components/VirtualRule/Rule.vue        | 5 +++--
 .../Metadata/Base/components/VirtualRule/index.vue       | 1 +
 8 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/components/FRuleEditor/Operator/index.vue b/src/components/FRuleEditor/Operator/index.vue
index 806a383b..d796df4c 100644
--- a/src/components/FRuleEditor/Operator/index.vue
+++ b/src/components/FRuleEditor/Operator/index.vue
@@ -86,6 +86,7 @@ import Markdown from 'vue3-markdown-it';
 
 const props = defineProps({
     id: String,
+    propertiesOptions: Array
 });
 
 interface Emits {
@@ -121,16 +122,14 @@ const lastClick = (node: OperatorItem) => {
     emit('addOperatorValue', `$lastState("${node.id}")`);
 };
 const addClick = (node: OperatorItem) => {
-  console.log(node)
     emit('addOperatorValue', node.code);
 };
 
 const productStore = useProductStore();
 
 const getData = async (id?: string) => {
-    const metadata = productStore.current.metadata || '{}';
-    const _properties =
-        JSON.parse(metadata).properties || ([] as PropertyMetadata[]);
+    // const metadata = productStore.current.metadata || '{}';
+    const _properties = props.propertiesOptions as PropertyMetadata[]
     const properties = {
         id: 'property',
         name: '属性',
diff --git a/src/components/FRuleEditor/index.vue b/src/components/FRuleEditor/index.vue
index c45a2204..9ca56d93 100644
--- a/src/components/FRuleEditor/index.vue
+++ b/src/components/FRuleEditor/index.vue
@@ -24,7 +24,7 @@
         <div class="box">
             <div class="left">
                 <div>
-                    <Operator :id="id" @add-operator-value="addOperatorValue" />
+                    <Operator :id="id" :propertiesOptions="propertiesOptions" @add-operator-value="addOperatorValue" />
                 </div>
                 <div style="margin-top: 10px;">
                     <Editor
@@ -70,7 +70,8 @@ const props = defineProps({
     value: String,
     id: String,
     virtualRule: Object,
-    aggList: Array
+    aggList: Array,
+    propertiesOptions: Array
 });
 
 const _value = ref<string | undefined>(props.value);
diff --git a/src/style.less b/src/style.less
index 8b3171c1..b119250d 100644
--- a/src/style.less
+++ b/src/style.less
@@ -212,3 +212,7 @@ body {
         margin: 16px 0;
     }
 }
+
+.ant-notification {
+    z-index: 1100;
+}
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index b5bbf228..920825f9 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -43,9 +43,7 @@ export const initWebSocket = () => {
             const data = JSON.parse(msg.data)
 
             if (data.type === 'error') {
-                notification.error({ key: 'wserr', message: data.message, style: {
-                    zIndex: 1040
-                } })
+                notification.error({ key: 'error', message: data.message })
             }
 
             if (subs[data.requestId]) {
diff --git a/src/views/device/components/Metadata/Base/columns.tsx b/src/views/device/components/Metadata/Base/columns.tsx
index d8d1249f..a9f14712 100644
--- a/src/views/device/components/Metadata/Base/columns.tsx
+++ b/src/views/device/components/Metadata/Base/columns.tsx
@@ -419,14 +419,7 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', n
         }
       },
       doubleClick(record){
-        if (target !== 'device') {
-          return true
-        } else {
-          if (record.expands.source === 'rule') {
-            return true
-          }
-          return !isExtendsProdcut(record._sortIndex, productNoEdit?.value, 'expands')
-        }
+        return !isExtendsProdcut(record._sortIndex, productNoEdit?.value, 'expands')
       },
       form: {
         required: true,
diff --git a/src/views/device/components/Metadata/Base/components/Source.vue b/src/views/device/components/Metadata/Base/components/Source.vue
index 66d84c80..7cbbef43 100644
--- a/src/views/device/components/Metadata/Base/components/Source.vue
+++ b/src/views/device/components/Metadata/Base/components/Source.vue
@@ -105,9 +105,9 @@ const type = ref<string>('');
 const virtualRuleRef = ref<any>(null);
 
 const disabled = computed(() => {
-    if (props.target === 'device') {
-        return true;
-    }
+    // if (props.target === 'device') {
+    //     return true;
+    // }
     return props.noEdit?.length
         ? props.noEdit.includes(props.value._sortIndex)
         : false;
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 99b7ab52..3ae60bea 100644
--- a/src/views/device/components/Metadata/Base/components/VirtualRule/Rule.vue
+++ b/src/views/device/components/Metadata/Base/components/VirtualRule/Rule.vue
@@ -2,7 +2,7 @@
     <j-button @click="visible = true" style="width: 100%" type="dashed">
         编辑规则
     </j-button>
-    <FRuleEditor :aggList="aggList" @close="onClose" v-if="visible" :value="value" @save="onChange" :id="id" :virtualRule="virtualRule" />
+    <FRuleEditor v-if="visible" :id="id" :aggList="aggList" :propertiesOptions="propertiesOptions" :value="value" :virtualRule="virtualRule" @close="onClose" @save="onChange" />
 </template>
 
 <script setup lang="ts" name="Rule">
@@ -21,7 +21,8 @@ const props = defineProps({
     value: String,
     id: String,
     virtualRule: Object,
-    aggList: Array
+    aggList: Array,
+    propertiesOptions: Array
 });
 
 const visible = ref<boolean>(false);
diff --git a/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue b/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue
index 9e6584d9..3e1405f0 100644
--- a/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue
+++ b/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue
@@ -57,6 +57,7 @@
                 <Rule
                     v-model:value="formData.virtualRule.script"
                     :virtualRule="_virtualRule.virtualRule"
+                    :propertiesOptions="options"
                     :id="value.id"
                     :aggList="aggList"
                 />