fix:修复设备配置mqtt新增选不上问题

@@ -26,7 +26,6 @@
       const isUpdate = ref(true);
       const isUpdate = ref(true);
       let allData: any = reactive({});
       let allData: any = reactive({});
       const editId = ref('');
       const editId = ref('');
-
       const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
       const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
         labelWidth: 120,
         labelWidth: 120,
         schemas: formSchema,
         schemas: formSchema,

@@ -172,11 +172,9 @@
           };
           };
         });
         });
         let arr3 = findName.filter((obj: any) => joinArray.some((obj1) => obj1 == obj.id));
         let arr3 = findName.filter((obj: any) => joinArray.some((obj1) => obj1 == obj.id));
-        let arr4 = arr3
-          .map((m: any) => {
-            return m.username;
-          })
-          .join();
+        let arr4 = arr3.map((m: any) => {
+          return m.username;
+        });
         Modal.info({
         Modal.info({
           title: '当前告警通知联系人',
           title: '当前告警通知联系人',
           width: 600,
           width: 600,
@@ -194,11 +192,10 @@
           };
           };
         });
         });
         let arr3 = findName.filter((obj: any) => joinArray.some((obj1) => obj1 == obj.itemValue));
         let arr3 = findName.filter((obj: any) => joinArray.some((obj1) => obj1 == obj.itemValue));
