Merge branch 'ft-dev' into 'main'

fix:DEFECT-387视频管理编辑回显问题和加了一些验证

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

@@ -54,7 +54,10 @@ export const emailRule: Rule[] = [
 ];
 ];
 
 
 // 中文正则
 // 中文正则
-export const ChineseRegexp = /[\u4E00-\u9FA5]/g;
+export const ChineseRegexp = /[\u4E00-\u9FA5]/;
+
+//字母或者数字正则
+export const allowLetterAndNumberRegExp = /^[A-Za-z0-9]+$/;
 
 
 // 电子邮箱正则
 // 电子邮箱正则
 export const EmailRegexp = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
 export const EmailRegexp = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
@@ -62,6 +65,36 @@ 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 PhoneRegexp = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
 
 
+/**
+ * 视频管理
+ */
+export const CameraMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('视频标题长度不超过200字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const CameraVideoUrl: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      const ChineseRegexp = /[\u4E00-\u9FA5]/;
+      if (ChineseRegexp.test(value)) {
+        return Promise.reject('视频流不能是中文');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
 //站内通知
 //站内通知
 export const NotificationTitleMaxLength: Rule[] = [
 export const NotificationTitleMaxLength: Rule[] = [
   {
   {

@@ -57,14 +57,9 @@
         setDrawerProps({ confirmLoading: false });
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
         isUpdate.value = !!data?.isUpdate;
         if (unref(isUpdate)) {
         if (unref(isUpdate)) {
-          if (data.record.organizationDTO) {
-            await setFieldsValue(data.record);
-          } else {
-            editId.value = data.record.id;
-            tenantLogo.value = data.record?.avatar;
-            Reflect.deleteProperty(data.record, 'organizationId');
-            await setFieldsValue(data.record);
-          }
+          editId.value = data.record.id;
+          tenantLogo.value = data.record?.avatar;
+          await setFieldsValue(data.record);
         } else {
         } else {
           tenantLogo.value = '';
           tenantLogo.value = '';
           editId.value = '';
           editId.value = '';

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { getOrganizationList } from '/@/api/system/system';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { copyTransFun } from '/@/utils/fnUtils';
+import type { FormSchema as QFormSchema } from '/@/components/Form/index';
+
+import { CameraVideoUrl, CameraMaxLength } from '/@/utils/rules';
 
 
 // 表格列数据
 // 表格列数据
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
@@ -57,7 +60,7 @@ export const searchFormSchema: FormSchema[] = [
 ];
 ];
 
 
 // 弹框配置项
 // 弹框配置项
-export const formSchema: FormSchema[] = [
+export const formSchema: QFormSchema[] = [
   {
   {
     field: 'avatar',
     field: 'avatar',
     label: '视频封面',
     label: '视频封面',
@@ -73,6 +76,7 @@ export const formSchema: FormSchema[] = [
       placeholder: '请输入视频名字',
       placeholder: '请输入视频名字',
       maxLength: 30,
       maxLength: 30,
     },
     },
+    rules: CameraMaxLength,
   },
   },
   {
   {
     field: 'organizationId',
     field: 'organizationId',
@@ -91,7 +95,6 @@ export const formSchema: FormSchema[] = [
     field: 'brand',
     field: 'brand',
     label: '视频厂家',
     label: '视频厂家',
     component: 'Input',
     component: 'Input',
-    required: true,
     componentProps: {
     componentProps: {
       placeholder: '请输入视频厂家',
       placeholder: '请输入视频厂家',
     },
     },
@@ -99,8 +102,9 @@ export const formSchema: FormSchema[] = [
   {
   {
     field: 'sn',
     field: 'sn',
     label: '摄像头编号',
     label: '摄像头编号',
-    component: 'Input',
     required: true,
     required: true,
+    component: 'Input',
+    rules: CameraVideoUrl,
     componentProps: {
     componentProps: {
       placeholder: '请输入摄像头编号',
       placeholder: '请输入摄像头编号',
     },
     },
@@ -114,5 +118,6 @@ export const formSchema: FormSchema[] = [
       placeholder: '请输入视频流',
       placeholder: '请输入视频流',
       maxLength: 255,
       maxLength: 255,
     },
     },
+    rules: CameraVideoUrl,
   },
   },
 ];
 ];