From 1d238367befc929316cc57a8d0a83ba074d7356c Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Wed, 19 Jul 2023 11:19:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=E7=89=A9=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/components/Metadata/Base/Base.vue  |  8 +++----
 .../components/Metadata/Base/columns.tsx      | 21 +------------------
 .../Metadata/Base/components/Source.vue       |  6 +++++-
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/views/device/components/Metadata/Base/Base.vue b/src/views/device/components/Metadata/Base/Base.vue
index 3f1fa096..fea0d350 100644
--- a/src/views/device/components/Metadata/Base/Base.vue
+++ b/src/views/device/components/Metadata/Base/Base.vue
@@ -51,9 +51,6 @@
         <template #valueType="{ data }">
             {{ TypeStringMap[data.record.valueType?.type] }}
         </template>
-        <template #expands="{ data }">
-            {{ sourceMap?.[data.record?.expands?.source] || '' }}
-        </template>
         <template #inputs="{ data }">
           <InputParams v-model:value="data.record.inputs" />
         </template>
@@ -66,6 +63,9 @@
         <template #expands="{ data }" v-if="type === 'events'">
           {{ levelMap?.[data.record.expands?.level] || '-' }}
         </template>
+      <template v-else-if="type === 'properties'" #expands="{ data }">
+        {{ data.record.id && !data.record?.expands?.source ? '设备' : sourceMap?.[data.record?.expands?.source] || '' }}
+      </template>
         <template #properties="{ data }">
           <ConfigParams v-model:value="data.record.valueType" />
         </template>
@@ -80,7 +80,7 @@
         <template #other="{ data }">
           <j-tooltip
             v-if="target === 'device' && productNoEdit.id?.includes?.(data.record._sortIndex)"
-            title="继承自产品物模型的数据不支持删除"
+            title="继承自产品物模型的数据不支持修改"
           >
 <!--            <ModelButton :disabled="true"/>-->
             <j-button :disabled="true" type="link" style="padding-left: 0;">
diff --git a/src/views/device/components/Metadata/Base/columns.tsx b/src/views/device/components/Metadata/Base/columns.tsx
index da29f209..2760f361 100644
--- a/src/views/device/components/Metadata/Base/columns.tsx
+++ b/src/views/device/components/Metadata/Base/columns.tsx
@@ -416,7 +416,7 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', n
         name: Source,
         props: {
           noEdit: noEdit?.value?.source || [],
-          target: target
+          target: target,
         }
       },
       doubleClick(record){
@@ -434,7 +434,6 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', n
         rules: target !== 'device' ? [
           {
             callback: async (rule: any, value: any, dataSource: any[]) => {
-              console.log('value', value)
               const field = rule.field.split('.')
               const fieldIndex = Number(field[1])
 
@@ -455,24 +454,6 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', n
 
               return Promise.reject('请选择属性来源');
             }
-            //   if (value.source) {
-            //     if(value.source !== 'rule') {
-            //       if(value.type?.length) {
-            //         return Promise.resolve();
-            //       } else {
-            //         return Promise.reject('请选择读写类型');
-            //       }
-            //     } else {
-            //       if(value.virtualRule?.script) {
-            //         return Promise.resolve();
-            //       }else {
-            //         return Promise.reject('请配置规则');
-            //       }
-            //     }
-            //   } else {
-            //     return Promise.reject('请选择属性来源');
-            //   }
-            // }
           },
         ]: []
       },
diff --git a/src/views/device/components/Metadata/Base/components/Source.vue b/src/views/device/components/Metadata/Base/components/Source.vue
index dec3128a..122c9b6a 100644
--- a/src/views/device/components/Metadata/Base/components/Source.vue
+++ b/src/views/device/components/Metadata/Base/components/Source.vue
@@ -28,7 +28,7 @@
                     </div>
                 </j-scrollbar>
             </template>
-            <j-button :disabled="!myValue" type="link" style="padding: 4px 8px">
+            <j-button style="padding: 4px 8px" type="link">
                 <AIcon type="EditOutlined" />
             </j-button>
         </j-popconfirm-modal>
@@ -146,7 +146,11 @@ const confirm = async () => {
 watch(
     () => props.value,
     () => {
+      if (props.value.id && !props.value?.expands?.source) {
+        myValue.value = 'device';
+      } else {
         myValue.value = props.value?.expands?.source || '';
+      }
         type.value = props.value?.expands?.type || [];
     },
     { immediate: true },