Merge branch 'local_devbranch_byft' into 'main_dev'

fix: DEFECT-1800 物模型字段中不能包含逗号

See merge request yunteng/thingskit-front!1084

 import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
 import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
+import { Rule } from '/@/components/Form';
 import { FormSchema } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { DataTypeEnum } from '/@/enums/objectModelEnum';
 import { DataTypeEnum } from '/@/enums/objectModelEnum';
 import { isNullOrUnDef } from '/@/utils/is';
 import { isNullOrUnDef } from '/@/utils/is';
@@ -27,6 +28,23 @@ interface StructFormSchemasParmasType {
   isTcp?: boolean;
   isTcp?: boolean;
 }
 }
 
 
+//功能名称和标识符 输入框不能包含逗号
+const validateExcludeComma = (field: string, errorName: string): Rule[] => {
+  return [
+    {
+      required: true,
+      trigger: 'blur',
+      validator: () => {
+        const reg = /[,，]+/;
+        if (reg.test(field)) {
+          return Promise.reject(errorName);
+        }
+        return Promise.resolve();
+      },
+    },
+  ];
+};
+
 export const formSchemas = ({
 export const formSchemas = ({
   hasStructForm,
   hasStructForm,
   hiddenAccessMode,
   hiddenAccessMode,
@@ -45,6 +63,9 @@ export const formSchemas = ({
         maxLength: 32,
         maxLength: 32,
         placeholder: '请输入功能名称',
         placeholder: '请输入功能名称',
       },
       },
+      dynamicRules: ({ values }) => {
+        return validateExcludeComma(values[FormField.FUNCTION_NAME], '功能名称不能包含逗号');
+      },
     },
     },
     {
     {
       field: FormField.IDENTIFIER,
       field: FormField.IDENTIFIER,
@@ -58,6 +79,9 @@ export const formSchemas = ({
         maxLength: 128,
         maxLength: 128,
         placeholder: '请输入标识符',
         placeholder: '请输入标识符',
       },
       },
+      dynamicRules: ({ values }) => {
+        return validateExcludeComma(values[FormField.IDENTIFIER], '标识符不能包含逗号');
+      },
     },
     },
     {
     {
       field: FormField.HAS_STRUCT_FROM,
       field: FormField.HAS_STRUCT_FROM,