Merge branch 'perf/linkedage' into 'main_dev'

perf: 修改场景联动事件触发key与调整清除告警样式

See merge request yunteng/thingskit-front!1055

@@ -137,9 +137,10 @@ export const getFormSchemas = (hasAlarmNotify: Ref<boolean>): FormSchema[] => {
     },
     },
     {
     {
       field: FormFieldsEnum.ENABLE_CLEAR_RULE,
       field: FormFieldsEnum.ENABLE_CLEAR_RULE,
-      label: '',
+      label: ' ',
       component: 'Checkbox',
       component: 'Checkbox',
       ifShow: ({ model }) => model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.MSG_NOTIFY,
       ifShow: ({ model }) => model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.MSG_NOTIFY,
+      labelWidth: 24,
       renderComponentContent: () => ({
       renderComponentContent: () => ({
         default: () => [
         default: () => [
           h('span', FormFieldsNameEnum.ENABLE_CLEAR_RULE),
           h('span', FormFieldsNameEnum.ENABLE_CLEAR_RULE),

@@ -14,7 +14,7 @@ import { ConditionItemType } from '../ConditionFilter/type';
 export function useFlipFlopData(
 export function useFlipFlopData(
   flipFlopListRef: Ref<FlipFlopItemType[]>
   flipFlopListRef: Ref<FlipFlopItemType[]>
 ): DefineComponentsBasicExpose<FlipFlopConditionType[]> {
 ): DefineComponentsBasicExpose<FlipFlopConditionType[]> {
-  const getEventTriggerCOndition = (
+  const getEventTriggerCondition = (
     basicRecord: FlipFlopFormRecordType,
     basicRecord: FlipFlopFormRecordType,
     _flipFlopItem: FlipFlopItemType
     _flipFlopItem: FlipFlopItemType
   ): ConditionItemType[] => {
   ): ConditionItemType[] => {
@@ -23,7 +23,7 @@ export function useFlipFlopData(
       {
       {
         key: {
         key: {
           type: DeviceTriggerTypeEum.DEVICE_EVENT,
           type: DeviceTriggerTypeEum.DEVICE_EVENT,
-          key: deviceEventTriggerKey,
+          key: 'eventIdentifier',
         },
         },
         valueType: TriggerValueTypeEnum.STRING,
         valueType: TriggerValueTypeEnum.STRING,
         predicate: {
         predicate: {
@@ -41,7 +41,7 @@ export function useFlipFlopData(
     const { conditionType } = basicRecord;
     const { conditionType } = basicRecord;
     return conditionType === DeviceTriggerTypeEum.TIME_SERIES
     return conditionType === DeviceTriggerTypeEum.TIME_SERIES
       ? flipFlopItem.conditionRef?.getFieldsValue() || []
       ? flipFlopItem.conditionRef?.getFieldsValue() || []
-      : getEventTriggerCOndition(basicRecord, flipFlopItem);
+      : getEventTriggerCondition(basicRecord, flipFlopItem);
   };
   };
 
 
   const crateFlipFlopCondition = (flipFlopItem: FlipFlopItemType): FlipFlopConditionType => {
   const crateFlipFlopCondition = (flipFlopItem: FlipFlopItemType): FlipFlopConditionType => {
@@ -106,6 +106,7 @@ export function useFlipFlopData(
         const { key, valueType } = firstItem;
         const { key, valueType } = firstItem;
         const { type, unit, predicate } = condition.spec;
         const { type, unit, predicate } = condition.spec;
         const { defaultValue } = predicate || {};
         const { defaultValue } = predicate || {};
+        const { value } = firstItem.predicate;
 
 
         const record = {
         const record = {
           ...data,
           ...data,
@@ -122,7 +123,7 @@ export function useFlipFlopData(
 
 
         if (key.type === DeviceTriggerTypeEum.DEVICE_EVENT) {
         if (key.type === DeviceTriggerTypeEum.DEVICE_EVENT) {
           Object.assign(record, {
           Object.assign(record, {
-            [FormFieldEnum.DEVICE_EVENT_TRIGGER_KEY]: key.key,
+            [FormFieldEnum.DEVICE_EVENT_TRIGGER_KEY]: value.defaultValue,
             [FormFieldEnum.CONDITION_KEY]: null,
             [FormFieldEnum.CONDITION_KEY]: null,
           });
           });
         }
         }