fix：修改数据流转 属性验证和说明字段回显问题

@@ -86,6 +86,7 @@
         type: '',
         configuration: {},
         name: '',
+        additionalInfo: {},
       });
       const editNextType = reactive({
         type: '',
@@ -97,6 +98,7 @@
         editType.type = d.type;
         editType.configuration = d.configuration;
         editType.name = d.name;
+        editType.additionalInfo = d.additionalInfo;
       };
 
       const [registerDrawer, { setModalProps, closeModal }] = useModalInner(async (data) => {
@@ -247,7 +249,6 @@
           id,
           additionalInfoV
         );
-
         if (!unref(isUpdate)) {
           delete allPostForm.id;
         }
@@ -260,6 +261,17 @@
             if (allPostForm.name == undefined) {
               return createMessage.error('请填写名称');
             }
+            //验证属性新增了必填
+            const isApiHeaders =
+              allPostForm?.configuration?.headers ||
+              allPostForm?.configuration?.otherProperties ||
+              allPostForm?.configuration?.clientProperties;
+            if (isApiHeaders && Object.keys(isApiHeaders).includes('')) {
+              return createMessage.error('请填写属性');
+            }
+            if (isApiHeaders && Object.values(isApiHeaders).includes('')) {
+              return createMessage.error('请填写属性');
+            }
             await postAddConvertApi(allPostForm);
             createMessage.success('数据流转新增成功');
             emit('success');
@@ -267,6 +279,19 @@
             closeModal();
           } else {
             await addOrEditFunc();
+            if (!isEdit.value) {
+              //验证属性新增了必填
+              const isApiHeaders =
+                allPostForm?.configuration?.headers ||
+                allPostForm?.configuration?.otherProperties ||
+                allPostForm?.configuration?.clientProperties;
+              if (isApiHeaders && Object.keys(isApiHeaders).includes('')) {
+                return createMessage.error('请填写属性');
+              }
+              if (isApiHeaders && Object.values(isApiHeaders).includes('')) {
+                return createMessage.error('请填写属性');
+              }
+            }
             await postAddConvertApi(isEdit.value ? noEditObj : allPostForm);
             createMessage.success('数据流转编辑成功');
             emit('success');

@@ -269,7 +269,6 @@ export const modeMqttForm: FormSchema[] = [
     field: 'name',
     label: '名称',
     colProps: { span: 12 },
-    required: true,
     component: 'Input',
     componentProps: {
       maxLength: 255,
@@ -293,7 +292,6 @@ export const modeMqttForm: FormSchema[] = [
     label: 'Host',
     colProps: { span: 12 },
     component: 'Input',
-    required: true,
     componentProps: {
       maxLength: 255,
       placeholder: '请输入Host',
@@ -644,7 +642,7 @@ export const modeRabbitMqForm: FormSchema[] = [
     field: 'description',
     label: '说明',
     colProps: { span: 12 },
-    component: 'Input',
+    component: 'InputTextArea',
     componentProps: {
       maxLength: 255,
       placeholder: '请输入说明',

@@ -142,10 +142,11 @@
         submitFunc: customSubmitFunc,
       });
 
-      const setStepTwoFieldsValueFunc = (v, v1) => {
+      const setStepTwoFieldsValueFunc = (v, v1, v2) => {
         setFieldsValue(v);
         setFieldsValue({
           name: v1,
+          description: v2,
         });
         setFieldsValue({
           password: v.credentials?.password,
@@ -232,14 +233,17 @@
             fileList1.value = [];
             showImg1.value = false;
             showImg1Pic.value = '';
+            caCertFileName.value = '';
           } else if (e == 'F') {
             fileList2.value = [];
             showImg2.value = false;
             showImg2Pic.value = '';
+            certFileName.value = '';
           } else {
             fileList3.value = [];
             showImg3.value = false;
             showImg3Pic.value = '';
+            privateKeyFileName.value = '';
           }
         } else {
           const isLt5M = file.size / 1024 / 1024 < 5;

@@ -42,12 +42,13 @@
         await clearValidate(['name']);
       };
 
-      const setStepTwoFieldsValueFunc = async (v, v1) => {
+      const setStepTwoFieldsValueFunc = async (v, v1, v2) => {
         clearName.value = v1;
         setFieldsValue(v);
         vType.value = v1;
         setFieldsValue({
           name: v1,
+          description: v2,
         });
       };
 

@@ -160,14 +160,17 @@
             fileList1.value = [];
             showImg1.value = false;
             showImg1Pic.value = '';
+            caCertFileName.value = '';
           } else if (e == 'F') {
             fileList2.value = [];
             showImg2.value = false;
             showImg2Pic.value = '';
+            certFileName.value = '';
           } else {
             fileList3.value = [];
             showImg3.value = false;
             showImg3Pic.value = '';
+            privateKeyFileName.value = '';
           }
         } else {
           const isLt5M = file.size / 1024 / 1024 < 5;
@@ -230,10 +233,11 @@
           }
         }
       };
-      const setStepTwoFieldsValueFunc = (v, v1) => {
+      const setStepTwoFieldsValueFunc = (v, v1, v2) => {
         setFieldsValue(v);
         setFieldsValue({
           name: v1,
+          description: v2,
         });
         setFieldsValue({
           password: v.credentials?.password,

@@ -32,10 +32,11 @@
         submitFunc: customSubmitFunc,
       });
 
-      const setStepTwoFieldsValueFunc = (v, v1) => {
+      const setStepTwoFieldsValueFunc = (v, v1, v2) => {
         setFieldsValue(v);
         setFieldsValue({
           name: v1,
+          description: v2,
         });
       };
       const customClearStepTwoValueFunc = async () => {

@@ -95,19 +95,32 @@
         try {
           if (v.type == 'org.thingsboard.rule.engine.kafka.TbKafkaNode') {
             isWhereComp.value = v.type;
-            proxy.$refs.refTransferConfigKafka.setStepTwoFieldsValueFunc(v.configuration, v.name);
+            proxy.$refs.refTransferConfigKafka.setStepTwoFieldsValueFunc(
+              v.configuration,
+              v.name,
+              v?.additionalInfo?.description
+            );
           } else if (v.type == 'org.thingsboard.rule.engine.mqtt.TbMqttNode') {
             isWhereComp.value = v.type;
-            proxy.$refs.refTransferConfigMqtt.setStepTwoFieldsValueFunc(v.configuration, v.name);
+            proxy.$refs.refTransferConfigMqtt.setStepTwoFieldsValueFunc(
+              v.configuration,
+              v.name,
+              v?.additionalInfo?.description
+            );
           } else if (v.type == 'org.thingsboard.rule.engine.rabbitmq.TbRabbitMqNode') {
             isWhereComp.value = v.type;
             proxy.$refs.refTransferConfigRabbitMq.setStepTwoFieldsValueFunc(
               v.configuration,
-              v.name
+              v.name,
+              v?.additionalInfo?.description
             );
           } else if (v.type == 'org.thingsboard.rule.engine.rest.TbRestApiCallNode') {
             isWhereComp.value = v.type;
-            proxy.$refs.refTransferConfigApi.setStepTwoFieldsValueFunc(v.configuration, v.name);
+            proxy.$refs.refTransferConfigApi.setStepTwoFieldsValueFunc(
+              v.configuration,
+              v.name,
+              v?.additionalInfo?.description
+            );
           }
         } catch (e) {
           return e;