From ea8620278a7681995b5566647b3d9caa3f6eddd9 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 15 Mar 2023 17:31:36 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E9=87=87=E9=9B=86=E5=99=A8=20?=
 =?UTF-8?q?=E7=82=B9=E4=BD=8D=E6=96=B0=E5=A2=9E=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Collector/Point/Save/SaveModBus.vue       | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
index 185dda6b..162dbcaf 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
@@ -31,7 +31,7 @@
                     :options="[
                         { label: '01线圈寄存器', value: 'Coils' },
                         { label: '03保存寄存器', value: 'HoldingRegisters' },
-                        { label: '04输入寄存器', value: 'DiscreteInputs' },
+                        { label: '04输入寄存器', value: 'InputRegisters' },
                     ]"
                     placeholder="请选择所功能码"
                     allowClear
@@ -74,7 +74,10 @@
                 />
             </j-form-item>
             <j-form-item
-                v-if="formData.configuration.function === 'HoldingRegisters'"
+                v-if="
+                    formData.configuration.function === 'HoldingRegisters' ||
+                    formData.configuration.function === 'InputRegisters'
+                "
                 label="数据类型"
                 :name="['configuration', 'codec', 'provider']"
                 :rules="[
@@ -246,7 +249,8 @@ const props = defineProps({
 
 const emit = defineEmits(['change']);
 const loading = ref(false);
-const providerList = ref([]);
+const providerListAll: any = ref([]);
+const providerList: any = ref([]);
 const formRef = ref<FormInstance>();
 
 const id = props.data.id;
@@ -322,7 +326,7 @@ const changeWriteByteCount = (value: Array<string>) => {
 };
 const changeFunction = (value: string) => {
     formData.value.accessModes =
-        value === 'DiscreteInputs' ? ['read'] : ['read', 'write'];
+        value === 'InputRegisters' ? ['read'] : ['read', 'write'];
 };
 
 const checkLength = (_rule: Rule, value: string): Promise<any> =>
@@ -361,7 +365,7 @@ const filterOption = (input: string, option: any) => {
 
 const getProviderList = async () => {
     const res: any = await queryCodecProvider();
-    providerList.value = res.result
+    providerListAll.value = res.result
         .filter((i: any) => i.id !== 'property')
         .map((item: any) => ({
             value: item.id,
@@ -377,11 +381,23 @@ watch(
     },
     { immediate: true, deep: true },
 );
+watch(
+    () => formData.value.configuration.function,
+    (value) => {
+        providerList.value =
+            value === 'HoldingRegisters'
+                ? providerListAll.value
+                : providerListAll.value.filter(
+                      (item: any) => item.value !== 'bool',
+                  );
+    },
+    { deep: true },
+);
 watch(
     () => props.data,
     (value) => {
         if (value.id && value.provider === 'MODBUS_TCP') {
-            const _value = cloneDeep(value);
+            const _value: any = cloneDeep(value);
             const { writeByteCount, byteCount } =
                 _value.configuration.parameter;
             formData.value = _value;