fix: generator popover add popover error and group style error

jd-opensource · Nov 14, 2024 · ea90d79 · ea90d79
1 parent 01f7c47
commit ea90d79
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ip-table-generator/src/layouts/table-workstation/editable-table/components/cell/group.tsx b/...ip-table-generator/src/layouts/table-workstation/editable-table/components/cell/group.tsx
@@ -109,7 +109,7 @@ function GroupCell<
                       empty: !itemColumnSchema,
                     })}
                     style={{
-                      ...itemColumn && 'style' in itemColumn && 'schema' in itemColumn ? itemColumn.style : {},
+                      ...itemColumn && 'style' in itemColumn && 'schema' in itemColumn && typeof itemColumn.style === 'object' ? itemColumn.style : {},
                       minWidth: `${100 / colLength}%`,
                       justifyContent: options.horizontalAlign,
                     }}

diff --git a/...tor/src/layouts/table-workstation/editable-table/components/components-selector/index.tsx b/...tor/src/layouts/table-workstation/editable-table/components/components-selector/index.tsx
@@ -128,7 +128,7 @@ ExtraOptions extends Partial<DripTableExtraOptions> = never,
                   showFilter={props.showFilter}
                   floatPanel
                   value={popoverConfig?.['ui:type']}
-                  options={components.map(item => ({
+                  options={components.filter(item => item['ui:type'] !== 'popover').map(item => ({
                     label: item.title,
                     value: item['ui:type'],
                     group: item.group,
@@ -149,7 +149,7 @@ ExtraOptions extends Partial<DripTableExtraOptions> = never,
                   showFilter={props.showFilter}
                   floatPanel
                   value={contentConfig?.['ui:type']}
-                  options={components.map(item => ({
+                  options={components.filter(item => item['ui:type'] !== 'popover').map(item => ({
                     label: item.title,
                     value: item['ui:type'],
                     group: item.group,