Merge branch 'fix/object-model' into 'main_dev'

fix: 修复物模型存在重复表单项

See merge request yunteng/thingskit-front!1182

@@ -51,7 +51,7 @@ export const validateIdentifier: ValidatorRule['validator'] = (_rule, value: any
   return Promise.reject('支持大小写字母、数字和下划线.');
 };
 
-export const createFunctionNameFormItem = (): FormSchema => {
+export const createFunctionNameFormItem = (params: Partial<FormSchema> = {}): FormSchema => {
   return {
     field: FormFieldsEnum.FUNCTION_NAME,
     label: FormFieldsNameEnum.FUNCTION_NAME,
@@ -67,10 +67,11 @@ export const createFunctionNameFormItem = (): FormSchema => {
     componentProps: {
       placeholder: `请输入${FormFieldsNameEnum.FUNCTION_NAME}`,
     },
+    ...params,
   };
 };
 
-export const createIdentifierFormItem = (): FormSchema => {
+export const createIdentifierFormItem = (params: Partial<FormSchema> = {}): FormSchema => {
   return {
     field: FormFieldsEnum.IDENTIFIER,
     label: FormFieldsNameEnum.IDENTIFIER,
@@ -87,6 +88,7 @@ export const createIdentifierFormItem = (): FormSchema => {
         validator: validateIdentifier,
       },
     ],
+    ...params,
   };
 };
 

@@ -115,8 +115,12 @@ export const getFormSchemas = ({
       ifShow: ({ model }) => model[FormFieldsEnum.FUNCTION_TYPE] === FunctionTypeEnum.PROPERTIES,
       colSlot: FormFieldsEnum.DATA_TYPE_FORM,
     },
-    createFunctionNameFormItem(),
-    createIdentifierFormItem(),
+    createFunctionNameFormItem({
+      ifShow: ({ model }) => model[FormFieldsEnum.FUNCTION_TYPE] !== FunctionTypeEnum.PROPERTIES,
+    }),
+    createIdentifierFormItem({
+      ifShow: ({ model }) => model[FormFieldsEnum.FUNCTION_TYPE] !== FunctionTypeEnum.PROPERTIES,
+    }),
     {
       field: FormFieldsEnum.EXTENSION_DESC,
       component: 'Input',