Merge branch 'ft' into 'main_dev'

fix: DEFECT-1405 修复测试数据，输出参数没有显示完全

See merge request yunteng/thingskit-front!739

@@ -67,7 +67,7 @@ export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
 
 
       if (items.length) {
       if (items.length) {
         const first = items.at(0)!;
         const first = items.at(0)!;
-        const { deviceName, id, severity } = first;
+        const { deviceName, id, severity, type } = first;
 
 
         let key: Nullable<string> = `open-notify-${id}`;
         let key: Nullable<string> = `open-notify-${id}`;
 
 
@@ -82,6 +82,10 @@ export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
               h('span', { style: { marginRight: '5px' } }, '设备:'),
               h('span', { style: { marginRight: '5px' } }, '设备:'),
               h('span', {}, `[${deviceName}]`),
               h('span', {}, `[${deviceName}]`),
             ]),
             ]),
+            h('div', { style: { marginRight: '5px' } }, [
+              h('span', { style: { marginRight: '5px' } }, '告警场景:'),
+              h('span', {}, `[${type}]`),
+            ]),
             h('div', { style: { marginTop: '5px' } }, [
             h('div', { style: { marginTop: '5px' } }, [
               h('span', { style: { marginRight: '5px' } }, '告警状态:'),
               h('span', { style: { marginRight: '5px' } }, '告警状态:'),
               h(Tag, { color }, () => `${alarmNotifyStatusMean}`),
               h(Tag, { color }, () => `${alarmNotifyStatusMean}`),

@@ -109,6 +109,15 @@
         unref(DeviceStep1Ref)?.resetFields();
         unref(DeviceStep1Ref)?.resetFields();
         unref(DeviceStep2Ref)?.resetFieldsValueAndStatus();
         unref(DeviceStep2Ref)?.resetFieldsValueAndStatus();
       }
       }
+      //验证设备名称不能超过255长度
+      const MAX_NAME_LENGTH = 255;
+      const validateNameLength = (name: string) => {
+        if (String(name).length > MAX_NAME_LENGTH) {
+          const errorText = `设备名称长度不能超过${MAX_NAME_LENGTH}`;
+          createMessage.error(errorText);
+          throw Error(errorText);
+        }
+      };
       // 提交
       // 提交
       const msg = computed(() => (unref(isUpdate) ? '更新设备成功' : '新增设备成功'));
       const msg = computed(() => (unref(isUpdate) ? '更新设备成功' : '新增设备成功'));
       async function handleOk() {
       async function handleOk() {
@@ -150,6 +159,7 @@
                 ...DeviceStep1Ref.value?.positionState,
                 ...DeviceStep1Ref.value?.positionState,
               },
               },
             };
             };
+            validateNameLength(stepRecord.name);
             await createOrEditDevice(editData);
             await createOrEditDevice(editData);
           } else {
           } else {
             const stepRecord = unref(stepState);
             const stepRecord = unref(stepState);
@@ -178,6 +188,7 @@
                           : null,
                           : null,
                     },
                     },
             };
             };
+            validateNameLength(stepRecord.name);
             await createOrEditDevice(createData);
             await createOrEditDevice(createData);
           }
           }
           createMessage.success(unref(msg));
           createMessage.success(unref(msg));

@@ -107,7 +107,6 @@
           v-else
           v-else
           v-model:value="scriptForm.output"
           v-model:value="scriptForm.output"
           placeholder="输出参数为服务端返回的内容"
           placeholder="输出参数为服务端返回的内容"
-          :maxlength="255"
         />
         />
       </a-form-item>
       </a-form-item>
     </a-form>
     </a-form>

@@ -138,7 +138,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     component: 'Input',
     required: true,
     required: true,
     componentProps: {
     componentProps: {
-      maxLength: 255,
+      maxLength: 100,
     },
     },
   },
   },