Merge branch 'main' into ft-dev

 import { FormSchema } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { isExistDataManagerNameApi } from '/@/api/datamanager/dataManagerApi';
 import { ref } from 'vue';
 import { useMessage } from '/@/hooks/web/useMessage';
 const { createMessage } = useMessage();
@@ -125,25 +124,7 @@ export const modeKafkaForm: FormSchema[] = [
               if (value == '') {
                 reject('请输入名称');
               } else {
-                if (values.name != undefined) {
-                  isExistDataManagerNameApi({
-                    id: '',
-                    name: value,
-                    type:
-                      typeValue.value == ''
-                        ? 'org.thingsboard.rule.engine.kafka.TbKafkaNode'
-                        : typeValue.value,
-                  }).then((data) => {
-                    if (data == true) {
-                      createMessage.error('名称已存在');
-                      resolve();
-                    } else {
-                      resolve();
-                    }
-                  });
-                } else {
-                  resolve();
-                }
+                resolve();
               }
             });
           },
@@ -319,39 +300,6 @@ export const modeMqttForm: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入名称',
     },
-    dynamicRules: ({ values }) => {
-      return [
-        {
-          required: true,
-          validator(_, value) {
-            return new Promise((resolve, reject) => {
-              if (value == '') {
-                reject('请输入名称');
-              } else {
-                if (values.name != undefined) {
-                  isExistDataManagerNameApi({
-                    name: value,
-                    type:
-                      typeValue.value == ''
-                        ? 'org.thingsboard.rule.engine.mqtt.TbMqttNode'
-                        : typeValue.value,
-                  }).then((data) => {
-                    if (data == true) {
-                      createMessage.error('名称已存在');
-                      resolve();
-                    } else {
-                      resolve();
-                    }
-                  });
-                } else {
-                  resolve();
-                }
-              }
-            });
-          },
-        },
-      ];
-    },
   },
   {
     field: 'topicPattern',
@@ -440,24 +388,24 @@ export const modeMqttForm: FormSchema[] = [
   },
   {
     field: 'username',
-    label: 'Username',
+    label: '用户名',
     colProps: { span: 12 },
     component: 'Input',
     required: true,
     componentProps: {
       maxLength: 255,
-      placeholder: '请输入Username',
+      placeholder: '请输入用户名',
     },
     ifShow: ({ values }) => isBasic(Reflect.get(values, 'type')),
   },
   {
     field: 'password',
-    label: 'Password',
+    label: '密码',
     colProps: { span: 12 },
     component: 'Input',
     componentProps: {
       maxLength: 255,
-      placeholder: '请输入Password',
+      placeholder: '请输入密码',
     },
     ifShow: ({ values }) => isBasic(Reflect.get(values, 'type')),
   },
@@ -528,24 +476,7 @@ export const modeRabbitMqForm: FormSchema[] = [
               if (value == '') {
                 reject('请输入名称');
               } else {
-                if (values.name != undefined) {
-                  isExistDataManagerNameApi({
-                    name: value,
-                    type:
-                      typeValue.value == ''
-                        ? 'org.thingsboard.rule.engine.rabbitmq.TbRabbitMqNode'
-                        : typeValue.value,
-                  }).then((data) => {
-                    if (data == true) {
-                      createMessage.error('名称已存在');
-                      resolve();
-                    } else {
-                      resolve();
-                    }
-                  });
-                } else {
-                  resolve();
-                }
+                resolve();
               }
             });
           },

@@ -66,7 +66,7 @@
 <script lang="ts">
   import { defineComponent, ref, reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { modeMqttForm } from '../config';
+  import { CredentialsEnum, modeMqttForm } from '../config';
   import { InboxOutlined } from '@ant-design/icons-vue';
   import { Alert, Divider, Descriptions, Upload } from 'ant-design-vue';
 
@@ -128,6 +128,12 @@
       const getSonValueFunc = async () => {
         sonValues.configuration = await validate();
         credentialsV.credentials.type = sonValues.configuration.type;
+        if (credentialsV.credentials.type == CredentialsEnum.IS_BASIC) {
+          credentialsV.credentials.username = sonValues.configuration.username;
+          credentialsV.credentials.password = sonValues.configuration.password;
+          sonValues.configuration.username = undefined;
+          sonValues.configuration.password = undefined;
+        }
         Object.assign(sonValues.configuration, credentialsV);
         return sonValues;
       };