fix: generator column item click

Author: helloqian12138

packages/drip-table-generator/src/layouts/attributes-layout/utils.ts

@@ -38,9 +38,12 @@ export const updateColumnItemByPath = (
 
 export const getColumnItemByPath = (column: DTGTableConfig['columns'][number], path: (number | 'popover' | 'content')[]) => {
   const [key, ...rest] = path;
-  if (!column || path.length <= 0) {
+  if (!column) {
     return null;
   }
+  if (column && path.length <= 0) {
+    return column;
+  }
   const newColumn = cloneDeep(column && 'schema' in column ? column.schema : column) as DTGTableConfig['columns'][number];
   if (newColumn.component === 'group') {
     const items = newColumn.options.items as DTGTableConfig['columns'] || [];

packages/drip-table-generator/src/layouts/table-workstation/editable-table/components/cell/group.tsx

@@ -116,7 +116,7 @@ function GroupCell<
                     onClick={(e) => {
                       e.stopPropagation();
                       setState({
-                        currentComponentPath: colChecked ? [] : [componentIndex],
+                        currentComponentPath: colChecked ? [] : [...props.path, componentIndex],
                         currentComponentID: colChecked ? void 0 : itemColumnSchema?.key,
                         currentColumnID: rootColumn.key,
                         currentTableID: props.tableConfig.tableId,
@@ -137,10 +137,11 @@ function GroupCell<
                                 drawerType: 'column-item',
                               });
                               props.onClick?.('column-item', {
-                                currentComponentPath: colChecked ? [] : [componentIndex],
-                                currentComponentID: colChecked ? void 0 : itemColumnSchema?.key,
+                                currentComponentPath: [componentIndex],
+                                currentComponentID: itemColumnSchema?.key,
                                 currentColumnID: rootColumn.key,
                                 currentTableID: props.tableConfig.tableId,
+                                tableConfig: props.tableConfig,
                               });
                             }}
                           />

packages/drip-table-generator/src/layouts/table-workstation/editable-table/components/cell/index.tsx

@@ -16,7 +16,7 @@ import React from 'react';
 
 import { GeneratorContext } from '@/context';
 import { DTGTableConfig, TableConfigsContext } from '@/context/table-configs';
-import { updateColumnItemByPath } from '@/layouts/attributes-layout/utils';
+import { getColumnItemByPath, updateColumnItemByPath } from '@/layouts/attributes-layout/utils';
 import { getSchemaValue } from '@/layouts/utils';
 import { DataSourceTypeAbbr, DripTableGeneratorProps } from '@/typing';
 
@@ -111,7 +111,9 @@ ExtraOptions extends Partial<DripTableExtraOptions> = never,
                 onAddColumnItem={onAddColumnItem}
                 onRemoveColumnItem={onRemoveColumnItem}
                 onClick={(type, payload) => {
-                  if (type !== 'column-item') {
+                  const colPath = payload.currentComponentPath as (number | 'popover' | 'content')[] ?? [];
+                  const containerComponent = getColumnItemByPath(props.column, colPath);
+                  if (!(type === 'column-item' && containerComponent.component === 'group')) {
                     setState({
                       ...payload,
                       currentColumnID: props.column.key,