From 3b6b84f8c3c57f8034f3787b9d8644c5c995e475 Mon Sep 17 00:00:00 2001
From: katherinehhh <katherine_15995@163.com>
Date: Mon, 30 Jan 2023 10:24:13 +0800
Subject: [PATCH] feat: gant block table configure

---
 .../antd/gantt/components/gantt/gantt.tsx     | 72 ++++++++++---------
 .../client/src/schema-initializer/utils.ts    | 50 ++-----------
 2 files changed, 41 insertions(+), 81 deletions(-)

diff --git a/packages/core/client/src/schema-component/antd/gantt/components/gantt/gantt.tsx b/packages/core/client/src/schema-component/antd/gantt/components/gantt/gantt.tsx
index 6c3c3e2cf4..c8653c734b 100644
--- a/packages/core/client/src/schema-component/antd/gantt/components/gantt/gantt.tsx
+++ b/packages/core/client/src/schema-component/antd/gantt/components/gantt/gantt.tsx
@@ -456,7 +456,7 @@ export const Gantt: any = (props) => {
   return (
     <div>
       <Toolbar />
-      <div className={styles.wrapper} onKeyDown={handleKeyDown} tabIndex={0} ref={wrapperRef}>
+      <div>
         <TableBlockProvider
           service={ctx.service}
           {...ctx}
@@ -466,42 +466,44 @@ export const Gantt: any = (props) => {
         >
           <RecursionField name={'table'} schema={fieldSchema.properties.table} />
         </TableBlockProvider>
-        <TaskGantt
-          gridProps={gridProps}
-          calendarProps={calendarProps}
-          barProps={barProps}
-          ganttHeight={ganttHeight}
-          scrollY={scrollY}
-          scrollX={scrollX}
-          ref={verticalGanttContainerRef}
-        />
-
-        {ganttEvent.changedTask && (
-          <Tooltip
-            arrowIndent={arrowIndent}
-            rowHeight={rowHeight}
-            svgContainerHeight={svgContainerHeight}
-            svgContainerWidth={svgContainerWidth}
-            fontFamily={fontFamily}
-            fontSize={fontSize}
-            scrollX={scrollX}
+        <div className={styles.wrapper} onKeyDown={handleKeyDown} tabIndex={0} ref={wrapperRef}>
+          <TaskGantt
+            gridProps={gridProps}
+            calendarProps={calendarProps}
+            barProps={barProps}
+            ganttHeight={ganttHeight}
             scrollY={scrollY}
-            task={ganttEvent.changedTask}
-            headerHeight={headerHeight}
-            taskListWidth={taskListWidth}
-            TooltipContent={TooltipContent}
-            rtl={rtl}
-            svgWidth={svgWidth}
+            scrollX={scrollX}
+            ref={verticalGanttContainerRef}
           />
-        )}
-        <VerticalScroll
-          ganttFullHeight={ganttFullHeight}
-          ganttHeight={ganttHeight}
-          headerHeight={headerHeight}
-          scroll={scrollY}
-          onScroll={handleScrollY}
-          rtl={rtl}
-        />
+
+          {ganttEvent.changedTask && (
+            <Tooltip
+              arrowIndent={arrowIndent}
+              rowHeight={rowHeight}
+              svgContainerHeight={svgContainerHeight}
+              svgContainerWidth={svgContainerWidth}
+              fontFamily={fontFamily}
+              fontSize={fontSize}
+              scrollX={scrollX}
+              scrollY={scrollY}
+              task={ganttEvent.changedTask}
+              headerHeight={headerHeight}
+              taskListWidth={taskListWidth}
+              TooltipContent={TooltipContent}
+              rtl={rtl}
+              svgWidth={svgWidth}
+            />
+          )}
+          <VerticalScroll
+            ganttFullHeight={ganttFullHeight}
+            ganttHeight={ganttHeight}
+            headerHeight={headerHeight}
+            scroll={scrollY}
+            onScroll={handleScrollY}
+            rtl={rtl}
+          />
+        </div>
       </div>
       <HorizontalScroll
         svgWidth={svgWidth}
diff --git a/packages/core/client/src/schema-initializer/utils.ts b/packages/core/client/src/schema-initializer/utils.ts
index 0762138f91..7d35e46175 100644
--- a/packages/core/client/src/schema-initializer/utils.ts
+++ b/packages/core/client/src/schema-initializer/utils.ts
@@ -1056,15 +1056,16 @@ export const createGanttBlockSchema = (options) => {
             'x-initializer': 'GanttActionInitializers',
             properties: {},
           },
-          table:{
+          table: {
             type: 'array',
             'x-decorator': 'div',
             'x-decorator-props': {
               style: {
-                display: 'inline-block',
+                float: 'left',
+                width: '35%',
               },
             },
-        
+
             'x-initializer': 'TableColumnInitializers',
             'x-component': 'TableV2',
             'x-component-props': {
@@ -1076,49 +1077,6 @@ export const createGanttBlockSchema = (options) => {
               pagination: false,
             },
           },
-          // event: {
-          //   type: 'void',
-          //   'x-component': 'Gantt.Event',
-          //   properties: {
-          //     drawer: {
-          //       type: 'void',
-          //       'x-component': 'Action.Drawer',
-          //       'x-component-props': {
-          //         className: 'nb-action-popup',
-          //       },
-          //       title: '{{ t("View record") }}',
-          //       properties: {
-          //         tabs: {
-          //           type: 'void',
-          //           'x-component': 'Tabs',
-          //           'x-component-props': {},
-          //           'x-initializer': 'TabPaneInitializers',
-          //           properties: {
-          //             tab1: {
-          //               type: 'void',
-          //               title: '{{t("Details")}}',
-          //               'x-component': 'Tabs.TabPane',
-          //               'x-designer': 'Tabs.Designer',
-          //               'x-component-props': {},
-          //               properties: {
-          //                 grid: {
-          //                   type: 'void',
-          //                   'x-component': 'Grid',
-          //                   'x-initializer-props': {
-          //                     actionInitializers: 'GanttFormActionInitializers',
-          //                   },
-          //                   'x-initializer': 'RecordBlockInitializers',
-          //                   properties: {},
-          //                 },
-          //               },
-          //             },
-          //           },
-          //         },
-          //       },
-          //     },
-          //   },
-          // },
-
         },
       },
     },