fix: 修改数据流转配置参数问题

@@ -152,12 +152,14 @@ export const modelKafkaForm: FormSchema[] = [
     field: 'otherProperties',
     label: '其他属性',
     colProps: { span: 24 },
+    defaultValue: {},
     component: 'JAddInput',
   },
   {
     field: 'addMetadataKeyValuesAsKafkaHeaders',
     label: '是否启用',
     colProps: { span: 12 },
+    defaultValue: false,
     component: 'Checkbox',
     renderComponentContent: '将消息的元数据以键值对的方式添加到Kafka消息头中',
   },

@@ -32,9 +32,9 @@
   import { modelFormPublicConfig } from '../../../dataflowmodal/config';
 
   const credentialsFile = reactive({
-    caCertFileName: '',
-    certFileName: '',
-    privateKeyFileName: '',
+    caCertFileName: undefined,
+    certFileName: undefined,
+    privateKeyFileName: undefined,
   });
 
   const [register, { validateFields, setFieldsValue, resetFields }] = useForm({

@@ -12,6 +12,7 @@ class RabbitMqFormPartialConfig {
   static password = 'guest'; //密码
   static connectionTimeout = 60000; //连接超时（毫秒）
   static handshakeTimeout = 10000; //握手超时（毫秒）
+  static automaticRecoveryEnabled = false;
 
   //anonymous Select options配置
   static getMessageProperties() {
@@ -43,6 +44,7 @@ export const modeRabbitMqForm: FormSchema[] = [
     label: '交换名称模式',
     colProps: { span: 12 },
     component: 'Input',
+    defaultValue: '',
     componentProps: {
       maxLength: 255,
       placeholder: '请输入模式',
@@ -52,6 +54,7 @@ export const modeRabbitMqForm: FormSchema[] = [
     field: 'routingKeyPattern',
     label: '路由密钥模式',
     colProps: { span: 12 },
+    defaultValue: '',
     component: 'Input',
     componentProps: {
       maxLength: 255,
@@ -63,6 +66,7 @@ export const modeRabbitMqForm: FormSchema[] = [
     component: 'Select',
     label: '消息属性',
     colProps: { span: 12 },
+    defaultValue: null,
     componentProps: {
       placeholder: '请选择消息属性',
       options: RabbitMqFormPartialConfig.getMessageProperties(),
@@ -129,6 +133,7 @@ export const modeRabbitMqForm: FormSchema[] = [
     field: 'automaticRecoveryEnabled',
     label: '是否启用',
     colProps: { span: 12 },
+    defaultValue: RabbitMqFormPartialConfig.automaticRecoveryEnabled,
     component: 'Checkbox',
     renderComponentContent: '自动恢复',
   },
@@ -159,6 +164,7 @@ export const modeRabbitMqForm: FormSchema[] = [
     label: '客户端属性',
     colProps: { span: 24 },
     component: 'JAddInput',
+    defaultValue: {},
   },
   {
     field: 'description',

@@ -82,6 +82,14 @@
     setValue(record);
   });
 
+  // 判断转换方式
+  const isRabbitmq = (type) => {
+    return type == 'org.thingsboard.rule.engine.rabbitmq.TbRabbitMqNode';
+  };
+  const isKafka = (type) => {
+    return type == 'org.thingsboard.rule.engine.kafka.TbKafkaNode';
+  };
+
   const handleSubmit = async (closeModalAfterSuccess = true) => {
     try {
       if (closeModalAfterSuccess) {
@@ -98,26 +106,30 @@
           getDataFlowParams?.clientProperties
         );
         const data = getValue(description, name, getDataFlowMethod, getDataFlowParams);
-        const { caCertFileName, certFileName, privateKeyFileName } = getDataFlowParams.credentials;
         const configuration = {
-          topicPattern: getDataFlowParams.topicPattern,
-          host: getDataFlowParams.host,
-          port: getDataFlowParams.port,
-          connectTimeoutSec: getDataFlowParams.connectTimeoutSec,
-          clientId: getDataFlowParams.clientId ? getDataFlowParams.clientId : null,
-          cleanSession: getDataFlowParams.cleanSession,
-          ssl: getDataFlowParams.ssl,
-          appendClientIdSuffix: getDataFlowParams.appendClientIdSuffix,
-          credentials: {
-            type: getDataFlowParams.type,
-            caCertFileName: caCertFileName ? caCertFileName : undefined,
-            certFileName: certFileName ? certFileName : undefined,
-            privateKeyFileName: privateKeyFileName ? privateKeyFileName : undefined,
-            username: getDataFlowParams.username ? getDataFlowParams.username : undefined,
-            password: getDataFlowParams.password ? getDataFlowParams.password : undefined,
-          },
+          ...getDataFlowParams,
+          clientId: !isKafka(getDataFlowMethod?.type)
+            ? getDataFlowParams.clientId
+              ? getDataFlowParams.clientId
+              : null
+            : undefined,
+          kafkaHeadersCharset: isKafka(getDataFlowMethod?.type)
+            ? getDataFlowParams?.kafkaHeadersCharset
+              ? getDataFlowParams?.kafkaHeadersCharset
+              : 'UTF-8'
+            : undefined,
+          credentials: !isKafka(getDataFlowMethod?.type)
+            ? {
+                ...getDataFlowParams.credentials,
+                type: getDataFlowParams.type,
+                username: getDataFlowParams.username ? getDataFlowParams.username : undefined,
+                password: getDataFlowParams.password ? getDataFlowParams.password : undefined,
+              }
+            : undefined,
         };
-        const rest = await postAddConvertApi({ ...restData.data, ...data, configuration });
+        const rest = isRabbitmq(getDataFlowMethod?.type)
+          ? await postAddConvertApi({ ...restData.data, ...data })
+          : await postAddConvertApi({ ...restData.data, ...data, configuration });
         if (rest) {
           closeModalAfterSuccess && createMessage.success(`${businessText.value}成功`);
           closeModalAfterSuccess && closeModal();