🐛 fix: type == "update" not show formItem

eternallycyf · Apr 29, 2024 · 3d57a22 · 3d57a22
1 parent 3e2adde
commit 3d57a22
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/packages/ims-view-pc/src/components/CustomForm/FormItem/update.tsx b/packages/ims-view-pc/src/components/CustomForm/FormItem/update.tsx
@@ -51,7 +51,7 @@ const UpdateControl = React.forwardRef<any, IUpdateControlProps>((props, ref) =>
         return (
           <Fragment key={random.getUUID()}>
             {((nextValues as any[]) || []).map((item: any, index: number) => (
-              <Col span={item?.['col'] ?? 0} key={index}>
+              <Col span={item?.['col'] == undefined ? 24 : item?.['col'] || 0} key={index}>
                 <Form.Item
                   labelAlign="right"
                   label={item?.label}

diff --git a/packages/ims-view-pc/src/core/helpers/index.tsx b/packages/ims-view-pc/src/core/helpers/index.tsx
@@ -109,16 +109,15 @@ export const getFieldComp: FieldCompType = ({
 
   if (!FieldComp) return null;
 
-  return (
-    <Form.Item
-      key={name || random.getUUID()}
-      name={name}
-      label={label ?? ''}
-      {...(formProps?.itemProps as any)}
-    >
-      <FieldComp {...formProps} />
-    </Form.Item>
-  );
+  if (form) {
+    return (
+      <Form.Item name={name} label={label ?? ''} {...(formProps?.itemProps as any)}>
+        <FieldComp {...formProps} />
+      </Form.Item>
+    );
+  } else {
+    return <FieldComp {...formProps} />;
+  }
 };
 
 export const renderFormItem = (item: any, index?: number) => {