Merge branch 'ww-dev' into 'main'

fix: 修复数据流转保存参数有误

See merge request yunteng/thingskit-front!518

@@ -265,12 +265,29 @@
           delete allPostForm.id;
         }
       };
-      const setClientProperties = (record: Recordable) => {
+      const setConfiguration = (record: Recordable) => {
         const type = Reflect.get(record, 'type');
-        if (type === 'org.thingsboard.rule.engine.rabbitmq.TbRabbitMqNode') return;
         const configuration = Reflect.get(record, 'configuration');
         const clientProperties = Reflect.get(configuration, 'clientProperties');
-        !clientProperties && record.configuration && (record.configuration.clientProperties = {});
+        console.log(clientProperties);
+        !clientProperties && (record.configuration.clientProperties = {});
+
+        if (
+          type === 'org.thingsboard.rule.engine.mqtt.TbMqttNode' ||
+          type === 'org.thingsboard.rule.engine.kafka.TbKafkaNode' ||
+          type === 'org.thingsboard.rule.engine.rest.TbRestApiCallNode'
+        ) {
+          Reflect.deleteProperty(configuration, 'clientProperties');
+        }
+
+        if (type === 'org.thingsboard.rule.engine.kafka.TbKafkaNode') {
+          configuration.kafkaHeadersCharset = 'UTF-8';
+        }
+
+        if (type === 'org.thingsboard.rule.engine.rabbitmq.TbRabbitMqNode') {
+          configuration.exchangeNamePattern = configuration.exchangeNamePattern || '';
+          configuration.routingKeyPattern = configuration.routingKeyPattern || '';
+        }
       };
 
       const handleSubmit = async (closeModalAfterSuccess = true) => {
@@ -292,7 +309,7 @@
             if (isApiHeaders && Object.values(isApiHeaders).includes('')) {
               return createMessage.error('请填写属性');
             }
-            setClientProperties(allPostForm);
+            setConfiguration(allPostForm);
             const res = await postAddConvertApi(allPostForm);
             if (res) {
               closeModalAfterSuccess && closeModal();
@@ -321,8 +338,8 @@
               datasourceType: allPostForm.datasourceType,
               datasourceContent: allPostForm.datasourceContent,
             });
-            setClientProperties(allPostForm);
-            setClientProperties(noEditObj);
+            setConfiguration(allPostForm);
+            setConfiguration(noEditObj);
             const res = await postAddConvertApi(isEdit.value ? noEditObj : allPostForm);
             if (res) {
               closeModalAfterSuccess && closeModal();