Merge branch 'ww' into 'main'

fix: rule linkedge alarm configuration can not save deviceType fields

See merge request yunteng/thingskit-front!477

@@ -423,6 +423,7 @@
                     triggered:
                       action.doContext.clearRule[index].triggerCondition.condition.spec.type,
                     device: action.doContext.clearRule[index].entityType,
+                    deviceType: action.doContext.clearRule[index].deviceType,
                     triggerType: action.doContext.clearRule[index].triggerType,
                     type1:
                       action.doContext.clearRule[index].triggerCondition.condition.condition[0].key
@@ -694,8 +695,6 @@
       }
       if (mustTriggerCondition) return;
       if (mustCondition) return;
-      console.log(postAddOrEditData);
-      return;
       //FT change
       await screenLinkPageAddApi(postAddOrEditData, unref(isUpdate));
       createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);

@@ -120,7 +120,7 @@ export const genActionData = (actionData) => {
       triggerType: item.triggerType,
       entityType: item.device,
       entityId: item.device === 'PART' ? item.entityId : null,
-      deviceType,
+      deviceType: item.deviceType,
       deviceProfileId: item.deviceProfileId,
       triggerCondition: {
         alarmDetails: item.detail,