Merge branch 'feat/alarm-add-dingtalk' into 'main_dev'

feat: 告警联系人新增钉钉字段

See merge request yunteng/thingskit-front!1024

@@ -120,6 +120,22 @@ export const emailRule: Rule[] = [
   },
   },
 ];
 ];
 
 
+// 钉钉验证
+export const dingRule: Rule[] = [
+  {
+    validator: (_, value: string) => {
+      const reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+      if (!value) {
+        return Promise.resolve();
+      } else if (!reg.test(value)) {
+        return Promise.reject('手机号格式不正确');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
 // 中文正则
 // 中文正则
 export const ChineseRegexp = /[\u4E00-\u9FA5]/;
 export const ChineseRegexp = /[\u4E00-\u9FA5]/;
 
 

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { BasicColumn, FormSchema } from '/@/components/Table';
-import { emailRule, phoneRule } from '/@/utils/rules';
+import { dingRule, emailRule, phoneRule } from '/@/utils/rules';
 import { useComponentRegister } from '/@/components/Form';
 import { useComponentRegister } from '/@/components/Form';
 import { OrgTreeSelect } from '../../common/OrgTreeSelect';
 import { OrgTreeSelect } from '../../common/OrgTreeSelect';
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
@@ -31,6 +31,11 @@ export const columns: BasicColumn[] = [
     width: 180,
     width: 180,
   },
   },
   {
   {
+    title: '钉钉',
+    dataIndex: 'dingtalk',
+    width: 160,
+  },
+  {
     title: '备注',
     title: '备注',
     dataIndex: 'remark',
     dataIndex: 'remark',
     width: 120,
     width: 120,
@@ -109,6 +114,17 @@ export const formSchema: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    field: 'dingtalk',
+    label: '钉钉',
+    component: 'Input',
+    helpMessage: '请输入与钉钉相关联的手机号',
+    rules: dingRule,
+    componentProps: {
+      placeholder: '不填默认为手机号码',
+      maxLength: 11,
+    },
+  },
+  {
     field: 'remark',
     field: 'remark',
     label: '备注',
     label: '备注',
     component: 'InputTextArea',
     component: 'InputTextArea',