fix：修改设备配置相关

@@ -60,7 +60,7 @@
   });
   const emit = defineEmits(['expand']);
 
-  const show = ref(true);
+  const show = ref(false);
 
   const { prefixCls } = useDesign('collapse-container');
 

@@ -214,45 +214,49 @@
         if (isUpdate.value == 1) {
           delete postDeviceConfogData.id;
         }
-        //1 TODO 待解决OID对象唯一标识不能重复问题验证
-        let isMappings = false;
-        // let isQuerying = false;
+        let isMappingsKey = ref(false);
+        let isMappingValue = ref(false);
+        let isQueryings = ref(false);
+        let isOIDRepet = ref(false);
         postDeviceConfogData?.profileData?.transportConfiguration?.communicationConfigs?.forEach(
-          (f) => {
-            // if (f.spec == 'TELEMETRY_QUERYING' && f.queryingFrequencyMs == null) {
-            //   isQuerying = true;
-            // } else {
-            //   isQuerying = false;
-            // }
-            // if (f.spec == 'CLIENT_ATTRIBUTES_QUERYING' && f.queryingFrequencyMs == null) {
-            //   isQuerying = true;
-            // } else {
-            //   isQuerying = false;
-            // }
+          (f: any) => {
+            if (f.spec == 'TELEMETRY_QUERYING' || f.spec == 'CLIENT_ATTRIBUTES_QUERYING') {
+              if (f.queryingFrequencyMs == null) {
+                isQueryings.value = true;
+                return createMessage.error('请填写查询频率');
+              } else {
+                isQueryings.value = false;
+              }
+            }
             if (f.mappings.length == 0) {
-              isMappings = true;
+              isMappingsKey.value = true;
+              isMappingValue.value = true;
             } else {
               f.mappings.forEach((f1) => {
                 const findNoneKey = Object.keys(f1).includes('');
                 if (findNoneKey) {
-                  isMappings = findNoneKey;
-                } else {
-                  isMappings = false;
+                  isMappingsKey.value = true;
                 }
               });
               f.mappings.forEach((f2) => {
                 const findNoneVal = Object.values(f2).includes('');
                 if (findNoneVal) {
-                  isMappings = findNoneVal;
-                } else {
-                  isMappings = false;
+                  isMappingValue.value = true;
+                }
+              });
+              //新增OID不能重复=====同一层级的OID不能重复
+              f.mappings.forEach((item, _) => {
+                if (f.mappings.some((citem) => citem !== item && citem.oid === item.oid)) {
+                  isOIDRepet.value = true;
                 }
               });
             }
           }
         );
-        // if (isQuerying) return createMessage.error('请填写Querying frequency,ms');
-        if (isMappings) return createMessage.error('请填写Date key和OID');
+        if (isQueryings.value) return createMessage.error('请填写查询频率');
+        if (isMappingsKey.value) return createMessage.error('请填写Date key和OID');
+        if (isMappingValue.value) return createMessage.error('请填写Date key和OID');
+        if (isOIDRepet.value) return createMessage.error('OID不能重复');
         deviceConfigAddOrEdit(isEdit.value ? noEditObj : postDeviceConfogData)
           .then((res) => {
             if (!res) return;

@@ -32,7 +32,7 @@ export const CoapSchemas: FormSchema[] = [
   {
     field: 'coapDeviceType',
     component: 'Select',
-    label: 'CoAP 设备类型',
+    label: 'CoAP设备类型',
     defaultValue: 'DEFAULT',
     componentProps: {
       options: [
@@ -45,7 +45,7 @@ export const CoapSchemas: FormSchema[] = [
   {
     field: 'transportPayloadType',
     component: 'Select',
-    label: 'CoAP 设备消息 Payload',
+    label: 'CoAP设备消息Payload',
     defaultValue: 'JSON',
     componentProps: {
       options: [
@@ -59,7 +59,7 @@ export const CoapSchemas: FormSchema[] = [
   {
     field: 'powerMode',
     component: 'Select',
-    label: 'Power Saving Mode',
+    label: '节能模式',
     defaultValue: 'DRX',
     componentProps: {
       options: [
@@ -76,11 +76,11 @@ export const CoapSchemas: FormSchema[] = [
   {
     field: 'psmActivityTimer',
     component: 'InputNumber',
-    label: 'PSM Activity Timer',
+    label: 'PSM活动计时器',
     required: true,
-    defaultValue: '10',
+    defaultValue: 10,
     componentProps: {
-      placeholder: '请输入PSM Activity Timer',
+      placeholder: '请输入PSM活动计时器',
     },
     colProps: { span: 11 },
     ifShow: ({ values }) => isPsm(values.powerMode),
@@ -104,11 +104,11 @@ export const CoapSchemas: FormSchema[] = [
   {
     field: 'edrxCycle',
     component: 'InputNumber',
-    label: 'eDRX cycle',
+    label: 'eDRX循环',
     required: true,
-    defaultValue: '81',
+    defaultValue: 81,
     componentProps: {
-      placeholder: '请输入PSM Activity Timer',
+      placeholder: '请输入eDRX循环',
     },
     colProps: { span: 11 },
     ifShow: ({ values }) => isDrx(values.powerMode),
@@ -132,11 +132,11 @@ export const CoapSchemas: FormSchema[] = [
   {
     field: 'pagingTransmissionWindow',
     component: 'InputNumber',
-    label: 'Paging Transmission Window',
+    label: '寻呼传输窗口',
     required: true,
-    defaultValue: '10',
+    defaultValue: 10,
     componentProps: {
-      placeholder: '请输入Paging Transmission Window',
+      placeholder: '请输入寻呼传输窗口',
     },
     colProps: { span: 11 },
     ifShow: ({ values }) => isDrx(values.powerMode),

+<template>
+  <div>
+    <BasicModal
+      v-bind="$attrs"
+      width="30rem"
+      :height="heightNum"
+      @register="register"
+      title="Add new server config"
+      @cancel="handleCancel"
+      :showOkBtn="true"
+      @ok="handleSubmit"
+      v-model:visible="visible"
+    >
+      <div style="display: flex; align-items: center; justify-content: center">
+        <h2>Server type：</h2>
+        <Select
+          v-model:value="selectValue"
+          style="width: 340px"
+          :options="selectOptions"
+          @change="emitChange"
+        />
+      </div>
+    </BasicModal>
+  </div>
+</template>
+<script setup lang="ts">
+  import { ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { Select } from 'ant-design-vue';
+  import { SelectTypes } from 'ant-design-vue/es/select';
+
+  const emit = defineEmits(['register', 'emitSelect']);
+  const [register] = useModalInner((data) => {
+    console.log(data);
+  });
+  const heightNum = ref(80);
+  const visible = ref(false);
+  const selectValue = ref('LwM2M');
+  const selectOptions = ref<SelectTypes['options']>([
+    {
+      label: 'LwM2M Server',
+      value: 'LwM2M',
+    },
+    {
+      label: 'Bootstrap Server',
+      value: 'Bootstrap',
+    },
+  ]);
+  const emitChange = (e) => {
+    selectValue.value = e;
+  };
+  const handleSubmit = () => {
+    emit('emitSelect', selectValue.value);
+    handleCancel();
+  };
+
+  const handleCancel = () => {
+    visible.value = false;
+  };
+</script>
+<style lang="less" scoped></style>

@@ -236,7 +236,6 @@ export const deviceSchemas: FormSchema[] = [
     colProps: { span: 22 },
     component: 'InputTextArea',
     componentProps: {
-      disabled: true,
       autoSize: {
         maxRows: 50,
       },
@@ -250,45 +249,31 @@ export const deviceSchemas: FormSchema[] = [
         "keyName": {},
         "attributeLwm2m": {}
       },
-      "bootstrap": {
-        "servers": {
-          "binding": "UQ",
-          "shortId": 123,
-          "lifetime": 300,
-          "notifIfDisabled": true,
-          "defaultMinPeriod": 1
-        },
-        "bootstrapServer": {
-          "bootstrapServerIs": true,
-          "host": "0.0.0.0",
-          "port": 5687,
-          "securityHost": "0.0.0.0",
-          "securityPort": 5688,
-          "serverId": 111,
-          "clientHoldOffTime": 1,
-          "serverPublicKey": "",
-          "bootstrapServerAccountTimeout": 0
-        },
-        "lwm2mServer": {
+      "bootstrap": [
+        {
+          "shortServerId": 123,
           "bootstrapServerIs": false,
           "host": "0.0.0.0",
           "port": 5685,
-          "securityHost": "0.0.0.0",
-          "securityPort": 5686,
-          "serverId": 123,
           "clientHoldOffTime": 1,
           "serverPublicKey": "",
-          "bootstrapServerAccountTimeout": 0
+          "serverCertificate": "",
+          "bootstrapServerAccountTimeout": 0,
+          "lifetime": 300,
+          "defaultMinPeriod": 1,
+          "notifIfDisabled": true,
+          "binding": "U",
+          "securityMode": "NO_SEC"
         }
-      },
+      ],
       "clientLwM2mSettings": {
         "clientOnlyObserveAfterConnect": 1,
         "fwUpdateStrategy": 1,
-        "swUpdateStrategy": 2,
-        "swUpdateResource": "coap://localhost:5685",
+        "swUpdateStrategy": 1,
         "powerMode": "DRX",
         "compositeOperationsSupport": false
       },
+      "bootstrapServerUpdateEnable": false,
       "type": "LWM2M"
     }
     `,

@@ -11,29 +11,44 @@
       </TabPane>
       <TabPane forceRender key="2" tab="Bootstrap">
         <div>
-          <Checkbox v-model:checked="bootstrapServerUpdateEnable">包括引导服务器更新</Checkbox>
-          <Card
+          <Checkbox
+            @change="handleCheckChange($event)"
+            v-model:checked="bootstrapServerUpdateEnable"
+            >包括引导服务器更新</Checkbox
+          >
+          <CollapseContainer
             v-for="(item, index) in dynamicBOOTSTRAP.bootstrap"
             :key="item"
-            title="LwM2M Server"
-            style="width: 99%; margin-top: 2vh"
+            :title="collapseTitle(item)"
+            class="mt-4"
           >
-            <template #extra>
-              <Button size="small" type="dashed" @click="handleRemove(index)">
-                <template #icon>
-                  <MinusCircleOutlined />
-                </template>
+            <template #action>
+              <Button
+                style="margin-right: 1vw"
+                size="small"
+                type="text"
+                @click="handleRemove(index)"
+              >
+                <template #icon> <DeleteOutlined /> </template>
               </Button>
             </template>
-            <!-- BootStrapForm表单项 -->
-            <BootStrapForm :ref="dynamicBindRef.BootStrapFormItemRef" :index="index" :item="item" />
-          </Card>
+            <div style="border: 1px solid #d9d9d9; width: 100%">
+              <div style="margin: 10px 15px">
+                <BootStrapForm
+                  :ref="dynamicBindRef.BootStrapFormItemRef"
+                  :index="index"
+                  :item="item"
+                />
+              </div>
+            </div>
+          </CollapseContainer>
           <div style="margin-top: 2vh">
-            <Button size="middle" type="dashed" @click="handleAdd">
+            <Button size="middle" type="text" @click="handleAdd">
               <template #icon>
                 <PlusCircleOutlined />
               </template>
-              Add LwM2M Server
+              <span v-if="selectCheckStatus">Add server config</span>
+              <span v-else>Add LwM2M Server</span>
             </Button>
           </div>
         </div>
@@ -61,6 +76,7 @@
         <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerDevice" />
       </TabPane>
     </Tabs>
+    <ServerConfigModal @register="registerModal" @emitSelect="acceptEmitFunc" />
   </div>
 </template>
 
@@ -70,8 +86,11 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { modelSchemas, settingsSchemas, deviceSchemas } from './index';
   import BootStrapForm from './cpns/BootStrapForm.vue';
-  import { MinusCircleOutlined, PlusCircleOutlined } from '@ant-design/icons-vue';
+  import { DeleteOutlined, PlusCircleOutlined } from '@ant-design/icons-vue';
   import { Button, Checkbox } from 'ant-design-vue';
+  import { CollapseContainer } from '/@/components/Container';
+  import { useModal } from '/@/components/Modal';
+  import ServerConfigModal from './cpns/ServerConfigModal.vue';
 
   export default defineComponent({
     name: 'index',
@@ -80,16 +99,21 @@
       TabPane: Tabs.TabPane,
       BasicForm,
       BootStrapForm,
-      MinusCircleOutlined,
+      DeleteOutlined,
       Card,
       PlusCircleOutlined,
       Button,
       Checkbox,
+      CollapseContainer,
+      ServerConfigModal,
     },
     setup() {
+      const collapseTitle = (item) => {
+        return `LwM2M Server        Short server ID: ${item.shortServerId}        Security config mode: ${item.securityMode}`;
+      };
       const bootstrapServerUpdateEnable = ref(false);
       const dynamicBOOTSTRAP: any = reactive({
-        bootstrap: [{}],
+        bootstrap: [{ securityMode: 'NO_SEC', shortServerId: 1234 }],
       });
       const dynamicBindRef: any = {
         BootStrapFormItemRef: ref([]),
@@ -140,9 +164,20 @@
             span: 14,
           },
         });
+      const [registerModal, { openModal }] = useModal();
 
       const handleAdd = () => {
-        dynamicBOOTSTRAP.bootstrap.push({});
+        //TODO 如果是server config 则只弹窗一次
+        if (selectCheckStatus.value) {
+          openModal(true, {
+            isUpdate: true,
+          });
+        } else {
+          dynamicBOOTSTRAP.bootstrap.push({
+            securityMode: 'NO_SEC',
+            shortServerId: 1234,
+          });
+        }
       };
       const handleRemove = (index) => {
         dynamicBOOTSTRAP.bootstrap.splice(index, 1);
@@ -240,7 +275,32 @@
           resetDeviceValue();
         });
       };
-
+      const selectCheckStatus = ref(false);
+      const handleCheckChange = (e) => {
+        selectCheckStatus.value = e.target.checked;
+        if (!selectCheckStatus.value) {
+          const findIndex = dynamicBOOTSTRAP.bootstrap.findIndex((o) => o.type == 'Bootstrap');
+          if (findIndex !== -1) {
+            dynamicBOOTSTRAP.bootstrap.splice(findIndex, 1);
+          }
+        }
+      };
+      const acceptEmitFunc = (e) => {
+        switch (e) {
+          case 'LwM2M':
+            dynamicBOOTSTRAP.bootstrap.push({
+              securityMode: 'NO_SEC',
+              shortServerId: 1234,
+            });
+            break;
+          case 'Bootstrap':
+            dynamicBOOTSTRAP.bootstrap.push({
+              securityMode: 'NO_SEC',
+              shortServerId: 1234,
+            });
+            break;
+        }
+      };
       return {
         currentKey,
         currentSize,
@@ -256,6 +316,11 @@
         handleAdd,
         handleRemove,
         bootstrapServerUpdateEnable,
+        collapseTitle,
+        handleCheckChange,
+        registerModal,
+        acceptEmitFunc,
+        selectCheckStatus,
       };
     },
   });

@@ -20,7 +20,7 @@ export const MqttSchemas: FormSchema[] = [
   {
     field: 'deviceTelemetryTopic',
     component: 'Input',
-    label: '遥测数据 topic 筛选器',
+    label: '遥测数据主题筛选器',
     required: true,
     defaultValue: 'v1/devices/me/telemetry',
     componentProps: {
@@ -32,7 +32,7 @@ export const MqttSchemas: FormSchema[] = [
     field: 'deviceAttributesTopic',
     component: 'Input',
     required: true,
-    label: 'Attributes topic filter',
+    label: '属性主题过滤器',
     defaultValue: 'v1/devices/me/attributes',
     componentProps: {
       placeholder: '请输入Attributes topic 筛选器',
@@ -64,7 +64,14 @@ export const MqttSchemas: FormSchema[] = [
     colProps: { span: 23 },
     defaultValue: false,
     component: 'Checkbox',
-    renderComponentContent: `启用后，平台将默认使用Protobuf有效载荷格式。如果解析失败，平台将尝试使用JSON有效负载格式。用于固件更新期间的向后兼容性。例如，固件的初始版本使用Json，而新版本使用Protobuf。在设备组的固件更新过程中，需要同时支持Protobuf和JSON。兼容性模式会导致性能轻微下降，因此建议在所有设备更新后禁用此模式。`,
+    ifShow: ({ values }) => isProtobuf(values.transportPayloadType),
+    renderComponentContent: '启用与其他有效负载格式的兼容性',
+  },
+  {
+    field: 'desc1',
+    component: 'InputTextArea',
+    label: '',
+    slot: 'desc1',
     ifShow: ({ values }) => isProtobuf(values.transportPayloadType),
   },
   {
@@ -73,7 +80,16 @@ export const MqttSchemas: FormSchema[] = [
     colProps: { span: 23 },
     defaultValue: false,
     component: 'Checkbox',
-    renderComponentContent: `启用后，平台将使用Json有效负载格式通过以下主题推送属性和RPC：v1/devices/me/attributes/response/$request_id, v1/devices/me/attributes, v1/devices/me/rpc/request/$request_id,v1/devices/me/rpc/response/$request_id.此设置不会影响使用新（v2）主题发送的属性和rpc订阅：v2/a/res/$request_id, v2/a, v2/r/req/$request_id, v2/r/res/$request_id. Where $request_id是一个整数请求标识符。`,
+    renderComponentContent: '默认下行主题使用Json格式',
+    ifShow: ({ values }) =>
+      isProtobuf(values.transportPayloadType) &&
+      !!values.useJsonPayloadFormatForDefaultDownlinkTopics,
+  },
+  {
+    field: 'desc2',
+    component: 'InputTextArea',
+    label: '',
+    slot: 'desc2',
     ifShow: ({ values }) =>
       isProtobuf(values.transportPayloadType) &&
       !!values.useJsonPayloadFormatForDefaultDownlinkTopics,

@@ -19,6 +19,28 @@
             </p>
           </div>
         </template>
+        <template #desc1>
+          <div style="width: 47rem; margin-left: 2rem">
+            <p>
+              启用时，默认情况下，平台将使用Protobuf有效载荷格式。如果解析失败，平台将尝试使用JSON负载格式。
+              有助于固件更新期间的向后兼容性。例如，固件的初始版本使用Json，而新版本使用Protobuf。
+              在设备组的固件更新过程中，需要同时支持Protobuf和JSON。兼容性模式会导致性能略有下降，
+              因此建议在更新所有设备后禁用此模式。
+            </p>
+          </div>
+        </template>
+         <template #desc2>
+          <div style="width: 47rem; margin-left: 2rem">
+            <p>
+             启用后，平台将使用Json负载格式通过以下主题推送属性
+             和RPC:v1/devices/me/attributes/response/$request\u id、v1/devices/me/attributes、
+             v1/devices/me/RPC/request/$request\u id、v1/devices/me/RPC/response/$request\u id。
+             此设置不会影响使用新（v2）主题发送的属性和rpc订阅：
+             v2/a/res/$request\u id、v2/a、v2/r/req/$request\u id、v2/r/res/$request\u id。
+             其中，$request\u id是整数请求标识符。
+            </p>
+          </div>
+        </template>
       </BasicForm>
     </div>
   </div>

@@ -2,7 +2,7 @@
   <div
     v-for="(param, index) in dynamicInput.params"
     :key="index"
-    style="display: flex; margin-top: 0.2vh"
+    style="display: flex; margin-top: 0.25vh"
   >
     <Select
       v-model:value="param.dataType"
@@ -17,7 +17,7 @@
       @change="emitChange"
     />
     <a-input
-      placeholder="请输入OID"
+      placeholder="请输入OID(不能重复)"
       v-model:value="param.oid"
       style="width: 38%; margin: 0 0 5px 8px"
       @change="emitChange"
@@ -30,7 +30,7 @@
     />
   </div>
   <div>
-    <a-button type="dashed" style="width: 38%" @click="add">
+    <a-button type="text" style="width: 28%; margin-top: 0.25vh" @click="add">
       <PlusCircleOutlined />
       Add mapping
     </a-button>

@@ -16,10 +16,12 @@
         >
         <InputNumber
           v-if="item.spec == 'TELEMETRY_QUERYING' || item.spec == 'CLIENT_ATTRIBUTES_QUERYING'"
-          v-model:value="item.queryingFrequencyMs"
-          :min="5000"
-          :max="1000000000"
+          v-model:value="queryingFrequencyMs"
+          :min="0"
+          :max="99999999999999999999"
+          style="margin-top: 0.25vh"
         />
+        <div style="margin-top: 0.65vh"></div>
         <MappingsForm
           :value="item.mappings"
           @change="handleMappingsChange"
@@ -33,7 +35,7 @@
         style="text-align: center; line-height: 20vh"
         :style="{ lineHeight: dynamicHeight + 'vh' }"
       >
-        <Button size="small" type="dashed" @click="handleRemove(item, index)">
+        <Button size="small" type="default" @click="handleRemove(item, index)">
           <template #icon>
             <MinusCircleOutlined />
           </template>
@@ -47,6 +49,7 @@
   import { Button, InputNumber } from 'ant-design-vue';
   import { MinusCircleOutlined } from '@ant-design/icons-vue';
   import MappingsForm from './MappingsForm.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
   const props = defineProps({
     item: {
@@ -59,7 +62,8 @@
   });
   const emit = defineEmits(['removeItem']);
   const dynamicHeight = ref(25);
-
+  const queryingFrequencyMs = ref(5000);
+  const { createMessage } = useMessage();
   const handleMappingsChange = (e) => {
     // eslint-disable-next-line vue/no-mutating-props
     props.item.mappings = e;
@@ -70,9 +74,18 @@
   //设置回显的高度
   const setFieldsValueFunc = () => {
     dynamicHeight.value = props.item.mappings.length * 3 + props.item.mappings.length + 15;
+    queryingFrequencyMs.value = props.item.queryingFrequencyMs;
   };
   //获取表单的值
   const getSnmpFormFunc = () => {
+    if (
+      props.item.spec == 'TELEMETRY_QUERYING' ||
+      props.item.spec == 'CLIENT_ATTRIBUTES_QUERYING'
+    ) {
+      if (queryingFrequencyMs.value == null) {
+        return createMessage.error('请填写查询频率');
+      }
+    }
     let obj: any = {};
     obj = {
       ...{ spec: props.item.spec },
@@ -80,7 +93,7 @@
       ...{
         queryingFrequencyMs:
           props.item.spec == 'TELEMETRY_QUERYING' || props.item.spec == 'CLIENT_ATTRIBUTES_QUERYING'
-            ? props.item.queryingFrequencyMs
+            ? queryingFrequencyMs.value
             : null,
       },
     };

@@ -27,22 +27,14 @@
                   :options="selectOptions"
                   @change="handleChange(item.spec)"
                   allowClear
-                >
-                  <SelectOption
-                    v-for="it in selectOptions"
-                    :value="it.value"
-                    :key="it.value"
-                    :label="it.label"
-                    :disabled="it.disabled"
-                  />
-                </Select>
+                />
               </SnmpForm>
             </template>
             <div
               v-if="dynamicSNMP.communicationConfigs.length < 4"
               style="margin-left: 0vw; margin-top: 2vh"
             >
-              <Button size="middle" type="dashed" @click="handleAdd">
+              <Button size="middle" type="text" @click="handleAdd">
                 <template #icon>
                   <PlusCircleOutlined />
                 </template>
@@ -60,7 +52,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { snmpSchemas } from './config';
   import { PlusCircleOutlined } from '@ant-design/icons-vue';
-  import { Button, Select, SelectOption } from 'ant-design-vue';
+  import { Button, Select } from 'ant-design-vue';
   import SnmpForm from './cpns/SnmpForm.vue';
 
   interface mappingsI {
@@ -77,26 +69,22 @@
     {
       label: 'Telemetry',
       value: 'TELEMETRY_QUERYING',
-      disabled: false,
     },
     {
       label: 'Client attributes',
       value: 'CLIENT_ATTRIBUTES_QUERYING',
-      disabled: false,
     },
     {
       label: 'Shared attributes',
       value: 'SHARED_ATTRIBUTES_SETTING',
-      disabled: false,
     },
     {
       label: 'RPC request',
       value: 'TO_DEVICE_RPC_REQUEST',
-      disabled: false,
     },
   ]);
   const selectValue = ref('');
-  //解决新增选择框互斥问题和编辑回显互斥问题
+  //Select互斥
   const handleChange = (value: string) => {
     selectValue.value = value;
     selectOptions.value.forEach((ele: any) => {
@@ -154,12 +142,15 @@
     });
   };
   const handleRemoveItem = (item, index) => {
-    console.log(item.spec);
-    //2 TODO待解决删除时清空互斥问题
+    selectOptions.value.forEach((ele: any) => {
+      if (ele.value == item.spec) {
+        ele.disabled = false;
+      }
+    });
     dynamicSNMP.communicationConfigs.splice(index, 1);
   };
+
   //回显表单值
-  //TODO 采用这种方式动态绑定ref 都会造成回显数据顺序是随机的但不影响回显数据的正确性
   const setStepFieldsValueFunc = (v) => {
     setFieldsValue({
       timeoutMs: v.timeoutMs,
@@ -168,14 +159,13 @@
     dynamicSNMP.communicationConfigs = v.communicationConfigs;
     dynamicSNMP.communicationConfigs.forEach((snmp, index: number) => {
       nextTick(() => {
-        //编辑回显互斥赋值
         handleChange(snmp.spec);
         unref(dynamicBindRef.SnmpFormItemRef)[index]?.setFieldsValueFunc();
       });
     });
   };
 
-  //获取最终的值
+  //获取表单值
   const getSnmpForm = async () => {
     let value = await validate();
     if (!value) return;