@canlooks/can-ui 0.0.162 → 0.0.163

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  import { ReactElement, ReactNode, Ref } from 'react';
2
- import { DivProps, Id, Obj } from '../../types';
2
+ import { DivProps, Id, Obj, Size } from '../../types';
3
3
  import { ColumnType, DataGridBaseProps, DataGridMultipleProps, DataGridSingleProps, OrderType, RowType } from '../dataGrid';
4
4
  import { FormItemProps, FormProps, FormRef, FormValue } from '../form';
5
5
  import { CurdFilterable, CurdFilterableProps } from './curdFilterable';
@@ -69,6 +69,8 @@ export interface CurdBaseProps<R extends RowType = RowType, F extends FormValue
69
69
  order?: Id[];
70
70
  onOrderChange?(order: Id[]): void;
71
71
  };
72
+ defaultSize?: Size;
73
+ onSizeChange?(size: Size): void;
72
74
  filterableProps?: Omit<CurdFilterableProps, 'columns'>;
73
75
  renderFilterable?(filterableProps: CurdFilterableProps): ReactNode;
74
76
  renderFilterConditions?: CurdFilterableProps['renderFilterConditions'];
@@ -24,7 +24,7 @@ const faPenToSquare_1 = require("@fortawesome/free-regular-svg-icons/faPenToSqua
24
24
  const faPlus_1 = require("@fortawesome/free-solid-svg-icons/faPlus");
25
25
  const faRotateRight_1 = require("@fortawesome/free-solid-svg-icons/faRotateRight");
26
26
  exports.Curd = (0, react_1.memo)((props) => {
27
- const { ref, wrapperProps, variant = 'standard', loadRows, onLoad, columns, toolbarLeft, toolbarRight, reloadable = true, onReload, resizable = true, columnConfigurable = true, filterProps, initialFilterValue, onFilter, filterableProps, renderFilterable, renderFilterConditions, copyable, creatable = true, updatable = true, deletable = true, createButtonProps, updateButtonProps, deleteButtonProps, deleteConfirmProps, controlColumnTitle = '操作', renderExtraControl, titleKey, dataName = '', createName = '添加', updateName = '编辑', deleteName = '删除', onCreate, onUpdate, onDelete, rowToForm, dialogProps, formProps, formRef, onChange, ...dataGridProps } = props;
27
+ const { ref, wrapperProps, variant = 'standard', loadRows, onLoad, columns, toolbarLeft, toolbarRight, reloadable = true, onReload, resizable = true, columnConfigurable = true, defaultSize = 'medium', onSizeChange, filterProps, initialFilterValue, onFilter, filterableProps, renderFilterable, renderFilterConditions, copyable, creatable = true, updatable = true, deletable = true, createButtonProps, updateButtonProps, deleteButtonProps, deleteConfirmProps, controlColumnTitle = '操作', renderExtraControl, titleKey, dataName = '', createName = '添加', updateName = '编辑', deleteName = '删除', onCreate, onUpdate, onDelete, rowToForm, dialogProps, formProps, formRef, onChange, ...dataGridProps } = props;
28
28
  /**
29
29
  * -------------------------------------------------------------
30
30
  * ref
@@ -120,7 +120,7 @@ exports.Curd = (0, react_1.memo)((props) => {
120
120
  * -------------------------------------------------------------
121
121
  * 表格设置
122
122
  */
123
- const [innerSize, setInnerSize] = (0, utils_1.useDerivedState)(props.size || props.tableProps?.size || 'medium');
123
+ const [innerSize, setInnerSize] = (0, utils_1.useControlled)(defaultSize, props.size || props.tableProps?.size, onSizeChange);
124
124
  const [innerPage, setInnerPage] = (0, utils_1.useControlled)(props.paginationProps?.defaultPage ?? 1, props.paginationProps?.page, props.paginationProps?.onPageChange);
125
125
  const [innerPageSize, setInnerPageSize] = (0, utils_1.useControlled)(props.paginationProps?.defaultPageSize ?? 10, props.paginationProps?.pageSize, props.paginationProps?.onPageSizeChange);
126
126
  const [innerOrderColumn, setInnerOrderColumn] = (0, utils_1.useControlled)(props.defaultOrderColumn, props.orderColumn);
@@ -1,5 +1,5 @@
1
1
  import { ReactElement, ReactNode, Ref } from 'react';
2
- import { DivProps, Id, Obj } from '../../types.js';
2
+ import { DivProps, Id, Obj, Size } from '../../types.js';
3
3
  import { ColumnType, DataGridBaseProps, DataGridMultipleProps, DataGridSingleProps, OrderType, RowType } from '../dataGrid/index.js';
4
4
  import { FormItemProps, FormProps, FormRef, FormValue } from '../form/index.js';
5
5
  import { CurdFilterable, CurdFilterableProps } from './curdFilterable.js';
@@ -69,6 +69,8 @@ export interface CurdBaseProps<R extends RowType = RowType, F extends FormValue
69
69
  order?: Id[];
70
70
  onOrderChange?(order: Id[]): void;
71
71
  };
72
+ defaultSize?: Size;
73
+ onSizeChange?(size: Size): void;
72
74
  filterableProps?: Omit<CurdFilterableProps, 'columns'>;
73
75
  renderFilterable?(filterableProps: CurdFilterableProps): ReactNode;
74
76
  renderFilterConditions?: CurdFilterableProps['renderFilterConditions'];
@@ -21,7 +21,7 @@ import { faPenToSquare } from '@fortawesome/free-regular-svg-icons/faPenToSquare
21
21
  import { faPlus } from '@fortawesome/free-solid-svg-icons/faPlus';
22
22
  import { faRotateRight } from '@fortawesome/free-solid-svg-icons/faRotateRight';
23
23
  export const Curd = memo((props) => {
24
- const { ref, wrapperProps, variant = 'standard', loadRows, onLoad, columns, toolbarLeft, toolbarRight, reloadable = true, onReload, resizable = true, columnConfigurable = true, filterProps, initialFilterValue, onFilter, filterableProps, renderFilterable, renderFilterConditions, copyable, creatable = true, updatable = true, deletable = true, createButtonProps, updateButtonProps, deleteButtonProps, deleteConfirmProps, controlColumnTitle = '操作', renderExtraControl, titleKey, dataName = '', createName = '添加', updateName = '编辑', deleteName = '删除', onCreate, onUpdate, onDelete, rowToForm, dialogProps, formProps, formRef, onChange, ...dataGridProps } = props;
24
+ const { ref, wrapperProps, variant = 'standard', loadRows, onLoad, columns, toolbarLeft, toolbarRight, reloadable = true, onReload, resizable = true, columnConfigurable = true, defaultSize = 'medium', onSizeChange, filterProps, initialFilterValue, onFilter, filterableProps, renderFilterable, renderFilterConditions, copyable, creatable = true, updatable = true, deletable = true, createButtonProps, updateButtonProps, deleteButtonProps, deleteConfirmProps, controlColumnTitle = '操作', renderExtraControl, titleKey, dataName = '', createName = '添加', updateName = '编辑', deleteName = '删除', onCreate, onUpdate, onDelete, rowToForm, dialogProps, formProps, formRef, onChange, ...dataGridProps } = props;
25
25
  /**
26
26
  * -------------------------------------------------------------
27
27
  * ref
@@ -117,7 +117,7 @@ export const Curd = memo((props) => {
117
117
  * -------------------------------------------------------------
118
118
  * 表格设置
119
119
  */
120
- const [innerSize, setInnerSize] = useDerivedState(props.size || props.tableProps?.size || 'medium');
120
+ const [innerSize, setInnerSize] = useControlled(defaultSize, props.size || props.tableProps?.size, onSizeChange);
121
121
  const [innerPage, setInnerPage] = useControlled(props.paginationProps?.defaultPage ?? 1, props.paginationProps?.page, props.paginationProps?.onPageChange);
122
122
  const [innerPageSize, setInnerPageSize] = useControlled(props.paginationProps?.defaultPageSize ?? 10, props.paginationProps?.pageSize, props.paginationProps?.onPageSizeChange);
123
123
  const [innerOrderColumn, setInnerOrderColumn] = useControlled(props.defaultOrderColumn, props.orderColumn);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@canlooks/can-ui",
3
- "version": "0.0.162",
3
+ "version": "0.0.163",
4
4
  "author": "C.CanLiang <canlooks@gmail.com>",
5
5
  "description": "My ui framework",
6
6
  "license": "MIT",