Merge branch 'ft-dev' into 'main'

fix:修复设备配置无法点击第三步问题，feat:站内通知表单字段限制

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

@@ -60,3 +60,182 @@ export const EmailRegexp = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a
 
 // 手机号正则
 export const PhoneRegexp = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+
+//站内通知
+export const NotificationTitleMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('标题长度不超过200字');
+      }
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const NotificationContentMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('内容长度不超过50字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+export const NotificationTypeMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (!value) {
+        return Promise.reject('请选择类型');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceNameMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 30) {
+        return Promise.reject('设备名称长度不超过30字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceProfileIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('设备配置长度不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceOrgIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('组织长度不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceLabelMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 255) {
+        return Promise.reject('设备标签不超过255字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+export const DeviceDescriptionlMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 500) {
+        return Promise.reject('备注不超过500字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+export const DeviceIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('id不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceTenantIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('租户Code不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceTbDeviceIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('tbDeviceId不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceUserNameMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('用户名长度不超过50字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceQueryUserNameMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('设备名称长度不超过50字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceProfileQueryUserNameMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('配置名称长度不超过50字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];

@@ -3,6 +3,18 @@ import { findDictItemByCode } from '/@/api/system/dict';
 import { deviceProfile } from '/@/api/device/deviceManager';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
+import {
+  DeviceNameMaxLength,
+  DeviceUserNameMaxLength,
+  DeviceProfileIdMaxLength,
+  DeviceOrgIdMaxLength,
+  DeviceLabelMaxLength,
+  DeviceDescriptionlMaxLength,
+  DeviceIdMaxLength,
+  DeviceTenantIdMaxLength,
+  DeviceTbDeviceIdMaxLength,
+} from '/@/utils/rules';
+
 // 第一步的表单
 export const step1Schemas: FormSchema[] = [
   {
@@ -17,8 +29,9 @@ export const step1Schemas: FormSchema[] = [
     required: true,
     component: 'Input',
     componentProps: {
-      maxLength: 30,
+      placeholder: '设备名称',
     },
+    rules: DeviceNameMaxLength,
   },
   {
     field: 'deviceType',
@@ -26,6 +39,7 @@ export const step1Schemas: FormSchema[] = [
     required: true,
     component: 'ApiSelect',
     componentProps: {
+      placeholder: '设备类型',
       api: findDictItemByCode,
       params: {
         dictCode: 'device_type',
@@ -44,6 +58,7 @@ export const step1Schemas: FormSchema[] = [
       labelField: 'name',
       valueField: 'id',
     },
+    rules: DeviceProfileIdMaxLength,
   },
   {
     field: 'organizationId',
@@ -57,6 +72,7 @@ export const step1Schemas: FormSchema[] = [
         return data;
       },
     },
+    rules: DeviceOrgIdMaxLength,
   },
   {
     field: 'label',
@@ -65,6 +81,7 @@ export const step1Schemas: FormSchema[] = [
     componentProps: {
       maxLength: 255,
     },
+    rules: DeviceLabelMaxLength,
   },
   {
     field: 'deviceAddress',
@@ -76,24 +93,28 @@ export const step1Schemas: FormSchema[] = [
     field: 'description',
     label: '备注',
     component: 'InputTextArea',
+    rules: DeviceDescriptionlMaxLength,
   },
   {
     field: 'id',
     label: 'id',
     component: 'Input',
     show: false,
+    rules: DeviceIdMaxLength,
   },
   {
     field: 'tenantId',
     label: '租户Code',
     component: 'Input',
     show: false,
+    rules: DeviceTenantIdMaxLength,
   },
   {
     field: 'tbDeviceId',
     label: 'tbDeviceId',
     component: 'Input',
     show: false,
+    rules: DeviceTbDeviceIdMaxLength,
   },
 ];
 
@@ -264,6 +285,7 @@ export const step2Schemas: FormSchema[] = [
     component: 'Input',
     field: 'username',
     required: true,
+    rules: DeviceUserNameMaxLength,
     ifShow: false,
   },
   {
@@ -430,6 +452,7 @@ export const TokenSchemas: FormSchema[] = [
     field: 'username',
     required: true,
     ifShow: false,
+    rules: DeviceUserNameMaxLength,
   },
   {
     label: '密码',

@@ -2,6 +2,8 @@ import { formatToDate } from '/@/utils/dateUtil';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { DeviceTypeEnum, DeviceState } from '/@/api/device/model/deviceModel';
+import { DeviceQueryUserNameMaxLength } from '/@/utils/rules';
+
 // 表格列数据
 export const columns: BasicColumn[] = [
   {
@@ -84,6 +86,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'name',
     label: '设备名称',
     component: 'Input',
-    colProps: { span: 6 },
+    colProps: { span: 7 },
+    rules: DeviceQueryUserNameMaxLength,
   },
 ];

@@ -34,10 +34,9 @@
           @next="handleStep3Next"
           @redo="handleRedo"
       /></div>
-
       <div v-show="current === 3">
-        <DeviceProfileStep4 ref="DeviceProfileStep4Ref" @prev="handleStepPrev"
-      /></div>
+        <DeviceProfileStep4 ref="DeviceProfileStep4Ref" @prev="handleStepPrev" />
+      </div>
     </div>
   </BasicModal>
 </template>
@@ -95,6 +94,8 @@
           current.value = 0;
           proxy.$refs.DeviceProfileStep3Ref.clearProfileDataFunc();
           proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
+          // proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc();
+
           switch (current.value) {
             case 0:
               proxy.$refs.DeviceProfileStep1Ref.customResetFunc();
@@ -142,6 +143,7 @@
       }
       function handleStep2Next(v) {
         current.value++;
+
         getStepTwoData.value = v;
         if (unref(isUpdate)) {
           proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormFunc({
@@ -234,13 +236,22 @@
       function handleStep3Next(v) {
         current.value++;
         getStepThreeData.value = v;
-        if (unref(isUpdate)) {
-          proxy.$refs.DeviceProfileStep4Ref.resetFieldsFunc({
-            alarmContactId: editEchoData.value.alarmProfile.alarmContactId,
-            messageMode: editEchoData.value.alarmProfile.messageMode,
-          });
-        } else {
-          proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc();
+        try {
+          if (unref(isUpdate)) {
+            setTimeout(() => {
+              proxy.$refs.DeviceProfileStep4Ref.resetFieldsFunc({
+                alarmContactId: editEchoData.value.alarmProfile.alarmContactId,
+                messageMode: editEchoData.value.alarmProfile.messageMode,
+              });
+            }, 1000);
+          }
+          // if (!unref(isUpdate)) {
+          //   setTimeout(() => {
+          //     proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc();
+          //   }, 1000);
+          // }
+        } catch (e) {
+          return e;
         }
       }
       function handleRedo() {

@@ -2,8 +2,9 @@ import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { MessageEnum } from '/@/enums/messageEnum';
-import { getOrganizationList } from '/@/api/system/system';
-import { copyTransFun } from '/@/utils/fnUtils';
+// import { getOrganizationList } from '/@/api/system/system';
+// import { copyTransFun } from '/@/utils/fnUtils';
+import { DeviceProfileQueryUserNameMaxLength } from '/@/utils/rules';
 
 export const columns: BasicColumn[] = [
   {
@@ -30,23 +31,13 @@ export const columns: BasicColumn[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'organizationId',
-    label: '请选择组织',
-    component: 'ApiTreeSelect',
-    colProps: { span: 6 },
-    componentProps: {
-      api: async () => {
-        const data = await getOrganizationList();
-        copyTransFun(data as any as any[]);
-        return data;
-      },
-    },
-  },
-  {
     field: 'name',
     label: '配置名称',
     component: 'Input',
     colProps: { span: 8 },
+    componentProps: {
+      placeholder: '请输入配置名称',
+    },
   },
 ];
 
@@ -63,6 +54,10 @@ export const formSchema: FormSchema[] = [
     label: '配置名称',
     required: true,
     component: 'Input',
+    componentProps: {
+      placeholder: '请输入配置名称',
+    },
+    rules: DeviceProfileQueryUserNameMaxLength,
   },
   {
     field: 'messageType',

@@ -223,7 +223,8 @@
       const [register] = useModalInner(async (data) => {
         activeKey.value = '1';
         isUpdate.value = !!data?.isUpdate;
-        descInfo.value = await deviceConfigGetDetail(data.record.id);
+        const getV = await deviceConfigGetDetail(data.record.id);
+        descInfo.value = getV;
         try {
           resetFields();
           await setRegisterDetail({ ...descInfo.value });
@@ -312,10 +313,12 @@
                 });
               }, 1000);
             case '4':
-              setRegisterContact({
-                alarmContactId: descInfo.value.alarmProfile.alarmContactId,
-                messageMode: descInfo.value.alarmProfile.messageMode,
-              });
+              setTimeout(() => {
+                setRegisterContact({
+                  alarmContactId: descInfo.value.alarmProfile.alarmContactId,
+                  messageMode: descInfo.value.alarmProfile.messageMode,
+                });
+              }, 1000);
               break;
           }
         } catch (e) {

@@ -949,7 +949,11 @@
         isRuleAlarmRuleConditions.value = 4;
         setTimeout(() => {
           openModal4(true);
-          proxy.$refs.getChildData1.resetDataFunc();
+          try {
+            proxy.$refs.getChildData1.resetDataFunc();
+          } catch (e) {
+            return e;
+          }
         }, 50);
       };
       const handleOpenClearEnableRule = () => {

@@ -5,6 +5,7 @@ import { deviceConfigGetRuleChain } from '/@/api/device/deviceConfigApi';
 import { ref } from 'vue';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { alarmContactGetPage } from '/@/api/device/deviceConfigApi';
+import { DeviceProfileQueryUserNameMaxLength } from '/@/utils/rules';
 
 export const step1Schemas: FormSchema[] = [
   {
@@ -13,8 +14,9 @@ export const step1Schemas: FormSchema[] = [
     required: true,
     component: 'Input',
     componentProps: {
-      maxLength: 30,
+      placeholder: '请输入配置名称',
     },
+    rules: DeviceProfileQueryUserNameMaxLength,
   },
   //规则链(string)
   {
@@ -216,7 +218,9 @@ export const alertContactsSchemas: FormSchema[] = [
     field: 'alarmContactId',
     label: '告警通知联系人',
     component: 'ApiSelect',
+    required: true,
     componentProps: {
+      placeholder: '请选择告警通知联系人',
       api: alarmContactGetPage,
       labelField: 'username',
       valueField: 'id',
@@ -229,6 +233,7 @@ export const alertContactsSchemas: FormSchema[] = [
     required: true,
     component: 'ApiSelect',
     componentProps: {
+      placeholder: '请选择告警通知方式',
       api: findDictItemByCode,
       params: {
         dictCode: 'message_type',

@@ -5,6 +5,7 @@ import { Tinymce } from '/@/components/Tinymce/index';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { Tag } from 'ant-design-vue';
+import { NotificationTitleMaxLength, NotificationTypeMaxLength } from '/@/utils/rules';
 
 export enum IsOrgEnum {
   IS_ORG_ENUM = '1',
@@ -86,6 +87,7 @@ export const formSchema: FormSchema[] = [
         },
       ],
     },
+    rules: NotificationTypeMaxLength,
   },
   {
     field: 'title',
@@ -96,6 +98,7 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       placeholder: '请输入标题',
     },
+    rules: NotificationTitleMaxLength,
   },
   {
     field: 'content',