Merge branch 'perf/linkedage-alarm' into 'main_dev'

perf: 优化变更场景联动告警输出告警等级与告警配置顺序

See merge request yunteng/thingskit-front!1155

@@ -102,6 +102,22 @@ export const getFormSchemas = (hasAlarmNotify: Ref<boolean>): FormSchema[] => {
       },
       },
     },
     },
     {
     {
+      field: FormFieldsEnum.ALARM_LEVEL,
+      label: '',
+      component: 'Select',
+      ifShow: ({ model }) => model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.MSG_NOTIFY,
+      rules: [{ required: true, message: `请选择${FormFieldsNameEnum.ALARM_LEVEL}` }],
+      componentProps: () => {
+        return {
+          options: Object.keys(AlarmLevelEnum).map((value) => ({
+            label: AlarmLevelNameEnum[value],
+            value,
+          })),
+          placeholder: `请选择${FormFieldsNameEnum.ALARM_LEVEL}`,
+        };
+      },
+    },
+    {
       field: FormFieldsEnum.ALARM_PROFILED,
       field: FormFieldsEnum.ALARM_PROFILED,
       label: '',
       label: '',
       component: 'AlarmProfileSelect',
       component: 'AlarmProfileSelect',
@@ -115,23 +131,7 @@ export const getFormSchemas = (hasAlarmNotify: Ref<boolean>): FormSchema[] => {
           },
           },
           labelField: 'name',
           labelField: 'name',
           valueField: 'id',
           valueField: 'id',
-          placeholder: `请选择${FormFieldsNameEnum.ALARM_PROFILED}`,
-        };
-      },
-    },
-    {
-      field: FormFieldsEnum.ALARM_LEVEL,
-      label: '',
-      component: 'Select',
-      ifShow: ({ model }) => model[FormFieldsEnum.OUT_TARGET] === ExecutionActionEnum.MSG_NOTIFY,
-      rules: [{ required: true, message: `请选择${FormFieldsEnum.ALARM_LEVEL}` }],
-      componentProps: () => {
-        return {
-          options: Object.keys(AlarmLevelEnum).map((value) => ({
-            label: AlarmLevelNameEnum[value],
-            value,
-          })),
-          placeholder: `请选择${FormFieldsNameEnum.ALARM_LEVEL}`,
+          placeholder: `请选择${FormFieldsNameEnum.ALARM_PROFILED}(可选项)`,
         };
         };
       },
       },
     },
     },