-        let arr4 = arr3
-          .map((m: any) => {
-            return m.itemText;
-          })
-          .join();
+        let arr4 = arr3.map((m: any) => {
+          return m.itemText;
+        });
+
         Modal.info({
         Modal.info({
           title: '当前告警联系方式',
           title: '当前告警联系方式',
           width: 600,
           width: 600,

@@ -29,13 +29,14 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, watch, reactive, ref, getCurrentInstance } from 'vue';
+  import { defineComponent, reactive, ref, getCurrentInstance, onUnmounted } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { step2Schemas, isChangeType } from './data';
+  import { step2Schemas } from './data';
   import { Alert, Divider, Descriptions } from 'ant-design-vue';
   import { Alert, Divider, Descriptions } from 'ant-design-vue';
   import { Button } from '/@/components/Button';
   import { Button } from '/@/components/Button';
   import MqttCpns from '../step/cpns/mqtt/Mqtt.vue';
   import MqttCpns from '../step/cpns/mqtt/Mqtt.vue';
   import CoapCpns from '../step/cpns/coap/Coap.vue';
   import CoapCpns from '../step/cpns/coap/Coap.vue';
+  import { nextTick } from 'process';
 
 
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {
@@ -57,7 +58,7 @@
       let step2Data = reactive({
       let step2Data = reactive({
         transportConfiguration: {},
         transportConfiguration: {},
       });
       });
-      const [register, { validate, resetFields, setFieldsValue }] = useForm({
+      const [register, { validate, resetFields, setFieldsValue, updateSchema }] = useForm({
         labelWidth: 80,
         labelWidth: 80,
         schemas: step2Schemas,
         schemas: step2Schemas,
         actionColOptions: {
         actionColOptions: {
@@ -74,15 +75,33 @@
           proxy.$refs.coapRef?.setStepFieldsValueFunc(v?.profileData?.transportConfiguration);
           proxy.$refs.coapRef?.setStepFieldsValueFunc(v?.profileData?.transportConfiguration);
         }, 100);
         }, 100);
       };
       };
+
       const customClearStepTwoValueFunc = () => {
       const customClearStepTwoValueFunc = () => {
-        isMqttType.value = 'other';
+        isMqttType.value = '';
         resetFields();
         resetFields();
       };
       };
       async function customResetFunc() {
       async function customResetFunc() {
         emit('prev');
         emit('prev');
       }
       }
-      watch(isChangeType, (v) => {
-        isMqttType.value = v;
+      nextTick(() => {
+        updateSchema({
+          field: 'transportType',
+          componentProps() {
+            return {
+              options: [
+                { label: '默认', value: 'DEFAULT' },
+                { label: 'MQTT', value: 'MQTT' },
+                { label: 'CoAP', value: 'COAP' },
+              ],
+              onChange(e) {
+                isMqttType.value = e;
+              },
+            };
+          },
+        });
+      });
+      onUnmounted(() => {
+        isMqttType.value = '';
       });
       });
       const getStep2DataFunc = async () => {
       const getStep2DataFunc = async () => {
         const val = await validate();
         const val = await validate();

 import { FormSchema } from '/@/components/Form';
 import { FormSchema } from '/@/components/Form';
 import { deviceConfigGetRuleChain } from '/@/api/device/deviceConfigApi';
 import { deviceConfigGetRuleChain } from '/@/api/device/deviceConfigApi';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { ref } from 'vue';
 
 
 export const step1Schemas: FormSchema[] = [
 export const step1Schemas: FormSchema[] = [
   {
   {
@@ -66,22 +65,21 @@ export const step1Schemas: FormSchema[] = [
   },
   },
 ];
 ];
 
 
-export const isChangeType = ref('');
 export const step2Schemas: FormSchema[] = [
 export const step2Schemas: FormSchema[] = [
   {
   {
     field: 'transportType',
     field: 'transportType',
     component: 'Select',
     component: 'Select',
     label: '传输方式',
     label: '传输方式',
     defaultValue: 'DEFAULT',
     defaultValue: 'DEFAULT',
-    componentProps: {
-      options: [
-        { label: '默认', value: 'DEFAULT' },
-        { label: 'MQTT', value: 'MQTT' },
-        { label: 'CoAP', value: 'COAP' },
-      ],
-      onChange(e) {
-        isChangeType.value = e;
-      },
+    componentProps() {
+      return {
+        options: [
+          { label: '默认', value: 'DEFAULT' },
+          { label: 'MQTT', value: 'MQTT' },
+          { label: 'CoAP', value: 'COAP' },
+        ],
+        onChange(e) {},
+      };
     },
     },
     colProps: { span: 11 },
     colProps: { span: 11 },
   },
   },

@@ -46,7 +46,7 @@ export const columns: BasicColumn[] = [
     width: 200,
     width: 200,
     customRender: ({ record }) => {
     customRender: ({ record }) => {
       const status = record.status;
       const status = record.status;
-      const enable = status === 0 ? '已发布' : status === 1 ? '草稿' : '其他';
+      const enable = status === 1 ? '已发布' : status === 0 ? '草稿' : '其他';
       const color = enable === '已发布' ? 'green' : enable === '草稿' ? 'yellow' : 'red';
       const color = enable === '已发布' ? 'green' : enable === '草稿' ? 'yellow' : 'red';
       const text = enable === '已发布' ? '已发布' : enable === '草稿' ? '草稿' : '其他';
       const text = enable === '已发布' ? '已发布' : enable === '草稿' ? '草稿' : '其他';
       return h(Tag, { color }, () => text);
       return h(Tag, { color }, () => text);

@@ -22,7 +22,6 @@
               label: '编辑',
               label: '编辑',
               icon: 'clarity:note-edit-line',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
               onClick: handleEdit.bind(null, record),
-              // auth: 'isTenant' || 'isCustomer',
               ifShow: (_action) => {
               ifShow: (_action) => {
                 return record.status === 0 && record.creator == userId;
                 return record.status === 0 && record.creator == userId;
               },
               },
@@ -31,7 +30,7 @@
               label: '删除',
               label: '删除',
               icon: 'ant-design:delete-outlined',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               color: 'error',
-              ifShow: record.creator == userId || record.tenantId == tenantId,
+              ifShow: record.creator == userId,
               popConfirm: {
               popConfirm: {
                 title: '是否确认删除',
                 title: '是否确认删除',
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
                 confirm: handleDeleteOrBatchDelete.bind(null, record),

@@ -35,7 +35,7 @@
       const { proxy } = getCurrentInstance() as any;
       const { proxy } = getCurrentInstance() as any;
       const getChildData = ref(null);
       const getChildData = ref(null);
       const editGetId: any = ref('');
       const editGetId: any = ref('');
-      const [registerForm, { getFieldsValue, resetFields, setFieldsValue }] = useForm({
+      const [registerForm, { validate, resetFields, setFieldsValue }] = useForm({
         schemas: formSchema,
         schemas: formSchema,
         showActionButtonGroup: false,
         showActionButtonGroup: false,
       });
       });
@@ -60,8 +60,9 @@
       });
       });
       const getTitle = computed(() => (!unref(isUpdate) ? '新增租户配置' : '编辑租户配置'));
       const getTitle = computed(() => (!unref(isUpdate) ? '新增租户配置' : '编辑租户配置'));
 
 
-      const getAllFieldsFunc = () => {
-        getValuesFormData = getFieldsValue();
+      const getAllFieldsFunc = async () => {
+        getValuesFormData = await validate();
+        if (!getValuesFormData) return;
         let getChildValues = proxy.$refs.getChildData.getAllFields();
         let getChildValues = proxy.$refs.getChildData.getAllFields();
         let profileData1 = {
         let profileData1 = {
           configuration: getChildValues,
           configuration: getChildValues,