@canlooks/can-ui 0.0.69 → 0.0.70
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.
|
@@ -95,7 +95,7 @@ exports.Curd = (0, react_1.memo)((props) => {
|
|
|
95
95
|
* -------------------------------------------------------------
|
|
96
96
|
* 表格设置
|
|
97
97
|
*/
|
|
98
|
-
const [innerSize, setInnerSize] = (0, utils_1.useDerivedState)(props.tableProps?.size || 'medium');
|
|
98
|
+
const [innerSize, setInnerSize] = (0, utils_1.useDerivedState)(props.size || props.tableProps?.size || 'medium');
|
|
99
99
|
const [innerPage, setInnerPage] = (0, utils_1.useControlled)(props.paginationProps?.defaultPage ?? 1, props.paginationProps?.page, props.paginationProps?.onPageChange);
|
|
100
100
|
const [innerPageSize, setInnerPageSize] = (0, utils_1.useControlled)(props.paginationProps?.defaultPageSize ?? 10, props.paginationProps?.pageSize, props.paginationProps?.onPageSizeChange);
|
|
101
101
|
const [innerOrderColumn, setInnerOrderColumn] = (0, utils_1.useControlled)(props.defaultOrderColumn, props.orderColumn);
|
|
@@ -92,7 +92,7 @@ export const Curd = memo((props) => {
|
|
|
92
92
|
* -------------------------------------------------------------
|
|
93
93
|
* 表格设置
|
|
94
94
|
*/
|
|
95
|
-
const [innerSize, setInnerSize] = useDerivedState(props.tableProps?.size || 'medium');
|
|
95
|
+
const [innerSize, setInnerSize] = useDerivedState(props.size || props.tableProps?.size || 'medium');
|
|
96
96
|
const [innerPage, setInnerPage] = useControlled(props.paginationProps?.defaultPage ?? 1, props.paginationProps?.page, props.paginationProps?.onPageChange);
|
|
97
97
|
const [innerPageSize, setInnerPageSize] = useControlled(props.paginationProps?.defaultPageSize ?? 10, props.paginationProps?.pageSize, props.paginationProps?.onPageSizeChange);
|
|
98
98
|
const [innerOrderColumn, setInnerOrderColumn] = useControlled(props.defaultOrderColumn, props.orderColumn);
|