Merge branch 'ww' into 'main'

fix: 修复数据流转RabbitMQ ClientProperties字段为空时,需要保存为空对象

See merge request yunteng/thingskit-front!501

@@ -14,7 +14,7 @@ VITE_GLOB_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # 线上测试环境
 # 线上测试环境
 # VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
-VITE_PROXY = [["/api","http://222.180.200.114:48080/api"],["/thingskit-drawio","http://localhost:3000/"]]
+VITE_PROXY = [["/api","http://222.180.200.114:48080/api"],["/thingskit-drawio","http://localhost:3000/"],["/large-designer", "http://localhost:5555/large-designer/"]]
 # VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://192.168.10.103:8080/api"],["/thingskit-drawio","http://192.168.10.136:8080/api"]]
 # VITE_PROXY = [["/api","http://192.168.10.103:8080/api"],["/thingskit-drawio","http://192.168.10.136:8080/api"]]
 
 

@@ -259,6 +259,12 @@
           delete allPostForm.id;
           delete allPostForm.id;
         }
         }
       };
       };
+      const setClientProperties = (record: Recordable) => {
+        const configuration = Reflect.get(record, 'configuration');
+        const clientProperties = Reflect.get(configuration, 'clientProperties');
+        !clientProperties && record.configuration && (record.configuration.clientProperties = {});
+      };
+
       const handleSubmit = async (closeModalAfterSuccess = true) => {
       const handleSubmit = async (closeModalAfterSuccess = true) => {
         try {
         try {
           closeModalAfterSuccess && setModalProps({ confirmLoading: true });
           closeModalAfterSuccess && setModalProps({ confirmLoading: true });
@@ -278,7 +284,7 @@
             if (isApiHeaders && Object.values(isApiHeaders).includes('')) {
             if (isApiHeaders && Object.values(isApiHeaders).includes('')) {
               return createMessage.error('请填写属性');
               return createMessage.error('请填写属性');
             }
             }
-            Object.assign(allPostForm, { clientProperties: {} });
+            setClientProperties(allPostForm);
             const res = await postAddConvertApi(allPostForm);
             const res = await postAddConvertApi(allPostForm);
             if (res) {
             if (res) {
               closeModalAfterSuccess && closeModal();
               closeModalAfterSuccess && closeModal();
@@ -304,10 +310,11 @@
               }
               }
             }
             }
             Object.assign(noEditObj, getTypeObj, {
             Object.assign(noEditObj, getTypeObj, {
-              clientProperties: {},
               datasourceType: allPostForm.datasourceType,
               datasourceType: allPostForm.datasourceType,
               datasourceContent: allPostForm.datasourceContent,
               datasourceContent: allPostForm.datasourceContent,
             });
             });
+            setClientProperties(allPostForm);
+            setClientProperties(noEditObj);
             const res = await postAddConvertApi(isEdit.value ? noEditObj : allPostForm);
             const res = await postAddConvertApi(isEdit.value ? noEditObj : allPostForm);
             if (res) {
             if (res) {
               closeModalAfterSuccess && closeModal();
               closeModalAfterSuccess && closeModal();

@@ -587,7 +587,9 @@ export const actionSchema: FormSchema[] = [
         placeholder: '请选择服务',
         placeholder: '请选择服务',
         api: async (params: Recordable) => {
         api: async (params: Recordable) => {
           try {
           try {
-            const record = await getModelServices(params as Record<'deviceProfileId', string>);
+            if (!Reflect.get(params, 'deviceProfileId')) return [];
+            const record =
+              (await getModelServices(params as Record<'deviceProfileId', string>)) || [];
             const selected = record.find((item) => item.id === thingsModelId);
             const selected = record.find((item) => item.id === thingsModelId);
             selected &&
             selected &&
               updateSchema({
               updateSchema({