Merge branch 'next' into develop

packages/plugins/@nocobase/plugin-block-workbench/src/client/WorkbenchAction.tsx

@@ -42,15 +42,18 @@ const useStyles = createStyles(({ token, css }) => ({
   `,
 }));
 
-function Button() {
+function Button({ onlyIcon }) {
   const fieldSchema = useFieldSchema();
-  const icon = fieldSchema['x-component-props']?.['icon'];
+  const { icon, iconColor: backgroundColor } = fieldSchema['x-component-props'] || {};
-  const backgroundColor = fieldSchema['x-component-props']?.['iconColor'];
   const { layout, ellipsis = true } = useContext(WorkbenchBlockContext);
   const { styles, cx } = useStyles();
   const { t } = useTranslation();
   const title = t(fieldSchema.title, { ns: NAMESPACE_UI_SCHEMA });
-  return layout === WorkbenchLayout.Grid ? (
+
+  const shouldShowTitle = !onlyIcon;
+
+  if (layout === WorkbenchLayout.Grid) {
+    return (
       <div title={title} className={cx(styles.avatar)}>
         <Avatar style={{ backgroundColor }} size={48} icon={<Icon type={icon} />} />
         <div
@@ -61,14 +64,15 @@ function Button() {
             overflow: ellipsis ? 'hidden' : 'visible',
           }}
         >
-        {title}
+          {shouldShowTitle && title}
         </div>
       </div>
-  ) : (
-    <span>{title}</span>
     );
   }
 
+  return <span>{shouldShowTitle && title}</span>;
+}
+
 export const WorkbenchAction = withDynamicSchemaProps((props) => {
   const { className, ...others } = props;
   const { styles, cx } = useStyles() as any;
@@ -79,9 +83,10 @@ export const WorkbenchAction = withDynamicSchemaProps((props) => {
       <Component
         className={cx(className, styles.action, 'nb-action-panel')}
         {...others}
+        onlyIcon={false}
         type="text"
         icon={null}
-        title={<Button />}
+        title={<Button onlyIcon={others?.onlyIcon} />}
         confirmTitle={fieldSchema.title}
         style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}
       />

packages/plugins/@nocobase/plugin-block-workbench/src/client/WorkbenchBlock.tsx

@@ -85,6 +85,7 @@ const InternalIcons = () => {
                   key={key}
                   prefix={<Avatar style={{ backgroundColor }} icon={<Icon type={icon} />} />}
                   onClick={() => {}}
+                  style={{ marginTop: '5px' }}
                 >
                   <NocoBaseRecursionField name={key} schema={s} />
                 </List.Item>