Skip to content

Commit

Permalink
chore(form): remove comment
Browse files Browse the repository at this point in the history
  • Loading branch information
soul committed Aug 13, 2024
1 parent e6cd3f2 commit 14068c0
Show file tree
Hide file tree
Showing 11 changed files with 27,205 additions and 19,814 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {

export default () => {
return (
<QueryFilter defaultCollapsed split>
<QueryFilter defaultColsNumber={1} split>
<ProFormText name="name" label="应用名称" />
<ProFormDatePicker name="createDate" label="创建时间" />
<ProFormText name="status" label="应用状态" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default () => {
</QueryFilter>
<pre>{JSON.stringify(formProps, null, 2)}</pre>
</>
<QueryFilter<{
{/* <QueryFilter<{
name: string;
company: string;
}>
Expand Down Expand Up @@ -152,7 +152,7 @@ export default () => {
<ProFormText name="status" label="应用状态" />
<ProFormText name="startdate" label="响应日期" />
<ProFormText name="create" label="创建时间" colSize={3} />
</QueryFilter>
</QueryFilter> */}
</>
);
};
12 changes: 6 additions & 6 deletions packages/form/src/components/QueryFilter/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ atomId: QueryFilter,LightFilter

## 查询筛选

<code src="./demos/query-filter.tsx" title="基本使用"></code>
<!-- <code src="./demos/query-filter.tsx" title="基本使用"></code> -->

<code src="./demos/query-filter-test.tsx" title="基本使用" debug></code>
<!-- <code src="./demos/query-filter-test.tsx" title="基本使用" debug></code> -->

<code src="./demos/query-filter-collapsed.tsx" title="查询筛选-默认收起"></code>

<code src="./demos/query-filter-vertical.tsx" title="查询筛选-垂直布局"></code>
<!-- <code src="./demos/query-filter-vertical.tsx" title="查询筛选-垂直布局"></code>
<code src="./demos/search-filter.tsx" background="var(--main-bg-color)" title="查询筛选-搜索"></code>
Expand All @@ -26,15 +26,15 @@ atomId: QueryFilter,LightFilter
<code src="./demos/light-filter-footer.tsx" title="轻量筛选-自定义footer"></code>
<code src="./demos/light-filter-bordered.tsx" title="轻量筛选-边框模式"></code>
<code src="./demos/light-filter-bordered.tsx" title="轻量筛选-边框模式"></code> -->

折叠模式下所有的选项都会默认折叠,不管是否有值,控件的 `secondary` 将不再有效。

<code src="./demos/light-filter-collapse.tsx" title="轻量筛选-折叠模式"></code>
<!-- <code src="./demos/light-filter-collapse.tsx" title="轻量筛选-折叠模式"></code> -->

手动设置轻量筛选的弹出框,默认为 `bottomLeft`

<code src="./demos/light-filter-placement.tsx" title="轻量筛选-弹出框对齐方式"></code>
<!-- <code src="./demos/light-filter-placement.tsx" title="轻量筛选-弹出框对齐方式"></code> -->

## API

Expand Down
1 change: 0 additions & 1 deletion packages/form/src/layouts/QueryFilter/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,6 @@ function QueryFilter<T = Record<string, any>>(props: QueryFilterProps<T>) {
if(defaultFormItemsNumber !== undefined) {
return defaultFormItemsNumber
}
// 查询重置按钮也会占一个spanSize格子,需要减掉计算
if (defaultColsNumber !== undefined) {
// 折叠为一行,需要处理多行的情况请使用 defaultFormItemsNumber
const oneRowControlsNumber = 24 / spanSize.span - 1;
Expand Down
6 changes: 3 additions & 3 deletions packages/layout/src/components/WaterMark/demos/custom.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
WaterMark,
} from '@ant-design/pro-components';
import { Divider } from 'antd';
import { ColorFactory } from 'antd/es/color-picker/color';
// import { ColorFactory } from 'antd/es/color-picker/color';

export default () => {
return (
Expand All @@ -30,7 +30,7 @@ export default () => {
headerBordered
bordered
>
<ProCard colSpan="70%">
{/* <ProCard colSpan="70%">
<ProFormDependency
name={['rotate', 'content', 'fontColor', 'fontSize', 'zIndex']}
>
Expand Down Expand Up @@ -95,7 +95,7 @@ export default () => {
);
}}
</ProFormDependency>
</ProCard>
</ProCard> */}
<ProCard title="配置面板">
<ProFormText label="水印文字" name="content" />
<ProFormColorPicker label="字体颜色" name="fontColor" />
Expand Down
Loading

0 comments on commit 14068c0

Please sign in to comment.