From a869162799f2756a5629b904101b8050b6db8335 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Thu, 6 Jul 2023 20:53:48 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/components/Metadata/Base/Base.vue  |  3 +-
 .../components/Metadata/Base/columns.tsx      |  5 +--
 .../Base/components/DataTypeObjectChild.vue   |  2 +-
 .../Base/components/Function/InputParams.vue  | 33 +++++++--------
 .../Base/components/Function/OutputParams.vue |  9 ++--
 .../Base/components/Function/Type.vue         | 41 +++++++++++++++++++
 yarn.lock                                     |  4 +-
 7 files changed, 68 insertions(+), 29 deletions(-)
 create mode 100644 src/views/device/components/Metadata/Base/components/Function/Type.vue

diff --git a/src/views/device/components/Metadata/Base/Base.vue b/src/views/device/components/Metadata/Base/Base.vue
index aeca560e..f0dba2e0 100644
--- a/src/views/device/components/Metadata/Base/Base.vue
+++ b/src/views/device/components/Metadata/Base/Base.vue
@@ -87,6 +87,7 @@
             {{ sourceMap?.[data.record?.expands?.source] || '' }}
         </template>
         <template #inputs="{ data }">
+          <InputParams v-model:value="dataSource[data.index]" />
           {{ data.record.inputs?.map(item => item.name).join(',') }}
         </template>
         <template #output="{ data }">
@@ -202,7 +203,7 @@ import { useMetadata, useOperateLimits } from './hooks';
 import { useColumns } from './columns';
 import { levelMap, sourceMap, expandsType, limitsMap } from './utils';
 import Rule from '@/components/Metadata/Rule';
-import { Source, OtherSetting } from './components';
+import { Source, OtherSetting, InputParams } from './components';
 import { saveProductVirtualProperty } from '@/api/device/product';
 import { saveDeviceVirtualProperty } from '@/api/device/instance';
 import { useInstanceStore } from '@/store/instance';
diff --git a/src/views/device/components/Metadata/Base/columns.tsx b/src/views/device/components/Metadata/Base/columns.tsx
index 148f8dd2..f0384880 100644
--- a/src/views/device/components/Metadata/Base/columns.tsx
+++ b/src/views/device/components/Metadata/Base/columns.tsx
@@ -172,10 +172,7 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', d
     {
       title: '输入参数',
       dataIndex: 'inputs',
-      type: 'components',
-      components: {
-        name: InputParams,
-      }
+      width: 120
     },
     {
       title: '输出参数',
diff --git a/src/views/device/components/Metadata/Base/components/DataTypeObjectChild.vue b/src/views/device/components/Metadata/Base/components/DataTypeObjectChild.vue
index 57f53342..91db99e9 100644
--- a/src/views/device/components/Metadata/Base/components/DataTypeObjectChild.vue
+++ b/src/views/device/components/Metadata/Base/components/DataTypeObjectChild.vue
@@ -3,7 +3,7 @@
         <div class="values-test">
             {{ text }}
         </div>
-        <!-- <OtherConfigInfo :value="formData"></OtherConfigInfo> -->
+            <OtherConfigInfo :value="formData"></OtherConfigInfo>
             <DataTableEnum v-if="formData.type === 'enum'" v-model:value="formData" />
             <DataTableBoolean v-else-if="formData.type === 'boolean'" v-model:value="formData" />
             <DataTableDouble
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 b97a1b22..c680b4af 100644
--- a/src/views/device/components/Metadata/Base/components/Function/InputParams.vue
+++ b/src/views/device/components/Metadata/Base/components/Function/InputParams.vue
@@ -1,22 +1,19 @@
 <template>
-  <div class="input-params">
-    <div class="input-params-text">
-      {{ dataSource?.map((item) => item.name).join(',') }}
-    </div>
-    <DataTableObject v-model:value="dataSource" :columns="columns" :onAdd="addItem" width="700px" @confirm="confirm">
-      <template #valueType="{ data }">
-        <span>{{ data.record.valueType?.type }}</span>
-      </template>
-      <template #required="{ data }">
-        <span>{{ data.record.expands?.required ? "是": '否' }}</span>
-      </template>
-      <template #config="{ data }">
-        <OtherConfigInfo :value="data.record.valueType"></OtherConfigInfo>
-      </template>
-    </DataTableObject>
-  </div>
-
-
+  <DataTableObject v-model:value="dataSource" :columns="columns" :onAdd="addItem" width="700px" @confirm="confirm">
+    <template #valueType="{ data }">
+      <span>{{ data.record.valueType?.type }}</span>
+    </template>
+    <template #required="{ data }">
+      <span>{{ data.record.expands?.required ? "是": '否' }}</span>
+    </template>
+    <template #config="{ data }">
+      <OtherConfigInfo :value="data.record.valueType"></OtherConfigInfo>
+    </template>
+    <j-button>
+      <AIcon type="SettingOutlined" />
+      配置
+    </j-button>
+  </DataTableObject>
 </template>
 
 <script setup lang="ts" name="InputParams">
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 9e665f33..26439fae 100644
--- a/src/views/device/components/Metadata/Base/components/Function/OutputParams.vue
+++ b/src/views/device/components/Metadata/Base/components/Function/OutputParams.vue
@@ -20,7 +20,7 @@
                     type: 'components',
                     dataIndex: 'valueTypes',
                     components: {
-                      name: DataTableTypeSelect,
+                      name: Type,
                     }
                 },
                 {
@@ -32,7 +32,9 @@
                   }
                 },
                 {
-                  title: '操作'
+                  title: '操作',
+                  dataIndex: 'action',
+                  width: 60
                 }
             ]"
             @confirm="valueChange"
