Merge branch 'f-dev' into 'main'

fix：修改地理位置弹窗 修改数据流转属性验证

See merge request huang/yun-teng-iot-front!258

@@ -2,7 +2,7 @@
   <div class="wrapper">
     <div ref="wrapRef" :style="{ height, width }"> </div>
     <div class="right-wrap">
-      <BasicTable @register="registerTable" @rowClick="deviceRowClick">
+      <BasicTable style="cursor: pointer" @register="registerTable" @rowClick="deviceRowClick">
         <template #deviceState="{ record }">
           <Tag
             :color="
@@ -230,24 +230,28 @@
         const BMap = (window as any).BMap;
         const wrapEl = unref(wrapRef);
         const map = new BMap.Map(wrapEl);
-        if (record.deviceInfo.address) {
-          keys = await getDeviceDataKeys(entityId);
-          const { name, organizationDTO, deviceState, deviceProfile } = record;
-          const { longitude, latitude, address } = record.deviceInfo;
-          const point = new BMap.Point(longitude, latitude);
-          let options = {
-            width: 330, // 信息窗口宽度
-            height: 0, // 信息窗口高度
-          };
-          map.centerAndZoom(point, 15);
-          map.enableScrollWheelZoom(true);
-          // 创建信息窗口对象
-          const res = await getDeviceActiveTime(entityId);
+        // if (record.deviceInfo.address) {
+        keys = await getDeviceDataKeys(entityId);
+        const { name, organizationDTO, deviceState, deviceProfile } = record;
+        const { longitude, latitude, address } = record.deviceInfo;
+        //这里如果没有地理位置 最好设置一个默认位置 不然地图会全蓝
+        const point = new BMap.Point(
+          longitude == '' ? 104.04666605565338 : longitude,
+          latitude == '' ? 30.543516387560476 : latitude
+        );
+        let options = {
+          width: 330, // 信息窗口宽度
+          height: 0, // 信息窗口高度
+        };
+        map.centerAndZoom(point, 15);
+        map.enableScrollWheelZoom(true);
+        // 创建信息窗口对象
+        const res = await getDeviceActiveTime(entityId);
 
-          let { value: activeStatus, lastUpdateTs } = res[0];
-          lastUpdateTs = moment(lastUpdateTs).format('YYYY-MM-DD HH:mm:ss');
-          let infoWindow = new BMap.InfoWindow(
-            `
+        let { value: activeStatus, lastUpdateTs } = res[0];
+        lastUpdateTs = moment(lastUpdateTs).format('YYYY-MM-DD HH:mm:ss');
+        let infoWindow = new BMap.InfoWindow(
+          `
             <div style="display:flex;justify-content:space-between; margin:20px 0px;">
               <div style="font-size:16px;font-weight:bold">${name}</div>
               ${
@@ -261,43 +265,45 @@
             </div>
             <div>所属组织：${organizationDTO.name}</div>
             <div style="margin-top:6px;">接入协议：${deviceProfile.transportType}</div>
-            <div style="margin-top:6px;">设备位置：${address}</div>
+            <div style="margin-top:6px;">设备位置：${
+              address == '' ? '该设备暂无地理位置' : address
+            }</div>
             <div style="margin-top:6px;">${activeStatus ? '在' : '离'}线时间：${lastUpdateTs}</div>
             <div style="display:flex;justify-content:end; margin-top:10px">
               <button onclick="openDeviceInfoDrawer()" style="margin-right:10px;color:#fff;background-color:#409eff;padding:4px; border-radius:4px;">设备信息</button>
               <button onclick="openHistoryModal()" style="color:#fff;background-color:#409eff;padding:4px; border-radius:4px;">历史数据</button>
             </div>
             `,
-            options
-          );
+          options
+        );
 
-          map.openInfoWindow(infoWindow, map.getCenter());
-          let preMarker = null;
+        map.openInfoWindow(infoWindow, map.getCenter());
+        let preMarker = null;
 
-          const rivet = deviceState === 'INACTIVE' ? djx : deviceState === 'ONLINE' ? zx : lx;
-          let myIcon = new BMap.Icon(rivet, new BMap.Size(20, 30));
-          let marker = new BMap.Marker(point, { icon: myIcon });
-          if (marker) {
-            map.removeOverlay(preMarker);
-          }
-          map.addOverlay(marker);
-          //标注监听事件
-          marker.addEventListener('click', function () {
-            map.openInfoWindow(infoWindow, map.getCenter());
-          });
-          //标注监听事件
-        } else {
-          const point = new BMap.Point(106.63028229687498, 36.06735821600903);
-          let options = {
-            width: 100, // 信息窗口宽度
-            height: 100, // 信息窗口高度
-            title: '提示', // 信息窗口标题
-          };
-          map.centerAndZoom(point, 5);
-          map.enableScrollWheelZoom(true);
-          let infoWindow = new BMap.InfoWindow('该设备暂无地理位置', options); // 创建信息窗口对象
-          map.openInfoWindow(infoWindow, map.getCenter());
+        const rivet = deviceState === 'INACTIVE' ? djx : deviceState === 'ONLINE' ? zx : lx;
+        let myIcon = new BMap.Icon(rivet, new BMap.Size(20, 30));
+        let marker = new BMap.Marker(point, { icon: myIcon });
+        if (marker) {
+          map.removeOverlay(preMarker);
         }
+        map.addOverlay(marker);
+        //标注监听事件
+        marker.addEventListener('click', function () {
+          map.openInfoWindow(infoWindow, map.getCenter());
+        });
+        //标注监听事件
+        // } else {
+        //   const point = new BMap.Point(106.63028229687498, 36.06735821600903);
+        //   let options = {
+        //     width: 100, // 信息窗口宽度
+        //     height: 100, // 信息窗口高度
+        //     title: '提示', // 信息窗口标题
+        //   };
+        //   map.centerAndZoom(point, 5);
+        //   map.enableScrollWheelZoom(true);
+        //   let infoWindow = new BMap.InfoWindow('该设备暂无地理位置', options); // 创建信息窗口对象
+        //   map.openInfoWindow(infoWindow, map.getCenter());
+        // }
       };
 
       // 设备信息

@@ -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;