From 90df330400cdf76f78f961bdf4e7af6e6135c4b6 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Fri, 7 Jul 2023 11:09:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=89=A9=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B-=E5=8A=9F=E8=83=BD=E5=AE=9A=E4=B9=89-=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/components/Metadata/Base/Base.vue  |  1 +
 .../components/Metadata/Base/columns.tsx      |  2 +-
 .../Metadata/Base/components/DataType.vue     | 13 ++++++++----
 .../Base/components/Function/InputParams.vue  |  6 +-----
 .../components/Properties/Metrics/Metrics.vue |  2 +-
 .../Properties/Metrics/ValueItem.vue          |  2 +-
 .../components/Properties/OtherSetting.vue    | 20 ++++++++++++++-----
 yarn.lock                                     |  4 ++--
 8 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/views/device/components/Metadata/Base/Base.vue b/src/views/device/components/Metadata/Base/Base.vue
index dbc06fcf..8f05c94a 100644
--- a/src/views/device/components/Metadata/Base/Base.vue
+++ b/src/views/device/components/Metadata/Base/Base.vue
@@ -162,6 +162,7 @@
                 style="padding: 0"
                 danger
                 :pop-confirm="{
+                  placement: 'topRight',
                 title: dataSource.length === 1 ? '这是最后一条数据了，确认删除？' : '确认删除？',
                 onConfirm: async () => {
                     await removeItem(data.index, dataSource.length === 1);
diff --git a/src/views/device/components/Metadata/Base/columns.tsx b/src/views/device/components/Metadata/Base/columns.tsx
index b7451b24..da2de2f2 100644
--- a/src/views/device/components/Metadata/Base/columns.tsx
+++ b/src/views/device/components/Metadata/Base/columns.tsx
@@ -90,7 +90,7 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', d
             const hasId = oldValue.some((item) => item.id === value)
             if (value) {
               if (hasId) {
-                return Promise.reject('标识重复')
+                return Promise.reject('该标识存在')
               }
               return Promise.resolve()
             }
diff --git a/src/views/device/components/Metadata/Base/components/DataType.vue b/src/views/device/components/Metadata/Base/components/DataType.vue
index 9695fff2..2dcbb9b4 100644
--- a/src/views/device/components/Metadata/Base/components/DataType.vue
+++ b/src/views/device/components/Metadata/Base/components/DataType.vue
@@ -7,11 +7,13 @@
             v-if="type === 'array'"
             v-model:value="_valueType.elementType"
             :unitOptions="options"
+            placement="topRight"
             @confirm="valueChange"
         />
         <DataTableObject
             v-else-if="type === 'object'"
             v-model:value="_valueType.properties"
+            placement="topRight"
             :columns="[
                 { title: '参数标识', dataIndex: 'id', type: 'text', width: 100 },
                 { title: '参数名称', dataIndex: 'name', type: 'text', width: 100 },
@@ -48,25 +50,28 @@
                 <OtherConfigInfo :value="data.record.valueType"></OtherConfigInfo>
             </template>
         </DataTableObject>
-        <DataTableEnum v-else-if="type === 'enum'" v-model:value="_valueType" @confirm="valueChange"/>
-        <DataTableBoolean v-else-if="type === 'boolean'" v-model:value="_valueType" @confirm="valueChange"/>
+        <DataTableEnum v-else-if="type === 'enum'" v-model:value="_valueType" placement="topRight" @confirm="valueChange"/>
+        <DataTableBoolean v-else-if="type === 'boolean'" v-model:value="_valueType" placement="topRight" @confirm="valueChange"/>
         <DataTableDouble
             v-else-if="['float', 'double'].includes(type)"
             :options="options"
             v-model:value="_valueType"
+            placement="topRight"
             @confirm="valueChange"
         />
         <DataTableInteger
             v-else-if="['int', 'long'].includes(type)"
             :options="options"
             v-model:value="_valueType.unit"
+            placement="topRight"
             @confirm="valueChange"
         />
-        <DataTableFile v-else-if="type === 'file'" v-model:value="_valueType.fileType" @confirm="valueChange"/>
-        <DataTableDate v-else-if="type === 'date'" v-model:value="_valueType.format" @confirm="valueChange"/>
+        <DataTableFile v-else-if="type === 'file'" v-model:value="_valueType.fileType" placement="topRight" @confirm="valueChange"/>
+        <DataTableDate v-else-if="type === 'date'" v-model:value="_valueType.format" placement="topRight" @confirm="valueChange"/>
         <DataTableString
             v-else-if="['string', 'password'].includes(type)"
             v-model:value="_valueType.maxLength"
+            placement="topRight"
         />
     </div>
 </template>
diff --git a/src/views/device/components/Metadata/Base/components/Function/InputParams.vue b/src/views/device/components/Metadata/Base/components/Function/InputParams.vue
index c680b4af..22e07450 100644
--- a/src/views/device/components/Metadata/Base/components/Function/InputParams.vue
+++ b/src/views/device/components/Metadata/Base/components/Function/InputParams.vue
@@ -93,7 +93,7 @@ watch(() => JSON.stringify(dataSource.value), () => {
               const hasId = oldValue.some((item) => item.id === value)
               if (value) {
                 if (hasId) {
-                  return Promise.reject('标识重复')
+                  return Promise.reject('该标识存在')
                 }
                 return Promise.resolve()
               }
@@ -127,10 +127,6 @@ watch(() => JSON.stringify(dataSource.value), () => {
     {
       title: '其他配置',
       dataIndex: 'config',
-      type: 'components',
-      components: {
-        name: DataTypeObjectChild
-      }
     },
     {
       title: '操作',
diff --git a/src/views/device/components/Metadata/Base/components/Properties/Metrics/Metrics.vue b/src/views/device/components/Metadata/Base/components/Properties/Metrics/Metrics.vue
index 695d5bd9..c2e2eaa7 100644
--- a/src/views/device/components/Metadata/Base/components/Properties/Metrics/Metrics.vue
+++ b/src/views/device/components/Metadata/Base/components/Properties/Metrics/Metrics.vue
@@ -11,7 +11,7 @@
         {{ data.record.range === 'true' ? '范围值' : '固定值'}}
       </template>
       <template #value="{data}">
-        {{ data.record.range === 'true' ? data.record.value.toString() : data.record.value }}
+        {{ data.record.range === 'true' ? data.record.value?.toString() : data.record.value }}
       </template>
       <template #action="{data}">
         <j-button
diff --git a/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue b/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue
index d2ad33b6..e1d917f1 100644
--- a/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue
+++ b/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue
@@ -71,7 +71,7 @@ const showText = computed(() => {
   if (props.value.range === 'false') {
     return props.value.value || ''
   } else {
-    return props.value.value[0] ? props.value.value.join('-') : ''
+    return props.value.value?.[0] ? props.value.value.join('-') : ''
   }
 })
 
diff --git a/src/views/device/components/Metadata/Base/components/Properties/OtherSetting.vue b/src/views/device/components/Metadata/Base/components/Properties/OtherSetting.vue
index d5b39c15..b2957704 100644
--- a/src/views/device/components/Metadata/Base/components/Properties/OtherSetting.vue
+++ b/src/views/device/components/Metadata/Base/components/Properties/OtherSetting.vue
@@ -7,8 +7,8 @@
       @visibleChange="visibleChange"
   >
     <template #content>
-      <j-scrollbar height="350">
-        <j-collapse v-model:activeKey="activeKey" >
+      <j-scrollbar height="350"   v-if="showMetrics || config.length > 0">
+        <j-collapse v-model:activeKey="activeKey">
           <j-collapse-panel v-for="(item, index) in config" :key="'store_'+index" :header="item.name">
             <j-table
                 :columns="columns"
@@ -40,7 +40,14 @@
             <Metrics ref="metricsRef" :value="myValue.expands?.metrics" :type="props.value?.valueType?.type"/>
           </j-collapse-panel>
         </j-collapse>
+
       </j-scrollbar>
+      <div v-else style="padding-top: 24px">
+        <j-empty
+            description="没有动态配置项"
+        />
+      </div>
+
     </template>
     <j-button>
       <AIcon type="SettingOutlined" />
@@ -123,8 +130,13 @@ const getConfig = async () => {
   if (resp.status === 200) {
 
     config.value = resp.result
-    if (resp.result.length && !configValue.value) {
+    if (resp.result.length) {
       activeKey.value = ['store_0']
+    } else if (showMetrics.value) {
+      activeKey.value = ['metrics']
+    }
+
+    if (resp.result.length && !configValue.value) {
       resp.result.forEach(a => {
         if (a.properties) {
           a.properties.forEach(b => {
@@ -132,8 +144,6 @@ const getConfig = async () => {
           })
         }
       })
-    } else if (showMetrics.value) {
-      activeKey.value = ['metrics']
     }
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 732f8e23..44bcd418 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3825,8 +3825,8 @@ jetlinks-store@^0.0.3:
 
 jetlinks-ui-components@^1.0.23, jetlinks-ui-components@^1.0.24:
   version "1.0.24"
-  resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#6633322daa90f3acd9a48aeab61c5eaf23c06e10"
-  integrity sha512-5KxeoLb9tnA4TGoX5Q1e43jNobPmGfHk+lxZsxEs50LTaOYVj0E6DSqCfaHbLHrXMdCcL45eKRCauRusVIXQTA==
+  resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#4fed08d639873b642911b808d94ef64856c62cd1"
+  integrity sha512-bFdN1VdrOR8bmHlE81h5MoTSSwpXPS/qjW0ppDZU55qm8GtNszZfGBi8VeWD2Kvn1oTM43ldyVcGVqipl2DtMQ==
   dependencies:
     "@vueuse/core" "^9.12.0"
     "@vueuse/router" "^9.13.0"