@@ -65,7 +67,7 @@
 <script setup lang="ts" name="OutPutParams">
 import { getUnit } from '@/api/device/instance';
 import {
-    DataTableTypeSelect,
+  DataTableTypeSelect,
     DataTableArray,
     DataTableString,
     DataTableInteger,
@@ -80,6 +82,7 @@ import {
 import DataTypeObjectChild from '../DataTypeObjectChild.vue';
 import { cloneDeep } from 'lodash-es';
 import {typeSelectChange} from "@/views/device/components/Metadata/Base/columns";
+import Type from './Type.vue'
 
 const props = defineProps({
     value: {
diff --git a/src/views/device/components/Metadata/Base/components/Function/Type.vue b/src/views/device/components/Metadata/Base/components/Function/Type.vue
new file mode 100644
index 00000000..3efa6d1f
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/components/Function/Type.vue
@@ -0,0 +1,41 @@
+<template>
+  <DataTableTypeSelect
+      v-model="myValue"
+      :filter="['object']"
+      @change="change"
+  />
+</template>
+
+<script setup lang="ts" name="DataTypeSelect">
+import {
+  DataTableTypeSelect,
+} from 'jetlinks-ui-components';
+import {typeSelectChange} from "@/views/device/components/Metadata/Base/columns";
+
+const props = defineProps({
+  value: {
+    type: Object,
+    default: undefined
+  }
+})
+
+const emit = defineEmits(['update:value'])
+
+const myValue = ref()
+
+const change = (e: string) => {
+  const obj = typeSelectChange(e)
+  const _data = {...props.value}
+  _data.valueType = obj
+  emit('update:value', _data)
+}
+
+watch(() => props.value, () => {
+  myValue.value = props.value?.valueType?.type
+}, { immediate: true, deep: true})
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index c643b085..732f8e23 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#1b7ad3ecf9eb4cc8f42692f935d6f2c5cf70e597"
-  integrity sha512-+tS6vzKJlphNUCR59Lc8vJpRfHIzSyMVuhHPfTH3dAa4Ow3OXaUxRdqJhQbDxIwptP3u2Rc7nxdZ5GZFMbJgjw==
+  resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#6633322daa90f3acd9a48aeab61c5eaf23c06e10"
+  integrity sha512-5KxeoLb9tnA4TGoX5Q1e43jNobPmGfHk+lxZsxEs50LTaOYVj0E6DSqCfaHbLHrXMdCcL45eKRCauRusVIXQTA==
   dependencies:
     "@vueuse/core" "^9.12.0"
     "@vueuse/router" "^9.13.0"