GH-38 Change layout

agentlab · Oct 12, 2021 · 396937e · 396937e
1 parent 42ed9e3
commit 396937e
Show file tree

Hide file tree

Showing 4 changed files with 258 additions and 210 deletions.
diff --git a/src/layouts/AntdFormLayout.tsx b/src/layouts/AntdFormLayout.tsx
@@ -78,11 +78,11 @@ export const AntdFormLayout: React.FC<any> = ({
   onEdit,
   editing,
 }) => {
-  const { readOnly } = viewKindElement.options;
+  const { readOnly, style } = viewKindElement.options;
   return (
     <AutoSizer>
       {({ width, height }: any) => (
-        <div style={{ width, height, overflow: 'auto', position: 'relative' }} onClick={() => onEdit()}>
+        <div style={{ width, height, overflow: 'auto', position: 'relative', ...style }} onClick={() => onEdit()}>
           <span style={{ padding: '7px', fontSize: '2em' }}>{title}</span>
           {readOnly ? null : <LogicalButton form={id} onSave={onSave} onCancel={onCancel} />}
           <Form labelAlign={'left'}>

diff --git a/src/layouts/AntdHorizontalLayout.tsx b/src/layouts/AntdHorizontalLayout.tsx
@@ -30,12 +30,16 @@ export const AntdHorizontalLayoutRenderer: React.FC<LayoutComponent> = ({
   //const layout = viewKindElement as Layout;
   const parentViewKindElement = viewKindElement;
   const Render: React.FC<FormsDispatchProps & Idx> = ({ idx, viewKind, viewKindElement, viewDescr, enabled }) => {
+    const defaultSize = parentViewKindElement.options?.defaultSize;
     const options = viewKindElement.options || {};
     const numberOfColumns = Math.ceil(24 / (parentViewKindElement.elements?.length || 1));
     const style: any = options.style;
-    const span = options.contentSize || numberOfColumns;
+    const span =
+      defaultSize && defaultSize[viewKindElement['@id']]
+        ? defaultSize && defaultSize[viewKindElement['@id']]
+        : options.contentSize || numberOfColumns;
     return (
-      <Col key={idx} style={style} span={numberOfColumns}>
+      <Col key={idx} style={style} span={span}>
         <FormsDispatch
           viewKind={viewKind}
           viewKindElement={viewKindElement}

diff --git a/src/layouts/AntdVerticalLayout.tsx b/src/layouts/AntdVerticalLayout.tsx
@@ -40,6 +40,7 @@ export const AntdVerticalLayoutRenderer: React.FC<LayoutComponent> = ({
         style={{
           position: 'relative',
           width: '100%',
+          height: '100%',
           //flex: viewKindElement.options && viewKindElement.options.height === 'all-empty-space' ? '1 1 auto' : '',
         }}>
         <Col span={24} style={{ position: 'relative' }}>