From 1622206283c2d75b5d043fc779e9ab96078ea7e7 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Thu, 6 Jul 2023 18:15:19 +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=85=A5=E3=80=81=E8=BE=93=E5=87=BA)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Base/DetailModal/PropertiesModal.vue      |   5 +-
 .../Base/components/Function/InputParams.vue  | 115 +++++++++++-------
 .../Base/components/Function/OutputParams.vue |  13 +-
 yarn.lock                                     |   4 +-
 4 files changed, 90 insertions(+), 47 deletions(-)

diff --git a/src/views/device/components/Metadata/Base/DetailModal/PropertiesModal.vue b/src/views/device/components/Metadata/Base/DetailModal/PropertiesModal.vue
index 22e59c18..e5a089c4 100644
--- a/src/views/device/components/Metadata/Base/DetailModal/PropertiesModal.vue
+++ b/src/views/device/components/Metadata/Base/DetailModal/PropertiesModal.vue
@@ -138,13 +138,16 @@ const handleDataTable = (type: string) => {
         ...props.data.valueType
       }
       break;
+    case 'array':
+      dataTypeTable.dataSource = props.data.valueType.elementType
+      break;
   }
 }
 
 
 watch(() => props.data.valueType.type, () => {
   const type = props.data.valueType.type
-  handleDataTable(props.data.valueType.type === 'array' ? props.data.valueType.elementType : props.data.valueType.type)
+  handleDataTable(props.data.valueType.type)
 
   if (['float', 'double', 'int', 'long'].includes(type)) {
     getUnit().then((res) => {
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 0a156bc2..b97a1b22 100644
--- a/src/views/device/components/Metadata/Base/components/Function/InputParams.vue
+++ b/src/views/device/components/Metadata/Base/components/Function/InputParams.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="input-params">
     <div class="input-params-text">
-      {{ value?.map((item) => item.name).join(',') }}
+      {{ dataSource?.map((item) => item.name).join(',') }}
     </div>
-    <DataTableObject v-model:value="value" :columns="columns" :addItem="addItem" width="700px" @confirm="confirm">
+    <DataTableObject v-model:value="dataSource" :columns="columns" :onAdd="addItem" width="700px" @confirm="confirm">
       <template #valueType="{ data }">
         <span>{{ data.record.valueType?.type }}</span>
       </template>
@@ -40,43 +40,7 @@ const addItem = () => {
   }
 }
 
-const columns = [
-    { title: '参数标识', dataIndex: 'id', type: 'text', form: { required: true, rules: [{ required: true, message: '请输入标识'}]} },
-    { title: '参数名称', dataIndex: 'name', type: 'text', form: { required: true, rules: [{ required: true, message: '请输入名称'}]} },
-    {
-      title: '填写约束',
-      dataIndex: 'required',
-      type: 'components',
-      width: 100,
-      components: {
-        name: ConstraintSelect,
-        props: {
-          name: ['expands', 'required']
-        }
-      }
-    },
-    {
-        title: '数据类型',
-        type: 'components',
-        dataIndex: 'valueType',
-        components: {
-            name: ValueObject,
-        },
-    },
-    {
-        title: '其他配置',
-        dataIndex: 'config',
-        type: 'components',
-        components: {
-            name: DataTypeObjectChild
-        }
-    },
-    {
-        title: '操作',
-        dataIndex: 'action',
-        width: 60
-    },
-];
+const columns = ref()
 
 type Emits = {
     (e: 'update:value', data: Record<string, any>): void;
@@ -99,26 +63,91 @@ const props = defineProps({
     },
 });
 
-const value = ref(props.value);
+const dataSource = ref(props.value);
 
 const change = (v: string) => {
-    emit('update:value', { ...props.value, async: value.value });
+    emit('update:value', { ...props.value, async: dataSource.value });
     emit('change', v);
 };
 
 watch(
     () => props.value,
     (newV) => {
-        value.value = props.value.inputs;
+      dataSource.value = props.value.inputs;
     },
     { immediate: true },
 );
 
+watch(() => JSON.stringify(dataSource.value), () => {
+  columns.value = [
+    {
+      title: '参数标识',
+      dataIndex: 'id',
+      type: 'text',
+      form: {
+        required: true,
+        rules: [
+          { required: true, message: '请输入标识' },
+          {
+            validator(va:any,value: any) {
+              const fieldIndex = va.field.split('.')[1]
+              const oldValue = (dataSource!.value || []).filter((_, index) => index != fieldIndex)
+              console.log(dataSource!.value)
+              const hasId = oldValue.some((item) => item.id === value)
+              if (value) {
+                if (hasId) {
+                  return Promise.reject('标识重复')
+                }
+                return Promise.resolve()
+              }
+              return Promise.reject('请输入标识')
+            }
+          },
+        ]
+      }
+    },
+    { title: '参数名称', dataIndex: 'name', type: 'text', form: { required: true, rules: [{ required: true, message: '请输入名称'}]} },
+    {
+      title: '填写约束',
+      dataIndex: 'required',
+      type: 'components',
+      width: 100,
+      components: {
+        name: ConstraintSelect,
+        props: {
+          name: ['expands', 'required']
+        }
+      }
+    },
+    {
+      title: '数据类型',
+      type: 'components',
+      dataIndex: 'valueType',
+      components: {
+        name: ValueObject,
+      },
+    },
+    {
+      title: '其他配置',
+      dataIndex: 'config',
+      type: 'components',
+      components: {
+        name: DataTypeObjectChild
+      }
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      width: 60
+    },
+  ]
+}, { immediate: true})
+
 const confirm = (v: any) => {
   console.log(v)
   emit('update:value', {
     ...props.value,
-    inputs: value.value
+    inputs: dataSource.value
   })
 }
 </script>
diff --git a/src/views/device/components/Metadata/Base/components/Function/OutputParams.vue b/src/views/device/components/Metadata/Base/components/Function/OutputParams.vue
index 976024f5..9e665f33 100644
--- a/src/views/device/components/Metadata/Base/components/Function/OutputParams.vue
+++ b/src/views/device/components/Metadata/Base/components/Function/OutputParams.vue
@@ -18,7 +18,7 @@
                 {
                     title: '数据类型',
                     type: 'components',
-                    dataIndex: ['valueType', 'type'],
+                    dataIndex: 'valueTypes',
                     components: {
                       name: DataTableTypeSelect,
                     }
@@ -36,6 +36,7 @@
                 }
             ]"
             @confirm="valueChange"
+            :onAdd="addItem"
         />
         <DataTableEnum v-else-if="type === 'enum'" v-model:value="data" @confirm="valueChange"/>
         <DataTableBoolean v-else-if="type === 'boolean'" v-model:value="data" @confirm="valueChange"/>
@@ -120,6 +121,16 @@ watch(
     { immediate: true, deep: true },
 );
 
+const addItem = () => {
+  return {
+    id: undefined,
+    name: undefined,
+    valueType: {
+      type: undefined
+    }
+  }
+}
+
 const valueChange = () => {
 
   emit('update:value', {
diff --git a/yarn.lock b/yarn.lock
index 7cc0e8c1..c643b085 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#201ac2119b4707a4d793b819a79ac37fe9bd1ae6"
-  integrity sha512-382mUqzC+/rWrqTJyarlODdwCchxgB0ZzcGOGmrqOn37eAF+grfPnpY6UsT4or0njes4eu//RlniLc92dVNcUA==
+  resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#1b7ad3ecf9eb4cc8f42692f935d6f2c5cf70e597"
+  integrity sha512-+tS6vzKJlphNUCR59Lc8vJpRfHIzSyMVuhHPfTH3dAa4Ow3OXaUxRdqJhQbDxIwptP3u2Rc7nxdZ5GZFMbJgjw==
   dependencies:
     "@vueuse/core" "^9.12.0"
     "@vueuse/router" "^9.13.0"