@ccs-ui/rc-pro 2.3.6-beta-31 → 2.3.6-beta-32
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.
- package/es/ccs.d.ts +1 -1
- package/es/dialog/button.d.ts +1 -1
- package/es/pro-table/table.d.ts +2 -2
- package/es/pro-table/table.js +2 -2
- package/package.json +1 -1
package/es/ccs.d.ts
CHANGED
package/es/dialog/button.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClos
|
|
|
16
16
|
export type DialogButtonRef = {
|
|
17
17
|
onSetButtons: (e: React.ReactElement) => void;
|
|
18
18
|
};
|
|
19
|
-
export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "
|
|
19
|
+
export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "onOk" | "onClose" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
|
|
20
20
|
formRef: React.RefObject<DialogFormRef<TParams>>;
|
|
21
21
|
formInitialValues: FormProps['initialValues'];
|
|
22
22
|
buttonRef: RefObject<DialogButtonRef>;
|
package/es/pro-table/table.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { ColumnGroupType, ColumnType } from 'antd/es/table';
|
|
|
3
3
|
import { TableSticky } from 'rc-table/lib/interface';
|
|
4
4
|
import React, { CSSProperties, ReactElement, ReactNode } from 'react';
|
|
5
5
|
import CCS from '..';
|
|
6
|
-
import { PropsWithCss, PropsWithNodeChildren,
|
|
6
|
+
import { PropsWithCss, PropsWithNodeChildren, TableColumns } from '../ccs';
|
|
7
7
|
import { CcsFieldNamesType } from '../context';
|
|
8
8
|
import { EllipsisProps } from '../ellipsis';
|
|
9
9
|
import './index.less';
|
|
@@ -29,7 +29,7 @@ type TableTitleType<T> = {
|
|
|
29
29
|
export type CcsTableProps<T> = Omit<TableProps<T>, 'columns' | 'title'> & {
|
|
30
30
|
data?: CCS.TableData<T>;
|
|
31
31
|
/** request 方法 */
|
|
32
|
-
request?: (params:
|
|
32
|
+
request?: (params: any) => Promise<any>;
|
|
33
33
|
/** request 额外参数 */
|
|
34
34
|
requestParam?: ParamType;
|
|
35
35
|
/** 接口字段指定,默认: */
|
package/es/pro-table/table.js
CHANGED
|
@@ -240,7 +240,7 @@ var InternalProTable = function InternalProTable(props) {
|
|
|
240
240
|
if (fsQuery && fsQuery.length > 0) {
|
|
241
241
|
onSetObj(params, _toConsumableArray(fsQuery), _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues));
|
|
242
242
|
} else {
|
|
243
|
-
params = _objectSpread(_objectSpread({}, requestParam), formValues);
|
|
243
|
+
params = _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues);
|
|
244
244
|
}
|
|
245
245
|
if (pagination !== false) {
|
|
246
246
|
// 分页
|
|
@@ -408,7 +408,7 @@ var InternalProTable = function InternalProTable(props) {
|
|
|
408
408
|
return {
|
|
409
409
|
data: data,
|
|
410
410
|
selectedRows: selectedRows,
|
|
411
|
-
formValues: _objectSpread(_objectSpread({}, (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFieldsValue()), filtersRef.current),
|
|
411
|
+
formValues: _objectSpread(_objectSpread(_objectSpread({}, formInitValues), (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFieldsValue()), filtersRef.current),
|
|
412
412
|
onSearch: function onSearch() {
|
|
413
413
|
_onSearch();
|
|
414
414
|
},
|