Skip to content

Commit

Permalink
fix(table): table search style fixed (#6069)
Browse files Browse the repository at this point in the history
* fix: table search style fixed

* fix: merge

* fix: update snapshot
  • Loading branch information
ONLY-yours authored Oct 13, 2022
1 parent f2f8daf commit 000e804
Show file tree
Hide file tree
Showing 14 changed files with 95 additions and 95 deletions.
4 changes: 2 additions & 2 deletions packages/table/src/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -846,15 +846,15 @@ const ProviderWarp = <
const { getPrefixCls } = useContext(ConfigProvider.ConfigContext);
const ErrorComponent =
props.ErrorBoundary === false ? React.Fragment : props.ErrorBoundary || ErrorBoundary;
const { wrapSSR } = useStyle(getPrefixCls('pro-table'));
const { wrapSSR, hashId } = useStyle(getPrefixCls('pro-table'));

return (
<Container.Provider initialState={props}>
<ConfigProviderWrap>
<ErrorComponent>
{wrapSSR(
<ProTable<DataType, Params, ValueType>
defaultClassName={getPrefixCls('pro-table')}
defaultClassName={`${getPrefixCls('pro-table')} ${hashId}`}
{...props}
/>,
)}
Expand Down
6 changes: 3 additions & 3 deletions packages/table/src/components/Form/FormRender.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ο»Ώimport type { BaseQueryFilterProps, ProFormProps } from '@ant-design/pro-form';
import { BetaSchemaForm } from '@ant-design/pro-form';
import { ProSchemaComponentTypes, useToken } from '@ant-design/pro-utils';
import type { ProSchemaComponentTypes } from '@ant-design/pro-utils';
import { useToken } from '@ant-design/pro-utils';
import type { FormInstance, FormItemProps } from 'antd';
import { ConfigProvider, Table } from 'antd';
import classNames from 'classnames';
Expand Down Expand Up @@ -195,8 +196,7 @@ const FormRender = <T, U = any>({

return (
<div
className={classNames({
hashId,
className={classNames(hashId, {
[getPrefixCls('pro-card')]: true,
[`${getPrefixCls('pro-card')}-border`]: !!bordered,
[`${getPrefixCls('pro-card')}-bordered`]: !!bordered,
Expand Down
2 changes: 1 addition & 1 deletion tests/__snapshots__/doc.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ exports[`docs demos πŸ“Έ renders ./docs/demos/customization-value-type.tsx corre
class="ant-pro "
>
<div
class="ant-pro-table"
class="ant-pro-table "
>
<div
class="ant-pro-card ant-pro-table-search ant-pro-table-search-query-filter"
Expand Down
2 changes: 1 addition & 1 deletion tests/form/__snapshots__/demo.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -49227,7 +49227,7 @@ exports[`form demos πŸ“Έ renders ./packages/form/src/demos/pro-form-editableTabl
class="ant-form-item-control-input-content"
>
<div
class="ant-pro-table"
class="ant-pro-table "
>
<div
class="ant-pro-card"
Expand Down
2 changes: 1 addition & 1 deletion tests/layout/__snapshots__/demo.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1676,7 +1676,7 @@ exports[`layout demos πŸ“Έ renders ./packages/layout/src/components/WaterMark/de
class="ant-pro "
>
<div
class="ant-pro-table"
class="ant-pro-table "
>
<div
class="ant-pro-card"
Expand Down
26 changes: 13 additions & 13 deletions tests/list/__snapshots__/demo.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports[`list demos πŸ“Έ renders ./packages/list/src/demos/ToolBar.tsx correctly
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -612,7 +612,7 @@ exports[`list demos πŸ“Έ renders ./packages/list/src/demos/base.tsx correctly 1`
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -1344,7 +1344,7 @@ exports[`list demos πŸ“Έ renders ./packages/list/src/demos/card-list.tsx correct
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -2482,7 +2482,7 @@ exports[`list demos πŸ“Έ renders ./packages/list/src/demos/editable.tsx correctl
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -2937,7 +2937,7 @@ exports[`list demos πŸ“Έ renders ./packages/list/src/demos/expand.tsx correctly
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -3444,7 +3444,7 @@ exports[`list demos πŸ“Έ renders ./packages/list/src/demos/filter.tsx correctly
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -4363,7 +4363,7 @@ exports[`list demos πŸ“Έ renders ./packages/list/src/demos/layout.tsx correctly
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -5138,7 +5138,7 @@ exports[`list demos πŸ“Έ renders ./packages/list/src/demos/pagination.tsx correc
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -6080,7 +6080,7 @@ exports[`list demos πŸ“Έ renders ./packages/list/src/demos/search.tsx correctly
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card ant-pro-table-search ant-pro-table-search-query-filter"
Expand Down Expand Up @@ -7074,7 +7074,7 @@ exports[`list demos πŸ“Έ renders ./packages/list/src/demos/selectedRow.tsx corre
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -7822,7 +7822,7 @@ exports[`list demos πŸ“Έ renders ./packages/list/src/demos/size.tsx correctly 1`
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list"
class="ant-pro-table ant-pro-list ant-pro-list"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -8329,7 +8329,7 @@ exports[`list demos πŸ“Έ renders ./packages/list/src/demos/special.tsx correctly
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -9012,7 +9012,7 @@ exports[`list demos πŸ“Έ renders ./packages/list/src/demos/testConfigProvider.ts
class="qixian-pro-pro "
>
<div
class="qixian-pro-pro-table qixian-pro-pro-list qixian-pro-pro-list qixian-pro-pro-list-no-split"
class="qixian-pro-pro-table qixian-pro-pro-list qixian-pro-pro-list qixian-pro-pro-list-no-split"
>
<div
class="qixian-pro-pro-card"
Expand Down
10 changes: 5 additions & 5 deletions tests/list/__snapshots__/index.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`List 🚏 ProList support rowClassName as a function 1`] = `
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -123,7 +123,7 @@ exports[`List 🚏 ProList support rowClassName as a string 1`] = `
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -200,7 +200,7 @@ exports[`List 🚏 only has content 1`] = `
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -254,7 +254,7 @@ exports[`List 🚏 only has description 1`] = `
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down Expand Up @@ -332,7 +332,7 @@ exports[`List 🚏 show loading state 1`] = `
class="ant-pro "
>
<div
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
class="ant-pro-table ant-pro-list ant-pro-list ant-pro-list-no-split"
>
<div
class="ant-pro-card"
Expand Down
6 changes: 3 additions & 3 deletions tests/table/__snapshots__/column.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exports[`Table ColumnSetting 🎏 columns proFieldProps support custom 1`] = `
class="ant-pro "
>
<div
class="ant-pro-table"
class="ant-pro-table "
>
<div
class="ant-pro-card ant-pro-table-search ant-pro-table-search-query-filter"
Expand Down Expand Up @@ -427,7 +427,7 @@ exports[`Table ColumnSetting 🎏 config provide render 1`] = `
class="qixian-pro "
>
<div
class="qixian-pro-table"
class="qixian-pro-table "
>
<div
class="qixian-pro-card qixian-pro-table-search qixian-pro-table-search-query-filter"
Expand Down Expand Up @@ -1220,7 +1220,7 @@ exports[`Table ColumnSetting 🎏 extra columns 1`] = `
class="ant-pro "
>
<div
class="ant-pro-table"
class="ant-pro-table "
>
<div
class="ant-pro-card ant-pro-table-search ant-pro-table-search-query-filter"
Expand Down
Loading

0 comments on commit 000e804

Please sign in to comment.