Merge pull request #701 from easyops-cn/alex/CMDB_INSTANCE-2129

feat(): cmdb实例编辑支持手动验证
easyops-cn · Dec 17, 2024 · e5e78db · e5e78db
2 parents 0b0ca6f + 386a83a
commit e5e78db
Showing 1 changed file with 31 additions and 13 deletions.
diff --git a/libs/cmdb-instances/src/model-attribute-form/ModelAttributeForm.tsx b/libs/cmdb-instances/src/model-attribute-form/ModelAttributeForm.tsx
@@ -90,6 +90,8 @@ interface ModelAttributeFormProps extends FormComponentProps {
   };
   isResetInstanceNameWhenSaveAndContinueToAddInstance?: boolean;
   uploadConfig?: UploadConfig;
+  useManualVerification?: boolean;
+  ref?: any;
 }
 
 export type attributesFieldsByTag = [string, ModifiedModelObjectField[]];
@@ -399,8 +401,12 @@ export class ModelAttributeForm extends Component<
     }
   };
   /* istanbul ignore next */
-  handleSubmit = (e: FormEvent, type?: string) => {
-    e.preventDefault();
+  public handleSubmit = (e?: FormEvent, type?: string) => {
+    // 允许不传入 event 参数
+    if (e) {
+      e.preventDefault();
+    }
+
     this.props.scrollToFirstError
       ? this.props.form.validateFieldsAndScroll(
           {
@@ -655,16 +661,17 @@ export class ModelAttributeForm extends Component<
                     label={
                       <span>
                         <span>{attribute.name}</span>
-                        {attribute.description && attribute.description !== "" && (
-                          <Tooltip title={attribute.description}>
-                            <ExclamationCircleFilled
-                              style={{
-                                padding: "0 2px",
-                                color: "var(--color-secondary-text)",
-                              }}
-                            />
-                          </Tooltip>
-                        )}
+                        {attribute.description &&
+                          attribute.description !== "" && (
+                            <Tooltip title={attribute.description}>
+                              <ExclamationCircleFilled
+                                style={{
+                                  padding: "0 2px",
+                                  color: "var(--color-secondary-text)",
+                                }}
+                              />
+                            </Tooltip>
+                          )}
                       </span>
                     }
                     key={attribute.name}
@@ -827,11 +834,22 @@ export class ModelAttributeForm extends Component<
     return (
       <Form>
         {collapse}
-        {submitContainer}
+        {!this.props.useManualVerification && submitContainer}
       </Form>
     );
   }
 }
 
 export const InstanceModelAttributeForm =
   Form.create<ModelAttributeFormProps>()(ModelAttributeForm);
+
+export const InstanceModelAttributeFormRef = React.forwardRef<
+  ModelAttributeForm,
+  ModelAttributeFormProps
+>((props, ref) => {
+  const WrappedForm = Form.create<ModelAttributeFormProps & { ref: any }>()(
+    ModelAttributeForm
+  ) as any;
+  return <WrappedForm {...props} wrappedComponentRef={ref} />;
+});
+InstanceModelAttributeFormRef.displayName = "InstanceModelAttributeFormRef";