From 5382aee3fe24357c2e8b70c3d8524dd05a28a91d Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Fri, 27 Oct 2023 15:00:05 +0800
Subject: [PATCH] fix: bug#19080

---
 .../Metadata/Base/components/DataType.vue     | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/views/device/components/Metadata/Base/components/DataType.vue b/src/views/device/components/Metadata/Base/components/DataType.vue
index bda8b030..dc9aefe1 100644
--- a/src/views/device/components/Metadata/Base/components/DataType.vue
+++ b/src/views/device/components/Metadata/Base/components/DataType.vue
@@ -21,7 +21,6 @@
                 {{ TypeStringMap[data.record.valueType?.type] }}
             </template>
             <template #config="{ data }">
-<!--                <OtherConfigInfo :value="data.record.valueType"></OtherConfigInfo>-->
               <ConfigModal v-model:value="data.record.valueType" :showOther="false" />
             </template>
         </DataTableObject>
@@ -54,7 +53,7 @@
 
 <script setup lang="ts" name="MetadataDataType">
 import { getUnit } from '@/api/device/instance';
-import { ValueObject } from '../components'
+import {DataType, ValueObject} from '../components'
 import {
     DataTableTypeSelect,
     DataTableArray,
@@ -68,7 +67,7 @@ import {
     DataTableObject,
 } from 'jetlinks-ui-components';
 import { cloneDeep } from 'lodash-es';
-import {handleTypeValue, typeSelectChange, TypeStringMap, useUnit} from '../columns'
+import {handleTypeValue, typeSelectChange, TypeStringMap, useUnit, validatorConfig} from '../columns'
 import ConfigModal from './ConfigModal.vue'
 import { Form } from 'jetlinks-ui-components'
 
@@ -137,7 +136,6 @@ const columns = [{
       required: true,
       rules: [{
         validator(_: any, value: any) {
-          console.log('validator',value)
           if (!value?.type) {
             return Promise.reject('请选择数据类型')
           }
@@ -150,7 +148,23 @@ const columns = [{
   {
     title: '其他配置',
     dataIndex: 'config',
-    width: 100
+    width: 100,
+    // components: {
+    //   name: ConfigModal,
+    //   props: {
+    //     showOther: false
+    //   }
+    // },
+    form: {
+      rules: [{
+        callback(rule: any, value: any, dataSource: any[]) {
+          const field = rule.field.split('.')
+          const fieldIndex = Number(field[1])
+          const values = dataSource.find((item, index) => index === fieldIndex)
+          return validatorConfig(values?.valueType)
+        }
+      }]
+    },
   },
   {
     title: '操作',