Merge branch 'next' into develop

packages/core/client/src/schema-component/antd/table-v2/Table.Column.ActionBar.tsx

@@ -10,7 +10,7 @@
 import { css } from '@emotion/css';
 import { observer } from '@formily/react';
 import React from 'react';
-import { SortableItem, useDesigner } from '../..';
+import { SortableItem, useDesigner, useSchemaComponentContext } from '../..';
 import { useFlag } from '../../../flag-provider/hooks/useFlag';
 
 export const designerCss = ({ margin = '-18px -16px', padding = '18px 16px' } = {}) => css`
@@ -53,9 +53,15 @@ export const designerCss = ({ margin = '-18px -16px', padding = '18px 16px' } =
 `;
 
 export const TableColumnActionBar = observer(
-  (props) => {
+  (props: any) => {
     const Designer = useDesigner();
     const { isInSubTable } = useFlag() || {};
+    const { designable } = useSchemaComponentContext();
+
+    if (!designable || Designer.isNullComponent) {
+      return props.children;
+    }
+
     return (
       <SortableItem
         className={designerCss({

packages/core/client/src/schema-component/antd/table-v2/Table.Column.Decorator.tsx

@@ -17,6 +17,7 @@ import {
   useCompile,
   useDesigner,
   useFlag,
+  useSchemaComponentContext,
 } from '../../../';
 import { designerCss } from './Table.Column.ActionBar';
 import { isCollectionFieldComponent } from './utils';
@@ -71,6 +72,7 @@ export const TableColumnDecorator = (props) => {
   const Designer = useDesigner();
   const field = useField();
   const { fieldSchema, uiSchema, collectionField } = useColumnSchema();
+  const { designable } = useSchemaComponentContext();
   const compile = useCompile();
   const { isInSubTable } = useFlag() || {};
   useEffect(() => {
@@ -84,6 +86,10 @@ export const TableColumnDecorator = (props) => {
       field.title = uiSchema?.title;
     }
   }, [uiSchema?.title]);
+
+  if (!designable || Designer.isNullComponent) {
+    return props.children;
+  }
   return (
     <SortableItem
       className={designerCss({

packages/core/client/src/schema-component/antd/table-v2/Table.tsx

@@ -750,9 +750,6 @@ const InternalNocoBaseTable = React.memo(
                   .ant-table-cell-fix-right {
                     padding: 8px 16px !important;
                   }
-                  .ant-table-thead .ant-table-cell {
-                    padding: 8px 16px;
-                  }
                 }
               }
             }

packages/core/client/src/schema-component/hooks/useDesigner.ts

@@ -13,6 +13,7 @@ import { useMemo } from 'react';
 import { SchemaToolbar } from '../../schema-settings';
 
 const DefaultSchemaToolbar = () => null;
+DefaultSchemaToolbar.isNullComponent = true;
 
 /**
  * @deprecated